diff options
author | Eric Sandall | 2010-12-16 14:34:20 -0800 |
---|---|---|
committer | George Sherwood | 2010-12-18 09:14:49 -0600 |
commit | f7ecbc5ed5a75e3b6f6baeed25fae51f8068e2d0 (patch) | |
tree | 66be74b62503778d93a300a501329b8c49ca4b1a | |
parent | c475f12242110abb2dddc1c7560bf6d16947794f (diff) |
libx11: Revert header-breaking commit, fixes Bug #15921
Revert this commit to upstream libx11, which at least breaks perl-tk:
commit d0cbf388919364fe6b5b9127f36426eb744090a0
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Sun Sep 26 21:21:16 2010 -0700
Add an "X11_" string to header guards to avoid possible collision
This addresses a build failure which can result from <X11/Xlocale.h> and
<xlocale.h> being included in the same code since they both used the same
_XLOCALE_H_ protection.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit 26d0bfed28cb4e070f3cb229f5ab3bc8ca1530a1)
-rwxr-xr-x | xorg-lib/libx11/DETAILS | 1 | ||||
-rw-r--r-- | xorg-lib/libx11/HISTORY | 5 | ||||
-rwxr-xr-x | xorg-lib/libx11/PRE_BUILD | 4 | ||||
-rwxr-xr-x | xorg-lib/libx11/xlibh.patch | 36 |
4 files changed, 46 insertions, 0 deletions
diff --git a/xorg-lib/libx11/DETAILS b/xorg-lib/libx11/DETAILS index 3b5c641b7a..191b8e9451 100755 --- a/xorg-lib/libx11/DETAILS +++ b/xorg-lib/libx11/DETAILS @@ -9,6 +9,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION} WEB_SITE=http://xorg.freedesktop.org/wiki ENTERED=20051125 SECURITY_PATCH=2 + PATCHLEVEL=1 LICENSE[0]=XCL SHORT="Module libx11 for xorg" cat << EOF diff --git a/xorg-lib/libx11/HISTORY b/xorg-lib/libx11/HISTORY index 2cb16129e5..e6e44b509e 100644 --- a/xorg-lib/libx11/HISTORY +++ b/xorg-lib/libx11/HISTORY @@ -1,3 +1,8 @@ +2010-12-16 Eric Sandall <sandalle@sourcemage.org> + * DETAILS: PATCHLEVEL++ + * PRE_BUILD: Apply xlibh.patch + * xlibh.patch: Revert header-breaking commit, fixes Bug #15921 + 2010-11-30 Vlad Glagolev <stealth@sourcemage.org> * DEPENDS: libxcb isn't optional anymore diff --git a/xorg-lib/libx11/PRE_BUILD b/xorg-lib/libx11/PRE_BUILD new file mode 100755 index 0000000000..ee58e9379f --- /dev/null +++ b/xorg-lib/libx11/PRE_BUILD @@ -0,0 +1,4 @@ +default_pre_build && +message "${MESSAGE_COLOR}Applying Xlib.h header fix${DEFAULT_COLOR}" && +patch "$SOURCE_DIRECTORY"/include/X11/Xlib.h \ + "$SPELL_DIRECTORY"/xlibh.patch diff --git a/xorg-lib/libx11/xlibh.patch b/xorg-lib/libx11/xlibh.patch new file mode 100755 index 0000000000..237184e6be --- /dev/null +++ b/xorg-lib/libx11/xlibh.patch @@ -0,0 +1,36 @@ +# +# Rollback this offending patch, see +# http://bugs.sourcemage.org/show_bug.cgi?id=15921 +# +commit d0cbf388919364fe6b5b9127f36426eb744090a0 +Author: Jeremy Huddleston <jeremyhu@apple.com> +Date: Sun Sep 26 21:21:16 2010 -0700 + + Add an "X11_" string to header guards to avoid possible collision + + This addresses a build failure which can result from <X11/Xlocale.h> and + <xlocale.h> being included in the same code since they both used the same + _XLOCALE_H_ protection. + + Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> + +diff -Naur libX11-1.4.0.orig/include/X11/Xlib.h libX11-1.4.0/include/X11/Xlib.h +--- libX11-1.4.0.orig/include/X11/Xlib.h 2010-12-16 14:19:08.398837832 -0800 ++++ libX11-1.4.0/include/X11/Xlib.h 2010-12-16 14:20:17.853837890 -0800 +@@ -30,8 +30,8 @@ + * interface library (Xlib) to the X Window System Protocol (V11). + * Structures and symbols starting with "_" are private to the library. + */ +-#ifndef _X11_XLIB_H_ +-#define _X11_XLIB_H_ ++#ifndef _XLIB_H_ ++#define _XLIB_H_ + + #define XlibSpecificationRelease 6 + +@@ -4020,4 +4020,4 @@ + + _XFUNCPROTOEND + +-#endif /* _X11_XLIB_H_ */ ++#endif /* _XLIB_H_ */ |