From 2944fb94169a20ae42eccdd0b5bb0e1e8193feea0362d4727857c4b5e6511b23 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 4 Oct 2017 11:56:29 +0000 Subject: [PATCH 1/3] Accepting request 531081 from GNOME:Next 1 OBS-URL: https://build.opensuse.org/request/show/531081 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=291 --- gtk+-3.22.21.tar.xz | 3 -- gtk+-3.22.22.tar.xz | 3 ++ gtk3-silence-log-spew-blank-cursors.patch | 54 +++++++++++++++++++++++ gtk3.changes | 15 +++++++ gtk3.spec | 5 ++- 5 files changed, 76 insertions(+), 4 deletions(-) delete mode 100644 gtk+-3.22.21.tar.xz create mode 100644 gtk+-3.22.22.tar.xz create mode 100644 gtk3-silence-log-spew-blank-cursors.patch diff --git a/gtk+-3.22.21.tar.xz b/gtk+-3.22.21.tar.xz deleted file mode 100644 index cdc2643..0000000 --- a/gtk+-3.22.21.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1bd3c1a85cfb4db112cabb5379abb05a1a94fe43052d309d573493fca00e6b87 -size 18847580 diff --git a/gtk+-3.22.22.tar.xz b/gtk+-3.22.22.tar.xz new file mode 100644 index 0000000..3bbcff1 --- /dev/null +++ b/gtk+-3.22.22.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:862dc22c5e93cd800753e5e90dfdb3af0fc760a47f6ebd918ae19136d527c6cd +size 18838860 diff --git a/gtk3-silence-log-spew-blank-cursors.patch b/gtk3-silence-log-spew-blank-cursors.patch new file mode 100644 index 0000000..cad8368 --- /dev/null +++ b/gtk3-silence-log-spew-blank-cursors.patch @@ -0,0 +1,54 @@ +From 56714ffa0d61512bc249b481fc43e0bc118f47d7 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen +Date: Wed, 12 Apr 2017 13:56:49 -0400 +Subject: [PATCH] wayland: Don't spew warnings for blank cursors + +We were unnecessarily spewing warnings when blank cursors +were getting a new scale set. Standardize on "none" as the +name for blank cursors, and avoid the warning. + +https://bugzilla.gnome.org/show_bug.cgi?id=775217 +--- + gdk/wayland/gdkcursor-wayland.c | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +diff --git a/gdk/wayland/gdkcursor-wayland.c b/gdk/wayland/gdkcursor-wayland.c +index ab50755873..bffeff8884 100644 +--- a/gdk/wayland/gdkcursor-wayland.c ++++ b/gdk/wayland/gdkcursor-wayland.c +@@ -308,6 +308,10 @@ _gdk_wayland_cursor_set_scale (GdkCursor *cursor, + + wayland_cursor->scale = scale; + ++ /* Blank cursor case */ ++ if (g_str_equal (wayland_cursor->name, "none")) ++ return; ++ + _gdk_wayland_cursor_update (display_wayland, wayland_cursor); + } + +@@ -345,12 +349,18 @@ _gdk_wayland_display_get_cursor_for_name_with_scale (GdkDisplay *display, + "cursor-type", GDK_CURSOR_IS_PIXMAP, + "display", display, + NULL); +- private->name = g_strdup (name); +- private->scale = scale; + + /* Blank cursor case */ + if (!name || g_str_equal (name, "none") || g_str_equal (name, "blank_cursor")) +- return GDK_CURSOR (private); ++ { ++ private->name = g_strdup ("none"); ++ private->scale = scale; ++ ++ return GDK_CURSOR (private); ++ } ++ ++ private->name = g_strdup (name); ++ private->scale = scale; + + if (!_gdk_wayland_cursor_update (display_wayland, private)) + { +-- +2.12.2 + diff --git a/gtk3.changes b/gtk3.changes index 35d4d0f..f6a89b9 100644 --- a/gtk3.changes +++ b/gtk3.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Oct 3 18:23:04 UTC 2017 - zaitor@opensuse.org + +- Update to version 3.22.22: + + Bugs fixed: bgo#639931, bgo#644248, bgo#775126, bgo#780758, + bgo#781757, bgo#787021, bgo#787302, bgo#787303, bgo#787444, + bgo#787531, bgo#787600, bgo#787757. + + Updated translations. + +------------------------------------------------------------------- +Fri Sep 15 23:34:32 UTC 2017 - zaitor@opensuse.org + +- Add gtk3-silence-log-spew-blank-cursors.patch wayland: Don't spew + warnings for blank cursors. Patch from upstream bug (bgo#775217). + ------------------------------------------------------------------- Mon Sep 11 16:44:02 UTC 2017 - zaitor@opensuse.org diff --git a/gtk3.spec b/gtk3.spec index e78a0bf..f434790 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -29,7 +29,7 @@ Name: gtk3 %define _name gtk+ -Version: 3.22.21 +Version: 3.22.22 Release: 0 Summary: The GTK+ toolkit library (version 3) License: LGPL-2.1+ @@ -44,6 +44,8 @@ Source99: baselibs.conf Patch0: gtk3-GTK_PATH64.patch # PATCH-NEEDS-REBASE gtk3-path-local.patch Search in /usr/local/%{_lib} by default. bnc369696 bgo534474 -- Was PATCH-FIX-OPENSUSE Patch1: gtk3-path-local.patch +# PATCH-FIX-UPSTREAM gtk3-silence-log-spew-blank-cursors.patch bgo#775217 zaitor@opensuse.org -- wayland: Don't spew warnings for blank cursors +Patch2: gtk3-silence-log-spew-blank-cursors.patch BuildRequires: cups-devel >= 1.2 BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes @@ -363,6 +365,7 @@ cp -a %{S:1} . %endif # Patch disabled, needs rebase. #patch1 -p0 +%patch2 -p1 %build # Disabled since patch 1 is in need of rebase From 620aecb85229fa390efc68cca399bd351a2ef7e16aea8a8f79dd3b6926c78980 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 4 Oct 2017 13:57:27 +0000 Subject: [PATCH 2/3] Accepting request 531219 from GNOME:Next 1 OBS-URL: https://build.opensuse.org/request/show/531219 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=292 --- gtk+-3.22.22.tar.xz | 3 --- gtk+-3.22.23.tar.xz | 3 +++ gtk3.changes | 6 ++++++ gtk3.spec | 4 ++-- 4 files changed, 11 insertions(+), 5 deletions(-) delete mode 100644 gtk+-3.22.22.tar.xz create mode 100644 gtk+-3.22.23.tar.xz diff --git a/gtk+-3.22.22.tar.xz b/gtk+-3.22.22.tar.xz deleted file mode 100644 index 3bbcff1..0000000 --- a/gtk+-3.22.22.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:862dc22c5e93cd800753e5e90dfdb3af0fc760a47f6ebd918ae19136d527c6cd -size 18838860 diff --git a/gtk+-3.22.23.tar.xz b/gtk+-3.22.23.tar.xz new file mode 100644 index 0000000..da61043 --- /dev/null +++ b/gtk+-3.22.23.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cdaf2b014fc59caa1882450860a36387d5cbe4c160fe6a0017b4ebb9cf2ce3bc +size 18837060 diff --git a/gtk3.changes b/gtk3.changes index f6a89b9..23960ba 100644 --- a/gtk3.changes +++ b/gtk3.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 4 12:15:48 UTC 2017 - zaitor@opensuse.org + +- Update to version 3.22.23: + + Bugs fixed: bgo#783669, bgo#784562. + ------------------------------------------------------------------- Tue Oct 3 18:23:04 UTC 2017 - zaitor@opensuse.org diff --git a/gtk3.spec b/gtk3.spec index f434790..125c485 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -29,13 +29,13 @@ Name: gtk3 %define _name gtk+ -Version: 3.22.22 +Version: 3.22.23 Release: 0 Summary: The GTK+ toolkit library (version 3) License: LGPL-2.1+ Group: System/Libraries Url: http://www.gtk.org/ -Source: https://download.gnome.org/sources/gtk+/3.22/%{_name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/gtk+/3.22/%{_name}-%{version}.tar.xz Source1: README.SUSE Source2: settings.ini Source3: macros.gtk3 From 0db9f337d4b021eeabac37421debb9c02b5cf44cdaf308a08ba109b4281471f9 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 5 Oct 2017 09:59:19 +0000 Subject: [PATCH 3/3] Accepting request 531421 from GNOME:Next 1 OBS-URL: https://build.opensuse.org/request/show/531421 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=293 --- gtk+-3.22.23.tar.xz | 3 --- gtk+-3.22.24.tar.xz | 3 +++ gtk3.changes | 7 +++++++ gtk3.spec | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) delete mode 100644 gtk+-3.22.23.tar.xz create mode 100644 gtk+-3.22.24.tar.xz diff --git a/gtk+-3.22.23.tar.xz b/gtk+-3.22.23.tar.xz deleted file mode 100644 index da61043..0000000 --- a/gtk+-3.22.23.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cdaf2b014fc59caa1882450860a36387d5cbe4c160fe6a0017b4ebb9cf2ce3bc -size 18837060 diff --git a/gtk+-3.22.24.tar.xz b/gtk+-3.22.24.tar.xz new file mode 100644 index 0000000..f4151ef --- /dev/null +++ b/gtk+-3.22.24.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cbb16e4cfc928ab8f5f22f7290616f95f6ebc8c97cc724a2007b07ced833592b +size 18866048 diff --git a/gtk3.changes b/gtk3.changes index 23960ba..e0f7376 100644 --- a/gtk3.changes +++ b/gtk3.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Oct 4 17:25:48 UTC 2017 - zaitor@opensuse.org + +- Update to version 3.22.24: + + Combobox: Don't try to remove grabs on NULL devices. + + Fix some issues with the new resizable tiling. + ------------------------------------------------------------------- Wed Oct 4 12:15:48 UTC 2017 - zaitor@opensuse.org diff --git a/gtk3.spec b/gtk3.spec index 125c485..e92ed11 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -29,7 +29,7 @@ Name: gtk3 %define _name gtk+ -Version: 3.22.23 +Version: 3.22.24 Release: 0 Summary: The GTK+ toolkit library (version 3) License: LGPL-2.1+