Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.51 grimoire by George Sherwood (f7ecbc5ed5a75e3b6f6baeed25fae51f8068e2d0)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-rc-0.51 grimoire by George Sherwood (f7ecbc5ed5a75e3b6f6baeed25fae51f8068e2d0)
  • Date: Sat, 18 Dec 2010 09:17:17 -0600

GIT changes to stable-rc-0.51 grimoire by George Sherwood
<gsherwood AT sourcemage.org>:

xorg-lib/libx11/DETAILS | 1 +
xorg-lib/libx11/HISTORY | 5 +++++
xorg-lib/libx11/PRE_BUILD | 4 ++++
xorg-lib/libx11/xlibh.patch | 36 ++++++++++++++++++++++++++++++++++++
4 files changed, 46 insertions(+)

New commits:
commit f7ecbc5ed5a75e3b6f6baeed25fae51f8068e2d0
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

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 AT 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 AT apple.com>
(cherry picked from commit 26d0bfed28cb4e070f3cb229f5ab3bc8ca1530a1)

diff --git a/xorg-lib/libx11/DETAILS b/xorg-lib/libx11/DETAILS
index 3b5c641..191b8e9 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 2cb1612..e6e44b5 100644
--- a/xorg-lib/libx11/HISTORY
+++ b/xorg-lib/libx11/HISTORY
@@ -1,3 +1,8 @@
+2010-12-16 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * PRE_BUILD: Apply xlibh.patch
+ * xlibh.patch: Revert header-breaking commit, fixes Bug #15921
+
2010-11-30 Vlad Glagolev <stealth AT 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 0000000..ee58e93
--- /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 0000000..237184e
--- /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 AT 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 AT 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_ */



  • [SM-Commit] GIT changes to stable-rc-0.51 grimoire by George Sherwood (f7ecbc5ed5a75e3b6f6baeed25fae51f8068e2d0), George Sherwood, 12/18/2010

Archive powered by MHonArc 2.6.24.

Top of Page