From 902da955260a012f59fc412c18ed1f545c80e69d Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 11 Sep 2012 20:17:58 +0100 Subject: [PATCH] libx11: merge patches into a single directory (From OE-Core rev: 34b337e52551717106b377c53ea5dc617ac4c92c) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../xorg-lib/libx11-1.5.0/keysymdef_include.patch | 23 ------- .../libx11-1.5.0/makekeys_crosscompile.patch | 76 ---------------------- .../libx11-1.5.0/x11_disable_makekeys.patch | 34 ---------- .../libx11-diet-1.5.0/keysymdef_include.patch | 23 ------- .../libx11-diet-1.5.0/x11_disable_makekeys.patch | 34 ---------- meta/recipes-graphics/xorg-lib/libx11.inc | 4 +- .../X18NCMSstubs.diff | 0 .../fix-disable-xlocale.diff | 0 .../fix-utf8-wrong-define.patch | 0 .../keysymdef_include.patch | 0 .../makekeys_crosscompile.patch | 0 .../x11_disable_makekeys.patch | 0 12 files changed, 3 insertions(+), 191 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-1.5.0/keysymdef_include.patch delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-1.5.0/makekeys_crosscompile.patch delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-1.5.0/x11_disable_makekeys.patch delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/keysymdef_include.patch delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/x11_disable_makekeys.patch rename meta/recipes-graphics/xorg-lib/{libx11-diet-1.5.0 => libx11}/X18NCMSstubs.diff (100%) rename meta/recipes-graphics/xorg-lib/{libx11-diet-1.5.0 => libx11}/fix-disable-xlocale.diff (100%) rename meta/recipes-graphics/xorg-lib/{libx11-diet-1.5.0 => libx11}/fix-utf8-wrong-define.patch (100%) rename meta/recipes-graphics/xorg-lib/{libx11-trim-1.5.0 => libx11}/keysymdef_include.patch (100%) rename meta/recipes-graphics/xorg-lib/{libx11-trim-1.5.0 => libx11}/makekeys_crosscompile.patch (100%) rename meta/recipes-graphics/xorg-lib/{libx11-trim-1.5.0 => libx11}/x11_disable_makekeys.patch (100%) diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.5.0/keysymdef_include.patch b/meta/recipes-graphics/xorg-lib/libx11-1.5.0/keysymdef_include.patch deleted file mode 100644 index d1bdab9..0000000 --- a/meta/recipes-graphics/xorg-lib/libx11-1.5.0/keysymdef_include.patch +++ /dev/null @@ -1,23 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Martin Jansa - -diff -uNr libX11-1.3.6.orig//configure.ac libX11-1.3.6/configure.ac ---- libX11-1.3.6.orig//configure.ac 2010-09-20 08:04:16.000000000 +0200 -+++ libX11-1.3.6/configure.ac 2010-09-28 16:29:26.000000000 +0200 -@@ -355,7 +355,14 @@ - # Find keysymdef.h - # - AC_MSG_CHECKING([keysym definitions]) --KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 -+AC_ARG_WITH(keysymdefdir, -+ AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h]), -+ KEYSYMDEFDIR=$withval, KEYSYMDEFDIR="") -+ -+if test x$KEYSYMDEFDIR = x; then -+ KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 -+fi -+ - FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h" - for i in $FILES; do - if test -f "$KEYSYMDEFDIR/$i"; then diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.5.0/makekeys_crosscompile.patch b/meta/recipes-graphics/xorg-lib/libx11-1.5.0/makekeys_crosscompile.patch deleted file mode 100644 index daf3696..0000000 --- a/meta/recipes-graphics/xorg-lib/libx11-1.5.0/makekeys_crosscompile.patch +++ /dev/null @@ -1,76 +0,0 @@ -Because the size of "unsigned long" is different between 32-bit -and 64-bit, judge whether target is 32-bit or 64-bit and tell -"makekey". - -The error information from LSB Test suite is as follow: -VSW5TESTSUITE PURPOSE 7 -Assertion XStringToKeysym-7.(A) -When the string argument is the name of a KeySym in the -table with the prefix XK_ removed, then a call to -XStringToKeysym returns that KeySym. -METH: For each KeySym name in table with code G: -METH: Call XStringToKeysym to obtain the KeySym defined for that string. -METH: Verify that XStringToKeysym did not return NoSymbol. -METH: Verify that the returned string is correct. -CHECK: XStringToKeysym-7 1, line 130 -CHECK: XStringToKeysym-7 2, line 140 -CHECK: XStringToKeysym-7 3, line 150 -CHECK: XStringToKeysym-7 4, line 160 -CHECK: XStringToKeysym-7 5, line 170 -CHECK: XStringToKeysym-7 6, line 180 -CHECK: XStringToKeysym-7 7, line 190 -CHECK: XStringToKeysym-7 8, line 200 -CHECK: XStringToKeysym-7 9, line 210 -CHECK: XStringToKeysym-7 10, line 220 -CHECK: XStringToKeysym-7 11, line 230 -CHECK: XStringToKeysym-7 12, line 240 -CHECK: XStringToKeysym-7 13, line 250 -CHECK: XStringToKeysym-7 14, line 260 -CHECK: XStringToKeysym-7 15, line 270 -CHECK: XStringToKeysym-7 16, line 280 -CHECK: XStringToKeysym-7 17, line 290 -CHECK: XStringToKeysym-7 18, line 300 -CHECK: XStringToKeysym-7 19, line 310 -CHECK: XStringToKeysym-7 20, line 320 - -Upstream-Status: Pending - -Signed-off-by: dbuitenh@windriver.com - ---- libX11-1.3.4.orig/src/util/makekeys.c 2010-01-15 09:11:36.000000000 +0800 -+++ libX11-1.3.4/src/util/makekeys.c 2011-05-24 19:04:25.454774908 +0800 -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - - typedef unsigned long Signature; - -@@ -124,7 +125,12 @@ - name = info[i].name; - sig = 0; - while ((c = *name++)) -- sig = (sig << 1) + c; -+#ifdef USE32 -+ sig = (uint32_t)(sig << 1) + c; -+#else -+ sig = (uint64_t)(sig << 1) + c; -+#endif -+ - first = j = sig % z; - for (k = 0; tab[j]; k++) { - j += first + 1; -@@ -163,7 +169,11 @@ - name = info[i].name; - sig = 0; - while ((c = *name++)) -- sig = (sig << 1) + c; -+#ifdef USE32 -+ sig = (uint32_t)(sig << 1) + c; -+#else -+ sig = (uint64_t)(sig << 1) + c; -+#endif - first = j = sig % z; - while (offsets[j]) { - j += first + 1; diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.5.0/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-1.5.0/x11_disable_makekeys.patch deleted file mode 100644 index 69f9e6c..0000000 --- a/meta/recipes-graphics/xorg-lib/libx11-1.5.0/x11_disable_makekeys.patch +++ /dev/null @@ -1,34 +0,0 @@ -Upstream-Status: Pending - -Index: libX11-1.5.0/src/util/Makefile.am -=================================================================== ---- libX11-1.5.0.orig/src/util/Makefile.am -+++ libX11-1.5.0/src/util/Makefile.am -@@ -1,27 +1,2 @@ -- --noinst_PROGRAMS=makekeys -- --makekeys_CFLAGS = \ -- $(X11_CFLAGS) \ -- $(CWARNFLAGS) -- --makekeys_CPPFLAGS = \ -- -I$(top_srcdir)/include -- --CC = @CC_FOR_BUILD@ --CPPFLAGS = @CPPFLAGS_FOR_BUILD@ --CFLAGS = @CFLAGS_FOR_BUILD@ --LDFLAGS = @LDFLAGS_FOR_BUILD@ -- - EXTRA_DIST = mkks.sh - --if LINT --# Check source code with tools like lint & sparse -- --ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) -- --lint: -- $(LINT) $(ALL_LINT_FLAGS) makekeys.c -- --endif LINT diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/keysymdef_include.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/keysymdef_include.patch deleted file mode 100644 index d1bdab9..0000000 --- a/meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/keysymdef_include.patch +++ /dev/null @@ -1,23 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Martin Jansa - -diff -uNr libX11-1.3.6.orig//configure.ac libX11-1.3.6/configure.ac ---- libX11-1.3.6.orig//configure.ac 2010-09-20 08:04:16.000000000 +0200 -+++ libX11-1.3.6/configure.ac 2010-09-28 16:29:26.000000000 +0200 -@@ -355,7 +355,14 @@ - # Find keysymdef.h - # - AC_MSG_CHECKING([keysym definitions]) --KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 -+AC_ARG_WITH(keysymdefdir, -+ AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h]), -+ KEYSYMDEFDIR=$withval, KEYSYMDEFDIR="") -+ -+if test x$KEYSYMDEFDIR = x; then -+ KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 -+fi -+ - FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h" - for i in $FILES; do - if test -f "$KEYSYMDEFDIR/$i"; then diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/x11_disable_makekeys.patch deleted file mode 100644 index 69f9e6c..0000000 --- a/meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/x11_disable_makekeys.patch +++ /dev/null @@ -1,34 +0,0 @@ -Upstream-Status: Pending - -Index: libX11-1.5.0/src/util/Makefile.am -=================================================================== ---- libX11-1.5.0.orig/src/util/Makefile.am -+++ libX11-1.5.0/src/util/Makefile.am -@@ -1,27 +1,2 @@ -- --noinst_PROGRAMS=makekeys -- --makekeys_CFLAGS = \ -- $(X11_CFLAGS) \ -- $(CWARNFLAGS) -- --makekeys_CPPFLAGS = \ -- -I$(top_srcdir)/include -- --CC = @CC_FOR_BUILD@ --CPPFLAGS = @CPPFLAGS_FOR_BUILD@ --CFLAGS = @CFLAGS_FOR_BUILD@ --LDFLAGS = @LDFLAGS_FOR_BUILD@ -- - EXTRA_DIST = mkks.sh - --if LINT --# Check source code with tools like lint & sparse -- --ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) -- --lint: -- $(LINT) $(ALL_LINT_FLAGS) makekeys.c -- --endif LINT diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc index a524c5f..1e9f942 100644 --- a/meta/recipes-graphics/xorg-lib/libx11.inc +++ b/meta/recipes-graphics/xorg-lib/libx11.inc @@ -8,8 +8,10 @@ require xorg-lib-common.inc inherit siteinfo +FILESPATH = "${FILE_DIRNAME}/libx11" + PE = "1" -INC_PR = "r4" +INC_PR = "r5" PROVIDES = "virtual/libx11" diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/X18NCMSstubs.diff b/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff similarity index 100% rename from meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/X18NCMSstubs.diff rename to meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/fix-disable-xlocale.diff b/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff similarity index 100% rename from meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/fix-disable-xlocale.diff rename to meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/fix-utf8-wrong-define.patch b/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch similarity index 100% rename from meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/fix-utf8-wrong-define.patch rename to meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/keysymdef_include.patch b/meta/recipes-graphics/xorg-lib/libx11/keysymdef_include.patch similarity index 100% rename from meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/keysymdef_include.patch rename to meta/recipes-graphics/xorg-lib/libx11/keysymdef_include.patch diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/makekeys_crosscompile.patch b/meta/recipes-graphics/xorg-lib/libx11/makekeys_crosscompile.patch similarity index 100% rename from meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/makekeys_crosscompile.patch rename to meta/recipes-graphics/xorg-lib/libx11/makekeys_crosscompile.patch diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch similarity index 100% rename from meta/recipes-graphics/xorg-lib/libx11-trim-1.5.0/x11_disable_makekeys.patch rename to meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch -- 2.7.4