<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a34a3920f832252ec6970ddd621c468007e00eca">https://github.com/macports/macports-ports/commit/a34a3920f832252ec6970ddd621c468007e00eca</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a34a3920f832252ec6970ddd621c468007e00eca
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Sun Jun 23 11:52:08 2019 +0100
<span style='display:block; white-space:pre;color:#404040;'> xorg-server: Update to 1.20.5, remove patch file not needed since xorgproto 2019.1 update
</span>---
x11/xorg-server/Portfile | 12 ++++++------
...5007-patch-randr-randrstr-h-dont-redefine-CARD32.diff | 16 ----------------
2 files changed, 6 insertions(+), 22 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server/Portfile b/x11/xorg-server/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f40148b..18fe569 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xorg-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup compiler_blacklist_versions 1.0
</span>
name xorg-server
conflicts xorg-server-devel xorg-server-1.18
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.20.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.20.5
</span> revision 0
categories x11 devel
license X11
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,9 +20,9 @@ master_sites http://xorg.freedesktop.org/archive/individual/xserver/
</span>
distname xorg-server-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 cad624e1d1ada0b46a76a1e5de6b12446f7c6dda \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 fe0fd493ebe93bfc56bede382fa204458ff5f636ea54d413a5d1bd58e19166ee \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6123780
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 4b8c60978045bff8974524180e59b070fb1f1dec \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a81d8243f37e75a03d4f8c55f96d0bc25802be6ec45c3bfa5cb614c6d01bac9d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6126757
</span>
use_bzip2 yes
use_parallel_build yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,9 +87,9 @@ patchfiles \
</span> # https://trac.macports.org/ticket/57333
# another approach would be to update the port to build with gcc6+
# patches to do that are in the above noted ticket/57333.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Edit: 5007 patch no longer needed with xorgproto 2019.1
</span> patchfiles-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 5006-patch-xorg-server-dont-redefine-GLXscreen.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5007-patch-randr-randrstr-h-dont-redefine-CARD32.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5006-patch-xorg-server-dont-redefine-GLXscreen.diff
</span>
# Fixes what appears to be a mis-match in the way
# hw/xquartz/GL/visualConfigs.c allocates __GLXconfig
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server/files/5007-patch-randr-randrstr-h-dont-redefine-CARD32.diff b/x11/xorg-server/files/5007-patch-randr-randrstr-h-dont-redefine-CARD32.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ab396cd..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-server/files/5007-patch-randr-randrstr-h-dont-redefine-CARD32.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- 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:#ffe0e0;'>-+++ 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:#ffe0e0;'>-@@ -63,7 +63,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef XID RROutput;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef XID RRCrtc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef XID RRProvider;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* don't define this here. Causes redefinition errors with pre-C11 compilers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+due to a conflict in X11/Xmd.h (xorg-xorgproto)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+and there is no indication it is used anywhere in the xorg-server source
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef XID RRLease;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+*/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int RREventBase, RRErrorBase;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>