From 1a2b4af3fb5fcac12d6c9f56963d1fcc3db92b80 Mon Sep 17 00:00:00 2001
From: John Voltz <john.voltz@gmail.com>
Date: Thu, 6 Mar 2008 18:36:12 +0000
Subject: updated xorg to version 7.3 and added all of the fonts

---
 .../xlib_libXt/xlib_libXt-1.0.4-makestrs.patch     | 38 ----------------------
 package/x11r7/xlib_libXt/xlib_libXt.mk             |  2 +-
 2 files changed, 1 insertion(+), 39 deletions(-)
 delete mode 100644 package/x11r7/xlib_libXt/xlib_libXt-1.0.4-makestrs.patch

(limited to 'package/x11r7/xlib_libXt')

diff --git a/package/x11r7/xlib_libXt/xlib_libXt-1.0.4-makestrs.patch b/package/x11r7/xlib_libXt/xlib_libXt-1.0.4-makestrs.patch
deleted file mode 100644
index 3669b83bb..000000000
--- a/package/x11r7/xlib_libXt/xlib_libXt-1.0.4-makestrs.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- libXt-1.0.4/configure.ac.orig	2006-11-08 15:15:56.000000000 +0100
-+++ libXt-1.0.4/configure.ac	2007-06-08 16:41:59.000000000 +0200
-@@ -37,6 +37,16 @@
- AC_PROG_CC
- AC_PROG_LIBTOOL
- 
-+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)
-+
-+
- PKG_CHECK_MODULES(XT, sm x11 xproto kbproto)
- 
- # Needed for including Xalloca.h
---- libXt-1.0.4/util/Makefile.am.orig	2006-10-27 21:10:56.000000000 +0200
-+++ libXt-1.0.4/util/Makefile.am	2007-06-08 16:44:13.000000000 +0200
-@@ -4,6 +4,16 @@
- noinst_PROGRAMS = makestrs
- endif
- 
-+COMPILE = $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD)
-+LINK = $(CC_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(AM_LDFLAGS) $(LDFLAGS_FOR_BUILD) -o $@
-+
-+$(srcdir)/makestrs-makestrs.o:
-+	$(COMPILE) -c $< -o $@
-+
-+$(srcdir)/makestrs: $(srcdir)/makestrs-makestrs.o
-+	$(LINK) $< -o $@
-+
- EXTRA_DIST = \
- 	Shell.ht \
- 	StrDefs.ct \
diff --git a/package/x11r7/xlib_libXt/xlib_libXt.mk b/package/x11r7/xlib_libXt/xlib_libXt.mk
index 37aefbabb..751c12d8a 100644
--- a/package/x11r7/xlib_libXt/xlib_libXt.mk
+++ b/package/x11r7/xlib_libXt/xlib_libXt.mk
@@ -7,7 +7,7 @@
 XLIB_LIBXT_VERSION = 1.0.4
 XLIB_LIBXT_SOURCE = libXt-$(XLIB_LIBXT_VERSION).tar.bz2
 XLIB_LIBXT_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBXT_AUTORECONF = YES
+XLIB_LIBXT_AUTORECONF = NO
 XLIB_LIBXT_INSTALL_STAGING = YES
 XLIB_LIBXT_DEPENDENCIES = xlib_libSM xlib_libX11 xproto_kbproto xproto_xproto xcb-proto libxcb
 XLIB_LIBXT_CONF_ENV = CC_FOR_BUILD="/usr/bin/gcc -I$(STAGING_DIR)/usr/include"
-- 
cgit v1.2.3