From 7b5146db076218b7180208d6f6d1a500b8e10bc6 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sat, 10 Jun 2006 15:11:47 +0000 Subject: xlibs: move patches for lbxutil and libx11 to common dirs --- packages/xlibs/files/fix-utf8-wrong-define.patch | 16 +++++++ packages/xlibs/liblbxutil-1.0.0/.mtn2git_empty | 0 packages/xlibs/liblbxutil-1.0.0/mkg3states.patch | 51 ----------------------- packages/xlibs/liblbxutil/.mtn2git_empty | 0 packages/xlibs/liblbxutil/mkg3states.patch | 51 +++++++++++++++++++++++ packages/xlibs/libx11/fix-utf8-wrong-define.patch | 16 ------- 6 files changed, 67 insertions(+), 67 deletions(-) create mode 100644 packages/xlibs/files/fix-utf8-wrong-define.patch delete mode 100644 packages/xlibs/liblbxutil-1.0.0/.mtn2git_empty delete mode 100644 packages/xlibs/liblbxutil-1.0.0/mkg3states.patch create mode 100644 packages/xlibs/liblbxutil/.mtn2git_empty create mode 100644 packages/xlibs/liblbxutil/mkg3states.patch delete mode 100644 packages/xlibs/libx11/fix-utf8-wrong-define.patch diff --git a/packages/xlibs/files/fix-utf8-wrong-define.patch b/packages/xlibs/files/fix-utf8-wrong-define.patch new file mode 100644 index 0000000000..dca88fba92 --- /dev/null +++ b/packages/xlibs/files/fix-utf8-wrong-define.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- libX11-6.2.1/include/X11/Xlib.h~fix-utf8-wrong-define ++++ libX11-6.2.1/include/X11/Xlib.h +@@ -100,7 +100,7 @@ + + /* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in + November 2000. Its presence is indicated through the following macro. */ +-#define X_HAVE_UTF8_STRING 1 ++#undef X_HAVE_UTF8_STRING + + typedef char *XPointer; + diff --git a/packages/xlibs/liblbxutil-1.0.0/.mtn2git_empty b/packages/xlibs/liblbxutil-1.0.0/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/xlibs/liblbxutil-1.0.0/mkg3states.patch b/packages/xlibs/liblbxutil-1.0.0/mkg3states.patch deleted file mode 100644 index 58463db46b..0000000000 --- a/packages/xlibs/liblbxutil-1.0.0/mkg3states.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- liblbxutil-1.0.0/configure.ac.old 2006-03-31 02:38:44.000000000 -0500 -+++ liblbxutil-1.0.0/configure.ac 2006-03-31 02:39:06.000000000 -0500 -@@ -60,4 +60,5 @@ XORG_RELEASE_VERSION - - AC_OUTPUT([Makefile - src/Makefile -+ src/image/Makefile - lbxutil.pc]) ---- liblbxutil-1.0.0/src/Makefile.am.old 2006-03-31 02:38:51.000000000 -0500 -+++ liblbxutil-1.0.0/src/Makefile.am 2006-03-31 02:39:49.000000000 -0500 -@@ -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 @@ INCLUDES = @LBXUTIL_CFLAGS@ - - $(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 - ---- liblbxutil-1.0.0/src/image/Makefile.am.old 2006-03-31 02:41:19.000000000 -0500 -+++ liblbxutil-1.0.0/src/image/Makefile.am 2006-03-31 02:40:40.000000000 -0500 -@@ -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/xlibs/liblbxutil/.mtn2git_empty b/packages/xlibs/liblbxutil/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xlibs/liblbxutil/mkg3states.patch b/packages/xlibs/liblbxutil/mkg3states.patch new file mode 100644 index 0000000000..58463db46b --- /dev/null +++ b/packages/xlibs/liblbxutil/mkg3states.patch @@ -0,0 +1,51 @@ +--- liblbxutil-1.0.0/configure.ac.old 2006-03-31 02:38:44.000000000 -0500 ++++ liblbxutil-1.0.0/configure.ac 2006-03-31 02:39:06.000000000 -0500 +@@ -60,4 +60,5 @@ XORG_RELEASE_VERSION + + AC_OUTPUT([Makefile + src/Makefile ++ src/image/Makefile + lbxutil.pc]) +--- liblbxutil-1.0.0/src/Makefile.am.old 2006-03-31 02:38:51.000000000 -0500 ++++ liblbxutil-1.0.0/src/Makefile.am 2006-03-31 02:39:49.000000000 -0500 +@@ -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 @@ INCLUDES = @LBXUTIL_CFLAGS@ + + $(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 + +--- liblbxutil-1.0.0/src/image/Makefile.am.old 2006-03-31 02:41:19.000000000 -0500 ++++ liblbxutil-1.0.0/src/image/Makefile.am 2006-03-31 02:40:40.000000000 -0500 +@@ -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/xlibs/libx11/fix-utf8-wrong-define.patch b/packages/xlibs/libx11/fix-utf8-wrong-define.patch deleted file mode 100644 index dca88fba92..0000000000 --- a/packages/xlibs/libx11/fix-utf8-wrong-define.patch +++ /dev/null @@ -1,16 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- libX11-6.2.1/include/X11/Xlib.h~fix-utf8-wrong-define -+++ libX11-6.2.1/include/X11/Xlib.h -@@ -100,7 +100,7 @@ - - /* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in - November 2000. Its presence is indicated through the following macro. */ --#define X_HAVE_UTF8_STRING 1 -+#undef X_HAVE_UTF8_STRING - - typedef char *XPointer; - -- cgit v1.2.3