CVS commit: pkgsrc/x11/gtk2

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Wed Feb 12 05:07:23 UTC 2025

Modified Files:
        pkgsrc/x11/gtk2: Makefile buildlink3.mk distinfo modules.mk
Added Files:
        pkgsrc/x11/gtk2/patches: patch-gtk_Makefile.in
            patch-gtk_updateiconcache.c

Log Message:
x11/gtk2: fix the build on NetBSD-10.99.12-amd64


To generate a diff of this commit:
cvs rdiff -u -r1.350 -r1.351 pkgsrc/x11/gtk2/Makefile
cvs rdiff -u -r1.89 -r1.90 pkgsrc/x11/gtk2/buildlink3.mk
cvs rdiff -u -r1.171 -r1.172 pkgsrc/x11/gtk2/distinfo
cvs rdiff -u -r1.18 -r1.19 pkgsrc/x11/gtk2/modules.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/gtk2/patches/patch-gtk_Makefile.in \
    pkgsrc/x11/gtk2/patches/patch-gtk_updateiconcache.c

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

Modified files:

Index: pkgsrc/x11/gtk2/Makefile
diff -u pkgsrc/x11/gtk2/Makefile:1.350 pkgsrc/x11/gtk2/Makefile:1.351
--- pkgsrc/x11/gtk2/Makefile:1.350      Fri Dec 27 08:20:55 2024
+++ pkgsrc/x11/gtk2/Makefile    Wed Feb 12 05:07:23 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.350 2024/12/27 08:20:55 wiz Exp $
+# $NetBSD: Makefile,v 1.351 2025/02/12 05:07:23 rillig Exp $
 
 DISTNAME=      gtk+-2.24.33
 PKGNAME=       ${DISTNAME:S/gtk/gtk2/}
-PKGREVISION=   26
+PKGREVISION=   27
 CATEGORIES=    x11 gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gtk+/2.24/}
 EXTRACT_SUFX=  .tar.xz
@@ -24,6 +24,7 @@ USE_LIBTOOL=          yes
 PTHREAD_AUTO_VARS=     yes
 
 GNU_CONFIGURE=         yes
+GNU_CONFIGURE_ICONV=   no
 # bashism in "configure" (illegal variable substitution), patched
 #CONFIG_SHELL=         bash
 CONFIGURE_ARGS+=       --sysconfdir=${PREFIX}/libdata
@@ -34,6 +35,8 @@ CONFIGURE_ENV+=               ac_cv_prog_DB2HTML=fals
 MAKE_ENV+=             PKGLOCALEDIR=${PKGLOCALEDIR}
 TEST_TARGET=           check
 
+BROKEN_GETTEXT_DETECTION=      yes
+
 PKGCONFIG_OVERRIDE=    gdk-2.0-uninstalled.pc.in
 PKGCONFIG_OVERRIDE+=   gdk-2.0.pc.in
 PKGCONFIG_OVERRIDE+=   gtk+-2.0-uninstalled.pc.in
@@ -90,7 +93,7 @@ post-install:
        ${RM} -f ${DESTDIR}${GTK_IMMODULES_DB}
 
 FILES_SUBST+=          GTK_UPDATE_ICON_CACHE="${PREFIX}/bin/gtk2-update-icon-cache"
-FILES_SUBST+=          ICON_THEME_DIR="${LOCALBASE}/share/icons"
+FILES_SUBST+=          ICON_THEME_DIR="${PREFIX}/share/icons"
 INSTALL_TEMPLATES+=    ../../x11/gtk2/files/icon-cache.tmpl
 
 _BUILDING_GTK2=        yes

Index: pkgsrc/x11/gtk2/buildlink3.mk
diff -u pkgsrc/x11/gtk2/buildlink3.mk:1.89 pkgsrc/x11/gtk2/buildlink3.mk:1.90
--- pkgsrc/x11/gtk2/buildlink3.mk:1.89  Fri Dec 27 08:20:55 2024
+++ pkgsrc/x11/gtk2/buildlink3.mk       Wed Feb 12 05:07:23 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.89 2024/12/27 08:20:55 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.90 2025/02/12 05:07:23 rillig Exp $
 
 BUILDLINK_TREE+=       gtk2
 
@@ -22,7 +22,7 @@ pkgbase := gtk2
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf2/buildlink3.mk"
-.if !empty(PKG_BUILD_OPTIONS.gtk2:Mx11)
+.if ${PKG_BUILD_OPTIONS.gtk2:Mx11}
 .include "../../x11/libXcursor/buildlink3.mk"
 .include "../../x11/libXdamage/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"

Index: pkgsrc/x11/gtk2/distinfo
diff -u pkgsrc/x11/gtk2/distinfo:1.171 pkgsrc/x11/gtk2/distinfo:1.172
--- pkgsrc/x11/gtk2/distinfo:1.171      Sat Mar  9 04:17:07 2024
+++ pkgsrc/x11/gtk2/distinfo    Wed Feb 12 05:07:23 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.171 2024/03/09 04:17:07 schmonz Exp $
+$NetBSD: distinfo,v 1.172 2025/02/12 05:07:23 rillig Exp $
 
 BLAKE2s (gtk+-2.24.33.tar.xz) = 358ff13c5e021a4634bc5944474c0818181d56cff55473d911a4afb42d5d81fb
 SHA512 (gtk+-2.24.33.tar.xz) = 71b588797c81f727dfac8dcb1be193f7436f717d30ecf18eae2d3aeb0f445b3be4743400acac16435490db8f564f01032065d3f42d27871317f80c98aef929d5
@@ -6,9 +6,11 @@ Size (gtk+-2.24.33.tar.xz) = 12661828 by
 SHA1 (patch-ab) = 9c82cc60f3825d377a197c876fcc6faa379cbde3
 SHA1 (patch-af) = d59414e24a7da7f8694dbefbd2f0c2c2b60ec5ad
 SHA1 (patch-aj) = 9887573ac7ade9e8f8ee2ead68e279f67836a1a3
+SHA1 (patch-gtk_Makefile.in) = 354b61b7bde7105f065d0d97283e09002e9a0dbf
 SHA1 (patch-gtk_gtkfilechooserdefault.c) = f690f3a8c3066e49e8184fb096f5dd74e5a93f33
 SHA1 (patch-gtk_gtkfilesystemmodel.c) = 5a70efa956be67b8d9b4a5b79147003988c4befd
 SHA1 (patch-gtk_gtkpathbar.c) = 7e5c4186bd9533cb096f5331e3eb7193222b47b3
 SHA1 (patch-gtk_gtkscale.c) = 6fe1032e6969cdb2151769e50017ada07d419b3e
 SHA1 (patch-gtk_gtksearchenginesimple.c) = 3c44b84f2e0d3f7cdfb594bf56370f588d165b14
 SHA1 (patch-gtk_gtktooltips.c) = 94f384b4becd74a9effcdbb72bbe3ee9a58d2bb8
+SHA1 (patch-gtk_updateiconcache.c) = 6f31653c53cc8a93001dac7e03fc06ba3e7cc03a

Index: pkgsrc/x11/gtk2/modules.mk
diff -u pkgsrc/x11/gtk2/modules.mk:1.18 pkgsrc/x11/gtk2/modules.mk:1.19
--- pkgsrc/x11/gtk2/modules.mk:1.18     Thu Jul 18 13:10:03 2013
+++ pkgsrc/x11/gtk2/modules.mk  Wed Feb 12 05:07:23 2025
@@ -1,4 +1,4 @@
-# $NetBSD: modules.mk,v 1.18 2013/07/18 13:10:03 wiz Exp $
+# $NetBSD: modules.mk,v 1.19 2025/02/12 05:07:23 rillig Exp $
 #
 # This Makefile fragment is intended to be included by packages that install
 # GTK2 modules.  It takes care of rebuilding the corresponding databases at
@@ -18,7 +18,7 @@ BUILDLINK_PREFIX.gtk2=        ${PREFIX}
 GTK2_IMMODULES=                YES
 .endif
 
-.if defined(GTK2_IMMODULES) && !empty(GTK2_IMMODULES:M[Yy][Ee][Ss])
+.if !empty(GTK2_IMMODULES:M[Yy][Ee][Ss])
 FILES_SUBST+=          GTK_IMMODULES_DB=${GTK_IMMODULES_DB:Q}
 FILES_SUBST+=          GTK_QUERY_IMMODULES=${GTK_QUERY_IMMODULES:Q}
 GTK_IMMODULES_DB=      ${BUILDLINK_PREFIX.gtk2}/lib/gtk-2.0/2.10.0/immodules.cache

Added files:

Index: pkgsrc/x11/gtk2/patches/patch-gtk_Makefile.in
diff -u /dev/null pkgsrc/x11/gtk2/patches/patch-gtk_Makefile.in:1.1
--- /dev/null   Wed Feb 12 05:07:23 2025
+++ pkgsrc/x11/gtk2/patches/patch-gtk_Makefile.in       Wed Feb 12 05:07:23 2025
@@ -0,0 +1,20 @@
+$NetBSD: patch-gtk_Makefile.in,v 1.1 2025/02/12 05:07:23 rillig Exp $
+
+https://gitlab.gnome.org/GNOME/gtk/-/issues/7332
+
+On at least NetBSD 10.99.12 amd64, updateiconcache.c needs to run in a
+UTF-8 locale, to prevent this error message during the build:
+
+> GLib: Cannot convert message: Conversion from character set “UTF-8” to
+> “646” is not supported
+
+--- gtk/Makefile.in.orig       2025-02-12 02:53:53.541743756 +0000
++++ gtk/Makefile.in
+@@ -7520,6 +7520,7 @@
+ 
+ gtkbuiltincache.h: @REBUILD@ stamp-icons
+       $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
++      LC_ALL=en_US.UTF-8 \
+       $(gtk_update_icon_cache_program) --force --ignore-theme-index           \
+          --include-image-data                                                 \
+          --source builtin_icons stock-icons > gtkbuiltincache.h.tmp &&        \
Index: pkgsrc/x11/gtk2/patches/patch-gtk_updateiconcache.c
diff -u /dev/null pkgsrc/x11/gtk2/patches/patch-gtk_updateiconcache.c:1.1
--- /dev/null   Wed Feb 12 05:07:23 2025
+++ pkgsrc/x11/gtk2/patches/patch-gtk_updateiconcache.c Wed Feb 12 05:07:23 2025
@@ -0,0 +1,75 @@
+$NetBSD: patch-gtk_updateiconcache.c,v 1.1 2025/02/12 05:07:23 rillig Exp $
+
+https://gitlab.gnome.org/GNOME/gtk/-/issues/7332
+
+Add error handling to the option parsing. Without this error handling,
+option parsing was skipped on character conversion errors, and in turn,
+the file "--force/theme.index" was not found.
+
+Remove custom error handling, as it was missing proper error handling in
+the case where the message could not be converted from character set
+"UTF-8" to "646" when running with LC_ALL=C instead of
+LC_ALL=en_US.UTF-8.
+
+--- gtk/updateiconcache.c.orig 2020-12-18 05:50:58.000000000 +0000
++++ gtk/updateiconcache.c
+@@ -1667,43 +1667,16 @@ static GOptionEntry args[] = {
+   { NULL }
+ };
+ 
+-static void
+-printerr_handler (const gchar *string)
+-{
+-  const gchar *charset;
+-
+-  fputs (g_get_prgname (), stderr);
+-  fputs (": ", stderr);
+-  if (g_get_charset (&charset))
+-    fputs (string, stderr); /* charset is UTF-8 already */
+-  else
+-    {
+-      gchar *result;
+-
+-      result = g_convert_with_fallback (string, -1, charset, "UTF-8", "?", NULL, NULL, NULL);
+-      
+-      if (result)
+-        {
+-          fputs (result, stderr);
+-          g_free (result);
+-        }
+-   
+-      fflush (stderr);
+-    }
+-}
+-
+-
+ int
+ main (int argc, char **argv)
+ {
+   gchar *path;
+   GOptionContext *context;
++  GError *error = NULL;
+ 
+   if (argc < 2)
+     return 0;
+ 
+-  g_set_printerr_handler (printerr_handler);
+-  
+   setlocale (LC_ALL, "");
+ 
+ #ifdef ENABLE_NLS
+@@ -1716,8 +1689,12 @@ main (int argc, char **argv)
+   context = g_option_context_new ("ICONPATH");
+   g_option_context_add_main_entries (context, args, GETTEXT_PACKAGE);
+ 
+-  g_option_context_parse (context, &argc, &argv, NULL);
+-  
++  if (!g_option_context_parse (context, &argc, &argv, &error))
++    {
++      g_printerr ("%s\n", error->message);
++      exit (1);
++    }
++
+   path = argv[1];
+ #ifdef G_OS_WIN32
+   path = g_locale_to_utf8 (path, -1, NULL, NULL, NULL);