diff options
| author | jmmv <jmmv@pkgsrc.org> | 2004-07-03 10:37:24 +0000 |
|---|---|---|
| committer | jmmv <jmmv@pkgsrc.org> | 2004-07-03 10:37:24 +0000 |
| commit | 675ccdb885b97ee4825abbc539f9d38a03c4d2ee (patch) | |
| tree | 0775bcfc16001bb95662fe6493ebdabb4199c55d /x11 | |
| parent | 1de00e4490b48397b801f823a4de9e03a5cb054b (diff) | |
| download | pkgsrc-675ccdb885b97ee4825abbc539f9d38a03c4d2ee.tar.gz | |
Fix build when Xinerama is detected by also using Xext; if none of them are
found, just disable Xinerama support. Closes PR pkg/25198.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/gdm1/distinfo | 4 | ||||
| -rw-r--r-- | x11/gdm1/patches/patch-aa | 20 |
2 files changed, 21 insertions, 3 deletions
diff --git a/x11/gdm1/distinfo b/x11/gdm1/distinfo index 2dda344c38d..1f1e8102d98 100644 --- a/x11/gdm1/distinfo +++ b/x11/gdm1/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2004/07/03 10:22:38 jmmv Exp $ +$NetBSD: distinfo,v 1.3 2004/07/03 10:37:24 jmmv Exp $ SHA1 (gdm-2.2.0.tar.gz) = 135b424cc1493f92b500c4fe7d85e9ada57313e1 Size (gdm-2.2.0.tar.gz) = 810976 bytes @@ -6,7 +6,7 @@ SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b Size (Daemon.README) = 2191 bytes SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d Size (Daemon.png) = 15725 bytes -SHA1 (patch-aa) = e05abb384dba1ce0a8094687d15a6d8f3ed8f886 +SHA1 (patch-aa) = 3c060965959e0605c87e19ce23243d90cd2a8f9a SHA1 (patch-ab) = 944f67fd37460172b7b434ec5f3cc4ad31d3eff1 SHA1 (patch-ac) = 32361628caef6cd0f1f50318a0b3f76249f6b76c SHA1 (patch-ae) = 1af3691044028dcf75b7eac9aa20563b7cc152d5 diff --git a/x11/gdm1/patches/patch-aa b/x11/gdm1/patches/patch-aa index e3fde0f204a..ca3d8e4ed1e 100644 --- a/x11/gdm1/patches/patch-aa +++ b/x11/gdm1/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 2004/07/03 10:22:38 jmmv Exp $ +$NetBSD: patch-aa,v 1.3 2004/07/03 10:37:24 jmmv Exp $ --- configure.orig 2001-03-13 00:23:59.000000000 +0000 +++ configure 2004-07-03 10:09:16.000000000 +0000 @@ -11,6 +11,24 @@ $NetBSD: patch-aa,v 1.2 2004/07/03 10:22:38 jmmv Exp $ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo "configure:4627: checking for $ac_func" >&5 +@@ -4976,7 +4976,7 @@ + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-lXinerama $GTK_LIBS $LIBS" ++LIBS="-lXinerama -lXext $GTK_LIBS $LIBS" + cat > conftest.$ac_ext <<EOF + #line 4982 "configure" + #include "confdefs.h" +@@ -5010,7 +5010,7 @@ + #define $ac_tr_lib 1 + EOF + +- LIBS="-lXinerama $LIBS" ++ LIBS="-lXinerama -lXext $LIBS" + + else + echo "$ac_t""no" 1>&6 @@ -5289,6 +5289,10 @@ s%@LIBGLADE_LIBS@%$LIBGLADE_LIBS%g s%@CONSOLE_HELPER_TRUE@%$CONSOLE_HELPER_TRUE%g |