CVS commit: pkgsrc/graphics/cairo

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Wed Nov 15 15:11:39 UTC 2023

Modified Files:
        pkgsrc/graphics/cairo: PLIST options.mk

Log Message:
cairo: compile in the fontconfig and freetype2 backends even when using quartz

print/poppler does not compile if they are missing.
May well we be poppler problem but this fix is easier and behaves like
the package did before the update (cairo-ft.h shipped even with quartz)


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/graphics/cairo/PLIST
cvs rdiff -u -r1.24 -r1.25 pkgsrc/graphics/cairo/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/cairo/PLIST
diff -u pkgsrc/graphics/cairo/PLIST:1.43 pkgsrc/graphics/cairo/PLIST:1.44
--- pkgsrc/graphics/cairo/PLIST:1.43    Tue Nov 14 13:48:19 2023
+++ pkgsrc/graphics/cairo/PLIST Wed Nov 15 15:11:39 2023
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.43 2023/11/14 13:48:19 wiz Exp $
+@comment $NetBSD: PLIST,v 1.44 2023/11/15 15:11:39 tnn Exp $
 ${PLIST.trace}bin/cairo-trace
 include/cairo/cairo-deprecated.h
 include/cairo/cairo-features.h
-${PLIST.x11}include/cairo/cairo-ft.h
+${PLIST.freetype}include/cairo/cairo-ft.h
 include/cairo/cairo-gobject.h
 include/cairo/cairo-pdf.h
 include/cairo/cairo-ps.h
@@ -28,8 +28,8 @@ lib/libcairo-script-interpreter.so.2.118
 lib/libcairo.so
 lib/libcairo.so.2
 lib/libcairo.so.2.11800.0
-${PLIST.x11}lib/pkgconfig/cairo-fc.pc
-${PLIST.x11}lib/pkgconfig/cairo-ft.pc
+${PLIST.fontconfig}lib/pkgconfig/cairo-fc.pc
+${PLIST.freetype}lib/pkgconfig/cairo-ft.pc
 lib/pkgconfig/cairo-gobject.pc
 lib/pkgconfig/cairo-pdf.pc
 lib/pkgconfig/cairo-png.pc

Index: pkgsrc/graphics/cairo/options.mk
diff -u pkgsrc/graphics/cairo/options.mk:1.24 pkgsrc/graphics/cairo/options.mk:1.25
--- pkgsrc/graphics/cairo/options.mk:1.24       Tue Nov 14 13:48:19 2023
+++ pkgsrc/graphics/cairo/options.mk    Wed Nov 15 15:11:39 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.24 2023/11/14 13:48:19 wiz Exp $
+# $NetBSD: options.mk,v 1.25 2023/11/15 15:11:39 tnn Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.cairo
 PKG_SUPPORTED_OPTIONS= x11 xcb
@@ -11,13 +11,15 @@ PKG_SUGGESTED_OPTIONS=      x11 xcb
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=   x11 xcb quartz
+PLIST_VARS+=   fontconfig freetype x11 xcb quartz
 
 ###
 ### X11 and XCB support (XCB implies X11)
 ###
 .if !empty(PKG_OPTIONS:Mx11) || !empty(PKG_OPTIONS:Mxcb)
-PLIST.x11=     yes
+PLIST.fontconfig=      yes
+PLIST.freetype=                yes
+PLIST.x11=             yes
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
@@ -41,6 +43,12 @@ PLIST.xcb=   yes
 # fonts in MacOS X system-default paths too so sticking with it will
 # not be a problem.
 .if !empty(PKG_OPTIONS:Mquartz)
-PLIST.quartz=  yes
-WARNINGS+=     "You have enabled Quartz backend. No fonts installed with pkgsrc will be found."
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+MESON_ARGS+=           -Dfreetype=enabled
+MESON_ARGS+=           -Dfontconfig=enabled
+PLIST.fontconfig=      yes
+PLIST.freetype=                yes
+PLIST.quartz=          yes
+WARNINGS+=             "You have enabled Quartz backend. No fonts installed with pkgsrc will be found."
 .endif