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_liblbxutil-1.0.1-mk3gstates-nocc.patch    | 46 ++++++++++++++++++++++
 .../xlib_liblbxutil-1.0.1-mkg3states.patch         | 37 -----------------
 package/x11r7/xlib_liblbxutil/xlib_liblbxutil.mk   |  2 +-
 3 files changed, 47 insertions(+), 38 deletions(-)
 create mode 100644 package/x11r7/xlib_liblbxutil/xlib_liblbxutil-1.0.1-mk3gstates-nocc.patch
 delete mode 100644 package/x11r7/xlib_liblbxutil/xlib_liblbxutil-1.0.1-mkg3states.patch

(limited to 'package/x11r7/xlib_liblbxutil')

diff --git a/package/x11r7/xlib_liblbxutil/xlib_liblbxutil-1.0.1-mk3gstates-nocc.patch b/package/x11r7/xlib_liblbxutil/xlib_liblbxutil-1.0.1-mk3gstates-nocc.patch
new file mode 100644
index 000000000..62cbedf54
--- /dev/null
+++ b/package/x11r7/xlib_liblbxutil/xlib_liblbxutil-1.0.1-mk3gstates-nocc.patch
@@ -0,0 +1,46 @@
+--- a/src/Makefile.in.orig	2008-01-30 11:01:59.000000000 -0500
++++ b/src/Makefile.in	2008-01-30 11:03:59.000000000 -0500
+@@ -76,8 +76,11 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=c
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
++HOST_CC = gcc
+ LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++mkg3states_LINK = $(HOST_CC) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(liblbxutil_la_SOURCES) $(nodist_liblbxutil_la_SOURCES) \
+ 	$(mkg3states_SOURCES)
+ DIST_SOURCES = $(liblbxutil_la_SOURCES) $(mkg3states_SOURCES)
+@@ -282,7 +285,7 @@ clean-noinstPROGRAMS:
+ 	done
+ mkg3states$(EXEEXT): $(mkg3states_OBJECTS) $(mkg3states_DEPENDENCIES) 
+ 	@rm -f mkg3states$(EXEEXT)
+-	$(LINK) $(mkg3states_LDFLAGS) $(mkg3states_OBJECTS) $(mkg3states_LDADD) $(LIBS)
++	$(mkg3states_LINK) $(mkg3states_LDFLAGS) $(mkg3states_OBJECTS) $(mkg3states_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -386,18 +389,18 @@ lbxdelta.lo: $(srcdir)/delta/lbxdelta.c
+ @am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lbxdelta.lo `test -f '$(srcdir)/delta/lbxdelta.c' || echo '$(srcdir)/'`$(srcdir)/delta/lbxdelta.c
+ 
+ mkg3states.o: $(srcdir)/image/mkg3states.c
+-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mkg3states.o -MD -MP -MF "$(DEPDIR)/mkg3states.Tpo" -c -o mkg3states.o `test -f '$(srcdir)/image/mkg3states.c' || echo '$(srcdir)/'`$(srcdir)/image/mkg3states.c; \
++@am__fastdepCC_TRUE@	if $(HOST_CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mkg3states.o -MD -MP -MF "$(DEPDIR)/mkg3states.Tpo" -c -o mkg3states.o `test -f '$(srcdir)/image/mkg3states.c' || echo '$(srcdir)/'`$(srcdir)/image/mkg3states.c; \
+ @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mkg3states.Tpo" "$(DEPDIR)/mkg3states.Po"; else rm -f "$(DEPDIR)/mkg3states.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/image/mkg3states.c' object='mkg3states.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mkg3states.o `test -f '$(srcdir)/image/mkg3states.c' || echo '$(srcdir)/'`$(srcdir)/image/mkg3states.c
++@am__fastdepCC_FALSE@	$(HOST_CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mkg3states.o `test -f '$(srcdir)/image/mkg3states.c' || echo '$(srcdir)/'`$(srcdir)/image/mkg3states.c
+ 
+ mkg3states.obj: $(srcdir)/image/mkg3states.c
+-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mkg3states.obj -MD -MP -MF "$(DEPDIR)/mkg3states.Tpo" -c -o mkg3states.obj `if test -f '$(srcdir)/image/mkg3states.c'; then $(CYGPATH_W) '$(srcdir)/image/mkg3states.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/image/mkg3states.c'; fi`; \
++@am__fastdepCC_TRUE@	if $(HOST_CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mkg3states.obj -MD -MP -MF "$(DEPDIR)/mkg3states.Tpo" -c -o mkg3states.obj `if test -f '$(srcdir)/image/mkg3states.c'; then $(CYGPATH_W) '$(srcdir)/image/mkg3states.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/image/mkg3states.c'; fi`; \
+ @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mkg3states.Tpo" "$(DEPDIR)/mkg3states.Po"; else rm -f "$(DEPDIR)/mkg3states.Tpo"; exit 1; fi
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/image/mkg3states.c' object='mkg3states.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mkg3states.obj `if test -f '$(srcdir)/image/mkg3states.c'; then $(CYGPATH_W) '$(srcdir)/image/mkg3states.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/image/mkg3states.c'; fi`
++@am__fastdepCC_FALSE@	$(HOST_CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mkg3states.obj `if test -f '$(srcdir)/image/mkg3states.c'; then $(CYGPATH_W) '$(srcdir)/image/mkg3states.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/image/mkg3states.c'; fi`
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
diff --git a/package/x11r7/xlib_liblbxutil/xlib_liblbxutil-1.0.1-mkg3states.patch b/package/x11r7/xlib_liblbxutil/xlib_liblbxutil-1.0.1-mkg3states.patch
deleted file mode 100644
index 9a35ac221..000000000
--- a/package/x11r7/xlib_liblbxutil/xlib_liblbxutil-1.0.1-mkg3states.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- liblbxutil-1.0.1/configure.ac.orig	2007-06-08 21:57:50.000000000 +0200
-+++ liblbxutil-1.0.1/configure.ac	2007-06-08 21:58:06.000000000 +0200
-@@ -49,6 +49,15 @@
- 
- XORG_RELEASE_VERSION
- 
-+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_OUTPUT([Makefile
- 	   src/Makefile
- 	   lbxutil.pc])
---- liblbxutil-1.0.1/src/Makefile.am.orig	2007-06-08 21:57:50.000000000 +0200
-+++ liblbxutil-1.0.1/src/Makefile.am	2007-06-08 22:00:24.000000000 +0200
-@@ -5,6 +5,16 @@
- mkg3states_SOURCES =				\
- 	$(srcdir)/image/mkg3states.c
- 
-+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)/mkg3states.o:
-+	$(COMPILE) -c $< -o $@
-+
-+$(srcdir)/mkg3states: $(srcdir)/mkg3states.o
-+	$(LINK) $< -o $@
-+
- liblbxutil_la_SOURCES =				\
- 	$(srcdir)/lbx_zlib/reqstats.h		\
- 	$(srcdir)/lbx_zlib/lbx_zlib_io.c	\
diff --git a/package/x11r7/xlib_liblbxutil/xlib_liblbxutil.mk b/package/x11r7/xlib_liblbxutil/xlib_liblbxutil.mk
index 503698c97..a007b8eb8 100644
--- a/package/x11r7/xlib_liblbxutil/xlib_liblbxutil.mk
+++ b/package/x11r7/xlib_liblbxutil/xlib_liblbxutil.mk
@@ -7,7 +7,7 @@
 XLIB_LIBLBXUTIL_VERSION = 1.0.1
 XLIB_LIBLBXUTIL_SOURCE = liblbxutil-$(XLIB_LIBLBXUTIL_VERSION).tar.bz2
 XLIB_LIBLBXUTIL_SITE = http://xorg.freedesktop.org/releases/individual/lib
-XLIB_LIBLBXUTIL_AUTORECONF = YES
+XLIB_LIBLBXUTIL_AUTORECONF = NO
 XLIB_LIBLBXUTIL_INSTALL_STAGING = YES
 XLIB_LIBLBXUTIL_DEPENDENCIES = xproto_xextproto
 XLIB_LIBLBXUTIL_CONF_OPT = --enable-shared --disable-static
-- 
cgit v1.2.3