From 3bd8823cbcd27fc9daa24cd479ddfa6bb5f962ad Mon Sep 17 00:00:00 2001 From: Laurentiu Palcu Date: Wed, 4 Jul 2012 12:54:45 +0300 Subject: [PATCH] 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 Signed-off-by: Richard Purdie --- .../X18NCMSstubs.diff | 2 +- .../fix-disable-xlocale.diff | 0 .../fix-utf8-wrong-define.patch | 0 .../keysymdef_include.patch | 0 .../x11_disable_makekeys.patch | 20 ++++++++++---------- .../{libx11-diet_1.4.4.bb => libx11-diet_1.5.0.bb} | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) rename meta/recipes-graphics/xorg-lib/{libx11-diet-1.4.4 => libx11-diet-1.5.0}/X18NCMSstubs.diff (99%) rename meta/recipes-graphics/xorg-lib/{libx11-diet-1.4.4 => libx11-diet-1.5.0}/fix-disable-xlocale.diff (100%) rename meta/recipes-graphics/xorg-lib/{libx11-diet-1.4.4 => libx11-diet-1.5.0}/fix-utf8-wrong-define.patch (100%) rename meta/recipes-graphics/xorg-lib/{libx11-diet-1.4.4 => libx11-diet-1.5.0}/keysymdef_include.patch (100%) rename meta/recipes-graphics/xorg-lib/{libx11-diet-1.4.4 => libx11-diet-1.5.0}/x11_disable_makekeys.patch (62%) rename meta/recipes-graphics/xorg-lib/{libx11-diet_1.4.4.bb => libx11-diet_1.5.0.bb} (86%) 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 similarity index 99% rename from meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/X18NCMSstubs.diff rename to meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/X18NCMSstubs.diff index be71d44..8cd1870 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 + XRectangle *max_ink_extents, + XRectangle *max_logical_extents) +{ -+ ; ++ return(XcmsFailure); +} + +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 similarity index 100% rename from meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-disable-xlocale.diff rename to 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 similarity index 100% rename from meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-utf8-wrong-define.patch rename to 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 similarity index 100% rename from meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/keysymdef_include.patch rename to 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 similarity index 62% rename from meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/x11_disable_makekeys.patch rename to meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/x11_disable_makekeys.patch index ab48193..69f9e6c 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 @@ -Upstream-Status: Inappropriate [configuration] +Upstream-Status: Pending -Signed-off-by: Xiaofeng Yan ---- - src/util/Makefile.am | 21 ----------------- - 1 file changed, 21 deletions(-) - ---- a/src/util/Makefile.am -+++ b/src/util/Makefile.am -@@ -1,24 +1,3 @@ - +Index: libX11-1.5.0/src/util/Makefile.am +=================================================================== +--- libX11-1.5.0.orig/src/util/Makefile.am ++++ libX11-1.5.0/src/util/Makefile.am +@@ -1,27 +1,2 @@ +- -noinst_PROGRAMS=makekeys - -makekeys_CFLAGS = \ - $(X11_CFLAGS) \ - $(CWARNFLAGS) - +-makekeys_CPPFLAGS = \ +- -I$(top_srcdir)/include +- -CC = @CC_FOR_BUILD@ -CPPFLAGS = @CPPFLAGS_FOR_BUILD@ -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 similarity index 86% rename from meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb rename to meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb index 0a159d4..4ae8b29 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 \ RPROVIDES_${PN}-dev = "libx11-dev" RPROVIDES_${PN}-locale = "libx11-locale" -SRC_URI[md5sum] = "ed7c382cbf8c13425b6a66bcac0ca5d9" -SRC_URI[sha256sum] = "7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d" +SRC_URI[md5sum] = "78b4b3bab4acbdf0abcfca30a8c70cc6" +SRC_URI[sha256sum] = "c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86" DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ libxdmcp xf86bigfontproto kbproto inputproto xproto-native" -- 2.7.4