<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/9c0fa4e09dacec00d3f507a52d0293e029b58e4b">https://github.com/macports/macports-ports/commit/9c0fa4e09dacec00d3f507a52d0293e029b58e4b</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 9c0fa4e09da xorg-server-devel: bring up to 1.20.9
</span>9c0fa4e09da is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9c0fa4e09dacec00d3f507a52d0293e029b58e4b
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Sun Nov 1 15:03:50 2020 -0800
<span style='display:block; white-space:pre;color:#404040;'> xorg-server-devel: bring up to 1.20.9
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> of late the xorg-server port has been updated but this
</span><span style='display:block; white-space:pre;color:#404040;'> devel port has been a bit ignored. This brings it
</span><span style='display:block; white-space:pre;color:#404040;'> right up to date with the current 1.20.9 port.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> It is ready to be moved forward now to new git commits
</span><span style='display:block; white-space:pre;color:#404040;'> as needed.
</span>---
x11/xorg-server-devel/Portfile | 152 +++++++++++----------
.../0001-xquartz-Add-stub-ddxInputThread.patch | 30 ++++
...atch-randr-randrstr-h-dont-redefine-CARD32.diff | 16 ---
.../Darwin19-Remove-AppFlags-Active-Hack.patch | 10 ++
4 files changed, 122 insertions(+), 86 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 12bff82ad0a..59a4ab97122 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;'>@@ -5,13 +5,14 @@ PortGroup compiler_blacklist_versions 1.0
</span>
name xorg-server-devel
conflicts xorg-server 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.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories x11 devel
license X11
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {jeremyhu @jeremyhu} openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description The X.org / Xquartz X server.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://www.x.org
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin macosx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {jeremyhu @jeremyhu} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description The X.org / Xquartz X server.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://www.x.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin macosx
</span> long_description The X.org X server allows you to run X11 applications on your computer.
fetch.type git
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,43 +23,43 @@ git.branch xorg-server-${version}
</span> use_parallel_build yes
# Yes, mesa is a *BUILD* dependency
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:mesa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-xorgproto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-xtrans
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:mesa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-xorgproto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-xtrans
</span>
# This xinit dependency needs to be port: not bin: because we specifically run ${prefix}/bin/startx from bundle-main.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xinit \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:quartz-wm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-fonts \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xkeyboard-config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/pixman-1.pc:libpixman \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libxkbfile \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXfont2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libAppleWM \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXfixes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xinit \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:quartz-wm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-fonts \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xkeyboard-config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/pixman-1.pc:libpixman \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libxkbfile \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXfont \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libAppleWM \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXfixes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXfont2
</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;'>-compiler.blacklist gcc-4.0 macports-clang-devel \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {clang >= 802 < 900} {clang < 100}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist gcc-4.0 macports-clang-devel {clang >= 802 < 900}
</span>
configure.args --with-apple-applications-dir=${applications_dir} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-bundle-id-prefix=org.macports \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-dtrace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-doxygen \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-fop \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-xmlto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-devel-docs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-sha1=CommonCrypto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-dri2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-dri3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-bundle-id-prefix=org.macports \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-dtrace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-doxygen \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-fop \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-xmlto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-devel-docs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-sha1=CommonCrypto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-dri2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-dri3
</span>
# GL/internal/dri_interface.h is missing in prefix (provided by libdrm for the xorg DDX... not helpful for us)
configure.cppflags-append -I/usr/include -I${filespath}/dri -F${configure.sdkroot}/System/Library/Frameworks/ApplicationServices.framework/Frameworks
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,10 +71,11 @@ configure.cppflags-append -I/usr/include -I${filespath}/dri -F${configure.sdkroo
</span> #configure.cflags-replace -Os -O1
configure.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- RAWCPP=${configure.cpp}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RAWCPP=${configure.cpp}
</span>
patchfiles \
0001-os-connection-Improve-abstraction-for-launchd-secure.patch \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0001-xquartz-Add-stub-ddxInputThread.patch \
</span> 0002-randr-Initialize-RandR-even-if-there-are-currently-n.patch \
0003-glx-Initialize-glx-even-if-there-are-currently-no-sc.patch \
5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,9 +89,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;background:#e0e0e0;'>@@ -104,6 +106,12 @@ patchfiles-append 5008-fix-calloc-free-mis-match-bug.patch
</span> # doesn't complain about subdirectory *.in replacement files usage.
patchfiles-append 2001-enable-automake-subdir-objects.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Workaround for Darwin19+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# :info:build X11Application.m:431:17: error: use of undeclared identifier '_appFlags'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# :info:build _appFlags._active = YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# :info:build ^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append Darwin19-Remove-AppFlags-Active-Hack.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> patch.pre_args -p1
platform darwin 8 {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -116,47 +124,51 @@ autoreconf.args -fvi
</span> build.args V=1
depends_build-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-util-macros \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-font-util
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-util-macros \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-font-util
</span>
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s Xquartz ${destroot}${prefix}/bin/X
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s Xquartz ${destroot}${prefix}/bin/X
</span> }
platform macosx {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} < 10 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Xplugin.h is missing on Tiger and incorrect on Leopard
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cppflags-append -I${filespath}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.major} < 10 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Xplugin.h is missing on Tiger and incorrect on Leopard
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags-append -I${filespath}/include
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant xcsecurity description "Enable Security Extensions" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-xcsecurity
</span> }
variant docs description "Install extra documentation" {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:doxygen \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:fop \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xmlto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-sgml-doctools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_skip_archcheck-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- doxygen \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xmlto
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-doxygen \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-fop \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-xmlto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-devel-docs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-doxygen \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-fop \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-xmlto \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-devel-docs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DOXYGEN=${prefix}/bin/doxygen \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FOP=${prefix}/bin/fop \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- XMLTO=${prefix}/bin/xmlto
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:doxygen \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:fop \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xmlto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-sgml-doctools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_skip_archcheck-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ doxygen \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xmlto
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-doxygen \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-fop \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-xmlto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-devel-docs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-doxygen \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-fop \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-xmlto \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-devel-docs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DOXYGEN=${prefix}/bin/doxygen \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FOP=${prefix}/bin/fop \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XMLTO=${prefix}/bin/xmlto
</span> }
livecheck.type none
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server-devel/files/0001-xquartz-Add-stub-ddxInputThread.patch b/x11/xorg-server-devel/files/0001-xquartz-Add-stub-ddxInputThread.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..602d32f7d4d
</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/0001-xquartz-Add-stub-ddxInputThread.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,30 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From f013979507da96377fad0e58b0699d9de051bb39 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Jon Turney <jon.turney@dronecode.org.uk>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 18 Apr 2019 11:37:32 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] xquartz: Add stub ddxInputThread()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Omitted from 4ad21c32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hw/xquartz/darwin.c | 9 +++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 9 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6a143369e..ccfe5f963 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/hw/xquartz/darwin.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/hw/xquartz/darwin.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -826,3 +826,12 @@ ddxGiveUp(enum ExitCode error)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LogClose(error);
</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;'>++#if INPUTTHREAD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/** This function is called in Xserver/os/inputthread.c when starting
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ the input thread. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ddxInputThreadInit(void)
</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;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.24.1 (Apple Git-126)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ab396cd9f69..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xorg-server-devel/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><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xorg-server-devel/files/Darwin19-Remove-AppFlags-Active-Hack.patch b/x11/xorg-server-devel/files/Darwin19-Remove-AppFlags-Active-Hack.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b04ffb5d738
</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/Darwin19-Remove-AppFlags-Active-Hack.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/hw/xquartz/X11Application.m.orig 2019-07-16 13:45:05.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ a/hw/xquartz/X11Application.m 2019-07-16 13:46:31.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -428,7 +428,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* FIXME: This is a hack to avoid passing the event to AppKit which
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * would result in it raising one of its windows.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _appFlags._active = YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ //_appFlags._active = YES;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [self set_front_process:nil];
</span></pre><pre style='margin:0'>
</pre>