summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authoradam <adam>2014-03-31 13:26:31 +0000
committeradam <adam>2014-03-31 13:26:31 +0000
commit3c5e59efe8011be060f90e487bc82efb418c838e (patch)
tree8f9840201566893cb4a5d2bebde88c1207643ca7 /x11
parent9a80b9ece56bbf823b9c3bcbdd09a5038be2b713 (diff)
downloadpkgsrc-3c5e59efe8011be060f90e487bc82efb418c838e.tar.gz
buildlink3.mk: gtk3-atk-bridge is only valid for x11
Diffstat (limited to 'x11')
-rw-r--r--x11/gtk3/buildlink3.mk8
-rw-r--r--x11/gtk3/distinfo4
-rw-r--r--x11/gtk3/patches/patch-gtk_a11y_gtkaccessibility.c4
3 files changed, 8 insertions, 8 deletions
diff --git a/x11/gtk3/buildlink3.mk b/x11/gtk3/buildlink3.mk
index c5ae76db9ea..8f15c4f6d6e 100644
--- a/x11/gtk3/buildlink3.mk
+++ b/x11/gtk3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2013/10/10 14:41:46 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2014/03/31 13:26:31 adam Exp $
BUILDLINK_TREE+= gtk3
@@ -14,9 +14,6 @@ BUILDLINK_PKGSRCDIR.gtk3?= ../../x11/gtk3
pkgbase := gtk3
.include "../../mk/pkg-build-options.mk"
-.if !empty(PKG_BUILD_OPTIONS.gtk3:Mgtk3-atk-bridge)
-.include "../../devel/at-spi2-atk/buildlink3.mk"
-.endif
.include "../../devel/atk/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
@@ -27,6 +24,9 @@ pkgbase := gtk3
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
.if !empty(PKG_BUILD_OPTIONS.gtk3:Mx11)
+. if !empty(PKG_BUILD_OPTIONS.gtk3:Mgtk3-atk-bridge)
+. include "../../devel/at-spi2-atk/buildlink3.mk"
+. endif
.include "../../x11/libXcursor/buildlink3.mk"
.include "../../x11/libXft/buildlink3.mk"
.include "../../x11/libXrandr/buildlink3.mk"
diff --git a/x11/gtk3/distinfo b/x11/gtk3/distinfo
index 7d8a7fb578e..9ead0d99410 100644
--- a/x11/gtk3/distinfo
+++ b/x11/gtk3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2014/02/13 20:18:14 wiz Exp $
+$NetBSD: distinfo,v 1.23 2014/03/31 13:26:31 adam Exp $
SHA1 (gtk+-3.10.7.tar.xz) = cf30e2e0c4cab9d5dfc0b4325a3139ed01387d01
RMD160 (gtk+-3.10.7.tar.xz) = d2907147d6fc6a8532982c64edfd530b07ea343b
@@ -8,5 +8,5 @@ SHA1 (patch-config.h.in) = 479ebf5a5cf5ca6855fcda94063638a919bbf548
SHA1 (patch-configure) = 0bf253073a8799082f83fbd37b5424e9adf9b9d3
SHA1 (patch-configure.ac) = 4a2144abddc3468500515511cd934fd35f573952
SHA1 (patch-gdk_x11_gdkwindow-x11.h) = c80f7c9d5a570817e54fd74fa903a53400dc6f64
-SHA1 (patch-gtk_a11y_gtkaccessibility.c) = 9993c6909c5107fcbb5ac59c79e05045c3fe73d2
+SHA1 (patch-gtk_a11y_gtkaccessibility.c) = 11cf5dfe1bd6cfe08851c658ae871d3994759ae5
SHA1 (patch-gtk_gtkselection.c) = 44b4c3e2be54abf4420a98cd22b5534724f47b5e
diff --git a/x11/gtk3/patches/patch-gtk_a11y_gtkaccessibility.c b/x11/gtk3/patches/patch-gtk_a11y_gtkaccessibility.c
index 8da4cd70e4f..37972bcbb5e 100644
--- a/x11/gtk3/patches/patch-gtk_a11y_gtkaccessibility.c
+++ b/x11/gtk3/patches/patch-gtk_a11y_gtkaccessibility.c
@@ -1,5 +1,5 @@
-$NetBSD: patch-gtk_a11y_gtkaccessibility.c,v 1.2 2013/12/08 14:21:37 prlw1 Exp $
-
+$NetBSD: patch-gtk_a11y_gtkaccessibility.c,v 1.3 2014/03/31 13:26:31 adam Exp $
+
gtk3-atk-bridge option to avoid dbus dependency.
--- gtk/a11y/gtkaccessibility.c.orig 2013-10-14 16:39:20.000000000 +0000