mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 05:29:32 +00:00
Code Issues Projects Releases Wiki Activity

libx11-diet: upgrade to 1.5.0

Browse Source 
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>
This commit is contained in:
Laurentiu Palcu
2012-07-04 12:54:45 +03:00
committed by Richard Purdie
parent f013f72285
commit a5180e43ba
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/X18NCMSstubs.diff → meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/X18NCMSstubs.diff
+1 -1
View File
@@ -247,7 +247,7 @@ Index: libX11-1.3/src/X18NCMSstubs.c
+ XRectangle *max_ink_extents,
+ XRectangle *max_logical_extents)
+{
+ ;
+ return(XcmsFailure);
+}
+
+int
meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-disable-xlocale.diff → meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/fix-disable-xlocale.diff
View File
meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/fix-utf8-wrong-define.patch → meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/fix-utf8-wrong-define.patch
View File
meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/keysymdef_include.patch → meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/keysymdef_include.patch
View File
meta/recipes-graphics/xorg-lib/libx11-diet-1.4.4/x11_disable_makekeys.patch → meta/recipes-graphics/xorg-lib/libx11-diet-1.5.0/x11_disable_makekeys.patch
+10 -10
View File
@@ -1,20 +1,20 @@
Upstream-Status: Inappropriate [configuration]
Upstream-Status: Pending
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
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@
meta/recipes-graphics/xorg-lib/libx11-diet_1.4.4.bb → meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
+2 -2
View File
@@ -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"