summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChangqing Li <changqing.li@windriver.com>2018-09-10 10:33:25 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-11 09:05:35 +0100
commit17f1496f841e0409e345bf889f3396cded2d7d69 (patch)
tree2c8ca10e6583688782805ba81d6be39708d20fb7
parentf3fb768200b1f4710ed485037f9849d635905c6d (diff)
downloadpoky-17f1496f841e0409e345bf889f3396cded2d7d69.tar.gz
libx11: Upgrade 1.6.5 ->1.6.6
(From OE-Core rev: a04a0f309f4080497ddb6fa1cf81b9c2db5f4e11) Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-diet_1.6.6.bb (renamed from meta/recipes-graphics/xorg-lib/libx11-diet_1.6.5.bb)8
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.patch (renamed from meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff)159
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff17
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.patch32
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch29
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11_1.6.6.bb (renamed from meta/recipes-graphics/xorg-lib/libx11_1.6.5.bb)4
6 files changed, 145 insertions, 104 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.5.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.6.bb
index 295f96a2e7..a4ba4e54ed 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.5.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.6.bb
@@ -3,16 +3,16 @@ require libx11.inc
3DESCRIPTION += " Support for XCMS and XLOCALE is disabled in \ 3DESCRIPTION += " Support for XCMS and XLOCALE is disabled in \
4this version." 4this version."
5 5
6SRC_URI += "file://X18NCMSstubs.diff \ 6SRC_URI += "file://X18NCMSstubs.patch \
7 file://fix-disable-xlocale.diff \ 7 file://fix-disable-xlocale.patch \
8 file://fix-utf8-wrong-define.patch \ 8 file://fix-utf8-wrong-define.patch \
9 " 9 "
10 10
11RPROVIDES_${PN}-dev = "libx11-dev" 11RPROVIDES_${PN}-dev = "libx11-dev"
12RPROVIDES_${PN}-locale = "libx11-locale" 12RPROVIDES_${PN}-locale = "libx11-locale"
13 13
14SRC_URI[md5sum] = "0f618db70c4054ca67cee0cc156a4255" 14SRC_URI[md5sum] = "6b0f83e851b3b469dd660f3a95ac3e42"
15SRC_URI[sha256sum] = "4d3890db2ba225ba8c55ca63c6409c1ebb078a2806de59fb16342768ae63435d" 15SRC_URI[sha256sum] = "65fe181d40ec77f45417710c6a67431814ab252d21c2e85c75dd1ed568af414f"
16 16
17EXTRA_OECONF += "--disable-xlocale" 17EXTRA_OECONF += "--disable-xlocale"
18 18
diff --git a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff b/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.patch
index 744cedc777..4ca2f42d4c 100644
--- a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff
+++ b/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.patch
@@ -1,52 +1,49 @@
1Upstream-Status: Pending 1From 62005ad019d6afb81da100b3113292a16472d241 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Mon, 10 Sep 2018 09:08:27 +0800
4Subject: [PATCH] Upstream-Status: Inappropriate [configuration]
2 5
3Upstream-Status: Inappropriate [configuration] 6Update patch to version 1.6.6
4Index: libX11-1.3/src/imConv.c 7Signed-off-by: Changqing Li <changqing.li@windriver.com>
5=================================================================== 8---
6--- libX11-1.3.orig/src/imConv.c 9 src/Makefile.am | 5 +-
7+++ libX11-1.3/src/imConv.c 10 src/X18NCMSstubs.c | 426 +++++++++++++++++++++++++++++++++++++++++++++++++++++
8@@ -83,6 +83,7 @@ static const struct SubstRec SubstTable[ 11 src/imConv.c | 5 +-
9 * from UCS char to specified charset char. 12 src/locking.c | 4 +
10 * This converter is needed for _XimGetCharCode subroutine. 13 4 files changed, 438 insertions(+), 2 deletions(-)
11 */ 14 create mode 100644 src/X18NCMSstubs.c
12+#ifdef XLOCALE 15
13 XPointer 16diff --git a/src/Makefile.am b/src/Makefile.am
14 _XimGetLocaleCode ( 17index f8c476d..cdbcbbd 100644
15 _Xconst char* encoding_name) 18--- a/src/Makefile.am
16@@ -96,6 +97,7 @@ _XimGetLocaleCode ( 19+++ b/src/Makefile.am
17 } 20@@ -336,13 +336,16 @@ if THRSTUBS
18 return cvt; 21 libX11_la_SOURCES+=UIThrStubs.c
19 } 22 endif
20+#endif
21 23
22 /* 24+libX11_la_SOURCES+=X18NCMSstubs.c
23 * Returns the locale dependent representation of a keysym. 25+
24@@ -106,6 +108,7 @@ _XimGetLocaleCode ( 26 x11datadir = @X11_DATADIR@
25 * terminating NUL byte. Return 0 if the keysym is not representable in the 27 x11data_DATA = XErrorDB
26 * locale
27 */
28+#ifdef XLOCALE
29 /*ARGSUSED*/
30 int
31 _XimGetCharCode (
32@@ -135,6 +138,7 @@ _XimGetCharCode (
33 buf[count]= '\0';
34 return count;
35 }
36+#endif
37 28
38 #ifdef XKB 29 EXTRA_DIST = \
39 static int lookup_string( 30 $(x11data_DATA) \
40Index: libX11-1.3/src/X18NCMSstubs.c 31 os2Stubs.c \
41=================================================================== 32- UIThrStubs.c
33+ UIThrStubs.c \
34+ X18NCMSstubs.c
35
36 libX11_xcb_la_SOURCES = x11_xcb.c Xxcbint.h
37 libX11_xcb_la_LDFLAGS = -version-number 1:0:0 -no-undefined
38diff --git a/src/X18NCMSstubs.c b/src/X18NCMSstubs.c
39new file mode 100644
40index 0000000..429cb31
42--- /dev/null 41--- /dev/null
43+++ libX11-1.3/src/X18NCMSstubs.c 42+++ b/src/X18NCMSstubs.c
44@@ -0,0 +1,428 @@ 43@@ -0,0 +1,426 @@
45+/* 44+ /* - Provides stubs and dummy funcs needed when Xcms and XLocale stuff removed
46+ * X18NCMSstubs.c
47+ * - Provides stubs and dummy funcs needed when Xcms and XLocale stuff removed
48+ * 45+ *
49+ * Copyright © 2003 Matthew Allum 46+ * Copyright © 2003 Matthew Allum
50+ * 47+ *
51+ * Permission to use, copy, modify, distribute, and sell this software and its 48+ * Permission to use, copy, modify, distribute, and sell this software and its
52+ * documentation for any purpose is hereby granted without fee, provided that 49+ * documentation for any purpose is hereby granted without fee, provided that
@@ -470,33 +467,48 @@ Index: libX11-1.3/src/X18NCMSstubs.c
470+} 467+}
471+ 468+
472+#endif 469+#endif
473Index: libX11-1.3/src/Makefile.am 470diff --git a/src/imConv.c b/src/imConv.c
474=================================================================== 471index c3c1974..04ecc81 100644
475--- libX11-1.3.orig/src/Makefile.am 472--- a/src/imConv.c
476+++ libX11-1.3/src/Makefile.am 473+++ b/src/imConv.c
477@@ -335,6 +335,8 @@ if THRSTUBS 474@@ -80,6 +80,7 @@ static const struct SubstRec SubstTable[] = {
478 libX11_la_SOURCES+=UIThrStubs.c 475 * from UCS char to specified charset char.
479 endif 476 * This converter is needed for _XimGetCharCode subroutine.
480 477 */
481+libX11_la_SOURCES+=X18NCMSstubs.c 478+#ifdef XLOCALE
482+ 479 XPointer
483 x11datadir = @X11_DATADIR@ 480 _XimGetLocaleCode (
484 x11data_DATA = XKeysymDB XErrorDB 481 _Xconst char* encoding_name)
485 482@@ -93,7 +94,7 @@ _XimGetLocaleCode (
486@@ -342,6 +344,7 @@ EXTRA_DIST = \ 483 }
487 $(x11data_DATA) \ 484 return cvt;
488 os2Stubs.c \ 485 }
489- UIThrStubs.c 486-
490+ UIThrStubs.c \ 487+#endif
491+ X18NCMSstubs.c 488 /*
492 489 * Returns the locale dependent representation of a keysym.
493 if XCB 490 * The locale's encoding is passed in form of pointer to UCS convertor.
494 libX11_la_SOURCES += \ 491@@ -105,6 +105,7 @@ _XimGetLocaleCode (
495Index: libX11-1.3/src/locking.c 492 * locale
496=================================================================== 493 */
497--- libX11-1.3.orig/src/locking.c 494 /*ARGSUSED*/
498+++ libX11-1.3/src/locking.c 495+#ifdef XLOCALE
499@@ -66,7 +66,9 @@ in this Software without prior written a 496 int
497 _XimGetCharCode (
498 XPointer ucs_conv,
499@@ -133,6 +134,7 @@ _XimGetCharCode (
500 buf[count]= '\0';
501 return count;
502 }
503+#endif
504
505 #ifdef XKB
506 static int lookup_string(
507diff --git a/src/locking.c b/src/locking.c
508index 9f4fe06..e6967ee 100644
509--- a/src/locking.c
510+++ b/src/locking.c
511@@ -65,7 +65,9 @@ in this Software without prior written authorization from The Open Group.
500 #define NUM_FREE_CVLS 4 512 #define NUM_FREE_CVLS 4
501 513
502 /* in lcWrap.c */ 514 /* in lcWrap.c */
@@ -506,7 +518,7 @@ Index: libX11-1.3/src/locking.c
506 518
507 #ifdef WIN32 519 #ifdef WIN32
508 static DWORD _X_TlsIndex = (DWORD)-1; 520 static DWORD _X_TlsIndex = (DWORD)-1;
509@@ -594,9 +596,11 @@ Status XInitThreads(void) 521@@ -597,9 +599,11 @@ Status XInitThreads(void)
510 _Xglobal_lock = &global_lock; 522 _Xglobal_lock = &global_lock;
511 xmutex_init(_Xglobal_lock->lock); 523 xmutex_init(_Xglobal_lock->lock);
512 xmutex_set_name(_Xglobal_lock->lock, "Xlib global"); 524 xmutex_set_name(_Xglobal_lock->lock, "Xlib global");
@@ -518,3 +530,6 @@ Index: libX11-1.3/src/locking.c
518 _XLockMutex_fn = _XLockMutex; 530 _XLockMutex_fn = _XLockMutex;
519 _XUnlockMutex_fn = _XUnlockMutex; 531 _XUnlockMutex_fn = _XUnlockMutex;
520 _XCreateMutex_fn = _XCreateMutex; 532 _XCreateMutex_fn = _XCreateMutex;
533--
5342.7.4
535
diff --git a/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff b/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff
deleted file mode 100644
index a7c3984fd5..0000000000
--- a/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff
+++ /dev/null
@@ -1,17 +0,0 @@
1Upstream-Status: Pending
2
3Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
4--- libX11-X11R7.0-1.0.0/src/Font.c.orig 2006-03-12 18:35:42.000000000 +0100
5+++ libX11-X11R7.0-1.0.0/src/Font.c 2006-03-12 18:40:27.000000000 +0100
6@@ -701,7 +701,11 @@
7 }
8 if (l - 2 - (p - charset) < 0)
9 return 0;
10+#ifdef XLOCALE
11 if (_XlcNCompareISOLatin1(name + l - 2 - (p - charset), charset, p - charset))
12+#else
13+ if (strncasecmp(name + l - 2 - (p - charset), charset, p - charset))
14+#endif
15 return 0;
16 if (strlen(p + 1) + l - 1 >= sizeof(buf) - 1)
17 return 0;
diff --git a/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.patch b/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.patch
new file mode 100644
index 0000000000..3677fb1c5c
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.patch
@@ -0,0 +1,32 @@
1From 5c1693028ef12ab767d7cdbc349c27efa1ada87a Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Mon, 10 Sep 2018 09:13:38 +0800
4Subject: [PATCH] Upstream-Status: Pending
5
6Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
7
8Update patch to version 1.6.6
9Signed-off-by: Changqing Li <changqing.li@windriver.com>
10---
11 src/Font.c | 4 ++++
12 1 file changed, 4 insertions(+)
13
14diff --git a/src/Font.c b/src/Font.c
15index a73f9b1..8f4d210 100644
16--- a/src/Font.c
17+++ b/src/Font.c
18@@ -675,7 +675,11 @@ int _XF86LoadQueryLocaleFont(
19 }
20 if (l - 2 - (p - charset) < 0)
21 return 0;
22+#ifdef XLOCALE
23 if (_XlcNCompareISOLatin1(name + l - 2 - (p - charset), charset, p - charset))
24+#else
25+ if (strncasecmp(name + l - 2 - (p - charset), charset, p - charset))
26+#endif
27 return 0;
28 if (strlen(p + 1) + l - 1 >= sizeof(buf) - 1)
29 return 0;
30--
312.7.4
32
diff --git a/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch b/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch
index c6347f5be1..1a3069a9ad 100644
--- a/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch
@@ -1,19 +1,30 @@
1Upstream-Status: Pending 1From 046703373055c7029c19d171e415ff3caaa87372 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Mon, 10 Sep 2018 09:16:33 +0800
4Subject: [PATCH] Upstream-Status: Pending
2 5
3Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> 6Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
4 7
5# 8Update patch to version 1.6.6
6# Patch managed by http://www.holgerschurig.de/patcher.html
7#
8 9
9--- libX11-X11R7.0-1.0.0/include/X11/Xlib.h~fix-utf8-wrong-define 10Signed-off-by: Changqing Li <changqing.li@windriver.com>
10+++ libX11-X11R7.0-1.0.0/include/X11/Xlib.h 11---
11@@ -103,7 +103,7 @@ 12 include/X11/Xlib.h | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/include/X11/Xlib.h b/include/X11/Xlib.h
16index 84403f7..56be654 100644
17--- a/include/X11/Xlib.h
18+++ b/include/X11/Xlib.h
19@@ -67,7 +67,7 @@ _Xmblen(
12 20
13 /* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in 21 /* API mentioning "UTF8" or "utf8" is an XFree86 extension, introduced in
14 November 2000. Its presence is indicated through the following macro. */ 22 November 2000. Its presence is indicated through the following macro. */
15-#define X_HAVE_UTF8_STRING 1 23-#define X_HAVE_UTF8_STRING 1
16+#undef X_HAVE_UTF8_STRING 24+#undef X_HAVE_UTF8_STRING
17 25
18 typedef char *XPointer; 26 /* The Xlib structs are full of implicit padding to properly align members.
19 27 We can't clean that up without breaking ABI, so tell clang not to bother
28--
292.7.4
30
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.6.5.bb b/meta/recipes-graphics/xorg-lib/libx11_1.6.6.bb
index 427bf28ceb..0fee1a9089 100644
--- a/meta/recipes-graphics/xorg-lib/libx11_1.6.5.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.6.6.bb
@@ -10,5 +10,5 @@ do_configure_append () {
10 sed -i -e "/X11_CFLAGS/d" ${B}/src/util/Makefile 10 sed -i -e "/X11_CFLAGS/d" ${B}/src/util/Makefile
11} 11}
12 12
13SRC_URI[md5sum] = "0f618db70c4054ca67cee0cc156a4255" 13SRC_URI[md5sum] = "6b0f83e851b3b469dd660f3a95ac3e42"
14SRC_URI[sha256sum] = "4d3890db2ba225ba8c55ca63c6409c1ebb078a2806de59fb16342768ae63435d" 14SRC_URI[sha256sum] = "65fe181d40ec77f45417710c6a67431814ab252d21c2e85c75dd1ed568af414f"