From: Saul Wold <sgw@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [CONSOLIDATED PULL 05/41] libx11-diet: upgrade to 1.5.0
Date: Mon, 9 Jul 2012 08:47:19 -0700 [thread overview]
Message-ID: <4f6527786d6bfad3aac60e85df1f722ea1fcc29c.1341802889.git.sgw@linux.intel.com> (raw)
In-Reply-To: <cover.1341802889.git.sgw@linux.intel.com>
In-Reply-To: <cover.1341802889.git.sgw@linux.intel.com>
From: Laurentiu Palcu <laurentiu.palcu@intel.com>
The X18NCMSstubs.diff was modified to please the -Werror=return-type
compiler option. Otherwise, it will throw an error.
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
.../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 <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@
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"
--
1.7.7.6
next prev parent reply other threads:[~2012-07-09 15:59 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-09 15:47 [CONSOLIDATED PULL 00/41] Fixes and Updates Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 01/41] directfb: upgrade to 1.6.1 Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 02/41] directfb-examples: upgrade to 1.6.0 Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 03/41] libx11: upgrade to 1.5.0 Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 04/41] libx11-trim: " Saul Wold
2012-07-09 15:47 ` Saul Wold [this message]
2012-07-09 15:47 ` [CONSOLIDATED PULL 06/41] libxi: upgrade to 1.6.1 Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 07/41] xinput: upgrade to 1.6.0 Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 08/41] pixman: upgrade to 0.26.2 Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 09/41] recipes.txt: Add entries for "recipes-rt" and "recipes-support" Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 10/41] gcc-common: Don't use "is" for comparing strings, use "==" Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 11/41] gthumb: run make install in parallel Saul Wold
2012-07-09 15:50 ` Burton, Ross
2012-07-09 15:47 ` [CONSOLIDATED PULL 12/41] curl: upgrade to 7.26.0 Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 13/41] apt 0.7.14: runtime error: filename too long (tmpdir length) Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 14/41] apt 0.7.14: runtime error: Method file has died unexpectedly Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 15/41] sanity.bbclass: the tmpdir can't be longer than 410 Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 16/41] startup-notification: bump PR because libxcb-util soname was changed Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 17/41] matchbox-panel-2: " Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 18/41] runqemu: fix usage() help for MACHINE setting Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 19/41] runqemu: fix support for ext4 rootfs images Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 20/41] classes/license: fix manifest to work with deb Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 21/41] init-install: Use swap_ratio in the calulation of swap_size Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 22/41] init-install: Correct ext2->ext3 typo in logging Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 23/41] init-install: Clean up partition alignment Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 24/41] grub-efi: Do not use help2man Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 25/41] pseudo: Update to 1.3.1 (fixing chroot crash) Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 26/41] utils.bbclass: add helper function to add all multilib variants of a specific package Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 27/41] libxml-parser-perl_2.41.bb: fix MakeMaker issues with using wrong CC/LD/etc Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 28/41] gnutls: make sure native is patched for gettext version Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 29/41] populate_sdk_rpm: Sync multilib configuration with rootfs_rpm Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 30/41] multilib: Enable multilib remapping for SDK generation Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 31/41] package_rpm: Avoid duplicate package generation failures Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 32/41] rpm: Fix PACKAGECONFIG dependencies Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 33/41] qemu-0.15.1: add patch to fix compilatation problems on powerpc Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 34/41] packagedata.py: Fix get_subpkgedata_fn for multilib Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 35/41] bluez4: fix packaging issue after update Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 36/41] ncurses: fix packaging issue in multilib build Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 37/41] connman: remove some obviously wrong (circa early-GNOME 2?) directories from FILES Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 38/41] connman: ship the empty plugins directory in the connman package Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 39/41] kernel.bbclass: add non-santized kernel provides Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 40/41] initscripts: use update-alternative to handle file functions Saul Wold
2012-07-09 15:47 ` [CONSOLIDATED PULL 41/41] lsbinitscripts: increase ALTERNATIVE_PRIORITY Saul Wold
2012-07-09 16:04 ` [CONSOLIDATED PULL 00/41] Fixes and Updates Richard Purdie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4f6527786d6bfad3aac60e85df1f722ea1fcc29c.1341802889.git.sgw@linux.intel.com \
--to=sgw@linux.intel.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox