[packages/gtk+3] up to 3.24.3

atler atler at pld-linux.org
Mon Jan 14 15:47:32 CET 2019


commit dafcff723ba4b88b6c8af02ce957c02449e63f86
Author: Jan Palus <atler at pld-linux.org>
Date:   Mon Jan 14 15:47:05 2019 +0100

    up to 3.24.3
    
    - shooter and parentrelative patches no longer needed

 gtk+3.spec           | 10 +++-------
 parentrelative.patch | 41 -----------------------------------------
 shooter.patch        | 33 ---------------------------------
 3 files changed, 3 insertions(+), 81 deletions(-)
---
diff --git a/gtk+3.spec b/gtk+3.spec
index 717f5bb..8003a9a 100644
--- a/gtk+3.spec
+++ b/gtk+3.spec
@@ -20,17 +20,15 @@ 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.2
-Release:	2
+Version:	3.24.3
+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:	f336c5ce0bc10f6ebdd9e34dcff65b15
+# Source0-md5:	795fdc22e031a1a8774fa1aeaf0822e1
 Patch0:		%{name}-papi.patch
 Patch1:		typeahead.patch
 Patch2:		%{name}-cloudproviders.patch
-Patch3:		shooter.patch
-Patch4:		parentrelative.patch
 URL:		http://www.gtk.org/
 BuildRequires:	at-spi2-atk-devel >= 2.6.0
 BuildRequires:	atk-devel >= 1:2.16.0
@@ -292,8 +290,6 @@ Moduł GTK+ do drukowania przez PAPI.
 %patch1 -p1
 %endif
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 # for packaging clean examples
 # TODO: add am patch to do it like demos/gtk-demo via some configurable dir
diff --git a/parentrelative.patch b/parentrelative.patch
deleted file mode 100644
index 0549473..0000000
--- a/parentrelative.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From e3a1593a0984cc0156ec1892a46af8f256a64878 Mon Sep 17 00:00:00 2001
-From: Daniel Boles <dboles.src at gmail.com>
-Date: Thu, 13 Dec 2018 17:20:13 +0100
-Subject: [PATCH] x11: Fix deprecation macro use
-
-G_GNUC_END_IGNORE_DEPRECATIONS terminates the if statement and does not
-consider the following block to be part of the if. So that block was
-always taken irregardless of the pattern.
-
-Fixes #1280
----
- gdk/x11/gdkwindow-x11.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
-index 97ada6d739..764e39495f 100644
---- a/gdk/x11/gdkwindow-x11.c
-+++ b/gdk/x11/gdkwindow-x11.c
-@@ -2985,6 +2985,7 @@ gdk_window_x11_set_background (GdkWindow      *window,
-   double r, g, b, a;
-   cairo_surface_t *surface;
-   cairo_matrix_t matrix;
-+  cairo_pattern_t *parent_relative_pattern;
- 
-   if (GDK_WINDOW_DESTROYED (window))
-     return;
-@@ -2997,8 +2998,10 @@ gdk_window_x11_set_background (GdkWindow      *window,
-     }
- 
- G_GNUC_BEGIN_IGNORE_DEPRECATIONS
--  if (pattern == gdk_x11_get_parent_relative_pattern ())
-+  parent_relative_pattern = gdk_x11_get_parent_relative_pattern ();
- G_GNUC_END_IGNORE_DEPRECATIONS
-+
-+  if (pattern == parent_relative_pattern)
-     {
-       GdkWindow *parent;
- 
--- 
-2.18.1
-
diff --git a/shooter.patch b/shooter.patch
deleted file mode 100644
index 6643ad6..0000000
--- a/shooter.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 2905fc861acda3d134a198e56ef2f6c962ad3061 Mon Sep 17 00:00:00 2001
-From: Daniel Boles <dboles.src at 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
-
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gtk+3.git/commitdiff/dafcff723ba4b88b6c8af02ce957c02449e63f86



More information about the pld-cvs-commit mailing list