<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/754ad6e38728aa5c9889c51aa111c6b5b64e9b03">https://github.com/macports/macports-ports/commit/754ad6e38728aa5c9889c51aa111c6b5b64e9b03</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 754ad6e xorg-server-devel: avoid redefinition error on older compilers
</span>754ad6e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 754ad6e38728aa5c9889c51aa111c6b5b64e9b03
</span>Author: Ken Cunningham <ken.cunningham.webuse@gmail.com>
AuthorDate: Thu Jan 31 10:51:49 2019 -0800
<span style='display:block; white-space:pre;color:#404040;'> xorg-server-devel: avoid redefinition error on older compilers
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> fixes build on pre-C11 compilers used by default
</span><span style='display:block; white-space:pre;color:#404040;'> on 10.4 through 10.6
</span>---
x11/xorg-server-devel/Portfile | 15 +++++++++++++--
...5006-patch-xorg-server-dont-redefine-GLXscreen.diff | 18 ++++++++++++++++++
...07-patch-randr-randrstr-h-dont-redefine-CARD32.diff | 16 ++++++++++++++++
3 files changed, 47 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server-devel/Portfile b/x11/xorg-server-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 755b204..6001d7d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-server-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-server-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,8 +47,7 @@ depends_lib \
</span> # https://trac.macports.org/ticket/36055
# https://llvm.org/bugs/show_bug.cgi?id=30346
# https://trac.macports.org/ticket/53910
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/57333
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist gcc-4.* llvm-gcc-4.2 macports-clang-3.9 macports-clang-devel \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist gcc-4.0 macports-clang-3.9 macports-clang-devel \
</span> {clang >= 802 < 900} {clang < 100}
platform darwin {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,6 +92,14 @@ patchfiles \
</span> 5004-fb-Revert-fb-changes-that-broke-XQuartz.patch \
5005-fb-Revert-fb-changes-that-broke-XQuartz.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# the following two patches avoid redefinition errors on pre-C11 compilers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/57333
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# another approach would be to update the port to build with gcc6+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# patches to do that are in the above noted ticket/57333.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5006-patch-xorg-server-dont-redefine-GLXscreen.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5007-patch-randr-randrstr-h-dont-redefine-CARD32.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Fixes what appears to be a mis-match in the way
# hw/xquartz/GL/visualConfigs.c allocates __GLXconfig
# objects with a single calloc call to the way
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,6 +111,10 @@ patchfiles-append fix-calloc-free-mis-match-bug.patch
</span>
patch.pre_args -p1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin 8 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --disable-dependency-tracking
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> use_autoreconf yes
autoreconf.args -fvi
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server-devel/files/5006-patch-xorg-server-dont-redefine-GLXscreen.diff b/x11/xorg-server-devel/files/5006-patch-xorg-server-dont-redefine-GLXscreen.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..19c8878
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-server-devel/files/5006-patch-xorg-server-dont-redefine-GLXscreen.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git xorg-server-devel-1.20.3/include/glx_extinit.h.old xorg-server-devel-1.20.3/include/glx_extinit.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 07f3cc8..56a66e7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- xorg-server-devel-1.20.3/include/glx_extinit.h.old
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ xorg-server-devel-1.20.3/include/glx_extinit.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,7 +30,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* XXX this comment no longer makes sense i think */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef GLXEXT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct __GLXprovider __GLXprovider;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef _GLX_screens_h_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* this identical struct is also defined in glx/glxscreens.h and this causes */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* redefinition errors on compilers that don't support C11 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct __GLXscreen __GLXscreen;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct __GLXprovider {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __GLXscreen *(*screenProbe) (ScreenPtr pScreen);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char *name;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server-devel/files/5007-patch-randr-randrstr-h-dont-redefine-CARD32.diff b/x11/xorg-server-devel/files/5007-patch-randr-randrstr-h-dont-redefine-CARD32.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ab396cd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-server-devel/files/5007-patch-randr-randrstr-h-dont-redefine-CARD32.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- xorg-server-devel-1.20.3/randr/randrstr.h.orig 2019-01-31 11:25:32.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ xorg-server-devel-1.20.3/randr/randrstr.h 2019-01-31 11:31:44.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -63,7 +63,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef XID RROutput;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef XID RRCrtc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef XID RRProvider;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* don't define this here. Causes redefinition errors with pre-C11 compilers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++due to a conflict in X11/Xmd.h (xorg-xorgproto)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++and there is no indication it is used anywhere in the xorg-server source
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef XID RRLease;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int RREventBase, RRErrorBase;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>