CVS commit: pkgsrc/x11/gtk2

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sat Mar  9 04:17:08 UTC 2024

Modified Files:
        pkgsrc/x11/gtk2: distinfo
Added Files:
        pkgsrc/x11/gtk2/patches: patch-gtk_gtkscale.c

Log Message:
gtk2: fix clang build with latest macOS CLT.


To generate a diff of this commit:
cvs rdiff -u -r1.170 -r1.171 pkgsrc/x11/gtk2/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/gtk2/patches/patch-gtk_gtkscale.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/distinfo
diff -u pkgsrc/x11/gtk2/distinfo:1.170 pkgsrc/x11/gtk2/distinfo:1.171
--- pkgsrc/x11/gtk2/distinfo:1.170      Tue Feb 27 14:50:50 2024
+++ pkgsrc/x11/gtk2/distinfo    Sat Mar  9 04:17:07 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.170 2024/02/27 14:50:50 tsutsui Exp $
+$NetBSD: distinfo,v 1.171 2024/03/09 04:17:07 schmonz Exp $
 
 BLAKE2s (gtk+-2.24.33.tar.xz) = 358ff13c5e021a4634bc5944474c0818181d56cff55473d911a4afb42d5d81fb
 SHA512 (gtk+-2.24.33.tar.xz) = 71b588797c81f727dfac8dcb1be193f7436f717d30ecf18eae2d3aeb0f445b3be4743400acac16435490db8f564f01032065d3f42d27871317f80c98aef929d5
@@ -9,5 +9,6 @@ SHA1 (patch-aj) = 9887573ac7ade9e8f8ee2e
 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

Added files:

Index: pkgsrc/x11/gtk2/patches/patch-gtk_gtkscale.c
diff -u /dev/null pkgsrc/x11/gtk2/patches/patch-gtk_gtkscale.c:1.1
--- /dev/null   Sat Mar  9 04:17:08 2024
+++ pkgsrc/x11/gtk2/patches/patch-gtk_gtkscale.c        Sat Mar  9 04:17:08 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-gtk_gtkscale.c,v 1.1 2024/03/09 04:17:08 schmonz Exp $
+
+Fix cast, and thus at least the macOS build with clang-1500.3.9.4.
+
+--- gtk/gtkscale.c.orig        2024-03-09 04:11:20.974372762 +0000
++++ gtk/gtkscale.c
+@@ -1471,7 +1471,7 @@ gtk_scale_add_mark (GtkScale        *sca
+   mark->position = position;
+  
+   priv->marks = g_slist_insert_sorted_with_data (priv->marks, mark,
+-                                                 (GCompareFunc) compare_marks,
++                                                 (GCompareDataFunc) compare_marks,
+                                                  GINT_TO_POINTER (
+                                                    gtk_range_get_inverted (GTK_RANGE (scale)) 
+                                                    ));