From a6fb30b4489d5bb23371fc73a4920abbf447776fbe3e0d66a5c746d11fdcf1d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Mon, 9 Nov 2015 19:42:10 +0000 Subject: [PATCH] Accepting request 343255 from home:Zaitor New stable OBS-URL: https://build.opensuse.org/request/show/343255 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=206 --- gtk+-3.18.2.tar.xz | 3 --- gtk+-3.18.3.tar.xz | 3 +++ gtk3-places-sidebar-no-crash.patch | 29 ----------------------------- gtk3.changes | 12 ++++++++++++ gtk3.spec | 7 ++----- 5 files changed, 17 insertions(+), 37 deletions(-) delete mode 100644 gtk+-3.18.2.tar.xz create mode 100644 gtk+-3.18.3.tar.xz delete mode 100644 gtk3-places-sidebar-no-crash.patch diff --git a/gtk+-3.18.2.tar.xz b/gtk+-3.18.2.tar.xz deleted file mode 100644 index b5d33e0..0000000 --- a/gtk+-3.18.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5dbec561c4a00070073bf9cf4cfdd61fab4a14c8ff5b15d700bd378f8185e152 -size 18902000 diff --git a/gtk+-3.18.3.tar.xz b/gtk+-3.18.3.tar.xz new file mode 100644 index 0000000..5f1583f --- /dev/null +++ b/gtk+-3.18.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f3c76791f93f51e260b03676f83007730b9875a0a9bf5cd42442e2f14e593546 +size 18924048 diff --git a/gtk3-places-sidebar-no-crash.patch b/gtk3-places-sidebar-no-crash.patch deleted file mode 100644 index 0d703b5..0000000 --- a/gtk3-places-sidebar-no-crash.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 37cc6358557d5aa9ebd0b986af17a837d6a94aca Mon Sep 17 00:00:00 2001 -From: Dominique Leuenberger -Date: Thu, 29 Oct 2015 13:56:18 +0100 -Subject: [PATCH] placessidebar: do not crash if uris is NULL - -On Drag'n'Drop actions across system boundaries (VM host to gues), the -happen to be null. - -https://bugzilla.gnome.org/show_bug.cgi?id=757298 ---- - gtk/gtkplacessidebar.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c -index 42179c3..8dc6d30 100644 ---- a/gtk/gtkplacessidebar.c -+++ b/gtk/gtkplacessidebar.c -@@ -1708,7 +1708,7 @@ build_file_list_from_uris (const gchar **uris) - gint i; - - result = NULL; -- for (i = 0; uris[i]; i++) -+ for (i = 0; uris && uris[i]; i++) - { - GFile *file; - --- -2.6.0 - diff --git a/gtk3.changes b/gtk3.changes index c5b702c..dbd13ea 100644 --- a/gtk3.changes +++ b/gtk3.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Nov 9 17:38:07 UTC 2015 - zaitor@opensuse.org + +- Update to version 3.18.3: + + Bugs fixed: bgo#735342, bgo#753992, bgo#755654, bgo#756160, + bgo#756385, bgo#756449, bgo#756496, bgo#756505, bgo#756568, + bgo#756589, bgo#756625, bgo#756751, bgo#756780, bgo#756886, + bgo#757147, bgo#757221, bgo#757298, bgo#757303, bgo#757324, + bgo#757358, bgo#757377, bgo#757544. + + Updated translations. +- Drop gtk3-places-sidebar-no-crash.patch: Fixed upstream. + ------------------------------------------------------------------- Thu Oct 29 12:59:43 UTC 2015 - dimstar@opensuse.org diff --git a/gtk3.spec b/gtk3.spec index e83035c..65012ef 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -29,7 +29,7 @@ Name: gtk3 %define _name gtk+ -Version: 3.18.2 +Version: 3.18.3 Release: 0 Summary: The GTK+ toolkit library (version 3) License: LGPL-2.1+ @@ -47,8 +47,6 @@ Patch1: gtk3-path-local.patch ## PATCH-DISABLED gtk3-bnc130159-bgo319483-async-font-selection.patch - Upstream bug was closed as obsolete in 2011, lets see if anyone complains. # PATCH-FIX-UPSTREAM gtk3-bnc130159-bgo319483-async-font-selection.patch bnc130159 bgo319483 federico@novell.com - Load fonts asynchronously in GtkFontSelection to make it appear faster for CJK languages Patch3: gtk3-bnc130159-bgo319483-async-font-selection.patch -# PATCH-FIX-UPSTREAM gtk3-places-sidebar-no-crash.patch boo#952356 bgo#757298 dimstar@opensuse.org -- Don't crash when dragging files from host to guest over sidebar -Patch4: gtk3-places-sidebar-no-crash.patch BuildRequires: cups-devel >= 1.2 BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes @@ -340,10 +338,9 @@ cp -a %{S:1} . %patch1 -p0 ## PATCH-DISABLED - Upstream bug was closed as obsolete in 2011, as there was a new fontchooser, lets disable the patch and see if anyone complains. #%%patch3 -p1 -%patch4 -p1 %build -# Needed for patch1 and patch4 +# Needed for patch1 NOCONFIGURE=1 ./autogen.sh %configure \ --disable-static \