From: Martin Jansa Date: Sun, 28 Nov 2010 09:34:35 +0000 (+0100) Subject: libxext-1.2.0: fix native build on some hosts X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a0c5f94bdeedabe25fe423654a73e19ac6c0dc5;p=openembedded.git libxext-1.2.0: fix native build on some hosts * reported: http://bugs.openembedded.org/show_bug.cgi?id=5490 http://permalink.gmane.org/gmane.comp.handhelds.openembedded/39936 https://bugs.freedesktop.org/show_bug.cgi?id=29958 Signed-off-by: Martin Jansa --- diff --git a/recipes/xorg-lib/libxext-1.2.0/xgeExtRegister.hidden.patch b/recipes/xorg-lib/libxext-1.2.0/xgeExtRegister.hidden.patch new file mode 100644 index 0000000000..52f3fb452d --- /dev/null +++ b/recipes/xorg-lib/libxext-1.2.0/xgeExtRegister.hidden.patch @@ -0,0 +1,44 @@ +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 index f4482e652e..da1677e723 100644 --- a/recipes/xorg-lib/libxext_1.2.0.bb +++ b/recipes/xorg-lib/libxext_1.2.0.bb @@ -2,7 +2,9 @@ require xorg-lib-common.inc DESCRIPTION = "X11 miscellaneous extension library" DEPENDS += "xproto virtual/libx11 xextproto libxau" PE = "1" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" + +SRC_URI += "file://xgeExtRegister.hidden.patch" SRC_URI[archive.md5sum] = "9bb236ff0193e9fc1c1fb504dd840331" SRC_URI[archive.sha256sum] = "4aed3e211e41c47908c293515580e731c26048f61a1212bf0888d1f456de6ff7"