[OE-core] [PATCH 1/1] libx11-trim: update to 1.4.4
Xiaofeng Yan
xiaofeng.yan at windriver.com
Thu Nov 17 11:00:08 UTC 2011
From: Xiaofeng Yan <xiaofeng.yan at windriver.com>
I remove patch "nodolt.patch" because it is no use in the new version \
and change patch "include_fix.patch" to "keysymdef_include.patch" from libx11-1.4.4.
Signed-off-by: Xiaofeng Yan <xiaofeng.yan at windriver.com>
---
.../xorg-lib/libx11-trim-1.3.4/include_fix.patch | 21 ---------
.../libx11-trim-1.3.4/makekeys_crosscompile.patch | 45 --------------------
.../xorg-lib/libx11-trim-1.3.4/nodolt.patch | 12 -----
.../libx11-trim-1.3.4/x11_disable_makekeys.patch | 33 --------------
.../{libx11-trim_1.3.4.bb => libx11-trim_1.4.4.bb} | 7 +--
5 files changed, 3 insertions(+), 115 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/include_fix.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/makekeys_crosscompile.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/nodolt.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/x11_disable_makekeys.patch
rename meta/recipes-graphics/xorg-lib/{libx11-trim_1.3.4.bb => libx11-trim_1.4.4.bb} (78%)
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/include_fix.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/include_fix.patch
deleted file mode 100644
index eeb4175..0000000
--- a/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/include_fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
----
- configure.ac | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- libX11-1.3.4.orig/configure.ac
-+++ libX11-1.3.4/configure.ac
-@@ -353,9 +353,9 @@
- #
- # Find keysymdef.h
- #
--AC_MSG_CHECKING([keysymdef.h])
--dir=`$PKG_CONFIG --variable=includedir xproto`
--KEYSYMDEF="$dir/X11/keysymdef.h"
-+AC_ARG_WITH(keysymdef,
-+ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
-+ KEYSYMDEF=$withval, KEYSYMDEF="")
- if test -f "$KEYSYMDEF"; then
- AC_MSG_RESULT([$KEYSYMDEF])
- else
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/makekeys_crosscompile.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/makekeys_crosscompile.patch
deleted file mode 100644
index e5eacf0..0000000
--- a/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/makekeys_crosscompile.patch
+++ /dev/null
@@ -1,45 +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".
-
-Upstream-Status: Pending
-
-Signed-off-by: dbuitenh at 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 <X11/keysymdef.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <stdint.h>
-
- 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-trim-1.3.4/nodolt.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/nodolt.patch
deleted file mode 100644
index bf6c7d5..0000000
--- a/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/nodolt.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
---- libX11-1.3.4.orig/configure.ac
-+++ libX11-1.3.4/configure.ac
-@@ -32,7 +32,6 @@
-
- # Checks for programs.
- AC_PROG_LIBTOOL
--DOLT
- AC_PROG_CC
- PKG_PROG_PKG_CONFIG
-
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/x11_disable_makekeys.patch
deleted file mode 100644
index 561b577..0000000
--- a/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/x11_disable_makekeys.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
----
- src/util/Makefile.am | 21 -----------------
- 1 file changed, 21 deletions(-)
-
---- libX11-1.3.4.orig/src/util/Makefile.am
-+++ libX11-1.3.4/src/util/Makefile.am
-@@ -1,24 +1,3 @@
-
--noinst_PROGRAMS=makekeys
--
--makekeys_CFLAGS = \
-- $(X11_CFLAGS) \
-- $(CWARNFLAGS)
--
--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-trim_1.3.4.bb b/meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb
similarity index 78%
rename from meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb
rename to meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb
index 3a8f2c4..81fb63b 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.4.4.bb
@@ -3,15 +3,14 @@ require libx11.inc
DESCRIPTION += " Support for XCB, and XCMS is disabled in this version."
LICENSE = "MIT & MIT-style & BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=bf75bfe4d05068311b5e6862d4b5f2c5"
+LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
-PR = "r2"
+PR = "r0"
DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native"
SRC_URI += "file://x11_disable_makekeys.patch \
- file://include_fix.patch \
- file://nodolt.patch \
+ file://keysymdef_include.patch \
file://makekeys_crosscompile.patch"
SRC_URI[md5sum] = "f65c9c7ecbfb64c19dbd7927160d63fd"
--
1.7.0.4
More information about the Openembedded-core
mailing list