Tue Jan 3 11:54:52 2023 UTC ()
gtk3: omit atk-bridge-2.0 dep from pkgconfig file when disabled


(tnn)
diff -r1.178 -r1.179 pkgsrc/x11/gtk3/Makefile
diff -r1.98 -r1.99 pkgsrc/x11/gtk3/distinfo
diff -r1.2 -r1.3 pkgsrc/x11/gtk3/patches/patch-meson.build
cvs diff -r1.178 -r1.179 pkgsrc/x11/gtk3/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/gtk3/Makefile 2023/01/02 12:04:53 1.178
+++ pkgsrc/x11/gtk3/Makefile 2023/01/03 11:54:52 1.179
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.178 2023/01/02 12:04:53 adam Exp $ 1# $NetBSD: Makefile,v 1.179 2023/01/03 11:54:52 tnn Exp $
2 2
3DISTNAME= gtk+-3.24.36 3DISTNAME= gtk+-3.24.36
 4PKGREVISION= 1
4PKGNAME= ${DISTNAME:S/gtk/gtk3/} 5PKGNAME= ${DISTNAME:S/gtk/gtk3/}
5CATEGORIES= x11 gnome 6CATEGORIES= x11 gnome
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk+/${PKGVERSION_NOREV:R}/} 7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk+/${PKGVERSION_NOREV:R}/}
7EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.gtk.org/ 11HOMEPAGE= https://www.gtk.org/
11COMMENT= GIMP Toolkit v3 - libraries for building X11 user interfaces 12COMMENT= GIMP Toolkit v3 - libraries for building X11 user interfaces
12LICENSE= gnu-lgpl-v2.1 13LICENSE= gnu-lgpl-v2.1
13 14
14TOOL_DEPENDS+= gettext-tools>=0.19.4nb1:../../devel/gettext-tools 15TOOL_DEPENDS+= gettext-tools>=0.19.4nb1:../../devel/gettext-tools
15TOOL_DEPENDS+= gtk-doc>=1.32:../../textproc/gtk-doc 16TOOL_DEPENDS+= gtk-doc>=1.32:../../textproc/gtk-doc
16 17
cvs diff -r1.98 -r1.99 pkgsrc/x11/gtk3/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/gtk3/distinfo 2023/01/02 12:04:53 1.98
+++ pkgsrc/x11/gtk3/distinfo 2023/01/03 11:54:52 1.99
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: distinfo,v 1.98 2023/01/02 12:04:53 adam Exp $ 1$NetBSD: distinfo,v 1.99 2023/01/03 11:54:52 tnn Exp $
2 2
3BLAKE2s (gtk+-3.24.36.tar.xz) = f15cf26424935a14fec5b539e60ea7dca37d14a9479b71bad1403b8bfe53e50f 3BLAKE2s (gtk+-3.24.36.tar.xz) = f15cf26424935a14fec5b539e60ea7dca37d14a9479b71bad1403b8bfe53e50f
4SHA512 (gtk+-3.24.36.tar.xz) = 76280e847653576e6fd0586d6044ab315f04c3548c211b37612c4ac77f7bbccfcff17459b9d1d3cbddeb74a62a0bcac05f850b89a20d4abc3893c6c387ecb03a 4SHA512 (gtk+-3.24.36.tar.xz) = 76280e847653576e6fd0586d6044ab315f04c3548c211b37612c4ac77f7bbccfcff17459b9d1d3cbddeb74a62a0bcac05f850b89a20d4abc3893c6c387ecb03a
5Size (gtk+-3.24.36.tar.xz) = 12540184 bytes 5Size (gtk+-3.24.36.tar.xz) = 12540184 bytes
6SHA1 (patch-gdk_wayland_gdkdevice-wayland.c) = e283bd6533ea1307b971c524bc05f0d3ee90453d 6SHA1 (patch-gdk_wayland_gdkdevice-wayland.c) = e283bd6533ea1307b971c524bc05f0d3ee90453d
7SHA1 (patch-gdk_x11_gdkscreen-x11.h) = 455d6c3de8421984ba3c99baf51cd31982a3df78 7SHA1 (patch-gdk_x11_gdkscreen-x11.h) = 455d6c3de8421984ba3c99baf51cd31982a3df78
8SHA1 (patch-gdk_x11_gdkwindow-x11.h) = c80f7c9d5a570817e54fd74fa903a53400dc6f64 8SHA1 (patch-gdk_x11_gdkwindow-x11.h) = c80f7c9d5a570817e54fd74fa903a53400dc6f64
9SHA1 (patch-gtk_a11y_gtkaccessibility.c) = 13232c85bd570f21ea03153dacde4ca98c7c76a8 9SHA1 (patch-gtk_a11y_gtkaccessibility.c) = 13232c85bd570f21ea03153dacde4ca98c7c76a8
10SHA1 (patch-gtk_fallback-c89.c) = eaf5ac8aace9eab673eed0e265d4cb2617bf1fcd 10SHA1 (patch-gtk_fallback-c89.c) = eaf5ac8aace9eab673eed0e265d4cb2617bf1fcd
11SHA1 (patch-gtk_gtkfontchooserwidget.c) = 0f4a47b7260e9227ed7e20613bbe435163afd149 11SHA1 (patch-gtk_gtkfontchooserwidget.c) = 0f4a47b7260e9227ed7e20613bbe435163afd149
12SHA1 (patch-gtk_gtklabel.c) = 8ec7e9df8d2169f15698ff6a29cf8254ca44ea61 12SHA1 (patch-gtk_gtklabel.c) = 8ec7e9df8d2169f15698ff6a29cf8254ca44ea61
13SHA1 (patch-meson.build) = d20fc548e048de7a094836359cb22845888438ea 13SHA1 (patch-meson.build) = a65d3192495eba49135fa5d2624da65a1a55decb
14SHA1 (patch-meson_options.txt) = 8477c12e5a5116ca2eef7be0c272e86451d8d94f 14SHA1 (patch-meson_options.txt) = 8477c12e5a5116ca2eef7be0c272e86451d8d94f
15SHA1 (patch-tests_gtkgears.c) = f335cbb84d6e254b4feba3b1fe619a41229037e0 15SHA1 (patch-tests_gtkgears.c) = f335cbb84d6e254b4feba3b1fe619a41229037e0
cvs diff -r1.2 -r1.3 pkgsrc/x11/gtk3/patches/patch-meson.build (expand / switch to unified diff)

--- pkgsrc/x11/gtk3/patches/patch-meson.build 2023/01/02 12:04:53 1.2
+++ pkgsrc/x11/gtk3/patches/patch-meson.build 2023/01/03 11:54:52 1.3
@@ -1,25 +1,35 @@ @@ -1,25 +1,35 @@
1$NetBSD: patch-meson.build,v 1.2 2023/01/02 12:04:53 adam Exp $ 1$NetBSD: patch-meson.build,v 1.3 2023/01/03 11:54:52 tnn Exp $
2 2
3Make gtk3-atk-bridge an option to avoid unwanted dbus dependency. 3Make gtk3-atk-bridge an option to avoid unwanted dbus dependency.
4 4
5--- meson.build.orig 2022-12-22 14:01:18.000000000 +0000 5--- meson.build.orig 2022-12-22 14:01:18.000000000 +0000
6+++ meson.build 6+++ meson.build
7@@ -137,6 +137,7 @@ wayland_enabled = get_option('way 7@@ -137,6 +137,7 @@ wayland_enabled = get_option('way
8 broadway_enabled = get_option('broadway_backend') 8 broadway_enabled = get_option('broadway_backend')
9 quartz_enabled = get_option('quartz_backend') 9 quartz_enabled = get_option('quartz_backend')
10 win32_enabled = get_option('win32_backend') 10 win32_enabled = get_option('win32_backend')
11+atkbridge_enabled = get_option('atk_bridge') 11+atkbridge_enabled = get_option('atk_bridge')
12  12
13 os_unix = false 13 os_unix = false
14 os_linux = false 14 os_linux = false
15@@ -564,7 +565,10 @@ if x11_enabled 15@@ -564,7 +565,10 @@ if x11_enabled
16 xfixes_dep = dependency('xfixes', required: false) 16 xfixes_dep = dependency('xfixes', required: false)
17 xcomposite_dep = dependency('xcomposite', required: false) 17 xcomposite_dep = dependency('xcomposite', required: false)
18 fontconfig_dep = dependency('fontconfig', fallback: ['fontconfig', 'fontconfig_dep']) 18 fontconfig_dep = dependency('fontconfig', fallback: ['fontconfig', 'fontconfig_dep'])
19+ if atkbridge_enabled 19+ if atkbridge_enabled
20 atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req) 20 atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req)
21+ cdata.set('HAVE_ATK_BRIDGE', 1) 21+ cdata.set('HAVE_ATK_BRIDGE', 1)
22+ endif 22+ endif
23  23
24 backend_immodules += ['xim'] 24 backend_immodules += ['xim']
25  25
 26@@ -583,7 +587,9 @@ if x11_enabled
 27 x11_pkgs += ['xdamage']
 28 endif
 29
 30+ if atkbridge_enabled
 31 atk_pkgs += ['atk-bridge-2.0']
 32+ endif
 33
 34 cdata.set('HAVE_XDAMAGE', xdamage_dep.found() ? 1 : false)
 35 cdata.set('HAVE_XCURSOR', xcursor_dep.found() ? 1 : false)