summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-lib
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2012-07-04 12:54:45 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-09 16:58:55 +0100
commita5180e43ba7a15541dc8861e0d53aa531b99103f (patch)
treedc20539771fdf766c233f5532523c29cd24a8427 /meta/recipes-graphics/xorg-lib
parentf013f72285fcd116253780d0b05c69c432e3a1ee (diff)
downloadpoky-a5180e43ba7a15541dc8861e0d53aa531b99103f.tar.gz
libx11-diet: upgrade to 1.5.0
The X18NCMSstubs.diff was modified to please the -Werror=return-type compiler option. Otherwise, it will throw an error. (From OE-Core rev: 708785266d1d671f5d2a8e8af81a77e34c70662f) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib')
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/X18NCMSstubs.diff (renamed from meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/X18NCMSstubs.diff)2
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/fix-disable-xlocale.diff (renamed from meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-disable-xlocale.diff)0
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/fix-utf8-wrong-define.patch (renamed from meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-utf8-wrong-define.patch)0
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/keysymdef_include.patch (renamed from meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/keysymdef_include.patch)0
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/x11_disable_makekeys.patch (renamed from meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/x11_disable_makekeys.patch)20
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb (renamed from meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb)4
6 files changed, 13 insertions, 13 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/X18NCMSstubs.diff b/meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/X18NCMSstubs.diff
index be71d44302..8cd1870363 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/X18NCMSstubs.diff
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/X18NCMSstubs.diff
@@ -247,7 +247,7 @@ Index: libX11-1.3/src/X18NCMSstubs.c
247+ XRectangle *max_ink_extents, 247+ XRectangle *max_ink_extents,
248+ XRectangle *max_logical_extents) 248+ XRectangle *max_logical_extents)
249+{ 249+{
250+ ; 250+ return(XcmsFailure);
251+} 251+}
252+ 252+
253+int 253+int
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-disable-xlocale.diff b/meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/fix-disable-xlocale.diff
index a7c3984fd5..a7c3984fd5 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-disable-xlocale.diff
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/fix-disable-xlocale.diff
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-utf8-wrong-define.patch b/meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/fix-utf8-wrong-define.patch
index c6347f5be1..c6347f5be1 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-utf8-wrong-define.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/fix-utf8-wrong-define.patch
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.5.0/keysymdef_include.patch
index d1bdab9778..d1bdab9778 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/keysymdef_include.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/keysymdef_include.patch
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.5.0/x11_disable_makekeys.patch
index ab48193d8f..69f9e6c4d6 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/x11_disable_makekeys.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/x11_disable_makekeys.patch
@@ -1,20 +1,20 @@
1Upstream-Status: Inappropriate [configuration] 1Upstream-Status: Pending
2 2
3Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> 3Index: libX11-1.5.0/src/util/Makefile.am
4--- 4===================================================================
5 src/util/Makefile.am | 21 ----------------- 5--- libX11-1.5.0.orig/src/util/Makefile.am
6 1 file changed, 21 deletions(-) 6+++ libX11-1.5.0/src/util/Makefile.am
7 7@@ -1,27 +1,2 @@
8--- a/src/util/Makefile.am 8-
9+++ b/src/util/Makefile.am
10@@ -1,24 +1,3 @@
11
12-noinst_PROGRAMS=makekeys 9-noinst_PROGRAMS=makekeys
13- 10-
14-makekeys_CFLAGS = \ 11-makekeys_CFLAGS = \
15- $(X11_CFLAGS) \ 12- $(X11_CFLAGS) \
16- $(CWARNFLAGS) 13- $(CWARNFLAGS)
17- 14-
15-makekeys_CPPFLAGS = \
16- -I$(top_srcdir)/include
17-
18-CC = @CC_FOR_BUILD@ 18-CC = @CC_FOR_BUILD@
19-CPPFLAGS = @CPPFLAGS_FOR_BUILD@ 19-CPPFLAGS = @CPPFLAGS_FOR_BUILD@
20-CFLAGS = @CFLAGS_FOR_BUILD@ 20-CFLAGS = @CFLAGS_FOR_BUILD@
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
index 0a159d47e0..4ae8b29a7f 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
@@ -17,8 +17,8 @@ SRC_URI += "file://x11_disable_makekeys.patch \
17RPROVIDES_${PN}-dev = "libx11-dev" 17RPROVIDES_${PN}-dev = "libx11-dev"
18RPROVIDES_${PN}-locale = "libx11-locale" 18RPROVIDES_${PN}-locale = "libx11-locale"
19 19
20SRC_URI[md5sum] = "ed7c382cbf8c13425b6a66bcac0ca5d9" 20SRC_URI[md5sum] = "78b4b3bab4acbdf0abcfca30a8c70cc6"
21SRC_URI[sha256sum] = "7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d" 21SRC_URI[sha256sum] = "c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86"
22 22
23DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ 23DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
24 libxdmcp xf86bigfontproto kbproto inputproto xproto-native" 24 libxdmcp xf86bigfontproto kbproto inputproto xproto-native"