Fri Aug 14 11:14:09 2020 UTC ()
gtk3: updated to 3.24.22

Overview of Changes in GTK+ 3.24.22
===================================

* GtkTextView:
 - Fix some corner cases of pixelcache invalidation
 - Make select-all work on touch

* Fix print portal support

* Adwaita:
 - Tweak title style class
 - Add a public color for text view background

* Windows:
 - Limit the size of the corner mask cache
 - Use native API for keycode conversion
 - Use GLES on arm64

* Wayland: Add a way to change the application id

* Quartz: Add axes to master devices

* Add --enable-tracker3 option to configure

* Translation updates:
 Catalan
 German
 Indonesian
 Italian
 Kazakh
 Spanish
 Turkish


(adam)
diff -r1.152 -r1.153 pkgsrc/x11/gtk3/Makefile
diff -r1.41 -r1.42 pkgsrc/x11/gtk3/buildlink3.mk
diff -r1.81 -r1.82 pkgsrc/x11/gtk3/distinfo
diff -r0 -r1.1 pkgsrc/x11/gtk3/patches/patch-Makefile.in
diff -r1.6 -r0 pkgsrc/x11/gtk3/patches/patch-aj
cvs diff -r1.152 -r1.153 pkgsrc/x11/gtk3/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/gtk3/Makefile 2020/07/20 14:39:34 1.152
+++ pkgsrc/x11/gtk3/Makefile 2020/08/14 11:14:09 1.153
@@ -1,39 +1,39 @@ @@ -1,39 +1,39 @@
1# $NetBSD: Makefile,v 1.152 2020/07/20 14:39:34 maya Exp $ 1# $NetBSD: Makefile,v 1.153 2020/08/14 11:14:09 adam Exp $
2 2
3DISTNAME= gtk+-3.24.21 3DISTNAME= gtk+-3.24.22
4PKGNAME= ${DISTNAME:S/gtk/gtk3/} 4PKGNAME= ${DISTNAME:S/gtk/gtk3/}
5PKGREVISION= 1 
6CATEGORIES= x11 gnome 5CATEGORIES= x11 gnome
7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk+/${PKGVERSION_NOREV:R}/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk+/${PKGVERSION_NOREV:R}/}
8EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
9 8
10MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://www.gtk.org/ 10HOMEPAGE= https://www.gtk.org/
12COMMENT= GIMP Toolkit v3 - libraries for building X11 user interfaces 11COMMENT= GIMP Toolkit v3 - libraries for building X11 user interfaces
13LICENSE= gnu-lgpl-v2.1 12LICENSE= gnu-lgpl-v2.1
14 13
15USE_PKGLOCALEDIR= yes 14USE_LANGUAGES= c c++
16USE_TOOLS+= ggrep gmake perl pkg-config bash xgettext msgmerge 15USE_LIBTOOL= yes
17USE_LANGUAGES= c c++ 16USE_PKGLOCALEDIR= yes
18USE_LIBTOOL= yes 17USE_TOOLS+= ggrep gmake perl pkg-config bash xgettext msgmerge
19PTHREAD_AUTO_VARS= yes 18GNU_CONFIGURE= yes
20TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen 19PTHREAD_AUTO_VARS= yes
21TOOL_DEPENDS+= gettext-tools>=0.19.4nb1:../../devel/gettext-tools 20TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
 21TOOL_DEPENDS+= gettext-tools>=0.19.4nb1:../../devel/gettext-tools
 22
22# There is no logic in gettext.mk to detect the native version of xgettext, 23# There is no logic in gettext.mk to detect the native version of xgettext,
23# and we do need it to be compiled with Glade support. 24# and we do need it to be compiled with Glade support.
24_TOOLS_USE_PKGSRC.xgettext= yes 25_TOOLS_USE_PKGSRC.xgettext= yes
25 26
26GNU_CONFIGURE= yes 
27# XXX there is a subtle bashism in "configure" or a bug in NetBSD's sh 27# XXX there is a subtle bashism in "configure" or a bug in NetBSD's sh
28CONFIG_SHELL= ${TOOLS_PATH.bash} 28CONFIG_SHELL= ${TOOLS_PATH.bash}
29CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/libdata 29CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/libdata
30# Work around build problems, disable unstable PAPI, PR #41608: 30# Work around build problems, disable unstable PAPI, PR #41608:
31CONFIGURE_ARGS+= --disable-papi 31CONFIGURE_ARGS+= --disable-papi
32# Avoid regeneration of Makefile.in after configure.ac patch 32# Avoid regeneration of Makefile.in after configure.ac patch
33CONFIGURE_ARGS+= --disable-maintainer-mode 33CONFIGURE_ARGS+= --disable-maintainer-mode
34MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR} 34MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR}
35TEST_TARGET= check 35TEST_TARGET= check
36 36
37PKGCONFIG_OVERRIDE+= gdk-3.0.pc.in 37PKGCONFIG_OVERRIDE+= gdk-3.0.pc.in
38PKGCONFIG_OVERRIDE+= gtk+-3.0.pc.in 38PKGCONFIG_OVERRIDE+= gtk+-3.0.pc.in
39PKGCONFIG_OVERRIDE+= gtk+-unix-print-3.0.pc.in 39PKGCONFIG_OVERRIDE+= gtk+-unix-print-3.0.pc.in
cvs diff -r1.41 -r1.42 pkgsrc/x11/gtk3/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/x11/gtk3/buildlink3.mk 2020/03/10 22:09:06 1.41
+++ pkgsrc/x11/gtk3/buildlink3.mk 2020/08/14 11:14:09 1.42
@@ -1,47 +1,47 @@ @@ -1,47 +1,47 @@
1# $NetBSD: buildlink3.mk,v 1.41 2020/03/10 22:09:06 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.42 2020/08/14 11:14:09 adam Exp $
2 2
3BUILDLINK_TREE+= gtk3 3BUILDLINK_TREE+= gtk3
4 4
5.if !defined(GTK3_BUILDLINK3_MK) 5.if !defined(GTK3_BUILDLINK3_MK)
6GTK3_BUILDLINK3_MK:= 6GTK3_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.gtk3+= gtk3+>=3.0.0 8BUILDLINK_API_DEPENDS.gtk3+= gtk3+>=3.0.0
9BUILDLINK_ABI_DEPENDS.gtk3+= gtk3+>=3.24.14nb2 9BUILDLINK_ABI_DEPENDS.gtk3+= gtk3+>=3.24.14nb2
10BUILDLINK_PKGSRCDIR.gtk3?= ../../x11/gtk3 10BUILDLINK_PKGSRCDIR.gtk3?= ../../x11/gtk3
11 11
12.include "../../mk/bsd.fast.prefs.mk" 12.include "../../mk/bsd.fast.prefs.mk"
13 13
14pkgbase := gtk3 14pkgbase := gtk3
15.include "../../mk/pkg-build-options.mk" 15.include "../../mk/pkg-build-options.mk"
16 16
17.include "../../devel/atk/buildlink3.mk" 17.include "../../devel/atk/buildlink3.mk"
18.include "../../devel/gettext-lib/buildlink3.mk" 18.include "../../devel/gettext-lib/buildlink3.mk"
19.include "../../devel/glib2/buildlink3.mk" 19.include "../../devel/glib2/buildlink3.mk"
20.include "../../devel/pango/buildlink3.mk" 20.include "../../devel/pango/buildlink3.mk"
21.include "../../fonts/fontconfig/buildlink3.mk" 21.include "../../fonts/fontconfig/buildlink3.mk"
22.include "../../graphics/cairo/buildlink3.mk" 22.include "../../graphics/cairo/buildlink3.mk"
23.include "../../graphics/cairo-gobject/buildlink3.mk" 23.include "../../graphics/cairo-gobject/buildlink3.mk"
24.include "../../graphics/freetype2/buildlink3.mk" 24.include "../../graphics/freetype2/buildlink3.mk"
25.include "../../graphics/gdk-pixbuf2/buildlink3.mk" 25.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
26BUILDLINK_API_DEPENDS.libepoxy+= libepoxy>=1.4 26BUILDLINK_API_DEPENDS.libepoxy+= libepoxy>=1.4
27.include "../../graphics/libepoxy/buildlink3.mk" 27.include "../../graphics/libepoxy/buildlink3.mk"
28.if !empty(PKG_BUILD_OPTIONS.gtk3:Mx11) 28.if ${PKG_BUILD_OPTIONS.gtk3:Mx11}
29. if !empty(PKG_BUILD_OPTIONS.gtk3:Mgtk3-atk-bridge) 29. if ${PKG_BUILD_OPTIONS.gtk3:Mgtk3-atk-bridge}
30. include "../../devel/at-spi2-atk/buildlink3.mk" 30. include "../../devel/at-spi2-atk/buildlink3.mk"
31. endif # PKG_BUILD_OPTIONS.gtk3:Mgtk3-atk-bridge 31. endif # PKG_BUILD_OPTIONS.gtk3:Mgtk3-atk-bridge
32.include "../../x11/libXcursor/buildlink3.mk" 32.include "../../x11/libXcursor/buildlink3.mk"
33BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1.2nb2 33BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1.2nb2
34.include "../../x11/libXft/buildlink3.mk" 34.include "../../x11/libXft/buildlink3.mk"
35.include "../../x11/libXrandr/buildlink3.mk" 35.include "../../x11/libXrandr/buildlink3.mk"
36.include "../../x11/libXinerama/buildlink3.mk" 36.include "../../x11/libXinerama/buildlink3.mk"
37.include "../../x11/libXi/buildlink3.mk" 37.include "../../x11/libXi/buildlink3.mk"
38.include "../../x11/libXcomposite/buildlink3.mk" 38.include "../../x11/libXcomposite/buildlink3.mk"
39.endif # PKG_BUILD_OPTIONS.gtk3:Mx11 39.endif # PKG_BUILD_OPTIONS.gtk3:Mx11
40.if !empty(PKG_BUILD_OPTIONS.gtk3:Mwayland) 40.if ${PKG_BUILD_OPTIONS.gtk3:Mwayland}
41.include "../../devel/wayland/buildlink3.mk" 41.include "../../devel/wayland/buildlink3.mk"
42.include "../../devel/wayland-protocols/buildlink3.mk" 42.include "../../devel/wayland-protocols/buildlink3.mk"
43.include "../../x11/libxkbcommon/buildlink3.mk" 43.include "../../x11/libxkbcommon/buildlink3.mk"
44.endif # PKG_BUILD_OPTIONS.gtk3:Mwayland 44.endif # PKG_BUILD_OPTIONS.gtk3:Mwayland
45.endif # GTK3_BUILDLINK3_MK 45.endif # GTK3_BUILDLINK3_MK
46 46
47BUILDLINK_TREE+= -gtk3 47BUILDLINK_TREE+= -gtk3
cvs diff -r1.81 -r1.82 pkgsrc/x11/gtk3/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/gtk3/distinfo 2020/07/23 09:09:48 1.81
+++ pkgsrc/x11/gtk3/distinfo 2020/08/14 11:14:09 1.82
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: distinfo,v 1.81 2020/07/23 09:09:48 maya Exp $ 1$NetBSD: distinfo,v 1.82 2020/08/14 11:14:09 adam Exp $
2 2
3SHA1 (gtk+-3.24.21.tar.xz) = c34360a46556732d0143b2fd010f4065e9c3987b 3SHA1 (gtk+-3.24.22.tar.xz) = c55edc6f6233aa5fd94e77af3ae5a9362a483529
4RMD160 (gtk+-3.24.21.tar.xz) = a5d96f7ea194c24adc3468328aed19c631d5421e 4RMD160 (gtk+-3.24.22.tar.xz) = af613b25fb40eccd91121de45067c34b9cad4442
5SHA512 (gtk+-3.24.21.tar.xz) = 97ed88e69d9002279869044772e5aebc1ac4ed6f4a8afc1586a349710a1d414fc735e1257d5f34f6300914a0ca7c7ede073bd9429ee16077aa83f3594784c60e 5SHA512 (gtk+-3.24.22.tar.xz) = ac653438a0a818885f2aa46a131b1ab0038a57b438406724a674313d8bf4325b1d2e87e4e8c77a92d0cfa8f8d6eaac46ba6890830290e9a9e598c978144861a2
6Size (gtk+-3.24.21.tar.xz) = 21353740 bytes 6Size (gtk+-3.24.22.tar.xz) = 21349784 bytes
7SHA1 (patch-aj) = cbfab43f27352f7c6bc57a7c562c2d84c69da07a 7SHA1 (patch-Makefile.in) = 8edcfe2ff492d90138a24b680fe39814c3848d80
8SHA1 (patch-config.h.in) = dc5f8741eed554f88c0b6834cadad95083e4dc8f 8SHA1 (patch-config.h.in) = dc5f8741eed554f88c0b6834cadad95083e4dc8f
9SHA1 (patch-configure) = d531b33e52facf960058f1223b70db680da35300 9SHA1 (patch-configure) = d531b33e52facf960058f1223b70db680da35300
10SHA1 (patch-configure.ac) = 68793f40752f25ccaecc958c72c23a504670bea5 10SHA1 (patch-configure.ac) = 68793f40752f25ccaecc958c72c23a504670bea5
11SHA1 (patch-gdk_quartz_gdkquartz-gtk-only.h) = 24aefa2631c2546ef726eba0aee0f9460c1664ed 11SHA1 (patch-gdk_quartz_gdkquartz-gtk-only.h) = 24aefa2631c2546ef726eba0aee0f9460c1664ed
12SHA1 (patch-gdk_wayland_gdkdevice-wayland.c) = e283bd6533ea1307b971c524bc05f0d3ee90453d 12SHA1 (patch-gdk_wayland_gdkdevice-wayland.c) = e283bd6533ea1307b971c524bc05f0d3ee90453d
13SHA1 (patch-gdk_x11_gdkscreen-x11.h) = 455d6c3de8421984ba3c99baf51cd31982a3df78 13SHA1 (patch-gdk_x11_gdkscreen-x11.h) = 455d6c3de8421984ba3c99baf51cd31982a3df78
14SHA1 (patch-gdk_x11_gdkwindow-x11.h) = c80f7c9d5a570817e54fd74fa903a53400dc6f64 14SHA1 (patch-gdk_x11_gdkwindow-x11.h) = c80f7c9d5a570817e54fd74fa903a53400dc6f64
15SHA1 (patch-gtk_a11y_gtkaccessibility.c) = 13232c85bd570f21ea03153dacde4ca98c7c76a8 15SHA1 (patch-gtk_a11y_gtkaccessibility.c) = 13232c85bd570f21ea03153dacde4ca98c7c76a8
16SHA1 (patch-gtk_fallback-c89.c) = eaf5ac8aace9eab673eed0e265d4cb2617bf1fcd 16SHA1 (patch-gtk_fallback-c89.c) = eaf5ac8aace9eab673eed0e265d4cb2617bf1fcd
17SHA1 (patch-gtk_gtkfontchooserwidget.c) = 5ca98e5417865d8c60333c8c2b2ba757755ef547 17SHA1 (patch-gtk_gtkfontchooserwidget.c) = 5ca98e5417865d8c60333c8c2b2ba757755ef547
18SHA1 (patch-gtk_gtklabel.c) = 8ec7e9df8d2169f15698ff6a29cf8254ca44ea61 18SHA1 (patch-gtk_gtklabel.c) = 8ec7e9df8d2169f15698ff6a29cf8254ca44ea61
File Added: pkgsrc/x11/gtk3/patches/Attic/patch-Makefile.in
$NetBSD: patch-Makefile.in,v 1.1 2020/08/14 11:14:09 adam Exp $

Do not build files we won't install.
Oddly, the tool doc-shooter uses a source file from tests.

--- Makefile.in.orig	2020-08-10 15:35:54.000000000 +0000
+++ Makefile.in
@@ -573,7 +573,7 @@ XVFB_START = \
 	|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
 	&& DISPLAY=:$$XID && export DISPLAY
 
-SRC_SUBDIRS = gdk gtk libgail-util modules demos tests testsuite examples
+SRC_SUBDIRS = gdk gtk libgail-util modules demos tests
 SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros win32
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 MAINTAINERCLEANFILES = \
File Deleted: pkgsrc/x11/gtk3/patches/Attic/patch-aj