summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/packages/xorg-lib/liblbxutil/mkg3states-1.0.0.patch54
-rw-r--r--meta/packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb4
2 files changed, 58 insertions, 0 deletions
diff --git a/meta/packages/xorg-lib/liblbxutil/mkg3states-1.0.0.patch b/meta/packages/xorg-lib/liblbxutil/mkg3states-1.0.0.patch
new file mode 100644
index 0000000000..afa34712e2
--- /dev/null
+++ b/meta/packages/xorg-lib/liblbxutil/mkg3states-1.0.0.patch
@@ -0,0 +1,54 @@
1diff -ruN liblbxutil-X11R7.0-1.0.0_orig/configure.ac liblbxutil-X11R7.0-1.0.0/configure.ac
2--- liblbxutil-X11R7.0-1.0.0_orig/configure.ac 2005-12-15 00:24:36.000000000 +0000
3+++ liblbxutil-X11R7.0-1.0.0/configure.ac 2006-08-21 18:32:04.000000000 +0000
4@@ -60,4 +60,5 @@
5
6 AC_OUTPUT([Makefile
7 src/Makefile
8+ src/image/Makefile
9 lbxutil.pc])
10diff -ruN liblbxutil-X11R7.0-1.0.0_orig/src/Makefile.am liblbxutil-X11R7.0-1.0.0/src/Makefile.am
11--- liblbxutil-X11R7.0-1.0.0_orig/src/Makefile.am 2005-10-16 02:07:10.000000000 +0000
12+++ liblbxutil-X11R7.0-1.0.0/src/Makefile.am 2006-08-21 18:32:04.000000000 +0000
13@@ -1,9 +1,6 @@
14 lib_LTLIBRARIES = liblbxutil.la
15
16-noinst_PROGRAMS = mkg3states
17-
18-mkg3states_SOURCES = \
19- $(srcdir)/image/mkg3states.c
20+SUBDIRS = image
21
22 liblbxutil_la_SOURCES = \
23 $(srcdir)/lbx_zlib/reqstats.h \
24@@ -28,9 +25,8 @@
25
26 $(srcdir)/image/dfaxg42d.c: g3states.h
27
28-g3states.h: mkg3states
29- -rm -f g3states.h
30- ./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
31+g3states.h: image/mkg3states
32+ ./image/mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h
33
34 liblbxutil_la_LDFLAGS = -version-number 1:0:0
35
36diff -ruN liblbxutil-X11R7.0-1.0.0_orig/src/image/Makefile.am liblbxutil-X11R7.0-1.0.0/src/image/Makefile.am
37--- liblbxutil-X11R7.0-1.0.0_orig/src/image/Makefile.am 1970-01-01 00:00:00.000000000 +0000
38+++ liblbxutil-X11R7.0-1.0.0/src/image/Makefile.am 2006-08-21 18:32:04.000000000 +0000
39@@ -0,0 +1,15 @@
40+# evil hack
41+CFLAGS=$(CFLAGS_FOR_BUILD)
42+CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
43+LDFLAGS=$(LDFLAGS_FOR_BUILD)
44+
45+CC=$(CC_FOR_BUILD)
46+LIBTOOL = @LIBTOOL@ --tag=CC
47+
48+noinst_PROGRAMS = mkg3states
49+
50+mkg3states_SOURCES = \
51+ mkg3states.c
52+
53+mkg3states_CFLAGS=$(CFLAGS_FOR_BUILD)
54+mkg3states_LDFLAGS=$(LDFLAGS_FOR_BUILD)
diff --git a/meta/packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb b/meta/packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb
index df8b267601..1b8660dda6 100644
--- a/meta/packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb
+++ b/meta/packages/xorg-lib/liblbxutil_X11R7.1-1.0.1.bb
@@ -1,5 +1,9 @@
1require xorg-lib-common.inc 1require xorg-lib-common.inc
2 2
3export CC_FOR_BUILD = "gcc"
4
5SRC_URI += "file://mkg3states.patch;patch=1"
6
3DESCRIPTION = "XFIXES Extension" 7DESCRIPTION = "XFIXES Extension"
4 8
5DEPENDS += " xextproto xproto zlib" 9DEPENDS += " xextproto xproto zlib"