gtk3: Add a direct dependency to freetype2 Since 3.24 (probably from upstream commit d60cd1f4) freetype headers are directly included. Adjust configure script to check for freetype2 too. Should address PR pkg/53690. Index: distinfo =================================================================== RCS file: /cvsroot/pkgsrc/x11/gtk3/distinfo,v retrieving revision 1.57 diff -u -p -r1.57 distinfo --- distinfo 23 Oct 2018 07:42:23 -0000 1.57 +++ distinfo 29 Oct 2018 15:40:36 -0000 @@ -6,8 +6,8 @@ SHA512 (gtk+-3.24.1.tar.xz) = 13ddb1099a Size (gtk+-3.24.1.tar.xz) = 19307612 bytes SHA1 (patch-aj) = cbfab43f27352f7c6bc57a7c562c2d84c69da07a SHA1 (patch-config.h.in) = dc5f8741eed554f88c0b6834cadad95083e4dc8f -SHA1 (patch-configure) = d531b33e52facf960058f1223b70db680da35300 -SHA1 (patch-configure.ac) = 68793f40752f25ccaecc958c72c23a504670bea5 +SHA1 (patch-configure) = 0c5d666a862a0dc6482898112517846b3851f34e +SHA1 (patch-configure.ac) = d0b1ca5a67fe76d3141e896d15080a64c375d42e SHA1 (patch-gdk_x11_gdkscreen-x11.h) = 455d6c3de8421984ba3c99baf51cd31982a3df78 SHA1 (patch-gdk_x11_gdkwindow-x11.h) = c80f7c9d5a570817e54fd74fa903a53400dc6f64 SHA1 (patch-gtk_a11y_gtkaccessibility.c) = 13232c85bd570f21ea03153dacde4ca98c7c76a8 Index: patches/patch-configure =================================================================== RCS file: /cvsroot/pkgsrc/x11/gtk3/patches/patch-configure,v retrieving revision 1.4 diff -u -p -r1.4 patch-configure --- patches/patch-configure 23 Oct 2018 07:42:23 -0000 1.4 +++ patches/patch-configure 29 Oct 2018 15:40:36 -0000 @@ -1,6 +1,7 @@ $NetBSD: patch-configure,v 1.4 2018/10/23 07:42:23 leot Exp $ -Make gtk3-atk-bridge an option to avoid unwanted dbus dependency. +- Add a (direct) dependency to freetype2, PR pkg/53690. +- Make gtk3-atk-bridge an option to avoid unwanted dbus dependency. --- configure.orig 2018-09-19 01:46:05.000000000 +0000 +++ configure @@ -20,6 +21,25 @@ Make gtk3-atk-bridge an option to avoid --with-html-dir=PATH path to installed docs --with-xml-catalog=CATALOG path to xml catalog to use +@@ -25637,15 +25639,15 @@ GTK_DEP_LIBS_FOR_X= + X_EXTENSIONS= + + if test "x$enable_x11_backend" = xyes; then +- X_PACKAGES=fontconfig ++ X_PACKAGES="fontconfig freetype2" + + # + # We use fontconfig very peripherally when decoding the default + # settings. + # +- if $PKG_CONFIG --exists fontconfig; then : ; else ++ if $PKG_CONFIG --exists fontconfig freetype2; then : ; else + as_fn_error $? " +-*** fontconfig (http://www.fontconfig.org) is required by the X11 backend." "$LINENO" 5 ++*** fontconfig and freetype2 are required by the X11 backend." "$LINENO" 5 + fi + + # @@ -26974,8 +26976,20 @@ fi # Check for Accessibility Toolkit flags ######################################## Index: patches/patch-configure.ac =================================================================== RCS file: /cvsroot/pkgsrc/x11/gtk3/patches/patch-configure.ac,v retrieving revision 1.2 diff -u -p -r1.2 patch-configure.ac --- patches/patch-configure.ac 8 Sep 2014 12:06:48 -0000 1.2 +++ patches/patch-configure.ac 29 Oct 2018 15:40:36 -0000 @@ -1,10 +1,30 @@ $NetBSD: patch-configure.ac,v 1.2 2014/09/08 12:06:48 wiz Exp $ -Make gtk3-atk-bridge an option to avoid unwanted dbus dependency. +- Add a (direct) dependency to freetype2, PR pkg/53690. +- Make gtk3-atk-bridge an option to avoid unwanted dbus dependency. ---- configure.ac.orig 2013-01-07 10:50:02.000000000 +0000 +--- configure.ac.orig 2018-09-19 01:42:49.000000000 +0000 +++ configure.ac -@@ -1295,8 +1295,13 @@ AC_SUBST(GDK_DEP_CFLAGS) +@@ -1024,15 +1024,15 @@ GTK_DEP_LIBS_FOR_X= + X_EXTENSIONS= + + if test "x$enable_x11_backend" = xyes; then +- X_PACKAGES=fontconfig ++ X_PACKAGES="fontconfig freetype2" + + # + # We use fontconfig very peripherally when decoding the default + # settings. + # +- if $PKG_CONFIG --exists fontconfig; then : ; else ++ if $PKG_CONFIG --exists fontconfig freetype2; then : ; else + AC_MSG_ERROR([ +-*** fontconfig (http://www.fontconfig.org) is required by the X11 backend.]) ++*** fontconfig and freetype2 are required by the X11 backend.]) + fi + + # +@@ -1400,8 +1400,13 @@ AC_SUBST(GDK_DEP_CFLAGS) # Check for Accessibility Toolkit flags ########################################