From a257b199dc1c3b0fd37d62dcc7431b4d5cd77de7 Mon Sep 17 00:00:00 2001 From: adam Date: Wed, 16 Jan 2019 08:13:39 +0000 Subject: gtk3: updated to 3.24.3 Overview of Changes in GTK+ 3.24.3 * Bugs fixed: wayland: Respect length limits in text protocol wayland: Support key themes wayland: Fix hi-dpi cursor scaling quartz: Make point-to-pixel conversions work on all versions quartz: Re-add support for hidpi scaling quartz: Fix search engine integration win32: Fix ime change hangling placessidebar: Insert drops in the right place x11: Fix problems gdk_x11_get_parent_relative x11: Fix Wacom tool types icons: Recolor polygons as well in symbolic icons switch: Use Unicode symbols for I/O instead of translations * Translation updates: Japanese --- x11/gtk3/Makefile | 5 ++-- x11/gtk3/distinfo | 12 ++++----- x11/gtk3/patches/patch-docs_tools_shooter.c | 15 ----------- x11/gtk3/patches/patch-gdk_x11_gdkwindow-x11.c | 36 -------------------------- 4 files changed, 7 insertions(+), 61 deletions(-) delete mode 100644 x11/gtk3/patches/patch-docs_tools_shooter.c delete mode 100644 x11/gtk3/patches/patch-gdk_x11_gdkwindow-x11.c (limited to 'x11/gtk3') diff --git a/x11/gtk3/Makefile b/x11/gtk3/Makefile index e79585f2c56..48bcdb1ceb4 100644 --- a/x11/gtk3/Makefile +++ b/x11/gtk3/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.125 2019/01/04 20:54:03 leot Exp $ +# $NetBSD: Makefile,v 1.126 2019/01/16 08:13:39 adam Exp $ -DISTNAME= gtk+-3.24.2 +DISTNAME= gtk+-3.24.3 PKGNAME= ${DISTNAME:S/gtk/gtk3/} -PKGREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk+/${PKGVERSION_NOREV:R}/} EXTRACT_SUFX= .tar.xz diff --git a/x11/gtk3/distinfo b/x11/gtk3/distinfo index 8e20eeca498..59602774535 100644 --- a/x11/gtk3/distinfo +++ b/x11/gtk3/distinfo @@ -1,16 +1,14 @@ -$NetBSD: distinfo,v 1.62 2019/01/04 20:54:03 leot Exp $ +$NetBSD: distinfo,v 1.63 2019/01/16 08:13:39 adam Exp $ -SHA1 (gtk+-3.24.2.tar.xz) = 3c1d2c716cd17ac85554b130f92c22dadb4e04ad -RMD160 (gtk+-3.24.2.tar.xz) = 8229a1eef276abb01ea3924a7d6c8a1679e94eb0 -SHA512 (gtk+-3.24.2.tar.xz) = da225045cc577fccb4dc5fd2595da812d802b597950e378a678a0be0250815d982cb0b53519a2cdc02755f123164dbdad79a9178c03ecf29c85a45e757c47840 -Size (gtk+-3.24.2.tar.xz) = 21731348 bytes +SHA1 (gtk+-3.24.3.tar.xz) = 1ce16497188e872ad504347ed5c3bd7f2c0feef5 +RMD160 (gtk+-3.24.3.tar.xz) = c172b29746075f2dab12ba743188049c9d761bf4 +SHA512 (gtk+-3.24.3.tar.xz) = 72a69d71f2e16a1dd169cc74d568da47131bd5d77994bcdd3b427ec1cd37c5daf0841a6e4824b125d860bc1c4f07c9835a3b2e74d951666253d3e4edbed0e5fc +Size (gtk+-3.24.3.tar.xz) = 21099144 bytes SHA1 (patch-aj) = cbfab43f27352f7c6bc57a7c562c2d84c69da07a SHA1 (patch-config.h.in) = dc5f8741eed554f88c0b6834cadad95083e4dc8f SHA1 (patch-configure) = d531b33e52facf960058f1223b70db680da35300 SHA1 (patch-configure.ac) = 68793f40752f25ccaecc958c72c23a504670bea5 -SHA1 (patch-docs_tools_shooter.c) = e1fcd9decfaaee45ff4fa9b82bdb0c85e3d176fe SHA1 (patch-gdk_x11_gdkscreen-x11.h) = 455d6c3de8421984ba3c99baf51cd31982a3df78 -SHA1 (patch-gdk_x11_gdkwindow-x11.c) = aee82e913181b6aa49294981dfe58f1e1a571039 SHA1 (patch-gdk_x11_gdkwindow-x11.h) = c80f7c9d5a570817e54fd74fa903a53400dc6f64 SHA1 (patch-gtk_a11y_gtkaccessibility.c) = 13232c85bd570f21ea03153dacde4ca98c7c76a8 SHA1 (patch-gtk_fallback-c89.c) = eaf5ac8aace9eab673eed0e265d4cb2617bf1fcd diff --git a/x11/gtk3/patches/patch-docs_tools_shooter.c b/x11/gtk3/patches/patch-docs_tools_shooter.c deleted file mode 100644 index 2486aea42d1..00000000000 --- a/x11/gtk3/patches/patch-docs_tools_shooter.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-docs_tools_shooter.c,v 1.1 2019/01/01 19:57:58 leot Exp $ - -Fix a typo. - ---- docs/tools/shooter.c.orig 2018-12-12 17:46:09.000000000 +0000 -+++ docs/tools/shooter.c -@@ -170,7 +170,7 @@ 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_get_width (gdk_screen_get_default ())) - width = gdk_screen_width () - x_orig; - - if (y_orig + height > gdk_screen_get_height (gdk_screen_get_default ())) diff --git a/x11/gtk3/patches/patch-gdk_x11_gdkwindow-x11.c b/x11/gtk3/patches/patch-gdk_x11_gdkwindow-x11.c deleted file mode 100644 index 6479c2e1709..00000000000 --- a/x11/gtk3/patches/patch-gdk_x11_gdkwindow-x11.c +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-gdk_x11_gdkwindow-x11.c,v 1.1 2019/01/04 20:54:03 leot Exp $ - -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 - -From upstream commit: - - - ---- gdk/x11/gdkwindow-x11.c.orig 2018-12-12 14:08:44.000000000 +0000 -+++ gdk/x11/gdkwindow-x11.c -@@ -2985,6 +2985,7 @@ gdk_window_x11_set_background (GdkWindow - 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 - } - - 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; - -- cgit v1.2.3