From: Valentin Popa <valentin.popa@intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH v2] libx11: upgrade to 1.6.2
Date: Tue, 29 Oct 2013 14:50:44 +0200 [thread overview]
Message-ID: <1383051044-26924-1-git-send-email-valentin.popa@intel.com> (raw)
In-Reply-To: <1383050658-26633-1-git-send-email-valentin.popa@intel.com>
Adapted X18NCMSstubs.diff to correctly apply.
Tested on core-image-sato (for both libx11 and
libx11-diet)
Signed-off-by: Valentin Popa <valentin.popa@intel.com>
---
.../xorg-lib/{libx11-diet_1.6.1.bb => libx11-diet_1.6.2.bb} | 4 ++--
meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff | 3 +--
meta/recipes-graphics/xorg-lib/{libx11_1.6.1.bb => libx11_1.6.2.bb} | 4 ++--
3 files changed, 5 insertions(+), 6 deletions(-)
rename meta/recipes-graphics/xorg-lib/{libx11-diet_1.6.1.bb => libx11-diet_1.6.2.bb} (73%)
rename meta/recipes-graphics/xorg-lib/{libx11_1.6.1.bb => libx11_1.6.2.bb} (47%)
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.1.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.2.bb
similarity index 73%
rename from meta/recipes-graphics/xorg-lib/libx11-diet_1.6.1.bb
rename to meta/recipes-graphics/xorg-lib/libx11-diet_1.6.2.bb
index 3c3b8e7..89b0716 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.1.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.2.bb
@@ -11,8 +11,8 @@ SRC_URI += "file://X18NCMSstubs.diff \
RPROVIDES_${PN}-dev = "libx11-dev"
RPROVIDES_${PN}-locale = "libx11-locale"
-SRC_URI[md5sum] = "bc5fc459ec25a50c5a7e27035b89e579"
-SRC_URI[sha256sum] = "10a54fc16b58b4f5a5eed4d080c357a82fd2f42d09af625c1f5df50650701892"
+SRC_URI[md5sum] = "c35d6ad95b06635a524579e88622fdb5"
+SRC_URI[sha256sum] = "2aa027e837231d2eeea90f3a4afe19948a6eb4c8b2bec0241eba7dbc8106bd16"
EXTRA_OECONF += "--disable-xlocale"
diff --git a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff b/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff
index 9e91a8b..744cedc 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
x11datadir = @X11_DATADIR@
x11data_DATA = XKeysymDB XErrorDB
-@@ -342,7 +344,8 @@ EXTRA_DIST = \
+@@ -342,6 +344,7 @@ EXTRA_DIST = \
$(x11data_DATA) \
os2Stubs.c \
- udcInf.c \
- UIThrStubs.c
+ UIThrStubs.c \
+ X18NCMSstubs.c
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.6.1.bb b/meta/recipes-graphics/xorg-lib/libx11_1.6.2.bb
similarity index 47%
rename from meta/recipes-graphics/xorg-lib/libx11_1.6.1.bb
rename to meta/recipes-graphics/xorg-lib/libx11_1.6.2.bb
index b9fb832..2377d61 100644
--- a/meta/recipes-graphics/xorg-lib/libx11_1.6.1.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.6.2.bb
@@ -6,5 +6,5 @@ BBCLASSEXTEND = "native nativesdk"
SRC_URI += "file://disable_tests.patch \
"
-SRC_URI[md5sum] = "bc5fc459ec25a50c5a7e27035b89e579"
-SRC_URI[sha256sum] = "10a54fc16b58b4f5a5eed4d080c357a82fd2f42d09af625c1f5df50650701892"
+SRC_URI[md5sum] = "c35d6ad95b06635a524579e88622fdb5"
+SRC_URI[sha256sum] = "2aa027e837231d2eeea90f3a4afe19948a6eb4c8b2bec0241eba7dbc8106bd16"
--
1.8.3.2
prev parent reply other threads:[~2013-10-29 12:49 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-29 12:44 [PATCH] libx11: upgrade to 1.6.2 Valentin Popa
2013-10-29 12:50 ` Valentin Popa [this message]
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=1383051044-26924-1-git-send-email-valentin.popa@intel.com \
--to=valentin.popa@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