Author: pebender
Date: Thu Jun 18 06:55:39 2009
New Revision: 4971
Modified:
trunk/gar-minimyth/script/xorg-7.4/libX11/checksums
trunk/gar-minimyth/script/xorg-7.4/libX11/files/libX11-1.2.1-xdmcp.patch
Log:
- Fixed compilation bug introduced when the version of xorg-7.4/libX11 was
updated.
Modified: trunk/gar-minimyth/script/xorg-7.4/libX11/checksums
==============================================================================
--- trunk/gar-minimyth/script/xorg-7.4/libX11/checksums (original)
+++ trunk/gar-minimyth/script/xorg-7.4/libX11/checksums Thu Jun 18 06:55:39
2009
@@ -1,5 +1,5 @@
2f2beb98e71f397e1209beaca4e97cb1 download/libX11-1.2.1.tar.bz2
1fdb49db3f176d8980a57fcf9f3946f6
download/libX11-1.2.1-abstract_socket_fix.patch
d8b39bbee2be08cc40bbd58961bcf48a
download/libX11-1.2.1-default_local_trans.patch
-4dd7f1ff756e4887e0b039c308dbd6fc download/libX11-1.2.1-xdmcp.patch
+bfd4b26a4349f0da512e90556f966001 download/libX11-1.2.1-xdmcp.patch
709164de3687de6145b8d3514c33ae51 download/libX11-1.2.1-cross.patch.gar
Modified:
trunk/gar-minimyth/script/xorg-7.4/libX11/files/libX11-1.2.1-xdmcp.patch
==============================================================================
---
trunk/gar-minimyth/script/xorg-7.4/libX11/files/libX11-1.2.1-xdmcp.patch
(original)
+++
trunk/gar-minimyth/script/xorg-7.4/libX11/files/libX11-1.2.1-xdmcp.patch
Thu Jun 18 06:55:39 2009
@@ -1,12 +1,13 @@
diff -Naur libX11-1.2.1-old/configure.ac libX11-1.2.1-new/configure.ac
--- libX11-1.2.1-old/configure.ac 2009-04-07 15:18:30.000000000 -0700
-+++ libX11-1.2.1-new/configure.ac 2009-06-12 08:45:52.000000000 -0700
-@@ -49,8 +49,18 @@
++++ libX11-1.2.1-new/configure.ac 2009-06-18 06:52:08.000000000 -0700
+@@ -49,9 +49,18 @@
case "$ac_cv_use_xcb" in
no)
X11_REQUIRES="xau xcmiscproto bigreqsproto"
- X11_EXTRA_DEPS="xau xdmcp"
- PKG_CHECK_MODULES(XDMCP, xdmcp)
+- AC_CHECK_LIB(Xdmcp, XdmcpWrap, [xdmauth="yes"], [xdmauth="no"],
[$XDMCP_LIBS])
+ X11_EXTRA_DEPS="xau"
+ PKG_CHECK_MODULES(XDMCP, xdmcp,
+ AC_CHECK_LIB(Xdmcp, XdmcpWrap,
@@ -19,12 +20,12 @@
+ XDMCP_LIBS=
+ ], [$XDMCP_LIBS]),
+ [AC_MSG_RESULT(no)])
- AC_CHECK_LIB(Xdmcp, XdmcpWrap, [xdmauth="yes"], [xdmauth="no"],
[$XDMCP_LIBS])
AC_DEFINE(USE_XCB, 0, [Use XCB for low-level protocol implementation])
;;
+ *)
diff -Naur libX11-1.2.1-old/src/ConnDis.c libX11-1.2.1-new/src/ConnDis.c
--- libX11-1.2.1-old/src/ConnDis.c 2008-11-18 22:42:01.000000000 -0800
-+++ libX11-1.2.1-new/src/ConnDis.c 2009-06-12 08:43:34.000000000 -0700
++++ libX11-1.2.1-new/src/ConnDis.c 2009-06-18 06:51:40.000000000 -0700
@@ -39,7 +39,9 @@
#include <X11/Xlibint.h>
#include <X11/Xtrans/Xtrans.h>
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
