summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXiaofeng Yan <xiaofeng.yan@windriver.com>2011-11-15 12:58:36 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-16 17:32:43 +0000
commitbe24bd3ca24c0916b12a1c15b981b498035e462d (patch)
treeda3e2c11ded8fe42eb710a73b3d071cf95f0d799
parentbc9c52cf396e74ee7417a61f7716926926c6a64b (diff)
downloadpoky-be24bd3ca24c0916b12a1c15b981b498035e462d.tar.gz
libx11-diet: update to 1.4.4
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. (From OE-Core rev: dbb86f8445512f95d9dc3cbbdf935901fe2e04b9) Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-diet-1.3/include_fix.patch25
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-diet-1.3/nodolt.patch14
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-diet-1.3/x11_disable_makekeys.patch31
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/X18NCMSstubs.diff (renamed from meta/recipes-graphics/xorg-lib/libx11-diet-1.3/X18NCMSstubs.diff)1
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-disable-xlocale.diff (renamed from meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-disable-xlocale.diff)1
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-utf8-wrong-define.patch (renamed from meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-utf8-wrong-define.patch)2
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/keysymdef_include.patch23
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/x11_disable_makekeys.patch34
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb25
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb28
10 files changed, 89 insertions, 95 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/include_fix.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/include_fix.patch
deleted file mode 100644
index b3bcbabfeb..0000000000
--- a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/include_fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3---
4 configure.ac | 6 +++---
5 1 file changed, 3 insertions(+), 3 deletions(-)
6
7--- libX11-1.1.5.orig/configure.ac
8+++ libX11-1.1.5/configure.ac
9@@ -218,13 +218,13 @@ AC_SUBST(XDMCP_LIBS)
10 AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
11
12 #
13 # Find keysymdef.h
14 #
15-AC_MSG_CHECKING([keysymdef.h])
16-dir=`pkg-config --variable=includedir xproto`
17-KEYSYMDEF="$dir/X11/keysymdef.h"
18+AC_ARG_WITH(keysymdef,
19+ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
20+ KEYSYMDEF=$withval, KEYSYMDEF="")
21 if test -f "$KEYSYMDEF"; then
22 AC_MSG_RESULT([$KEYSYMDEF])
23 else
24 AC_MSG_ERROR([Cannot find keysymdef.h])
25 fi
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/nodolt.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/nodolt.patch
deleted file mode 100644
index cc05fdca7e..0000000000
--- a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/nodolt.patch
+++ /dev/null
@@ -1,14 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: libX11-1.2.1/configure.ac
4===================================================================
5--- libX11-1.2.1.orig/configure.ac 2009-07-02 14:07:54.000000000 +0100
6+++ libX11-1.2.1/configure.ac 2009-07-02 14:08:01.000000000 +0100
7@@ -20,7 +20,6 @@
8
9 # Checks for programs.
10 AC_PROG_LIBTOOL
11-DOLT
12 AC_PROG_CC
13 XORG_CWARNFLAGS
14
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/x11_disable_makekeys.patch
deleted file mode 100644
index 04458359e4..0000000000
--- a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/x11_disable_makekeys.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3---
4 src/util/Makefile.am | 17 -----------------
5 1 file changed, 17 deletions(-)
6
7Index: libX11-1.2.1/src/util/Makefile.am
8===================================================================
9--- libX11-1.2.1.orig/src/util/Makefile.am 2008-10-07 18:18:19.000000000 +0100
10+++ libX11-1.2.1/src/util/Makefile.am 2009-07-02 14:04:38.000000000 +0100
11@@ -1,20 +1,3 @@
12 # $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $
13
14-noinst_PROGRAMS=makekeys
15-
16-makekeys_CFLAGS=$(X11_CFLAGS)
17-
18-CC = @CC_FOR_BUILD@
19-
20 EXTRA_DIST = mkks.sh
21-
22-if LINT
23-# Check source code with tools like lint & sparse
24-
25-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
26- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
27-
28-lint:
29- $(LINT) $(ALL_LINT_FLAGS) makekeys.c
30-
31-endif LINT
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/X18NCMSstubs.diff b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/X18NCMSstubs.diff
index 91ab180816..be71d44302 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/X18NCMSstubs.diff
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/X18NCMSstubs.diff
@@ -1,5 +1,6 @@
1Upstream-Status: Pending 1Upstream-Status: Pending
2 2
3Upstream-Status: Inappropriate [configuration]
3Index: libX11-1.3/src/imConv.c 4Index: libX11-1.3/src/imConv.c
4=================================================================== 5===================================================================
5--- libX11-1.3.orig/src/imConv.c 6--- libX11-1.3.orig/src/imConv.c
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-disable-xlocale.diff b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-disable-xlocale.diff
index 7dcdd6af22..a7c3984fd5 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-disable-xlocale.diff
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-disable-xlocale.diff
@@ -1,5 +1,6 @@
1Upstream-Status: Pending 1Upstream-Status: Pending
2 2
3Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
3--- libX11-X11R7.0-1.0.0/src/Font.c.orig 2006-03-12 18:35:42.000000000 +0100 4--- libX11-X11R7.0-1.0.0/src/Font.c.orig 2006-03-12 18:35:42.000000000 +0100
4+++ libX11-X11R7.0-1.0.0/src/Font.c 2006-03-12 18:40:27.000000000 +0100 5+++ libX11-X11R7.0-1.0.0/src/Font.c 2006-03-12 18:40:27.000000000 +0100
5@@ -701,7 +701,11 @@ 6@@ -701,7 +701,11 @@
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-utf8-wrong-define.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-utf8-wrong-define.patch
index 26d3349bed..c6347f5be1 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-utf8-wrong-define.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-utf8-wrong-define.patch
@@ -1,5 +1,7 @@
1Upstream-Status: Pending 1Upstream-Status: Pending
2 2
3Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
4
3# 5#
4# Patch managed by http://www.holgerschurig.de/patcher.html 6# Patch managed by http://www.holgerschurig.de/patcher.html
5# 7#
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/keysymdef_include.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/keysymdef_include.patch
new file mode 100644
index 0000000000..d1bdab9778
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/keysymdef_include.patch
@@ -0,0 +1,23 @@
1Upstream-Status: Inappropriate [configuration]
2
3Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
4
5diff -uNr libX11-1.3.6.orig//configure.ac libX11-1.3.6/configure.ac
6--- libX11-1.3.6.orig//configure.ac 2010-09-20 08:04:16.000000000 +0200
7+++ libX11-1.3.6/configure.ac 2010-09-28 16:29:26.000000000 +0200
8@@ -355,7 +355,14 @@
9 # Find keysymdef.h
10 #
11 AC_MSG_CHECKING([keysym definitions])
12-KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
13+AC_ARG_WITH(keysymdefdir,
14+ AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h]),
15+ KEYSYMDEFDIR=$withval, KEYSYMDEFDIR="")
16+
17+if test x$KEYSYMDEFDIR = x; then
18+ KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
19+fi
20+
21 FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h"
22 for i in $FILES; do
23 if test -f "$KEYSYMDEFDIR/$i"; then
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/x11_disable_makekeys.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/x11_disable_makekeys.patch
new file mode 100644
index 0000000000..ab48193d8f
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/x11_disable_makekeys.patch
@@ -0,0 +1,34 @@
1Upstream-Status: Inappropriate [configuration]
2
3Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
4---
5 src/util/Makefile.am | 21 -----------------
6 1 file changed, 21 deletions(-)
7
8--- a/src/util/Makefile.am
9+++ b/src/util/Makefile.am
10@@ -1,24 +1,3 @@
11
12-noinst_PROGRAMS=makekeys
13-
14-makekeys_CFLAGS = \
15- $(X11_CFLAGS) \
16- $(CWARNFLAGS)
17-
18-CC = @CC_FOR_BUILD@
19-CPPFLAGS = @CPPFLAGS_FOR_BUILD@
20-CFLAGS = @CFLAGS_FOR_BUILD@
21-LDFLAGS = @LDFLAGS_FOR_BUILD@
22-
23 EXTRA_DIST = mkks.sh
24
25-if LINT
26-# Check source code with tools like lint & sparse
27-
28-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
29- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
30-
31-lint:
32- $(LINT) $(ALL_LINT_FLAGS) makekeys.c
33-
34-endif LINT
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
deleted file mode 100644
index de7edf1d56..0000000000
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
+++ /dev/null
@@ -1,25 +0,0 @@
1require libx11.inc
2
3DESCRIPTION += " Support for XCB, UDC, XCMS and XLOCALE is disabled in \
4this version."
5
6LIC_FILES_CHKSUM = "file://COPYING;md5=597df7e9217e89ccaeb749f48ce2aeb0"
7
8PR = "r4"
9
10SRC_URI += "file://x11_disable_makekeys.patch \
11 file://include_fix.patch \
12 file://X18NCMSstubs.diff \
13 file://fix-disable-xlocale.diff \
14 file://fix-utf8-wrong-define.patch \
15 file://nodolt.patch"
16
17SRC_URI[md5sum] = "0545089013213e90aac19b8f8045d32e"
18SRC_URI[sha256sum] = "34656d022ff2f94430b534612821428fe15ade028d86a42907958167f2e497ac"
19
20DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
21 libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
22
23
24EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h --without-xcb --disable-udc --disable-xcms --disable-xlocale"
25CFLAGS += "-D_GNU_SOURCE"
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb
new file mode 100644
index 0000000000..1762829755
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb
@@ -0,0 +1,28 @@
1require libx11.inc
2
3DESCRIPTION += " Support for XCB, UDC, XCMS and XLOCALE is disabled in \
4this version."
5
6LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
7
8PR = "r0"
9
10SRC_URI += "file://x11_disable_makekeys.patch \
11 file://X18NCMSstubs.diff \
12 file://keysymdef_include.patch \
13 file://fix-disable-xlocale.diff \
14 file://fix-utf8-wrong-define.patch \
15 "
16
17
18SRC_URI[md5sum] = "ed7c382cbf8c13425b6a66bcac0ca5d9"
19SRC_URI[sha256sum] = "7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d"
20
21DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
22 libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
23
24FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
25
26EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale --with-keysymdefdir=${STAGING_INCDIR}/X11"
27CFLAGS += "-D_GNU_SOURCE"
28
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 15:56:45 +0000