From c22cd021e7c6eea88d7d76f4b7cebab803068b95 Mon Sep 17 00:00:00 2001
From: Kristoffer Ericson <kristoffer_e1@hotmail.com>
Date: Tue, 22 Aug 2006 14:34:15 +0000
Subject: xorg-lib/liblbxutil : Addition of 1.0.0 patch * Addition of
 mkg3states-1.0.0 patch that works with   liblbxutil_X11R7.0-1.0.0 (correct
 directory layout for patch).

---
 .../xorg-lib/liblbxutil/mkg3states-1.0.0.patch     | 54 ++++++++++++++++++++++
 packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb      |  2 +
 2 files changed, 56 insertions(+)
 create mode 100644 packages/xorg-lib/liblbxutil/mkg3states-1.0.0.patch

diff --git a/packages/xorg-lib/liblbxutil/mkg3states-1.0.0.patch b/packages/xorg-lib/liblbxutil/mkg3states-1.0.0.patch
new file mode 100644
index 0000000000..afa34712e2
--- /dev/null
+++ b/packages/xorg-lib/liblbxutil/mkg3states-1.0.0.patch
@@ -0,0 +1,54 @@
+diff -ruN liblbxutil-X11R7.0-1.0.0_orig/configure.ac liblbxutil-X11R7.0-1.0.0/configure.ac
+--- liblbxutil-X11R7.0-1.0.0_orig/configure.ac	2005-12-15 00:24:36.000000000 +0000
++++ liblbxutil-X11R7.0-1.0.0/configure.ac	2006-08-21 18:32:04.000000000 +0000
+@@ -60,4 +60,5 @@
+ 
+ AC_OUTPUT([Makefile
+ 	   src/Makefile
++	   src/image/Makefile
+ 	   lbxutil.pc])
+diff -ruN liblbxutil-X11R7.0-1.0.0_orig/src/Makefile.am liblbxutil-X11R7.0-1.0.0/src/Makefile.am
+--- liblbxutil-X11R7.0-1.0.0_orig/src/Makefile.am	2005-10-16 02:07:10.000000000 +0000
++++ liblbxutil-X11R7.0-1.0.0/src/Makefile.am	2006-08-21 18:32:04.000000000 +0000
+@@ -1,9 +1,6 @@
+ lib_LTLIBRARIES = liblbxutil.la
+ 
+-noinst_PROGRAMS = mkg3states
+-
+-mkg3states_SOURCES =				\
+-	$(srcdir)/image/mkg3states.c
++SUBDIRS = image
+ 
+ liblbxutil_la_SOURCES =				\
+ 	$(srcdir)/lbx_zlib/reqstats.h		\
+@@ -28,9 +25,8 @@
+ 
+ $(srcdir)/image/dfaxg42d.c: g3states.h
+ 
+-g3states.h: mkg3states
+-	-rm -f g3states.h
+-	./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
++g3states.h: image/mkg3states
++	./image/mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
+ 
+ liblbxutil_la_LDFLAGS = -version-number 1:0:0
+ 
+diff -ruN liblbxutil-X11R7.0-1.0.0_orig/src/image/Makefile.am liblbxutil-X11R7.0-1.0.0/src/image/Makefile.am
+--- liblbxutil-X11R7.0-1.0.0_orig/src/image/Makefile.am	1970-01-01 00:00:00.000000000 +0000
++++ liblbxutil-X11R7.0-1.0.0/src/image/Makefile.am	2006-08-21 18:32:04.000000000 +0000
+@@ -0,0 +1,15 @@
++# evil hack
++CFLAGS=$(CFLAGS_FOR_BUILD)
++CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
++LDFLAGS=$(LDFLAGS_FOR_BUILD)
++
++CC=$(CC_FOR_BUILD)
++LIBTOOL = @LIBTOOL@ --tag=CC
++
++noinst_PROGRAMS = mkg3states
++
++mkg3states_SOURCES =				\
++	mkg3states.c
++
++mkg3states_CFLAGS=$(CFLAGS_FOR_BUILD)
++mkg3states_LDFLAGS=$(LDFLAGS_FOR_BUILD)
diff --git a/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb b/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb
index df8b267601..57b2987968 100644
--- a/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb
+++ b/packages/xorg-lib/liblbxutil_X11R7.0-1.0.0.bb
@@ -1,5 +1,7 @@
 require xorg-lib-common.inc
 
+SRC_URI += "file://mkg3states-1.0.0.patch;patch=0"
+
 DESCRIPTION = "XFIXES Extension"
 
 DEPENDS += " xextproto xproto zlib"
-- 
cgit v1.2.3