diff options
| author | jmmv <jmmv@pkgsrc.org> | 2004-02-12 11:13:39 +0000 |
|---|---|---|
| committer | jmmv <jmmv@pkgsrc.org> | 2004-02-12 11:13:39 +0000 |
| commit | 367b3555915fb66c429a1d1a8294297f9678aba0 (patch) | |
| tree | 1df1907bd538c67a9d3cf2791463f208e84c6e14 | |
| parent | 3ad808cdbf578f596718766079e5e58250b9ad44 (diff) | |
| download | pkgsrc-367b3555915fb66c429a1d1a8294297f9678aba0.tar.gz | |
Only use Xinerama if it is available as a shared library. Using only the
static one means that libnautilus-private won't be built, breaking this
(and other) packages. Patch tested by wiz@.
| -rw-r--r-- | wm/metacity/Makefile | 10 | ||||
| -rw-r--r-- | wm/metacity/distinfo | 3 | ||||
| -rw-r--r-- | wm/metacity/patches/patch-aa | 20 |
3 files changed, 31 insertions, 2 deletions
diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile index eb1b823d6d6..03c7178fcb9 100644 --- a/wm/metacity/Makefile +++ b/wm/metacity/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2004/02/11 05:41:22 xtraeme Exp $ +# $NetBSD: Makefile,v 1.23 2004/02/12 11:13:39 jmmv Exp $ # DISTNAME= metacity-2.6.3 @@ -26,6 +26,14 @@ PKGCONFIG_OVERRIDE= ${WRKSRC}/src/libmetacity-private.pc.in GCONF2_SCHEMAS= metacity.schemas +.include "../../mk/bsd.prefs.mk" + +.if exists(${X11BASE}/lib/libXinerama.so) +CONFIGURE_ENV+= USE_XINERAMA=yes +.else +CONFIGURE_ENV+= USE_XINERAMA=no +.endif + .include "../../devel/GConf2/schemas.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libglade2/buildlink3.mk" diff --git a/wm/metacity/distinfo b/wm/metacity/distinfo index bc6c19d57bf..09a3350081f 100644 --- a/wm/metacity/distinfo +++ b/wm/metacity/distinfo @@ -1,4 +1,5 @@ -$NetBSD: distinfo,v 1.6 2003/12/14 20:33:25 jmmv Exp $ +$NetBSD: distinfo,v 1.7 2004/02/12 11:13:39 jmmv Exp $ SHA1 (metacity-2.6.3.tar.bz2) = 0b1b44a2e3a4bcf35cdb51e98887053dc60a4574 Size (metacity-2.6.3.tar.bz2) = 1749859 bytes +SHA1 (patch-aa) = eee7a8613f368d0df1aa8e6bfeafaa4f7cdf3b93 diff --git a/wm/metacity/patches/patch-aa b/wm/metacity/patches/patch-aa new file mode 100644 index 00000000000..f04f1c95b24 --- /dev/null +++ b/wm/metacity/patches/patch-aa @@ -0,0 +1,20 @@ +$NetBSD: patch-aa,v 1.3 2004/02/12 11:13:39 jmmv Exp $ + +--- configure.orig 2003-10-28 01:38:32.000000000 +0100 ++++ configure +@@ -24482,6 +24482,7 @@ ALL_X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X + metacity_save_cppflags="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + ++if test "${USE_XINERAMA}" != no; then + use_solaris_xinerama=no + use_xfree_xinerama=no + case "$host" in +@@ -24740,6 +24741,7 @@ echo $ECHO_N "checking for Xinerama supp + echo "${ECHO_T}$use_xfree_xinerama" >&6; + ;; + esac ++fi + + CPPFLAGS="$metacity_save_cppflags" + |