mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-08 08:03:51 +02:00
gtk+3: update to 3.24.3.
This commit is contained in:
parent
196834a6ca
commit
13d9f7d504
3 changed files with 3 additions and 80 deletions
|
@ -1,34 +0,0 @@
|
||||||
Upstream: Yes
|
|
||||||
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
|
|
||||||
|
|
|
@ -1,43 +0,0 @@
|
||||||
Upstream: Yes
|
|
||||||
Reason: fixes crashing of some programs, e.g. FF 64
|
|
||||||
From e3a1593a0984cc0156ec1892a46af8f256a64878 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Daniel Boles <dboles.src@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
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Template file for 'gtk+3'
|
# Template file for 'gtk+3'
|
||||||
pkgname=gtk+3
|
pkgname=gtk+3
|
||||||
version=3.24.2
|
version=3.24.3
|
||||||
revision=1
|
revision=1
|
||||||
wrksrc="gtk+-${version}"
|
wrksrc="gtk+-${version}"
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
|
@ -21,12 +21,12 @@ makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
|
||||||
$(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
|
$(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')
|
||||||
$(vopt_if cloudproviders 'libcloudproviders-devel')"
|
$(vopt_if cloudproviders 'libcloudproviders-devel')"
|
||||||
depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
|
depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')"
|
||||||
short_desc="The GTK+ toolkit (v3)"
|
short_desc="GTK+ toolkit (v3)"
|
||||||
maintainer="Rasmus Thomsen <rasmus.thomsen@protonmail.com>"
|
maintainer="Rasmus Thomsen <rasmus.thomsen@protonmail.com>"
|
||||||
license="LGPL-2.1-or-later"
|
license="LGPL-2.1-or-later"
|
||||||
homepage="https://www.gtk.org/"
|
homepage="https://www.gtk.org/"
|
||||||
distfiles="${GNOME_SITE}/gtk+/${version%.*}/gtk+-${version}.tar.xz"
|
distfiles="${GNOME_SITE}/gtk+/${version%.*}/gtk+-${version}.tar.xz"
|
||||||
checksum=5b3b05e427cc928d103561ed2e91b2b2881fe88b1f167b0b1c9990da6aac8892
|
checksum=5708fa534d964b1fb9a69d15758729d51b9a438471d4612dc153f595904803bd
|
||||||
patch_args="-Np1"
|
patch_args="-Np1"
|
||||||
|
|
||||||
# Package build options
|
# Package build options
|
||||||
|
|
Loading…
Add table
Reference in a new issue