CVS commit: pkgsrc/x11/gtk3

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Tue Jan  3 11:54:52 UTC 2023

Modified Files:
        pkgsrc/x11/gtk3: Makefile distinfo
        pkgsrc/x11/gtk3/patches: patch-meson.build

Log Message:
gtk3: omit atk-bridge-2.0 dep from pkgconfig file when disabled


To generate a diff of this commit:
cvs rdiff -u -r1.178 -r1.179 pkgsrc/x11/gtk3/Makefile
cvs rdiff -u -r1.98 -r1.99 pkgsrc/x11/gtk3/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/gtk3/patches/patch-meson.build

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/gtk3/Makefile
diff -u pkgsrc/x11/gtk3/Makefile:1.178 pkgsrc/x11/gtk3/Makefile:1.179
--- pkgsrc/x11/gtk3/Makefile:1.178      Mon Jan  2 12:04:53 2023
+++ pkgsrc/x11/gtk3/Makefile    Tue Jan  3 11:54:52 2023
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.178 2023/01/02 12:04:53 adam Exp $
+# $NetBSD: Makefile,v 1.179 2023/01/03 11:54:52 tnn Exp $
 
 DISTNAME=      gtk+-3.24.36
+PKGREVISION=   1
 PKGNAME=       ${DISTNAME:S/gtk/gtk3/}
 CATEGORIES=    x11 gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gtk+/${PKGVERSION_NOREV:R}/}

Index: pkgsrc/x11/gtk3/distinfo
diff -u pkgsrc/x11/gtk3/distinfo:1.98 pkgsrc/x11/gtk3/distinfo:1.99
--- pkgsrc/x11/gtk3/distinfo:1.98       Mon Jan  2 12:04:53 2023
+++ pkgsrc/x11/gtk3/distinfo    Tue Jan  3 11:54:52 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.98 2023/01/02 12:04:53 adam Exp $
+$NetBSD: distinfo,v 1.99 2023/01/03 11:54:52 tnn Exp $
 
 BLAKE2s (gtk+-3.24.36.tar.xz) = f15cf26424935a14fec5b539e60ea7dca37d14a9479b71bad1403b8bfe53e50f
 SHA512 (gtk+-3.24.36.tar.xz) = 76280e847653576e6fd0586d6044ab315f04c3548c211b37612c4ac77f7bbccfcff17459b9d1d3cbddeb74a62a0bcac05f850b89a20d4abc3893c6c387ecb03a
@@ -10,6 +10,6 @@ SHA1 (patch-gtk_a11y_gtkaccessibility.c)
 SHA1 (patch-gtk_fallback-c89.c) = eaf5ac8aace9eab673eed0e265d4cb2617bf1fcd
 SHA1 (patch-gtk_gtkfontchooserwidget.c) = 0f4a47b7260e9227ed7e20613bbe435163afd149
 SHA1 (patch-gtk_gtklabel.c) = 8ec7e9df8d2169f15698ff6a29cf8254ca44ea61
-SHA1 (patch-meson.build) = d20fc548e048de7a094836359cb22845888438ea
+SHA1 (patch-meson.build) = a65d3192495eba49135fa5d2624da65a1a55decb
 SHA1 (patch-meson_options.txt) = 8477c12e5a5116ca2eef7be0c272e86451d8d94f
 SHA1 (patch-tests_gtkgears.c) = f335cbb84d6e254b4feba3b1fe619a41229037e0

Index: pkgsrc/x11/gtk3/patches/patch-meson.build
diff -u pkgsrc/x11/gtk3/patches/patch-meson.build:1.2 pkgsrc/x11/gtk3/patches/patch-meson.build:1.3
--- pkgsrc/x11/gtk3/patches/patch-meson.build:1.2       Mon Jan  2 12:04:53 2023
+++ pkgsrc/x11/gtk3/patches/patch-meson.build   Tue Jan  3 11:54:52 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-meson.build,v 1.2 2023/01/02 12:04:53 adam Exp $
+$NetBSD: patch-meson.build,v 1.3 2023/01/03 11:54:52 tnn Exp $
 
 Make gtk3-atk-bridge an option to avoid unwanted dbus dependency.
 
@@ -23,3 +23,13 @@ Make gtk3-atk-bridge an option to avoid 
  
    backend_immodules += ['xim']
  
+@@ -583,7 +587,9 @@ if x11_enabled
+     x11_pkgs += ['xdamage']
+   endif
+ 
++  if atkbridge_enabled
+   atk_pkgs += ['atk-bridge-2.0']
++  endif
+ 
+   cdata.set('HAVE_XDAMAGE', xdamage_dep.found() ? 1 : false)
+   cdata.set('HAVE_XCURSOR', xcursor_dep.found() ? 1 : false)