gtk3: Update to 3.24.2

pkgsrc changes:
- Remove patch-gdk_quartz_gdkmonitor-quartz.c,
  patch-gdk_quartz_gdkmonitor-quartz.h,
  patch-gdk_quartz_gdkscreen-quartz.c, applied upstream.

Changes:
Overview of Changes in GTK+ 3.24.2
==================================
* new api: gdk_x11_display_get_parent_relative pattern
* wayland: Use the settings portal when sandboxed
* Bugs fixed:
 - widget-factory: Move app menu contents to primary menu
 - Make dashed border-style work correctly
 - gtkstack: fix null pointer dereference
 - GDK W32: Support switching input modules at runtime
 - Tooltip: Fix the used cursor size if 0 in Settings
 - quartz: Fix crash when realizing GtkOffscreenWindow
 - win32 dnd: Fix setting icon on drag-begin
 - Fix race in GtkPlug window creation
 - widget-factory: Add Keyboard Shortcuts menu item
 - quartz: do not cache the screen in the gdkmonitor
 - Trash in side bar sometimes contains a home icon
 - wayland: Avoid crashes inside wl_proxy_marshal
 - gtkimcontextime.c: Fix Korean input
 - entry: Handle no-window events in gtk_entry_event
 - Tooltip: Fix the used cursor size if 0 in Setting
 - Notebook: Ensure menu_label updates with tab_label
 - Adwaita: Improve headerbar theming
 - win32: Make scroll behavior similar to Linux
 - fix symbolic icon rendering with new librsvg
 - emoji selector: force Emoji presentation
 - a11y: fix a crash under wayland
* Translation updates:
 - Africaans
 - Basque
 - Brazilian Portuguese
 - Chinese (Taiwan)
 - Esperanto
 - Lithuanian
 - Slovak
 - Slovenian
 - Spanish
 - Turkish
This commit is contained in:
leot 2019-01-01 19:57:58 +00:00
parent b1a6a9643c
commit 38d5290240
6 changed files with 23 additions and 100 deletions

View file

@ -1,8 +1,7 @@
# $NetBSD: Makefile,v 1.123 2018/11/20 08:13:56 maya Exp $
# $NetBSD: Makefile,v 1.124 2019/01/01 19:57:58 leot Exp $
DISTNAME= gtk+-3.24.1
DISTNAME= gtk+-3.24.2
PKGNAME= ${DISTNAME:S/gtk/gtk3/}
PKGREVISION= 3
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk+/${PKGVERSION_NOREV:R}/}
EXTRACT_SUFX= .tar.xz

View file

@ -1,16 +1,14 @@
$NetBSD: distinfo,v 1.60 2018/11/20 08:13:56 maya Exp $
$NetBSD: distinfo,v 1.61 2019/01/01 19:57:58 leot Exp $
SHA1 (gtk+-3.24.1.tar.xz) = 0a5ce28ba6065a484308093bdb56ff6056b0db3c
RMD160 (gtk+-3.24.1.tar.xz) = f1e26685ff6a267ad0a81e0f8dd06112b6a5a5b8
SHA512 (gtk+-3.24.1.tar.xz) = 13ddb1099a2a0eb44ea53fa4be5054a403e1b27468a33862646ba111577b7bb72b9bbe4f6aea15889c2a2bee1238023bc23524b901cf2dbb3adf0e126eb6ea5d
Size (gtk+-3.24.1.tar.xz) = 19307612 bytes
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 (patch-aj) = cbfab43f27352f7c6bc57a7c562c2d84c69da07a
SHA1 (patch-config.h.in) = dc5f8741eed554f88c0b6834cadad95083e4dc8f
SHA1 (patch-configure) = d531b33e52facf960058f1223b70db680da35300
SHA1 (patch-configure.ac) = 68793f40752f25ccaecc958c72c23a504670bea5
SHA1 (patch-gdk_quartz_gdkmonitor-quartz.c) = a35b7ed5de20ae5d4586c1c09dbc39fe50b8c726
SHA1 (patch-gdk_quartz_gdkmonitor-quartz.h) = 4b54b2a4a2ff5758520b5e25545b277e3ca4b767
SHA1 (patch-gdk_quartz_gdkscreen-quartz.c) = 4bcbbc0afc7966b8b6c3110cd2af3ab61685a0a0
SHA1 (patch-docs_tools_shooter.c) = e1fcd9decfaaee45ff4fa9b82bdb0c85e3d176fe
SHA1 (patch-gdk_x11_gdkscreen-x11.h) = 455d6c3de8421984ba3c99baf51cd31982a3df78
SHA1 (patch-gdk_x11_gdkwindow-x11.h) = c80f7c9d5a570817e54fd74fa903a53400dc6f64
SHA1 (patch-gtk_a11y_gtkaccessibility.c) = 13232c85bd570f21ea03153dacde4ca98c7c76a8

View file

@ -0,0 +1,15 @@
$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 ()))

View file

@ -1,41 +0,0 @@
$NetBSD: patch-gdk_quartz_gdkmonitor-quartz.c,v 1.1 2018/11/20 08:13:56 maya Exp $
From 2a392c220d992ba21b1e250be2497248658cfcdb Mon Sep 17 00:00:00 2001
From: Ignacio Casal Quinteiro <qignacio@amazon.com>
Date: Sun, 7 Oct 2018 21:51:35 +0200
Subject: [PATCH] quartz: do not cache the screen in the gdkmonitor
Instead we just cache the monitor number and get
out of it the nsscreen when it is needed. This is
a requirement since it nsscreen it is not supposed
to be cached.
Fixes: https://gitlab.gnome.org/GNOME/gtk/issues/1312
--- gdk/quartz/gdkmonitor-quartz.c.orig 2018-11-17 23:32:33.000000000 +0000
+++ gdk/quartz/gdkmonitor-quartz.c
@@ -35,12 +35,19 @@ gdk_quartz_monitor_get_workarea (GdkMoni
GDK_QUARTZ_ALLOC_POOL;
- NSRect rect = [quartz_monitor->nsscreen visibleFrame];
-
- dest->x = rect.origin.x - quartz_screen->min_x;
- dest->y = quartz_screen->height - (rect.origin.y + rect.size.height) + quartz_screen->min_y;
- dest->width = rect.size.width;
- dest->height = rect.size.height;
+ NSArray *array = [NSScreen screens];
+ if (quartz_monitor->monitor_num < [array count])
+ {
+ NSScreen *screen = [array objectAtIndex:quartz_monitor->monitor_num];
+ NSRect rect = [screen visibleFrame];
+
+ dest->x = rect.origin.x - quartz_screen->min_x;
+ dest->y = quartz_screen->height - (rect.origin.y + rect.size.height) + quartz_screen->min_y;
+ dest->width = rect.size.width;
+ dest->height = rect.size.height;
+ }
+ else
+ *dest = monitor->geometry;
GDK_QUARTZ_RELEASE_POOL;
}

View file

@ -1,24 +0,0 @@
$NetBSD: patch-gdk_quartz_gdkmonitor-quartz.h,v 1.1 2018/11/20 08:13:56 maya Exp $
From 2a392c220d992ba21b1e250be2497248658cfcdb Mon Sep 17 00:00:00 2001
From: Ignacio Casal Quinteiro <qignacio@amazon.com>
Date: Sun, 7 Oct 2018 21:51:35 +0200
Subject: [PATCH] quartz: do not cache the screen in the gdkmonitor
Instead we just cache the monitor number and get
out of it the nsscreen when it is needed. This is
a requirement since it nsscreen it is not supposed
to be cached.
Fixes: https://gitlab.gnome.org/GNOME/gtk/issues/1312
--- gdk/quartz/gdkmonitor-quartz.h.orig 2018-11-17 23:32:33.000000000 +0000
+++ gdk/quartz/gdkmonitor-quartz.h
@@ -30,7 +30,7 @@ struct _GdkQuartzMonitor
{
GdkMonitor parent;
- NSScreen *nsscreen;
+ gint monitor_num;
};
struct _GdkQuartzMonitorClass {

View file

@ -1,24 +0,0 @@
$NetBSD: patch-gdk_quartz_gdkscreen-quartz.c,v 1.1 2018/11/20 08:13:56 maya Exp $
From 2a392c220d992ba21b1e250be2497248658cfcdb Mon Sep 17 00:00:00 2001
From: Ignacio Casal Quinteiro <qignacio@amazon.com>
Date: Sun, 7 Oct 2018 21:51:35 +0200
Subject: [PATCH] quartz: do not cache the screen in the gdkmonitor
Instead we just cache the monitor number and get
out of it the nsscreen when it is needed. This is
a requirement since it nsscreen it is not supposed
to be cached.
Fixes: https://gitlab.gnome.org/GNOME/gtk/issues/1312
--- gdk/quartz/gdkscreen-quartz.c.orig 2018-11-17 23:32:33.000000000 +0000
+++ gdk/quartz/gdkscreen-quartz.c
@@ -156,7 +156,7 @@ gdk_quartz_screen_calculate_layout (GdkQ
"display", display,
NULL);
g_ptr_array_add (display_quartz->monitors, monitor);
- monitor->nsscreen = [array objectAtIndex:i];
+ monitor->monitor_num = i;
NSRect rect = [[array objectAtIndex:i] frame];