From faa8b4c12dd282da63bc26873e1abb9b141554d4 Mon Sep 17 00:00:00 2001 From: auouymous Date: Wed, 4 Jan 2023 22:33:01 -0700 Subject: [PATCH] Update gtk-osx modules. --- bootstrap.sh | 6 +-- modulesets/gtk-osx.modules | 53 +++++++++---------- ...gtk-3-24-36-image-recolor-load-crash.patch | 35 ++++++++++++ ...-3.24.33-quartz-window-transient-for.patch | 46 ---------------- ...ve-gtk4-update-icon-cache-dependency.patch | 10 ---- 5 files changed, 63 insertions(+), 87 deletions(-) create mode 100644 modulesets/patches/gtk-3-24-36-image-recolor-load-crash.patch delete mode 100644 modulesets/patches/gtk-3.24.33-quartz-window-transient-for.patch delete mode 100644 modulesets/patches/gtk-3.24.33-remove-gtk4-update-icon-cache-dependency.patch diff --git a/bootstrap.sh b/bootstrap.sh index 1795572..915de03 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -13,9 +13,9 @@ rm -f "$HOME/.config/jhbuildrc-custom" mkdir -p "$HOME/.config" cp misc/jhbuildrc-custom "$HOME/.config/jhbuildrc-custom" -git clone https://gitlab.gnome.org/GNOME/gtk-osx.git _gtk-osx -# try latest commit (2022-02-18) -(cd _gtk-osx && git checkout 6be92a11) +git clone https://gitlab.gnome.org/GNOME/gtk-osx.git _gtk-osx +# try latest commit (2023-01-03) +(cd _gtk-osx && git checkout 78bd3324) # fix boostrap failure: error message on pip download sed -i '' s,https://bootstrap.pypa.io/2.7/get-pip.py,https://bootstrap.pypa.io/pip/2.7/get-pip.py, _gtk-osx/gtk-osx-setup.sh sed -i '' 's:curl -ks :curl -ksS :' _gtk-osx/gtk-osx-setup.sh diff --git a/modulesets/gtk-osx.modules b/modulesets/gtk-osx.modules index ef139ad..dff44b9 100644 --- a/modulesets/gtk-osx.modules +++ b/modulesets/gtk-osx.modules @@ -2,8 +2,8 @@ - + - - + - + @@ -109,7 +109,7 @@ - + @@ -122,8 +122,9 @@ - + repo="sourceforge"/> @@ -183,10 +184,10 @@ - + + module="harfbuzz/harfbuzz/releases/download/4.1.0/harfbuzz-4.1.0.tar.xz" + hash="sha256:f7984ff4241d4d135f318a93aa902d910a170a8265b7eaf93b5d9a504eed40c8"> @@ -220,7 +221,7 @@ - + @@ -266,10 +267,9 @@ - - - + + @@ -287,8 +287,8 @@ - + module="ebassi/graphene/releases/download/1.10.6/graphene-1.10.6.tar.xz" + hash="sha256:80ae57723e4608e6875626a88aaa6f56dd25df75024bd16e9d77e718c3560b25"/> @@ -300,11 +300,11 @@ - + checkoutdir="libsass-3.6.5" + hash="sha256:89d8f2c46ae2b1b826b58ce7dde966a176bac41975b82e84ad46b01a55080582"/> - + @@ -325,11 +325,8 @@ - - - - + - - + + diff --git a/modulesets/patches/gtk-3-24-36-image-recolor-load-crash.patch b/modulesets/patches/gtk-3-24-36-image-recolor-load-crash.patch new file mode 100644 index 0000000..18b5a63 --- /dev/null +++ b/modulesets/patches/gtk-3-24-36-image-recolor-load-crash.patch @@ -0,0 +1,35 @@ +From 40bcba64548bb29b6a6209030eeb06bf13ca98f9 Mon Sep 17 00:00:00 2001 +From: John Ralls +Date: Fri, 23 Dec 2022 13:27:50 -0800 +Subject: [PATCH] Don't rely on gtk_icon_info_load_symbolic to set a GError. + +--- + gtk/gtkcssimagerecolor.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/gtk/gtkcssimagerecolor.c b/gtk/gtkcssimagerecolor.c +index 1c38654cfa..db7d08f008 100644 +--- a/gtk/gtkcssimagerecolor.c ++++ b/gtk/gtkcssimagerecolor.c +@@ -125,12 +125,17 @@ gtk_css_image_recolor_load (GtkCssImageRecolor *recolor, + if (gerror) + { + char *uri; ++ char *msg; ++ if (local_error && local_error->message) ++ msg = local_error->message; ++ else ++ msg = "gtk_icon_info_load_symbolic did not set the passed-in GError."; + + uri = g_file_get_uri (url->file); + g_set_error (gerror, + GTK_CSS_PROVIDER_ERROR, + GTK_CSS_PROVIDER_ERROR_FAILED, +- "Error loading image '%s': %s", uri, local_error->message); ++ "Error loading image '%s': %s", uri, msg); + g_error_free (local_error); + g_free (uri); + } +-- +2.37.1 (Apple Git-137.1) + diff --git a/modulesets/patches/gtk-3.24.33-quartz-window-transient-for.patch b/modulesets/patches/gtk-3.24.33-quartz-window-transient-for.patch deleted file mode 100644 index 39435df..0000000 --- a/modulesets/patches/gtk-3.24.33-quartz-window-transient-for.patch +++ /dev/null @@ -1,46 +0,0 @@ -From f42f7adc531da47b5c34a05da84ac873618f55ed Mon Sep 17 00:00:00 2001 -From: John Ralls -Date: Mon, 28 Mar 2022 11:26:41 -0700 -Subject: [PATCH] [quartz-window]Always ensure that transient_for isn't - destroyed before using it. - -Fixes crash when destroying a dialog whose transient_for parent is -already destroyed. ---- - gdk/quartz/gdkwindow-quartz.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c -index aa85318e0b..15cde981a0 100644 ---- a/gdk/quartz/gdkwindow-quartz.c -+++ b/gdk/quartz/gdkwindow-quartz.c -@@ -788,7 +788,7 @@ _gdk_quartz_window_did_become_main (GdkWindow *window) - if (window->window_type != GDK_WINDOW_TEMP) - main_window_stack = g_slist_prepend (main_window_stack, window); - -- if (impl->transient_for) -+ if (impl->transient_for && !GDK_WINDOW_DESTROYED (impl->transient_for)) - raise_transient (impl); - - clear_toplevel_order (); -@@ -1176,6 +1176,8 @@ _gdk_quartz_window_detach_from_parent (GdkWindow *window) - parent_impl = GDK_WINDOW_IMPL_QUARTZ (impl->transient_for->impl); - [parent_impl->toplevel removeChildWindow:impl->toplevel]; - clear_toplevel_order (); -+ g_object_unref (impl->transient_for); -+ impl->transient_for = NULL; - } - } - -@@ -1557,7 +1559,7 @@ gdk_window_quartz_raise (GdkWindow *window) - - impl = GDK_WINDOW_IMPL_QUARTZ (window->impl); - -- if (impl->transient_for) -+ if (impl->transient_for && !GDK_WINDOW_DESTROYED (impl->transient_for)) - raise_transient (impl); - else - [impl->toplevel orderFront:impl->toplevel]; --- -2.32.0 (Apple Git-132) - diff --git a/modulesets/patches/gtk-3.24.33-remove-gtk4-update-icon-cache-dependency.patch b/modulesets/patches/gtk-3.24.33-remove-gtk4-update-icon-cache-dependency.patch deleted file mode 100644 index 2850343..0000000 --- a/modulesets/patches/gtk-3.24.33-remove-gtk4-update-icon-cache-dependency.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/meson.build~ 2022-03-04 20:53:25.000000000 -0800 -+++ b/meson.build 2022-03-22 15:44:32.000000000 -0700 -@@ -1013,7 +1013,6 @@ - gnome.post_install( - glib_compile_schemas: true, - gio_querymodules: gio_module_dirs, -- gtk_update_icon_cache: get_option('demos'), - ) - else - # Keep this in sync with post-install.py expected arguments