summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-lib/libx11
diff options
context:
space:
mode:
authorValentin Popa <valentin.popa@intel.com>2013-10-29 14:50:44 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-30 17:33:14 +0000
commit3d204a58b38c5513e29aefacf190ab37c8a76505 (patch)
tree3c883f1c1005417794f1f031f2c200461be74eac /meta/recipes-graphics/xorg-lib/libx11
parent1d8cfc7fea59c2b550840cfdb7eb6f1b4c7e1b80 (diff)
downloadpoky-3d204a58b38c5513e29aefacf190ab37c8a76505.tar.gz
libx11: upgrade to 1.6.2
Adapted X18NCMSstubs.diff to correctly apply. Tested on core-image-sato (for both libx11 and libx11-diet) (From OE-Core rev: 1179a6dc039fc4ce7a540450de55f5a39681370e) Signed-off-by: Valentin Popa <valentin.popa@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib/libx11')
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff3
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff b/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff
index 9e91a8bbab..744cedc777 100644
--- a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff
+++ b/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff
@@ -483,10 +483,9 @@ Index: libX11-1.3/src/Makefile.am
483 x11datadir = @X11_DATADIR@ 483 x11datadir = @X11_DATADIR@
484 x11data_DATA = XKeysymDB XErrorDB 484 x11data_DATA = XKeysymDB XErrorDB
485 485
486@@ -342,7 +344,8 @@ EXTRA_DIST = \ 486@@ -342,6 +344,7 @@ EXTRA_DIST = \
487 $(x11data_DATA) \ 487 $(x11data_DATA) \
488 os2Stubs.c \ 488 os2Stubs.c \
489 udcInf.c \
490- UIThrStubs.c 489- UIThrStubs.c
491+ UIThrStubs.c \ 490+ UIThrStubs.c \
492+ X18NCMSstubs.c 491+ X18NCMSstubs.c