summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-06-12 14:51:07 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-14 15:28:24 +0100
commitbbedf4aa1013153cc32598f81ac00bb9274230e8 (patch)
tree2d10ba60007afae5b34d09d9d448458ca1aa1212 /meta/recipes-graphics
parent684a51950a77577e0af190e946aa338f892f423a (diff)
downloadpoky-bbedf4aa1013153cc32598f81ac00bb9274230e8.tar.gz
libx11-diet: Fixed checksum and rebase patch
(From OE-Core rev: fc2ef23f651bb06124a22168a72c881b9f32cb08) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb14
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff62
2 files changed, 44 insertions, 32 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
index fee44ae8ba..a4929d291a 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
@@ -3,13 +3,15 @@ require libx11.inc
3DESCRIPTION += " Support for XCB, UDC, XCMS and XLOCALE is disabled in \ 3DESCRIPTION += " Support for XCB, UDC, XCMS and XLOCALE is disabled in \
4this version." 4this version."
5 5
6PR = "r1" 6LIC_FILES_CHKSUM = "file://COPYING;md5=597df7e9217e89ccaeb749f48ce2aeb0"
7 7
8SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \ 8PR = "r2"
9 file://include_fix.patch;patch=1 \ 9
10 file://X18NCMSstubs.diff;patch=1 \ 10SRC_URI += "file://x11_disable_makekeys.patch \
11 file://fix-disable-xlocale.diff;patch=1 \ 11 file://include_fix.patch \
12 file://fix-utf8-wrong-define.patch;patch=1" 12 file://X18NCMSstubs.diff \
13 file://fix-disable-xlocale.diff \
14 file://fix-utf8-wrong-define.patch"
13 15
14DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ 16DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
15 libxdmcp xf86bigfontproto kbproto inputproto xproto-native" 17 libxdmcp xf86bigfontproto kbproto inputproto xproto-native"
diff --git a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff b/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff
index 2e86a48c2b..91ab180816 100644
--- a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff
+++ b/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff
@@ -1,8 +1,10 @@
1Upstream-Status: Pending 1Upstream-Status: Pending
2 2
3--- libX11-X11R7.0-1.0.0/src/imConv.c.orig 2006-03-08 09:46:03.000000000 +0100 3Index: libX11-1.3/src/imConv.c
4+++ libX11-X11R7.0-1.0.0/src/imConv.c 2006-03-08 10:50:10.000000000 +0100 4===================================================================
5@@ -83,6 +83,7 @@ 5--- libX11-1.3.orig/src/imConv.c
6+++ libX11-1.3/src/imConv.c
7@@ -83,6 +83,7 @@ static const struct SubstRec SubstTable[
6 * from UCS char to specified charset char. 8 * from UCS char to specified charset char.
7 * This converter is needed for _XimGetCharCode subroutine. 9 * This converter is needed for _XimGetCharCode subroutine.
8 */ 10 */
@@ -10,7 +12,7 @@ Upstream-Status: Pending
10 XPointer 12 XPointer
11 _XimGetLocaleCode ( 13 _XimGetLocaleCode (
12 _Xconst char* encoding_name) 14 _Xconst char* encoding_name)
13@@ -96,6 +97,7 @@ 15@@ -96,6 +97,7 @@ _XimGetLocaleCode (
14 } 16 }
15 return cvt; 17 return cvt;
16 } 18 }
@@ -18,15 +20,15 @@ Upstream-Status: Pending
18 20
19 /* 21 /*
20 * Returns the locale dependent representation of a keysym. 22 * Returns the locale dependent representation of a keysym.
21@@ -107,6 +109,7 @@ 23@@ -106,6 +108,7 @@ _XimGetLocaleCode (
24 * terminating NUL byte. Return 0 if the keysym is not representable in the
22 * locale 25 * locale
23 */ 26 */
24 /*ARGSUSED*/
25+#ifdef XLOCALE 27+#ifdef XLOCALE
26 int 28 /*ARGSUSED*/
29 int
27 _XimGetCharCode ( 30 _XimGetCharCode (
28 XPointer ucs_conv, 31@@ -135,6 +138,7 @@ _XimGetCharCode (
29@@ -135,6 +138,7 @@
30 buf[count]= '\0'; 32 buf[count]= '\0';
31 return count; 33 return count;
32 } 34 }
@@ -34,8 +36,10 @@ Upstream-Status: Pending
34 36
35 #ifdef XKB 37 #ifdef XKB
36 static int lookup_string( 38 static int lookup_string(
37--- libX11-X11R7.0-1.0.0/src/X18NCMSstubs.c.orig 2006-03-08 08:43:19.000000000 +0100 39Index: libX11-1.3/src/X18NCMSstubs.c
38+++ libX11-X11R7.0-1.0.0/src/X18NCMSstubs.c 2006-03-08 11:41:28.000000000 +0100 40===================================================================
41--- /dev/null
42+++ libX11-1.3/src/X18NCMSstubs.c
39@@ -0,0 +1,428 @@ 43@@ -0,0 +1,428 @@
40+/* 44+/*
41+ * X18NCMSstubs.c 45+ * X18NCMSstubs.c
@@ -465,9 +469,11 @@ Upstream-Status: Pending
465+} 469+}
466+ 470+
467+#endif 471+#endif
468--- libX11-X11R7.0-1.0.0/src/Makefile.am.orig 2006-03-08 08:31:09.000000000 +0100 472Index: libX11-1.3/src/Makefile.am
469+++ libX11-X11R7.0-1.0.0/src/Makefile.am 2006-03-08 09:36:23.000000000 +0100 473===================================================================
470@@ -331,6 +331,8 @@ 474--- libX11-1.3.orig/src/Makefile.am
475+++ libX11-1.3/src/Makefile.am
476@@ -335,6 +335,8 @@ if THRSTUBS
471 libX11_la_SOURCES+=UIThrStubs.c 477 libX11_la_SOURCES+=UIThrStubs.c
472 endif 478 endif
473 479
@@ -476,7 +482,7 @@ Upstream-Status: Pending
476 x11datadir = @X11_DATADIR@ 482 x11datadir = @X11_DATADIR@
477 x11data_DATA = XKeysymDB XErrorDB 483 x11data_DATA = XKeysymDB XErrorDB
478 484
479@@ -338,7 +340,8 @@ 485@@ -342,7 +344,8 @@ EXTRA_DIST = \
480 $(x11data_DATA) \ 486 $(x11data_DATA) \
481 os2Stubs.c \ 487 os2Stubs.c \
482 udcInf.c \ 488 udcInf.c \
@@ -484,11 +490,13 @@ Upstream-Status: Pending
484+ UIThrStubs.c \ 490+ UIThrStubs.c \
485+ X18NCMSstubs.c 491+ X18NCMSstubs.c
486 492
487 # 493 if XCB
488 # Figure out which sub-libraries to link into Xlib 494 libX11_la_SOURCES += \
489--- libX11-X11R7.0-1.0.0/src/locking.c.orig 2006-03-08 11:05:56.000000000 +0100 495Index: libX11-1.3/src/locking.c
490+++ libX11-X11R7.0-1.0.0/src/locking.c 2006-03-08 11:06:37.000000000 +0100 496===================================================================
491@@ -55,7 +55,9 @@ 497--- libX11-1.3.orig/src/locking.c
498+++ libX11-1.3/src/locking.c
499@@ -66,7 +66,9 @@ in this Software without prior written a
492 #define NUM_FREE_CVLS 4 500 #define NUM_FREE_CVLS 4
493 501
494 /* in lcWrap.c */ 502 /* in lcWrap.c */
@@ -498,7 +506,7 @@ Upstream-Status: Pending
498 506
499 #ifdef WIN32 507 #ifdef WIN32
500 static DWORD _X_TlsIndex = (DWORD)-1; 508 static DWORD _X_TlsIndex = (DWORD)-1;
501@@ -625,9 +627,11 @@ 509@@ -594,9 +596,11 @@ Status XInitThreads(void)
502 _Xglobal_lock = &global_lock; 510 _Xglobal_lock = &global_lock;
503 xmutex_init(_Xglobal_lock->lock); 511 xmutex_init(_Xglobal_lock->lock);
504 xmutex_set_name(_Xglobal_lock->lock, "Xlib global"); 512 xmutex_set_name(_Xglobal_lock->lock, "Xlib global");
@@ -510,10 +518,12 @@ Upstream-Status: Pending
510 _XLockMutex_fn = _XLockMutex; 518 _XLockMutex_fn = _XLockMutex;
511 _XUnlockMutex_fn = _XUnlockMutex; 519 _XUnlockMutex_fn = _XUnlockMutex;
512 _XCreateMutex_fn = _XCreateMutex; 520 _XCreateMutex_fn = _XCreateMutex;
513--- libX11-X11R7.0-1.0.0/configure.ac.orig 2006-03-08 10:03:57.000000000 +0100 521Index: libX11-1.3/configure.ac
514+++ libX11-X11R7.0-1.0.0/configure.ac 2006-03-08 10:06:01.000000000 +0100 522===================================================================
515@@ -215,7 +215,14 @@ 523--- libX11-1.3.orig/configure.ac
516 esac 524+++ libX11-1.3/configure.ac
525@@ -289,7 +289,14 @@ else
526 fi
517 AC_SUBST(KEYSYMDEF) 527 AC_SUBST(KEYSYMDEF)
518 528
519-AM_CONDITIONAL(UDC, test xfalse = xtrue) 529-AM_CONDITIONAL(UDC, test xfalse = xtrue)
@@ -526,5 +536,5 @@ Upstream-Status: Pending
526+ AC_DEFINE(UDC,1,[Include support for UDC]) 536+ AC_DEFINE(UDC,1,[Include support for UDC])
527+fi 537+fi
528 538
529 AC_ARG_ENABLE(xcms, 539 AC_ARG_ENABLE(xcms,
530 AC_HELP_STRING([--disable-xcms], 540 AC_HELP_STRING([--disable-xcms],