From 3d204a58b38c5513e29aefacf190ab37c8a76505 Mon Sep 17 00:00:00 2001 From: Valentin Popa Date: Tue, 29 Oct 2013 14:50:44 +0200 Subject: libx11: upgrade to 1.6.2 Adapted X18NCMSstubs.diff to correctly apply. Tested on core-image-sato (for both libx11 and libx11-diet) (From OE-Core rev: 1179a6dc039fc4ce7a540450de55f5a39681370e) Signed-off-by: Valentin Popa Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-graphics/xorg-lib/libx11-diet_1.6.1.bb | 19 ------------------- meta/recipes-graphics/xorg-lib/libx11-diet_1.6.2.bb | 19 +++++++++++++++++++ .../xorg-lib/libx11/X18NCMSstubs.diff | 3 +-- meta/recipes-graphics/xorg-lib/libx11_1.6.1.bb | 10 ---------- meta/recipes-graphics/xorg-lib/libx11_1.6.2.bb | 10 ++++++++++ 5 files changed, 30 insertions(+), 31 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet_1.6.1.bb create mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet_1.6.2.bb delete mode 100644 meta/recipes-graphics/xorg-lib/libx11_1.6.1.bb create mode 100644 meta/recipes-graphics/xorg-lib/libx11_1.6.2.bb (limited to 'meta/recipes-graphics') diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.1.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.1.bb deleted file mode 100644 index 3c3b8e7dce..0000000000 --- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.1.bb +++ /dev/null @@ -1,19 +0,0 @@ -require libx11.inc - -DESCRIPTION += " Support for XCMS and XLOCALE is disabled in \ -this version." - -SRC_URI += "file://X18NCMSstubs.diff \ - file://fix-disable-xlocale.diff \ - file://fix-utf8-wrong-define.patch \ - " - -RPROVIDES_${PN}-dev = "libx11-dev" -RPROVIDES_${PN}-locale = "libx11-locale" - -SRC_URI[md5sum] = "bc5fc459ec25a50c5a7e27035b89e579" -SRC_URI[sha256sum] = "10a54fc16b58b4f5a5eed4d080c357a82fd2f42d09af625c1f5df50650701892" - -EXTRA_OECONF += "--disable-xlocale" - -PACKAGECONFIG ??= "" diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.2.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.2.bb new file mode 100644 index 0000000000..89b07164c3 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.2.bb @@ -0,0 +1,19 @@ +require libx11.inc + +DESCRIPTION += " Support for XCMS and XLOCALE is disabled in \ +this version." + +SRC_URI += "file://X18NCMSstubs.diff \ + file://fix-disable-xlocale.diff \ + file://fix-utf8-wrong-define.patch \ + " + +RPROVIDES_${PN}-dev = "libx11-dev" +RPROVIDES_${PN}-locale = "libx11-locale" + +SRC_URI[md5sum] = "c35d6ad95b06635a524579e88622fdb5" +SRC_URI[sha256sum] = "2aa027e837231d2eeea90f3a4afe19948a6eb4c8b2bec0241eba7dbc8106bd16" + +EXTRA_OECONF += "--disable-xlocale" + +PACKAGECONFIG ??= "" diff --git a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff b/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff index 9e91a8bbab..744cedc777 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.1.bb deleted file mode 100644 index b9fb83242b..0000000000 --- a/meta/recipes-graphics/xorg-lib/libx11_1.6.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -require libx11.inc -inherit gettext - -BBCLASSEXTEND = "native nativesdk" - -SRC_URI += "file://disable_tests.patch \ - " - -SRC_URI[md5sum] = "bc5fc459ec25a50c5a7e27035b89e579" -SRC_URI[sha256sum] = "10a54fc16b58b4f5a5eed4d080c357a82fd2f42d09af625c1f5df50650701892" diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.6.2.bb b/meta/recipes-graphics/xorg-lib/libx11_1.6.2.bb new file mode 100644 index 0000000000..2377d61c37 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11_1.6.2.bb @@ -0,0 +1,10 @@ +require libx11.inc +inherit gettext + +BBCLASSEXTEND = "native nativesdk" + +SRC_URI += "file://disable_tests.patch \ + " + +SRC_URI[md5sum] = "c35d6ad95b06635a524579e88622fdb5" +SRC_URI[sha256sum] = "2aa027e837231d2eeea90f3a4afe19948a6eb4c8b2bec0241eba7dbc8106bd16" -- cgit v1.2.3-54-g00ecf