From 14f3a96c2a32d194df26f4f1597390401f1c4cc2 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 13 May 2011 14:01:49 +0200 Subject: [PATCH] libxext: upgrade from 1.2.0 to 1.3.0 and remove applied patch Signed-off-by: Martin Jansa --- .../libxext-1.2.0/xgeExtRegister.hidden.patch | 44 ---------------------- recipes/xorg-lib/libxext_1.2.0.bb | 14 ------- recipes/xorg-lib/libxext_1.3.0.bb | 12 ++++++ 3 files changed, 12 insertions(+), 58 deletions(-) delete mode 100644 recipes/xorg-lib/libxext-1.2.0/xgeExtRegister.hidden.patch delete mode 100644 recipes/xorg-lib/libxext_1.2.0.bb create mode 100644 recipes/xorg-lib/libxext_1.3.0.bb diff --git a/recipes/xorg-lib/libxext-1.2.0/xgeExtRegister.hidden.patch b/recipes/xorg-lib/libxext-1.2.0/xgeExtRegister.hidden.patch deleted file mode 100644 index 52f3fb452d..0000000000 --- a/recipes/xorg-lib/libxext-1.2.0/xgeExtRegister.hidden.patch +++ /dev/null @@ -1,44 +0,0 @@ -From patchwork Sun Sep 5 07:25:12 2010 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 8bit -Subject: [libXext] sync declarations/definitions of xgeExtRegister() -Date: Sun, 05 Sep 2010 15:25:12 -0000 -From: =?utf-8?q?R=C3=A9mi_Cardona_=3Cremi=40gentoo=2Eorg=3E?= -X-Patchwork-Id: 1786 -Message-Id: <1283671512-6655-1-git-send-email-remi@gentoo.org> -To: xorg-devel@lists.x.org - -src/extutil.c has _X_HIDDEN while src/Xge.c didn't. This apparently went -unnoticed by most compilers for a while, but not on Gentoo-prefix/amd64 -where this issue breaks the build. - -Fixes https://bugs.freedesktop.org/show_bug.cgi?id=29958 - -Signed-off-by: Ivan Jager -Reviewed-by: Rémi Cardona -Acked-by: Peter Hutterer - ---- -Could I get an extra pair of eyes to ACK this before committing? - -Thanks, - -Rémi - - src/Xge.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/Xge.c b/src/Xge.c -index 0655e00..2e25894 100644 ---- a/src/Xge.c -+++ b/src/Xge.c -@@ -291,7 +291,7 @@ _xgeEventToWire(Display* dpy, XEvent* re, xEvent* event) - /* - * Extensions need to register callbacks for their events. - */ --Bool -+_X_HIDDEN Bool - xgeExtRegister(Display* dpy, int offset, XExtensionHooks* callbacks) - { - XGEExtNode* newExt; diff --git a/recipes/xorg-lib/libxext_1.2.0.bb b/recipes/xorg-lib/libxext_1.2.0.bb deleted file mode 100644 index da1677e723..0000000000 --- a/recipes/xorg-lib/libxext_1.2.0.bb +++ /dev/null @@ -1,14 +0,0 @@ -require xorg-lib-common.inc -DESCRIPTION = "X11 miscellaneous extension library" -DEPENDS += "xproto virtual/libx11 xextproto libxau" -PE = "1" -PR = "${INC_PR}.1" - -SRC_URI += "file://xgeExtRegister.hidden.patch" - -SRC_URI[archive.md5sum] = "9bb236ff0193e9fc1c1fb504dd840331" -SRC_URI[archive.sha256sum] = "4aed3e211e41c47908c293515580e731c26048f61a1212bf0888d1f456de6ff7" - -BBCLASSEXTEND = "native nativesdk" - -XORG_PN = "libXext" diff --git a/recipes/xorg-lib/libxext_1.3.0.bb b/recipes/xorg-lib/libxext_1.3.0.bb new file mode 100644 index 0000000000..092426978f --- /dev/null +++ b/recipes/xorg-lib/libxext_1.3.0.bb @@ -0,0 +1,12 @@ +require xorg-lib-common.inc +DESCRIPTION = "X11 miscellaneous extension library" +DEPENDS += "xproto virtual/libx11 xextproto libxau" +PE = "1" +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "161d200b690ace818db1cc7537e70ba9" +SRC_URI[archive.sha256sum] = "e9daeb400855b9836e328500cec356b2769033174fc1b2be0df4a80f031debc0" + +BBCLASSEXTEND = "native nativesdk" + +XORG_PN = "libXext" -- 2.11.4.GIT