Author: pebender
Date: Fri Sep 5 21:24:50 2008
New Revision: 3706
Added:
trunk/gar-minimyth/script/xorg-7.3/libX11/files/libX11-1.1.5-cross.patch.gar
trunk/gar-minimyth/script/xorg-7.3/libX11/files/libX11-1.1.5-xdmcp.patch
Removed:
trunk/gar-minimyth/script/xorg-7.3/libX11/files/libX11-1.1.4-cross.patch
trunk/gar-minimyth/script/xorg-7.3/libX11/files/libX11-1.1.4-xdmcp.patch
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/script/xorg-7.3/libX11/Makefile
trunk/gar-minimyth/script/xorg-7.3/libX11/checksums
Log:
- Updated package
xorg-7.3/libX11
Modified: trunk/gar-minimyth/html/minimyth/document-changelog.txt
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-changelog.txt (original)
+++ trunk/gar-minimyth/html/minimyth/document-changelog.txt Fri Sep 5
21:24:50 2008
@@ -123,6 +123,7 @@
Updated utils/squashfs.
Updated utils/which.
Updated X11/xscreensaver.
+ Updated xorg-7.3/libX11.
Updated xorg-7.3/libXau.
Updated xorg-7.3/Mesa.
Updated xorg-7.3/pixman.
Modified: trunk/gar-minimyth/script/xorg-7.3/libX11/Makefile
==============================================================================
--- trunk/gar-minimyth/script/xorg-7.3/libX11/Makefile (original)
+++ trunk/gar-minimyth/script/xorg-7.3/libX11/Makefile Fri Sep 5 21:24:50
2008
@@ -1,9 +1,9 @@
GARNAME = libX11
-GARVERSION = 1.1.4
+GARVERSION = 1.1.5
CATEGORIES = $(CATEGORY)
MASTER_SITES = $(XORG_MASTER_SITES)
DISTFILES = $(DISTNAME).tar.bz2
-PATCHFILES = $(DISTNAME)-xdmcp.patch $(DISTNAME)-cross.patch
+PATCHFILES = $(DISTNAME)-xdmcp.patch $(DISTNAME)-cross.patch.gar
LICENSE = $(GARNAME)
$(GARNAME)_LICENSE_TEXT = $(WORKSRC)/COPYING
Modified: trunk/gar-minimyth/script/xorg-7.3/libX11/checksums
==============================================================================
--- trunk/gar-minimyth/script/xorg-7.3/libX11/checksums (original)
+++ trunk/gar-minimyth/script/xorg-7.3/libX11/checksums Fri Sep 5 21:24:50
2008
@@ -1,3 +1,3 @@
-1469a5a8aa8d288dce6f4c45d2f68dc3 download/libX11-1.1.4.tar.bz2
-7ed5041f8c5b5a48e89c4ef8a87aee65 download/libX11-1.1.4-xdmcp.patch
-0bc816fa58e0d390accc271d139ae85d download/libX11-1.1.4-cross.patch
+d1512d65dadd4f48c779d4749e7753a8 download/libX11-1.1.5.tar.bz2
+8e056f577ab14142f2074db67baada3e download/libX11-1.1.5-xdmcp.patch
+d6d96efbee1877979c538032c2f287ed download/libX11-1.1.5-cross.patch.gar
Added:
trunk/gar-minimyth/script/xorg-7.3/libX11/files/libX11-1.1.5-cross.patch.gar
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/xorg-7.3/libX11/files/libX11-1.1.5-cross.patch.gar
Fri Sep 5 21:24:50 2008
@@ -0,0 +1,81 @@
+diff -Naur libX11-1.1.5-old/configure.ac libX11-1.1.5-new/configure.ac
+--- libX11-1.1.5-old/configure.ac 2008-09-05 04:24:30.000000000 -0700
++++ libX11-1.1.5-new/configure.ac 2008-09-05 04:26:40.000000000 -0700
+@@ -7,6 +7,9 @@
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ libX11)
+ AC_CONFIG_SRCDIR([Makefile.am])
++AC_CANONICAL_BUILD
++AC_CANONICAL_HOST
++
+ AM_INIT_AUTOMAKE([dist-bzip2 foreign])
+
+ AM_MAINTAINER_MODE
+@@ -22,6 +25,42 @@
+ AC_PROG_LIBTOOL
+ AC_PROG_CC
+
++AC_MSG_CHECKING([for CC_FOR_BUILD])
++if test x$host != x$build ; then
++ CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
++else
++ CC_FOR_BUILD=${CC}
++fi
++AC_MSG_RESULT([$CC_FOR_BUILD])
++AC_SUBST(CC_FOR_BUILD)
++
++AC_MSG_CHECKING([for CPPFLAGS_FOR_BUILD])
++if test x$host != x$build ; then
++ CPPFLAGS_FOR_BUILD=${CPPFLAGS_FOR_BUILD}
++else
++ CPPFLAGS_FOR_BUILD=${CPPFLAGS}
++fi
++AC_MSG_RESULT([$CPPFLAGS_FOR_BUILD])
++AC_SUBST(CPPFLAGS_FOR_BUILD)
++
++AC_MSG_CHECKING([for CFLAGS_FOR_BUILD])
++if test x$host != x$build ; then
++ CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD}
++else
++ CFLAGS_FOR_BUILD=${CFLAGS}
++fi
++AC_MSG_RESULT([$CFLAGS_FOR_BUILD])
++AC_SUBST(CFLAGS_FOR_BUILD)
++
++AC_MSG_CHECKING([for LDFLAGS_FOR_BUILD])
++if test x$host != x$build ; then
++ LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD}
++else
++ LDFLAGS_FOR_BUILD=${LDFLAGS}
++fi
++AC_MSG_RESULT([$LDFLAGS_FOR_BUILD])
++AC_SUBST(LDFLAGS_FOR_BUILD)
++
+ XORG_PROG_RAWCPP
+
+ # Build with XCB support?
+@@ -232,7 +271,7 @@
+ #
+ AC_MSG_CHECKING([keysymdef.h])
+ dir=`pkg-config --variable=includedir xproto`
+-KEYSYMDEF="$dir/X11/keysymdef.h"
++KEYSYMDEF="@[EMAIL PROTECTED]/X11/keysymdef.h"
+ if test -f "$KEYSYMDEF"; then
+ AC_MSG_RESULT([$KEYSYMDEF])
+ else
+diff -Naur libX11-1.1.5-old/src/util/Makefile.am
libX11-1.1.5-new/src/util/Makefile.am
+--- libX11-1.1.5-old/src/util/Makefile.am 2007-10-13 06:24:34.000000000
-0700
++++ libX11-1.1.5-new/src/util/Makefile.am 2008-09-05 04:26:40.000000000
-0700
+@@ -7,6 +7,12 @@
+ #override CC = gcc
+ LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+
++CC = @CC_FOR_BUILD@
++CCLD = @CC_FOR_BUILD@
++CPPFLAGS = @CPPFLAGS_FOR_BUILD@
++CFLAGS = @CFLAGS_FOR_BUILD@
++LDFLAGS = @LDFLAGS_FOR_BUILD@
++
+ EXTRA_DIST = mkks.sh
+
+ if LINT
Added:
trunk/gar-minimyth/script/xorg-7.3/libX11/files/libX11-1.1.5-xdmcp.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/xorg-7.3/libX11/files/libX11-1.1.5-xdmcp.patch
Fri Sep 5 21:24:50 2008
@@ -0,0 +1,49 @@
+diff -Naur libX11-1.1.5-old/configure.ac libX11-1.1.5-new/configure.ac
+--- libX11-1.1.5-old/configure.ac 2008-09-04 14:38:59.000000000 -0700
++++ libX11-1.1.5-new/configure.ac 2008-09-05 04:00:14.000000000 -0700
+@@ -38,8 +38,18 @@
+ case "$ac_cv_use_xcb" in
+ no)
+ X11_REQUIRES="xau xcmiscproto bigreqsproto"
+- 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,
++ [
++ AC_CHECK_LIB(Xdmcp, XdmcpWrap, [xdmauth="yes"],
[xdmauth="no"],
[$XDMCP_LIBS])
++ X11_EXTRA_DEPS="$X11_EXTRA_DEPS xdmcp"
++ ],
++ [
++ XDMCP_CFLAGS=
++ XDMCP_LIBS=
++ ], [$XDMCP_LIBS]),
++ [AC_MSG_RESULT(no)])
+ AC_DEFINE(USE_XCB, 0, [Use XCB for low-level protocol implementation])
+ ;;
+ *)
+diff -Naur libX11-1.1.5-old/src/ConnDis.c libX11-1.1.5-new/src/ConnDis.c
+--- libX11-1.1.5-old/src/ConnDis.c 2008-09-04 14:35:13.000000000 -0700
++++ libX11-1.1.5-new/src/ConnDis.c 2008-09-05 04:00:14.000000000 -0700
+@@ -39,7 +39,9 @@
+ #include <X11/Xlibint.h>
+ #include <X11/Xtrans/Xtrans.h>
+ #include <X11/Xauth.h>
++#ifdef HASXDMAUTH
+ #include <X11/Xdmcp.h>
++#endif
+ #include <stdio.h>
+ #include <ctype.h>
+ #include <unistd.h>
+diff -Naur libX11-1.1.5-old/x11.pc.in libX11-1.1.5-new/x11.pc.in
+--- libX11-1.1.5-old/x11.pc.in 2007-10-13 06:24:34.000000000 -0700
++++ libX11-1.1.5-new/x11.pc.in 2008-09-05 04:00:14.000000000 -0700
+@@ -9,7 +9,7 @@
+ Description: X Library
+ Version: @PACKAGE_VERSION@
+ Requires: xproto @XKBPROTO_REQUIRES@
+-Requires.private: xau xdmcp @X11_EXTRA_DEPS@
++Requires.private: @X11_EXTRA_DEPS@
+ Cflags: -I${includedir} @XTHREAD_CFLAGS@
+ Libs: -L${libdir} -lX11
+ Libs.private: @XTHREADLIB@
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
