diff --git a/_service b/_service index b9e4972..600ec6e 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ https://gitlab.gnome.org/GNOME/gtk.git git - 3.24.28 + 3.24.29 @PARENT_TAG@+@TAG_OFFSET@ (.*)\+0 \1 diff --git a/gtk-3.24.28.obscpio b/gtk-3.24.28.obscpio deleted file mode 100644 index 0150a3a..0000000 --- a/gtk-3.24.28.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1e07b569ee24a5e3098dee1de8e3e2a97953f2651af9c0d06cd103245f0bb1ec -size 99428878 diff --git a/gtk-3.24.29.obscpio b/gtk-3.24.29.obscpio new file mode 100644 index 0000000..f0bd253 --- /dev/null +++ b/gtk-3.24.29.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ef654b2a185455330b725e703273633abf2e395f8c5bcb128f12a6a8396f6c1a +size 99478542 diff --git a/gtk.obsinfo b/gtk.obsinfo index be8dee2..37120bd 100644 --- a/gtk.obsinfo +++ b/gtk.obsinfo @@ -1,5 +1,5 @@ name: gtk -version: 3.24.28 -mtime: 1616810069 -commit: 23db3508899f8304482b68e04a181bb081549081 +version: 3.24.29 +mtime: 1619146070 +commit: 77f32a69c0a35ffd3a1a542a6057c1c6d13c793d diff --git a/gtk3-prevent-g_file_get_basename-return-NULL.patch b/gtk3-prevent-g_file_get_basename-return-NULL.patch deleted file mode 100644 index e4329e1..0000000 --- a/gtk3-prevent-g_file_get_basename-return-NULL.patch +++ /dev/null @@ -1,25 +0,0 @@ -commit ce2a433ca157b444b54646aa0383ff5b75cc41f9 -Author: Matthias Clasen -Date: Mon Apr 19 16:39:53 2021 -0400 - - Fix a possible crash in gtk_show_uri - - g_file_get_basename can return NULL. - Deal with it somehow. - - Fixes: #3883 - -diff --git a/gdk/x11/gdkapplaunchcontext-x11.c b/gdk/x11/gdkapplaunchcontext-x11.c -index 206c34e52d..43c190e5e6 100644 ---- a/gdk/x11/gdkapplaunchcontext-x11.c -+++ b/gdk/x11/gdkapplaunchcontext-x11.c -@@ -45,6 +45,9 @@ get_display_name (GFile *file, - if (name == NULL) - { - name = g_file_get_basename (file); -+ if (name == NULL) -+ name = g_file_get_uri (file); -+ - if (!g_utf8_validate (name, -1, NULL)) - { - tmp = name; diff --git a/gtk3.changes b/gtk3.changes index a53b905..203d731 100644 --- a/gtk3.changes +++ b/gtk3.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Fri Apr 23 21:18:32 UTC 2021 - Michael Gorse + +- Update to version 3.24.29: + + Input: + - Look for a Compose file in the right place. + - Revert some Compose sequence changes (mainly around dead + acute and apostrophe). + - Consume all key events during preedit, to avoid unexpected + interactions. + - Ignore more modifiers during preedit, to allow using 3rd and + 5th level choosers. + - Fix handling of cursor positions in non-ASCII preedit text. + + GtkSpinButton: Interpret localized digits. + + GtkScale: Fix sporadic criticals. + + GtkScrolledWindow: + - Cancel overshoot on size changes. + - Avoid criticals with non-overlay scrollbars. + + GtkFileChooser: Handle smb mounts better. + + GtkListBox: Fix extending multi-selections. + + Fix a possible crash in gtk_show_uri. + + Wayland: Improve font settings fallback. + + X11: + - Avoid log spam on exit. + - Don't beep on untrusted displays. + + Updated translations. +- Drop gtk3-prevent-g_file_get_basename-return-NULL.patch: fixed + upstream. + ------------------------------------------------------------------- Thu Apr 22 06:14:53 UTC 2021 - Dominique Leuenberger diff --git a/gtk3.spec b/gtk3.spec index 2c819d5..77454fb 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -32,7 +32,7 @@ %bcond_without broadway %bcond_with doc Name: %{pname} -Version: 3.24.28 +Version: 3.24.29 Release: 0 Summary: The GTK+ toolkit library (version 3) License: LGPL-2.1-or-later @@ -47,8 +47,6 @@ Source99: baselibs.conf Patch0: gtk3-GTK_PATH64.patch # PATCH-FIX-OPENSUSE gtk3-revert-forced-xftdpi.patch fvogt@opensuse.org -- Revert very controversal commit on GTK3, forcing DPI to 96 Patch1: gtk3-revert-forced-xftdpi.patch -# PATCH-FIX-UPSTREAM gtk3-prevent-g_file_get_basename-return-NULL.patch boo#1185082, glgo#GNOME/gtk!3458 qkzhu@suse.com -- Fix a possible crash in gtk_show_uri -Patch2: gtk3-prevent-g_file_get_basename-return-NULL.patch BuildRequires: cups-devel >= 1.7 BuildRequires: docbook-xsl-stylesheets @@ -397,7 +395,6 @@ cp -a %{SOURCE1} . %patch0 -p1 %endif %patch1 -p1 -%patch2 -p1 %build NOCONFIGURE=1 ./autogen.sh