diff options
| author | kwm <kwm@FreeBSD.org> | 2013-03-10 01:10:48 +0800 |
|---|---|---|
| committer | kwm <kwm@FreeBSD.org> | 2013-03-10 01:10:48 +0800 |
| commit | 0679df8ab9d21ace69b89628db0c5356086465a3 (patch) | |
| tree | e34402b8bb94ae87d638589529026d584c5da609 /accessibility/at-spi | |
| parent | 1212c130b2566304499003686ba79d85f8bd3ad6 (diff) | |
| download | freebsd-ports-gnome-0679df8ab9d21ace69b89628db0c5356086465a3.tar.gz freebsd-ports-gnome-0679df8ab9d21ace69b89628db0c5356086465a3.tar.zst freebsd-ports-gnome-0679df8ab9d21ace69b89628db0c5356086465a3.zip | |
Don't build the libatk-bridge.so gtk module, depend on at-spi2-atk for that.
This resolves conflict between at-spi2-atk and at-spi.
PR: ports/176750 [1]
PR: ports/176775 [2]
Sumbitted by: mandree@ [1], rm@ [2]
Diffstat (limited to 'accessibility/at-spi')
| -rw-r--r-- | accessibility/at-spi/Makefile | 5 | ||||
| -rw-r--r-- | accessibility/at-spi/pkg-plist | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile index adec6a788d8a..a4f81136601b 100644 --- a/accessibility/at-spi/Makefile +++ b/accessibility/at-spi/Makefile @@ -4,7 +4,7 @@ PORTNAME= at-spi PORTVERSION= 1.32.0 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= accessibility x11-toolkits MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -16,6 +16,8 @@ USE_BZIP2= yes .if !defined(REFERENCE_PORT) +RUN_DEPENDS= at-spi2-atk>2.6.0:${PORTSDIRS}/accessibility/at-spi2-atk + USE_GETTEXT= yes USE_GMAKE= yes USE_GNOME= gnomehack gnomehier intlhack gtk20 gconf2 libbonobo @@ -35,6 +37,7 @@ post-extract: post-patch: @${REINPLACE_CMD} -e "/^SUBDIRS =/s/test//" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "/^SUBDIRS =/s/docs//" ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e "/^SUBDIRS =/s/atk-bridge//" ${WRKSRC}/Makefile.in .include <bsd.port.mk> diff --git a/accessibility/at-spi/pkg-plist b/accessibility/at-spi/pkg-plist index 9d5f86967d48..377907ba8ee3 100644 --- a/accessibility/at-spi/pkg-plist +++ b/accessibility/at-spi/pkg-plist @@ -33,9 +33,6 @@ include/at-spi-1.0/libspi/text.h include/at-spi-1.0/libspi/value.h include/at-spi-1.0/login-helper/Accessibility_LoginHelper.h include/at-spi-1.0/login-helper/login-helper.h -lib/gtk-2.0/modules/libatk-bridge.a -lib/gtk-2.0/modules/libatk-bridge.la -lib/gtk-2.0/modules/libatk-bridge.so lib/libcspi.a lib/libcspi.la lib/libcspi.so |