diff --git a/gnome/gtk3/Portfile b/gnome/gtk3/Portfile index 37bc7d0334618..9cbd212a65b2d 100644 --- a/gnome/gtk3/Portfile +++ b/gnome/gtk3/Portfile @@ -12,11 +12,11 @@ PortGroup debug 1.0 name gtk3 conflicts gtk3-devel set my_name gtk3 -version 3.24.43 -revision 1 +version 3.24.49 +revision 0 epoch 1 -set proj_name gtk+ +set proj_name gtk set branch [join [lrange [split ${version} .] 0 1] .] categories gnome x11 license LGPL-2.1+ @@ -34,9 +34,9 @@ dist_subdir ${my_name} use_xz yes master_sites gnome:sources/${proj_name}/${branch}/ -checksums rmd160 df28a61ab70fecdac358e696e20846f619621223 \ - sha256 7e04f0648515034b806b74ae5d774d87cffb1a2a96c468cb5be476d51bf2f3c7 \ - size 13227856 +checksums rmd160 ee5e5999848582cd7c9be3cf258fb0ea4490bb1c \ + sha256 5ea52c6a28f0e5ecf2e9a3c2facbb30d040b73871fcd5f33cd1317e9018a146e \ + size 13450556 # Disable unexpected download of subprojects meson.wrap_mode nodownload @@ -86,6 +86,11 @@ patchfiles-append patch-tests-gdkgears.diff # https://github.com/mesonbuild/meson/issues/7652 patchfiles-append patch-sincos.diff +# When removing menu items, this prevents dereferencing a null pointer (from lukaso) +# https://gitlab.gnome.org/GNOME/gtk/-/issues/6304 +# *NOT* merged merge request: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/8136 +patchfiles-append patch-gtk-menu-crash.diff + # gtk3 +quartz uses instancetype which is not available # before approximately Xcode 4.6 (#49391) # if building +x11 blacklist comilers that do not support C11 diff --git a/gnome/gtk3/files/patch-gtk-menu-crash.diff b/gnome/gtk3/files/patch-gtk-menu-crash.diff new file mode 100644 index 0000000000000..20f3994ed67b7 --- /dev/null +++ b/gnome/gtk3/files/patch-gtk-menu-crash.diff @@ -0,0 +1,13 @@ +diff --git gtk/gtkmenutracker.c gtk/gtkmenutracker.c +index 2d39319875..85d318fa1f 100644 +--- gtk/gtkmenutracker.c ++++ gtk/gtkmenutracker.c +@@ -282,6 +282,8 @@ gtk_menu_tracker_remove_items (GtkMenuTracker *tracker, + { + gint i; + ++ g_return_if_fail (*change_point != NULL); ++ + for (i = 0; i < n_items; i++) + { + GtkMenuTrackerSection *subsection;