<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ffd9c6e4be106d3922c69d9c81afaa12111767fa">https://github.com/macports/macports-ports/commit/ffd9c6e4be106d3922c69d9c81afaa12111767fa</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ffd9c6e4be106d3922c69d9c81afaa12111767fa
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Wed Apr 24 15:12:27 2024 -0400
<span style='display:block; white-space:pre;color:#404040;'> gtk2: patch source issues
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - Disable silent rules
</span><span style='display:block; white-space:pre;color:#404040;'> - Reduce warnings
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/69471
</span>---
gnome/gtk2/Portfile | 14 +++++++--
gnome/gtk2/files/patch-gtkscale-bad-cast.diff | 18 ++++++++++++
gnome/gtk2/files/patch-tests-menubars.diff | 41 +++++++++++++++++++++++++++
3 files changed, 71 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk2/Portfile b/gnome/gtk2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9c01ac4a113..d77621a24f8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gtk2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gtk2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@ name gtk2
</span> conflicts gtk2-devel
set my_name gtk2
version 2.24.33
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> epoch 0
categories gnome x11
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,12 +61,18 @@ depends_run-append \
</span> patchfiles-append patch-aliases.diff
patchfiles-append patch-gtk-builder-convert.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Minor source fixes, only applicable to gtk2; fixed/removed for gtk3 and later.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See: https://trac.macports.org/ticket/69471
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-gtkscale-bad-cast.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-tests-menubars.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # autoreconf to deal with stupid issues during install (install: .libs/libferret.lai: No such file or directory)
use_autoreconf yes
autoreconf.args -fvi
configure.args-append \
--disable-glibtest \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-silent-rules \
</span> --enable-introspection \
--enable-static \
gio_can_sniff=yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,7 +82,11 @@ configure.cppflags-append \
</span> -DX_LOCALE \
-D_IPP_PRIVATE_STRUCTURES=1
configure.cflags-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -fstrict-aliasing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -fstrict-aliasing \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Wno-deprecated-declarations \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Wno-enum-conversion \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Wno-unknown-warning-option \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Wno-error=unknown-warning-option
</span>
# gobject-introspection uses g-ir-scanner, which uses $CC from env
if {${universal_possible} && [variant_isset universal]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk2/files/patch-gtkscale-bad-cast.diff b/gnome/gtk2/files/patch-gtkscale-bad-cast.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..253f19c01f3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gtk2/files/patch-gtkscale-bad-cast.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#==================================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Upstream bug fix, removing invalid cast to GCompareFunc. Fixed in gtk3 and later, but never
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# backported to gtk2.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Date: 2024-04-24
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See: https://trac.macports.org/ticket/69471
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#==================================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gtk/gtkscale.c.orig 2024-04-24 14:08:36.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gtk/gtkscale.c 2024-04-24 14:09:30.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1471,7 +1471,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mark->position = position;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ priv->marks = g_slist_insert_sorted_with_data (priv->marks, mark,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (GCompareFunc) compare_marks,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ compare_marks,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GINT_TO_POINTER (
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gtk_range_get_inverted (GTK_RANGE (scale))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ));
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk2/files/patch-tests-menubars.diff b/gnome/gtk2/files/patch-tests-menubars.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..676a2068858
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gtk2/files/patch-tests-menubars.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,41 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#==================================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Upstream bug fix, for a few fundamental issues with this source file. Removed in gtk3 and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# later, so only applicable to gtk2.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Date: 2024-04-25
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See: https://trac.macports.org/ticket/69471
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#==================================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tests/testmenubars.c.orig 2024-04-24 14:14:19.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tests/testmenubars.c 2024-04-24 14:17:42.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,7 +21,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <gtk/gtk.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static GtkWidget *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-create_menu (depth)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++create_menu (int depth)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GtkWidget *menu;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GtkWidget *menuitem;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -70,19 +70,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_HOME, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gtk_label_set_angle (GTK_LABEL (GTK_BIN (menuitem)->child), angle);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- menu = create_menu (2, TRUE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ menu = create_menu (2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menu);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ menuitem = gtk_menu_item_new_with_label ("foo");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gtk_label_set_angle (GTK_LABEL (GTK_BIN (menuitem)->child), angle);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- menu = create_menu (2, TRUE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ menu = create_menu (2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menu);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ menuitem = gtk_menu_item_new_with_label ("bar");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gtk_label_set_angle (GTK_LABEL (GTK_BIN (menuitem)->child), angle);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- menu = create_menu (2, TRUE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ menu = create_menu (2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menu);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return menubar;
</span></pre><pre style='margin:0'>
</pre>