up to 3.24.2

diff --git a/gtk+3.spec b/gtk+3.spec
index afc34008a01b465c0911bfb24ab0a372c1067f4e..12983907cb314a678d0abc6e5b2d941950da30d2 100644 (file)
--- a/gtk+3.spec
+++ b/gtk+3.spec
@@ -20,15 +20,16 @@ Summary(it.UTF-8):  Il toolkit per GIMP
 Summary(pl.UTF-8):     GIMP Toolkit
 Summary(tr.UTF-8):     GIMP ToolKit arayüz kitaplığı
 Name:          gtk+3
-Version:       3.24.1
-Release:       2
+Version:       3.24.2
+Release:       1
 License:       LGPL v2+
 Group:         X11/Libraries
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/gtk+/3.24/gtk+-%{version}.tar.xz
-# Source0-md5: 9dfe16f486573815f242fa400763feb7
+# Source0-md5: f336c5ce0bc10f6ebdd9e34dcff65b15
 Patch0:                %{name}-papi.patch
 Patch1:                typeahead.patch
 Patch2:                %{name}-cloudproviders.patch
+Patch3:                shooter.patch
 URL:           http://www.gtk.org/
 BuildRequires: at-spi2-atk-devel >= 2.6.0
 BuildRequires: atk-devel >= 1:2.16.0
@@ -290,6 +291,7 @@ Moduł GTK+ do drukowania przez PAPI.
 %patch1 -p1
 %endif
 %patch2 -p1
+%patch3 -p1
 
 # for packaging clean examples
 # TODO: add am patch to do it like demos/gtk-demo via some configurable dir

diff --git a/shooter.patch b/shooter.patch
new file mode 100644 (file)
index 0000000..6643ad6
--- /dev/null
+++ b/shooter.patch
@@ -0,0 +1,33 @@
+From 2905fc861acda3d134a198e56ef2f6c962ad3061 Mon Sep 17 00:00:00 2001
+From: Daniel Boles <dboles.src@gmail.com>
+Date: Wed, 12 Dec 2018 19:03:11 +0000
+Subject: [PATCH] Revert "Fix deprecation warnings"
+
+This reverts commit 5aedfe048b0fe07382433f1a78ec5bd26acd82dd.
+
+It had a typo that broke the build, only replaced half of the uses, and
+replaced them with other functions that are also deprecated anyway.
+---
+ docs/tools/shooter.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/docs/tools/shooter.c b/docs/tools/shooter.c
+index 3d910c6ab8..8cefa8bbf7 100644
+--- a/docs/tools/shooter.c
++++ b/docs/tools/shooter.c
+@@ -170,10 +170,10 @@ take_window_shot (Window         child,
+       y_orig = 0;
+     }
+ 
+-  if (x_orig + width > gdk_screen_get_width (gdk_screen_get_dfeault ()))
++  if (x_orig + width > gdk_screen_width ())
+     width = gdk_screen_width () - x_orig;
+ 
+-  if (y_orig + height > gdk_screen_get_height (gdk_screen_get_default ()))
++  if (y_orig + height > gdk_screen_height ())
+     height = gdk_screen_height () - y_orig;
+ 
+   tmp = gdk_pixbuf_get_from_window (window,
+-- 
+2.18.1
+