<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[141689] trunk/dports/x11/xorg-server</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/141689">141689</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2015-10-26 13:32:42 -0700 (Mon, 26 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>xorg-server: Bump to 1.17.3</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsx11xorgserverPortfile">trunk/dports/x11/xorg-server/Portfile</a></li>
<li><a href="#trunkdportsx11xorgserverfiles5000sdksymsshUseCPPFLAGSnotCFLAGSpatch">trunk/dports/x11/xorg-server/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch</a></li>
<li><a href="#trunkdportsx11xorgserverfiles5001UseoldmiTrapezoidsandmiTrianglesroutinespatch">trunk/dports/x11/xorg-server/files/5001-Use-old-miTrapezoids-and-miTriangles-routines.patch</a></li>
<li><a href="#trunkdportsx11xorgserverfiles5002fbRevertfbchangesthatbrokeXQuartzpatch">trunk/dports/x11/xorg-server/files/5002-fb-Revert-fb-changes-that-broke-XQuartz.patch</a></li>
<li><a href="#trunkdportsx11xorgserverfiles5003fbRevertfbchangesthatbrokeXQuartzpatch">trunk/dports/x11/xorg-server/files/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsx11xorgserverfiles0001XQuartzGLXUse__glXEnableExtensiontobuildextenspatch">trunk/dports/x11/xorg-server/files/0001-XQuartz-GLX-Use-__glXEnableExtension-to-build-extens.patch</a></li>
<li><a href="#trunkdportsx11xorgserverfiles0002XQuartzSilenceWpointerboolconversionpatch">trunk/dports/x11/xorg-server/files/0002-XQuartz-Silence-Wpointer-bool-conversion.patch</a></li>
<li><a href="#trunkdportsx11xorgserverfiles0003XQuartzSilenceWunusedvariablepatch">trunk/dports/x11/xorg-server/files/0003-XQuartz-Silence-Wunused-variable.patch</a></li>
<li><a href="#trunkdportsx11xorgserverfiles0004XQuartzSilenceWunusedfunctionpatch">trunk/dports/x11/xorg-server/files/0004-XQuartz-Silence-Wunused-function.patch</a></li>
<li><a href="#trunkdportsx11xorgserverfiles0005XQuartzSilenceWformatsecurityforNSRunAlertPanelpatch">trunk/dports/x11/xorg-server/files/0005-XQuartz-Silence-Wformat-security-for-NSRunAlertPanel.patch</a></li>
<li><a href="#trunkdportsx11xorgserverfiles0006XQuartzRelaxAppTransportSecurityforcommunicatipatch">trunk/dports/x11/xorg-server/files/0006-XQuartz-Relax-App-Transport-Security-for-communicati.patch</a></li>
<li><a href="#trunkdportsx11xorgserverfiles0007XQuartzRemoveInfoPliststringspatch">trunk/dports/x11/xorg-server/files/0007-XQuartz-Remove-InfoPlist.strings.patch</a></li>
<li><a href="#trunkdportsx11xorgserverfiles0008XQuartzFixhowwecalculatetheheightoftheOSXmpatch">trunk/dports/x11/xorg-server/files/0008-XQuartz-Fix-how-we-calculate-the-height-of-the-OSX-m.patch</a></li>
<li><a href="#trunkdportsx11xorgserverfiles1000XQuartzMakesurethatdarwin_all_modifier_mask_addipatch">trunk/dports/x11/xorg-server/files/1000-XQuartz-Make-sure-that-darwin_all_modifier_mask_addi.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsx11xorgserverPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/xorg-server/Portfile (141688 => 141689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/Portfile 2015-10-26 20:27:01 UTC (rev 141688)
+++ trunk/dports/x11/xorg-server/Portfile 2015-10-26 20:32:42 UTC (rev 141689)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> name xorg-server
</span><span class="cx"> conflicts xorg-server-devel
</span><span class="cx"> set my_name xorg-server
</span><del>-version 1.17.2
</del><ins>+version 1.17.3
</ins><span class="cx"> categories x11 devel
</span><span class="cx"> license X11
</span><span class="cx"> maintainers jeremyhu openmaintainer
</span><span class="lines">@@ -21,8 +21,8 @@
</span><span class="cx"> dist_subdir ${my_name}
</span><span class="cx"> distname ${my_name}-${version}
</span><span class="cx">
</span><del>-checksums rmd160 bf575a269f1e7b729992a20989be84e09fcc88a2 \
- sha256 f61120612728f2c5034671d0ca3e2273438c60aba93b3dda4a8aa40e6a257993
</del><ins>+checksums rmd160 4f8e71cd7cee539d875f9a441b28a3364baf2409 \
+ sha256 89b5c6b7e7ec4731645283d2178f607825b75a470e76b3ad3cb1c1dbd2456b73
</ins><span class="cx">
</span><span class="cx"> use_bzip2 yes
</span><span class="cx"> use_parallel_build yes
</span><span class="lines">@@ -87,15 +87,6 @@
</span><span class="cx"> RAWCPP=${configure.cpp}
</span><span class="cx">
</span><span class="cx"> patchfiles \
</span><del>- 0001-XQuartz-GLX-Use-__glXEnableExtension-to-build-extens.patch \
- 0002-XQuartz-Silence-Wpointer-bool-conversion.patch \
- 0003-XQuartz-Silence-Wunused-variable.patch \
- 0004-XQuartz-Silence-Wunused-function.patch \
- 0005-XQuartz-Silence-Wformat-security-for-NSRunAlertPanel.patch \
- 0006-XQuartz-Relax-App-Transport-Security-for-communicati.patch \
- 0007-XQuartz-Remove-InfoPlist.strings.patch \
- 0008-XQuartz-Fix-how-we-calculate-the-height-of-the-OSX-m.patch \
- 1000-XQuartz-Make-sure-that-darwin_all_modifier_mask_addi.patch \
</del><span class="cx"> 5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch \
</span><span class="cx"> 5001-Use-old-miTrapezoids-and-miTriangles-routines.patch \
</span><span class="cx"> 5002-fb-Revert-fb-changes-that-broke-XQuartz.patch \
</span></span></pre></div>
<a id="trunkdportsx11xorgserverfiles0001XQuartzGLXUse__glXEnableExtensiontobuildextenspatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/x11/xorg-server/files/0001-XQuartz-GLX-Use-__glXEnableExtension-to-build-extens.patch (141688 => 141689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/files/0001-XQuartz-GLX-Use-__glXEnableExtension-to-build-extens.patch 2015-10-26 20:27:01 UTC (rev 141688)
+++ trunk/dports/x11/xorg-server/files/0001-XQuartz-GLX-Use-__glXEnableExtension-to-build-extens.patch 2015-10-26 20:32:42 UTC (rev 141689)
</span><span class="lines">@@ -1,78 +0,0 @@
</span><del>-From c15e48bb032514f1123f715719c25eaba7e043a7 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Sun, 1 Jun 2014 04:29:19 -0700
-Subject: [PATCH 1/8] XQuartz: GLX: Use __glXEnableExtension to build
- extensions list
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-(cherry picked from commit 3790001ea29658872aebda00a03170e392b47878)
----
- hw/xquartz/GL/indirect.c | 37 +++++++++++++++++++++++++++++++------
- 1 file changed, 31 insertions(+), 6 deletions(-)
-
-diff --git a/hw/xquartz/GL/indirect.c b/hw/xquartz/GL/indirect.c
-index 19b7d86..4e6ab3d 100644
---- a/hw/xquartz/GL/indirect.c
-+++ b/hw/xquartz/GL/indirect.c
-@@ -52,6 +52,7 @@
-
- #include "visualConfigs.h"
- #include "dri.h"
-+#include "extension_string.h"
-
- #include "darwin.h"
- #define GLAQUA_DEBUG_MSG(msg, args ...) ASL_LOG(ASL_LEVEL_DEBUG, "GLXAqua", \
-@@ -111,6 +112,10 @@ typedef struct __GLXAquaDrawable __GLXAquaDrawable;
- */
- struct __GLXAquaScreen {
- __GLXscreen base;
-+
-+ /* Supported GLX extensions */
-+ unsigned char glx_enable_bits[__GLX_EXT_BYTES];
-+
- int index;
- int num_vis;
- };
-@@ -541,13 +546,33 @@ __glXAquaScreenProbe(ScreenPtr pScreen)
-
- screen->base.GLXmajor = 1;
- screen->base.GLXminor = 4;
-- screen->base.GLXextensions = strdup("GLX_SGIX_fbconfig "
-- "GLX_SGIS_multisample "
-- "GLX_ARB_multisample "
-- "GLX_EXT_visual_info "
-- "GLX_EXT_import_context ");
-
-- /*We may be able to add more GLXextensions at a later time. */
-+ memset(screen->glx_enable_bits, 0, __GLX_EXT_BYTES);
-+
-+ __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_visual_info");
-+ __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_visual_rating");
-+ __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_import_context");
-+ __glXEnableExtension(screen->glx_enable_bits, "GLX_OML_swap_method");
-+ __glXEnableExtension(screen->glx_enable_bits, "GLX_SGIX_fbconfig");
-+
-+ __glXEnableExtension(screen->glx_enable_bits, "GLX_SGIS_multisample");
-+ __glXEnableExtension(screen->glx_enable_bits, "GLX_ARB_multisample");
-+
-+ //__glXEnableExtension(screen->glx_enable_bits, "GLX_ARB_create_context");
-+ //__glXEnableExtension(screen->glx_enable_bits, "GLX_ARB_create_context_profile");
-+
-+ // Generate the GLX extensions string (overrides that set by __glXScreenInit())
-+ {
-+ unsigned int buffer_size =
-+ __glXGetExtensionString(screen->glx_enable_bits, NULL);
-+ if (buffer_size > 0) {
-+ free(screen->base.GLXextensions);
-+
-+ screen->base.GLXextensions = xnfalloc(buffer_size);
-+ __glXGetExtensionString(screen->glx_enable_bits,
-+ screen->base.GLXextensions);
-+ }
-+ }
-
- return &screen->base;
- }
---
-2.6.1
-
</del></span></pre></div>
<a id="trunkdportsx11xorgserverfiles0002XQuartzSilenceWpointerboolconversionpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/x11/xorg-server/files/0002-XQuartz-Silence-Wpointer-bool-conversion.patch (141688 => 141689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/files/0002-XQuartz-Silence-Wpointer-bool-conversion.patch 2015-10-26 20:27:01 UTC (rev 141688)
+++ trunk/dports/x11/xorg-server/files/0002-XQuartz-Silence-Wpointer-bool-conversion.patch 2015-10-26 20:32:42 UTC (rev 141689)
</span><span class="lines">@@ -1,54 +0,0 @@
</span><del>-From 414fc605a930c5baa7e65cc303b05f3977b86baf Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Tue, 9 Jun 2015 23:29:40 -0700
-Subject: [PATCH 2/8] XQuartz: Silence -Wpointer-bool-conversion
-
-X11Controller.m:417:17: error: address of function 'asl_log_descriptor' will always evaluate to 'true'
- [-Werror,-Wpointer-bool-conversion,Value Conversion Issue]
- if (asl_log_descriptor) {
- ~~ ^~~~~~~~~~~~~~~~~~
-X11Controller.m:417:17: note: prefix with the address-of operator to silence this warning [Semantic Issue]
- if (asl_log_descriptor) {
- ^
- &
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-(cherry picked from commit 0b9c32489131a5723bd78decf5d2557b94207cf4)
----
- hw/xquartz/X11Controller.m | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m
-index 022e832..c3c6976 100644
---- a/hw/xquartz/X11Controller.m
-+++ b/hw/xquartz/X11Controller.m
-@@ -364,7 +364,7 @@ extern char *bundle_id_prefix;
- }
-
- #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
-- if (asl_log_descriptor) {
-+ if (&asl_log_descriptor) {
- char *asl_sender;
- aslmsg amsg = asl_new(ASL_TYPE_MSG);
- assert(amsg);
-@@ -414,7 +414,7 @@ extern char *bundle_id_prefix;
-
- case 0: /* child2 */
- #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
-- if (asl_log_descriptor) {
-+ if (&asl_log_descriptor) {
- /* Replace our stdout/stderr */
- dup2(stdout_pipe[1], STDOUT_FILENO);
- dup2(stderr_pipe[1], STDERR_FILENO);
-@@ -443,7 +443,7 @@ extern char *bundle_id_prefix;
- }
-
- #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
-- if (asl_log_descriptor) {
-+ if (&asl_log_descriptor) {
- /* Close the write ends of the pipe */
- close(stdout_pipe[1]);
- close(stderr_pipe[1]);
---
-2.6.1
-
</del></span></pre></div>
<a id="trunkdportsx11xorgserverfiles0003XQuartzSilenceWunusedvariablepatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/x11/xorg-server/files/0003-XQuartz-Silence-Wunused-variable.patch (141688 => 141689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/files/0003-XQuartz-Silence-Wunused-variable.patch 2015-10-26 20:27:01 UTC (rev 141688)
+++ trunk/dports/x11/xorg-server/files/0003-XQuartz-Silence-Wunused-variable.patch 2015-10-26 20:32:42 UTC (rev 141689)
</span><span class="lines">@@ -1,30 +0,0 @@
</span><del>-From 601e9b5f8c147ef4242b4bda76e9a16e3d635370 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Tue, 9 Jun 2015 23:30:50 -0700
-Subject: [PATCH 3/8] XQuartz: Silence -Wunused-variable
-
-X11Controller.m:939:9: warning: unused variable 'remain' [-Wunused-variable,Unused Entity Issue]
- int remain;
- ^
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-(cherry picked from commit 9fe7f5ccada37e2d2a2fa92064b92a0334a3fcdd)
----
- hw/xquartz/X11Controller.m | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m
-index c3c6976..a5c5138 100644
---- a/hw/xquartz/X11Controller.m
-+++ b/hw/xquartz/X11Controller.m
-@@ -936,7 +936,6 @@ extern char *bundle_id_prefix;
-
- - (void) applicationWillTerminate:(NSNotification *)aNotification _X_NORETURN
- {
-- int remain;
- [X11App prefs_synchronize];
-
- /* shutdown the X server, it will exit () for us. */
---
-2.6.1
-
</del></span></pre></div>
<a id="trunkdportsx11xorgserverfiles0004XQuartzSilenceWunusedfunctionpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/x11/xorg-server/files/0004-XQuartz-Silence-Wunused-function.patch (141688 => 141689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/files/0004-XQuartz-Silence-Wunused-function.patch 2015-10-26 20:27:01 UTC (rev 141688)
+++ trunk/dports/x11/xorg-server/files/0004-XQuartz-Silence-Wunused-function.patch 2015-10-26 20:32:42 UTC (rev 141689)
</span><span class="lines">@@ -1,39 +0,0 @@
</span><del>-From 434890171d5ab4ec61a05596cb33e469a61a870c Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Tue, 9 Jun 2015 23:34:50 -0700
-Subject: [PATCH 4/8] XQuartz: Silence -Wunused-function
-
-quartzKeyboard.c:741:1: warning: unused function 'macroman2ucs' [-Wunused-function,Unused Entity Issue]
-macroman2ucs(unsigned char c)
-^
-1 warning generated.
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-(cherry picked from commit 3a6fa115759c787ec34483437021ad1e55c52423)
----
- hw/xquartz/quartzKeyboard.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/hw/xquartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c
-index 84e34d9..2fed593 100644
---- a/hw/xquartz/quartzKeyboard.c
-+++ b/hw/xquartz/quartzKeyboard.c
-@@ -737,6 +737,7 @@ LegalModifier(unsigned int key, DeviceIntPtr pDev)
- return 1;
- }
-
-+#if !defined(__LP64__) || MAC_OS_X_VERSION_MIN_REQUIRED < 1050
- static inline UniChar
- macroman2ucs(unsigned char c)
- {
-@@ -782,6 +783,7 @@ macroman2ucs(unsigned char c)
- if (c < 128) return c;
- else return table[c - 128];
- }
-+#endif
-
- static KeySym
- make_dead_key(KeySym in)
---
-2.6.1
-
</del></span></pre></div>
<a id="trunkdportsx11xorgserverfiles0005XQuartzSilenceWformatsecurityforNSRunAlertPanelpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/x11/xorg-server/files/0005-XQuartz-Silence-Wformat-security-for-NSRunAlertPanel.patch (141688 => 141689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/files/0005-XQuartz-Silence-Wformat-security-for-NSRunAlertPanel.patch 2015-10-26 20:27:01 UTC (rev 141688)
+++ trunk/dports/x11/xorg-server/files/0005-XQuartz-Silence-Wformat-security-for-NSRunAlertPanel.patch 2015-10-26 20:32:42 UTC (rev 141689)
</span><span class="lines">@@ -1,77 +0,0 @@
</span><del>-From ba00d8fe70cbb16e45e578437defaf3eed6d25f4 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Tue, 9 Jun 2015 23:41:12 -0700
-Subject: [PATCH 5/8] XQuartz: Silence -Wformat-security for NSRunAlertPanel
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-(cherry picked from commit 9003a3e5c55903ce4e371b2d5cb5030b5f97ae0e)
----
- hw/xquartz/X11Application.m | 15 +++++++--------
- hw/xquartz/X11Controller.m | 6 +++---
- 2 files changed, 10 insertions(+), 11 deletions(-)
-
-diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
-index 2efbd65..8a928ba 100644
---- a/hw/xquartz/X11Application.m
-+++ b/hw/xquartz/X11Application.m
-@@ -1069,12 +1069,12 @@ X11ApplicationCanEnterRandR(void)
- if (!XQuartzIsRootless)
- QuartzShowFullscreen(FALSE);
-
-- switch (NSRunAlertPanel(title, msg,
-+ switch (NSRunAlertPanel(title, @"%@",
- NSLocalizedString(@"Allow",
- @""),
- NSLocalizedString(@"Cancel",
- @""),
-- NSLocalizedString(@"Always Allow", @""))) {
-+ NSLocalizedString(@"Always Allow", @""), msg)) {
- case NSAlertOtherReturn:
- [X11App prefs_set_boolean:@PREFS_NO_RANDR_ALERT value:YES];
- [X11App prefs_synchronize];
-@@ -1122,10 +1122,10 @@ X11ApplicationFatalError(const char *f, va_list args)
- */
- dispatch_sync(dispatch_get_main_queue(), ^{
- if (NSAlertDefaultReturn ==
-- NSRunAlertPanel (title, msg,
-+ NSRunAlertPanel (title, @"%@",
- NSLocalizedString (@"Quit", @""),
-- NSLocalizedString (
-- @"Report...", @""), nil)) {
-+ NSLocalizedString (@"Report...", @""),
-+ nil, msg)) {
- exit (EXIT_FAILURE);
- }
- });
-@@ -1160,9 +1160,8 @@ check_xinitrc(void)
- @"Startup xinitrc dialog");
-
- if (NSAlertDefaultReturn ==
-- NSRunAlertPanel(nil, msg, NSLocalizedString(@"Yes", @""),
-- NSLocalizedString(@"No",
-- @""), nil)) {
-+ NSRunAlertPanel(nil, @"%@", NSLocalizedString(@"Yes", @""),
-+ NSLocalizedString(@"No", @""), nil, msg)) {
- char buf2[1024];
- int i = -1;
-
-diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m
-index a5c5138..c75493c 100644
---- a/hw/xquartz/X11Controller.m
-+++ b/hw/xquartz/X11Controller.m
-@@ -929,9 +929,9 @@ extern char *bundle_id_prefix;
- * and then run the alert on a timer? It seems to work here, so..
- */
-
-- return (NSRunAlertPanel(title, msg, NSLocalizedString(@"Quit", @""),
-- NSLocalizedString(@"Cancel", @""), nil)
-- == NSAlertDefaultReturn) ? NSTerminateNow : NSTerminateCancel;
-+ NSInteger result = NSRunAlertPanel(title, @"%@", NSLocalizedString(@"Quit", @""),
-+ NSLocalizedString(@"Cancel", @""), nil, msg);
-+ return (result == NSAlertDefaultReturn) ? NSTerminateNow : NSTerminateCancel;
- }
-
- - (void) applicationWillTerminate:(NSNotification *)aNotification _X_NORETURN
---
-2.6.1
-
</del></span></pre></div>
<a id="trunkdportsx11xorgserverfiles0006XQuartzRelaxAppTransportSecurityforcommunicatipatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/x11/xorg-server/files/0006-XQuartz-Relax-App-Transport-Security-for-communicati.patch (141688 => 141689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/files/0006-XQuartz-Relax-App-Transport-Security-for-communicati.patch 2015-10-26 20:27:01 UTC (rev 141688)
+++ trunk/dports/x11/xorg-server/files/0006-XQuartz-Relax-App-Transport-Security-for-communicati.patch 2015-10-26 20:32:42 UTC (rev 141689)
</span><span class="lines">@@ -1,39 +0,0 @@
</span><del>-From d939043594fe75c49f356e717f94195050f6d08c Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Mon, 12 Oct 2015 02:04:11 -0700
-Subject: [PATCH 6/8] XQuartz: Relax App Transport Security for communicating
- with the update server
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-(cherry picked from commit df80e2649aa47957986554928e6bf41b86c15240)
----
- hw/xquartz/bundle/Info.plist.cpp | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/hw/xquartz/bundle/Info.plist.cpp b/hw/xquartz/bundle/Info.plist.cpp
-index a0d9050..06e33f8 100644
---- a/hw/xquartz/bundle/Info.plist.cpp
-+++ b/hw/xquartz/bundle/Info.plist.cpp
-@@ -35,6 +35,19 @@
- <string>sparkle.pem</string>
- <key>SUFeedURL</key>
- <string>http://xquartz.macosforge.org/downloads/sparkle/release.xml</string>
-+ <key>NSAppTransportSecurity</key>
-+ <dict>
-+ <key>NSExceptionDomains</key>
-+ <dict>
-+ <key>macosforge.org</key>
-+ <dict>
-+ <key>NSIncludesSubdomains</key>
-+ <true/>
-+ <key>NSExceptionAllowsInsecureHTTPLoads</key>
-+ <true/>
-+ </dict>
-+ </dict>
-+ </dict>
- #endif
- <key>LSApplicationCategoryType</key>
- <string>public.app-category.utilities</string>
---
-2.6.1
-
</del></span></pre></div>
<a id="trunkdportsx11xorgserverfiles0007XQuartzRemoveInfoPliststringspatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/x11/xorg-server/files/0007-XQuartz-Remove-InfoPlist.strings.patch (141688 => 141689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/files/0007-XQuartz-Remove-InfoPlist.strings.patch 2015-10-26 20:27:01 UTC (rev 141688)
+++ trunk/dports/x11/xorg-server/files/0007-XQuartz-Remove-InfoPlist.strings.patch 2015-10-26 20:32:42 UTC (rev 141689)
</span><span class="lines">@@ -1,636 +0,0 @@
</span><del>-From 3a7ed42d33d264f7151fa2ed9bef7a55bde1c0e2 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Mon, 12 Oct 2015 02:06:10 -0700
-Subject: [PATCH 7/8] XQuartz: Remove InfoPlist.strings
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-(cherry picked from commit 6e6827aac33eddeacfb37ef3d7b0397b1446bf66)
----
- hw/xquartz/bundle/Makefile.am | 30 ---------------------
- .../bundle/Resources/Dutch.lproj/InfoPlist.strings | Bin 274 -> 0 bytes
- .../Resources/English.lproj/InfoPlist.strings | Bin 276 -> 0 bytes
- .../Resources/French.lproj/InfoPlist.strings | Bin 276 -> 0 bytes
- .../Resources/German.lproj/InfoPlist.strings | Bin 276 -> 0 bytes
- .../Resources/Italian.lproj/InfoPlist.strings | Bin 278 -> 0 bytes
- .../Resources/Japanese.lproj/InfoPlist.strings | Bin 272 -> 0 bytes
- .../Resources/Spanish.lproj/InfoPlist.strings | Bin 276 -> 0 bytes
- .../bundle/Resources/ar.lproj/InfoPlist.strings | Bin 276 -> 0 bytes
- .../bundle/Resources/ca.lproj/InfoPlist.strings | Bin 276 -> 0 bytes
- .../bundle/Resources/cs.lproj/InfoPlist.strings | Bin 272 -> 0 bytes
- .../bundle/Resources/da.lproj/InfoPlist.strings | Bin 276 -> 0 bytes
- .../bundle/Resources/el.lproj/InfoPlist.strings | Bin 274 -> 0 bytes
- .../bundle/Resources/fi.lproj/InfoPlist.strings | Bin 274 -> 0 bytes
- .../bundle/Resources/he.lproj/InfoPlist.strings | Bin 298 -> 0 bytes
- .../bundle/Resources/hr.lproj/InfoPlist.strings | Bin 286 -> 0 bytes
- .../bundle/Resources/hu.lproj/InfoPlist.strings | Bin 278 -> 0 bytes
- .../bundle/Resources/ko.lproj/InfoPlist.strings | Bin 266 -> 0 bytes
- .../bundle/Resources/no.lproj/InfoPlist.strings | Bin 276 -> 0 bytes
- .../bundle/Resources/pl.lproj/InfoPlist.strings | Bin 274 -> 0 bytes
- .../bundle/Resources/pt.lproj/InfoPlist.strings | Bin 274 -> 0 bytes
- .../bundle/Resources/pt_PT.lproj/InfoPlist.strings | Bin 274 -> 0 bytes
- .../bundle/Resources/ro.lproj/InfoPlist.strings | Bin 280 -> 0 bytes
- .../bundle/Resources/ru.lproj/InfoPlist.strings | Bin 274 -> 0 bytes
- .../bundle/Resources/sk.lproj/InfoPlist.strings | Bin 274 -> 0 bytes
- .../bundle/Resources/sv.lproj/InfoPlist.strings | Bin 260 -> 0 bytes
- .../bundle/Resources/th.lproj/InfoPlist.strings | Bin 270 -> 0 bytes
- .../bundle/Resources/tr.lproj/InfoPlist.strings | Bin 272 -> 0 bytes
- .../bundle/Resources/uk.lproj/InfoPlist.strings | Bin 264 -> 0 bytes
- .../bundle/Resources/zh_CN.lproj/InfoPlist.strings | Bin 260 -> 0 bytes
- .../bundle/Resources/zh_TW.lproj/InfoPlist.strings | Bin 264 -> 0 bytes
- hw/xquartz/bundle/mk_bundke.sh | 2 +-
- 32 files changed, 1 insertion(+), 31 deletions(-)
- delete mode 100644 hw/xquartz/bundle/Resources/Dutch.lproj/InfoPlist.strings
- delete mode 100644 hw/xquartz/bundle/Resources/English.lproj/InfoPlist.strings
- delete mode 100644 hw/xquartz/bundle/Resources/French.lproj/InfoPlist.strings
- delete mode 100644 hw/xquartz/bundle/Resources/German.lproj/InfoPlist.strings
- delete mode 100644 hw/xquartz/bundle/Resources/Italian.lproj/InfoPlist.strings
- delete mode 100644 hw/xquartz/bundle/Resources/Japanese.lproj/InfoPlist.strings
- delete mode 100644 hw/xquartz/bundle/Resources/Spanish.lproj/InfoPlist.strings
- delete mode 100644 hw/xquartz/bundle/Resources/ar.lproj/InfoPlist.strings
- delete mode 100644 hw/xquartz/bundle/Resources/ca.lproj/InfoPlist.strings
- delete mode 100644 hw/xquartz/bundle/Resources/cs.lproj/InfoPlist.strings
- delete mode 100644 hw/xquartz/bundle/Resources/da.lproj/InfoPlist.strings
- delete mode 100644 hw/xquartz/bundle/Resources/el.lproj/InfoPlist.strings
- delete mode 100644 hw/xquartz/bundle/Resources/fi.lproj/InfoPlist.strings
- delete mode 100644 hw/xquartz/bundle/Resources/he.lproj/InfoPlist.strings
- delete mode 100644 hw/xquartz/bundle/Resources/hr.lproj/InfoPlist.strings
- delete mode 100644 hw/xquartz/bundle/Resources/hu.lproj/InfoPlist.strings
- delete mode 100644 hw/xquartz/bundle/Resources/ko.lproj/InfoPlist.strings
- delete mode 100644 hw/xquartz/bundle/Resources/no.lproj/InfoPlist.strings
- delete mode 100644 hw/xquartz/bundle/Resources/pl.lproj/InfoPlist.strings
- delete mode 100644 hw/xquartz/bundle/Resources/pt.lproj/InfoPlist.strings
- delete mode 100644 hw/xquartz/bundle/Resources/pt_PT.lproj/InfoPlist.strings
- delete mode 100644 hw/xquartz/bundle/Resources/ro.lproj/InfoPlist.strings
- delete mode 100644 hw/xquartz/bundle/Resources/ru.lproj/InfoPlist.strings
- delete mode 100644 hw/xquartz/bundle/Resources/sk.lproj/InfoPlist.strings
- delete mode 100644 hw/xquartz/bundle/Resources/sv.lproj/InfoPlist.strings
- delete mode 100644 hw/xquartz/bundle/Resources/th.lproj/InfoPlist.strings
- delete mode 100644 hw/xquartz/bundle/Resources/tr.lproj/InfoPlist.strings
- delete mode 100644 hw/xquartz/bundle/Resources/uk.lproj/InfoPlist.strings
- delete mode 100644 hw/xquartz/bundle/Resources/zh_CN.lproj/InfoPlist.strings
- delete mode 100644 hw/xquartz/bundle/Resources/zh_TW.lproj/InfoPlist.strings
-
-diff --git a/hw/xquartz/bundle/Makefile.am b/hw/xquartz/bundle/Makefile.am
-index 87392b4..0740752 100644
---- a/hw/xquartz/bundle/Makefile.am
-+++ b/hw/xquartz/bundle/Makefile.am
-@@ -30,153 +30,123 @@ EXTRA_DIST = \
- Info.plist.cpp \
- PkgInfo \
- $(resource_DATA) \
-- Resources/ar.lproj/InfoPlist.strings \
- Resources/ar.lproj/Localizable.strings \
- Resources/ar.lproj/locversion.plist \
- Resources/ar.lproj/main.nib/designable.nib \
- Resources/ar.lproj/main.nib/keyedobjects.nib \
-- Resources/ca.lproj/InfoPlist.strings \
- Resources/ca.lproj/Localizable.strings \
- Resources/ca.lproj/locversion.plist \
- Resources/ca.lproj/main.nib/designable.nib \
- Resources/ca.lproj/main.nib/keyedobjects.nib \
-- Resources/cs.lproj/InfoPlist.strings \
- Resources/cs.lproj/Localizable.strings \
- Resources/cs.lproj/locversion.plist \
- Resources/cs.lproj/main.nib/designable.nib \
- Resources/cs.lproj/main.nib/keyedobjects.nib \
-- Resources/da.lproj/InfoPlist.strings \
- Resources/da.lproj/Localizable.strings \
- Resources/da.lproj/locversion.plist \
- Resources/da.lproj/main.nib/designable.nib \
- Resources/da.lproj/main.nib/keyedobjects.nib \
-- Resources/Dutch.lproj/InfoPlist.strings \
- Resources/Dutch.lproj/Localizable.strings \
- Resources/Dutch.lproj/locversion.plist \
- Resources/Dutch.lproj/main.nib/designable.nib \
- Resources/Dutch.lproj/main.nib/keyedobjects.nib \
-- Resources/el.lproj/InfoPlist.strings \
- Resources/el.lproj/Localizable.strings \
- Resources/el.lproj/locversion.plist \
- Resources/el.lproj/main.nib/designable.nib \
- Resources/el.lproj/main.nib/keyedobjects.nib \
-- Resources/English.lproj/InfoPlist.strings \
- Resources/English.lproj/Localizable.strings \
- Resources/English.lproj/locversion.plist \
- Resources/English.lproj/main.nib/designable.nib \
- Resources/English.lproj/main.nib/keyedobjects.nib \
-- Resources/fi.lproj/InfoPlist.strings \
- Resources/fi.lproj/Localizable.strings \
- Resources/fi.lproj/locversion.plist \
- Resources/fi.lproj/main.nib/designable.nib \
- Resources/fi.lproj/main.nib/keyedobjects.nib \
-- Resources/French.lproj/InfoPlist.strings \
- Resources/French.lproj/Localizable.strings \
- Resources/French.lproj/locversion.plist \
- Resources/French.lproj/main.nib/designable.nib \
- Resources/French.lproj/main.nib/keyedobjects.nib \
-- Resources/German.lproj/InfoPlist.strings \
- Resources/German.lproj/Localizable.strings \
- Resources/German.lproj/locversion.plist \
- Resources/German.lproj/main.nib/designable.nib \
- Resources/German.lproj/main.nib/keyedobjects.nib \
-- Resources/he.lproj/InfoPlist.strings \
- Resources/he.lproj/Localizable.strings \
- Resources/he.lproj/locversion.plist \
- Resources/he.lproj/main.nib/designable.nib \
- Resources/he.lproj/main.nib/keyedobjects.nib \
-- Resources/hr.lproj/InfoPlist.strings \
- Resources/hr.lproj/Localizable.strings \
- Resources/hr.lproj/locversion.plist \
- Resources/hr.lproj/main.nib/designable.nib \
- Resources/hr.lproj/main.nib/keyedobjects.nib \
-- Resources/hu.lproj/InfoPlist.strings \
- Resources/hu.lproj/Localizable.strings \
- Resources/hu.lproj/locversion.plist \
- Resources/hu.lproj/main.nib/designable.nib \
- Resources/hu.lproj/main.nib/keyedobjects.nib \
-- Resources/Italian.lproj/InfoPlist.strings \
- Resources/Italian.lproj/Localizable.strings \
- Resources/Italian.lproj/locversion.plist \
- Resources/Italian.lproj/main.nib/designable.nib \
- Resources/Italian.lproj/main.nib/keyedobjects.nib \
-- Resources/Japanese.lproj/InfoPlist.strings \
- Resources/Japanese.lproj/Localizable.strings \
- Resources/Japanese.lproj/locversion.plist \
- Resources/Japanese.lproj/main.nib/designable.nib \
- Resources/Japanese.lproj/main.nib/keyedobjects.nib \
-- Resources/ko.lproj/InfoPlist.strings \
- Resources/ko.lproj/Localizable.strings \
- Resources/ko.lproj/locversion.plist \
- Resources/ko.lproj/main.nib/designable.nib \
- Resources/ko.lproj/main.nib/keyedobjects.nib \
-- Resources/no.lproj/InfoPlist.strings \
- Resources/no.lproj/Localizable.strings \
- Resources/no.lproj/locversion.plist \
- Resources/no.lproj/main.nib/designable.nib \
- Resources/no.lproj/main.nib/keyedobjects.nib \
-- Resources/pl.lproj/InfoPlist.strings \
- Resources/pl.lproj/Localizable.strings \
- Resources/pl.lproj/locversion.plist \
- Resources/pl.lproj/main.nib/designable.nib \
- Resources/pl.lproj/main.nib/keyedobjects.nib \
-- Resources/pt.lproj/InfoPlist.strings \
- Resources/pt.lproj/Localizable.strings \
- Resources/pt.lproj/locversion.plist \
- Resources/pt.lproj/main.nib/designable.nib \
- Resources/pt.lproj/main.nib/keyedobjects.nib \
-- Resources/pt_PT.lproj/InfoPlist.strings \
- Resources/pt_PT.lproj/Localizable.strings \
- Resources/pt_PT.lproj/locversion.plist \
- Resources/pt_PT.lproj/main.nib/designable.nib \
- Resources/pt_PT.lproj/main.nib/keyedobjects.nib \
-- Resources/ro.lproj/InfoPlist.strings \
- Resources/ro.lproj/Localizable.strings \
- Resources/ro.lproj/locversion.plist \
- Resources/ro.lproj/main.nib/designable.nib \
- Resources/ro.lproj/main.nib/keyedobjects.nib \
-- Resources/ru.lproj/InfoPlist.strings \
- Resources/ru.lproj/Localizable.strings \
- Resources/ru.lproj/locversion.plist \
- Resources/ru.lproj/main.nib/designable.nib \
- Resources/ru.lproj/main.nib/keyedobjects.nib \
-- Resources/sk.lproj/InfoPlist.strings \
- Resources/sk.lproj/Localizable.strings \
- Resources/sk.lproj/locversion.plist \
- Resources/sk.lproj/main.nib/designable.nib \
- Resources/sk.lproj/main.nib/keyedobjects.nib \
-- Resources/Spanish.lproj/InfoPlist.strings \
- Resources/Spanish.lproj/Localizable.strings \
- Resources/Spanish.lproj/locversion.plist \
- Resources/Spanish.lproj/main.nib/designable.nib \
- Resources/Spanish.lproj/main.nib/keyedobjects.nib \
-- Resources/sv.lproj/InfoPlist.strings \
- Resources/sv.lproj/Localizable.strings \
- Resources/sv.lproj/locversion.plist \
- Resources/sv.lproj/main.nib/designable.nib \
- Resources/sv.lproj/main.nib/keyedobjects.nib \
-- Resources/th.lproj/InfoPlist.strings \
- Resources/th.lproj/Localizable.strings \
- Resources/th.lproj/locversion.plist \
- Resources/th.lproj/main.nib/designable.nib \
- Resources/th.lproj/main.nib/keyedobjects.nib \
-- Resources/tr.lproj/InfoPlist.strings \
- Resources/tr.lproj/Localizable.strings \
- Resources/tr.lproj/locversion.plist \
- Resources/tr.lproj/main.nib/designable.nib \
- Resources/tr.lproj/main.nib/keyedobjects.nib \
-- Resources/uk.lproj/InfoPlist.strings \
- Resources/uk.lproj/Localizable.strings \
- Resources/uk.lproj/locversion.plist \
- Resources/uk.lproj/main.nib/designable.nib \
- Resources/uk.lproj/main.nib/keyedobjects.nib \
- Resources/X11.icns \
-- Resources/zh_CN.lproj/InfoPlist.strings \
- Resources/zh_CN.lproj/Localizable.strings \
- Resources/zh_CN.lproj/locversion.plist \
- Resources/zh_CN.lproj/main.nib/designable.nib \
- Resources/zh_CN.lproj/main.nib/keyedobjects.nib \
-- Resources/zh_TW.lproj/InfoPlist.strings \
- Resources/zh_TW.lproj/Localizable.strings \
- Resources/zh_TW.lproj/locversion.plist \
- Resources/zh_TW.lproj/main.nib/designable.nib \
-diff --git a/hw/xquartz/bundle/Resources/Dutch.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/Dutch.lproj/InfoPlist.strings
-deleted file mode 100644
-index 8f978d63fbce745e2fa97bce8bc07e87994e97bb..0000000000000000000000000000000000000000
-GIT binary patch
-literal 0
-HcmV?d00001
-
-literal 274
-zcmZvX%L>9U5Jm6WuLxZhv9%i);zA3GAa2~amA(}1gSHC#@#;wyA|fHVlbJh{ljlo;
-zd>L(2E73t0o%B$ql-vz%)sd-Hp$5%4*W7aAks9ak)RR5qzB`xC%mFLbQVU&ir}#2$
-znO~wtGq$I_#w<_MKi(C-{`1m~xP_xq@zecHX(vZeg&GpY5H=9mzCuUG7*Pu~p*p8#
-N>1~hwPePv~c>|}zEV}>z
-
-diff --git a/hw/xquartz/bundle/Resources/English.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/English.lproj/InfoPlist.strings
-deleted file mode 100644
-index 88e1f04ac78e9f0b14a2b6fa57a4a02ae91d8edd..0000000000000000000000000000000000000000
-GIT binary patch
-literal 0
-HcmV?d00001
-
-literal 276
-zcmZvXy9&ZU5Jhk8S1c)mn3%>wEHt19Vq;?~c`2F)Nfh+s)w5ez1X*_P?983nv+s`r
-z`7+w6R-%(`y6B}$DY*yQsv}dYLJgX8Zn@>e6E)7?sV95I{d6v$nIl%LwN|?0PVr^h
-zGrvTQ7Hm&PO<A7if4m!f{qLm%aSKPKV$eOLG>YH~HO3di*uZ2v3!NQhL@m^e>XMq}
-Mw><Vo34M;`3l6p|GXMYp
-
-diff --git a/hw/xquartz/bundle/Resources/French.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/French.lproj/InfoPlist.strings
-deleted file mode 100644
-index 88e1f04ac78e9f0b14a2b6fa57a4a02ae91d8edd..0000000000000000000000000000000000000000
-GIT binary patch
-literal 0
-HcmV?d00001
-
-literal 276
-zcmZvXy9&ZU5Jhk8S1c)mn3%>wEHt19Vq;?~c`2F)Nfh+s)w5ez1X*_P?983nv+s`r
-z`7+w6R-%(`y6B}$DY*yQsv}dYLJgX8Zn@>e6E)7?sV95I{d6v$nIl%LwN|?0PVr^h
-zGrvTQ7Hm&PO<A7if4m!f{qLm%aSKPKV$eOLG>YH~HO3di*uZ2v3!NQhL@m^e>XMq}
-Mw><Vo34M;`3l6p|GXMYp
-
-diff --git a/hw/xquartz/bundle/Resources/German.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/German.lproj/InfoPlist.strings
-deleted file mode 100644
-index aa37e755573dcd4141d4044dad25870ae3210b24..0000000000000000000000000000000000000000
-GIT binary patch
-literal 0
-HcmV?d00001
-
-literal 276
-zcmZvXy$ZrG6h^<<rwAR3Xzk)44q8wIaS_B-`YUQ%+A8S7t0x&0L_%_td(TZyo-YmM
-z%V@1iu?{-xsE1M|<Zi@9EtyIs(GWA%6{n2-K(*srb!1P_cSrf$*<(anXs#=C0+(vT
-z{THIql<8@&5yR8u54(ixJ}+(AH+YoFf4Yr!kY7uq5U)UexCqA@C)=5;aF!vpKx3*i
-OYS!QS*dN98IhQvCmMs$i
-
-diff --git a/hw/xquartz/bundle/Resources/Italian.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/Italian.lproj/InfoPlist.strings
-deleted file mode 100644
-index 4121698807d1e090f39cf32b14d130c197c7d5f8..0000000000000000000000000000000000000000
-GIT binary patch
-literal 0
-HcmV?d00001
-
-literal 278
-zcmZvXI}5@<5QL}pR~#vWn3%>wEHt19Vq;?~c`2F)Nfh+QtKVH=5oEcWz1^9;+4o0*
-zd>QRjE73_eUG!3>l-dJq)lsQcfd<UEx4d%li5kc6)Kk5}ema)V%n=c5t(ESuQ+S#7
-z%r8Ns1;^7-Q^M2y4|fBv|NV3zZ}Cy77^sIX?eqv|p~hq}E*o4~ZK1RC8PN+hqr0SM
-NH?SJJQ-aR9`2ulQEtmiR
-
-diff --git a/hw/xquartz/bundle/Resources/Japanese.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/Japanese.lproj/InfoPlist.strings
-deleted file mode 100644
-index 2d6330fa7e8c58dec36e792de0f62f76ea0cb2fa..0000000000000000000000000000000000000000
-GIT binary patch
-literal 0
-HcmV?d00001
-
-literal 272
-zcmZvXJqp4=5QSguDMHF1x~8!Z3k@iO*x1-g{uDI{Nfh*C9>ZIB09#SNO<^Ij?9S}G
-zH?!Zq-s;Meqq%a0T5GSZE{YXVI}uA&RB~lRhnR5AxFzHr6^*}AO?8L++_*euwpf8C
-z8taHV!WV17`~%U^knL)v9?R9>k9Uf%{=T#%FX70P{&YL$W}fD1?&g8w!(`MZ3*al@
-av0bS)4WW-_)JGkmS$4}}e-qNzaC`tP?k{@)
-
-diff --git a/hw/xquartz/bundle/Resources/Spanish.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/Spanish.lproj/InfoPlist.strings
-deleted file mode 100644
-index 0e4287d14155bd78396ae9d50cecdf37782ca44a..0000000000000000000000000000000000000000
-GIT binary patch
-literal 0
-HcmV?d00001
-
-literal 276
-zcmZvXJqyAx6h-gsuLvEBXzk)44q8wIadB~#ep%GEv{lf*?XI3=5D^K<dwKW1my_p9
-zL-{gVt5U4JPAYU)s)X8=*r=sasU#X=#<}8_kq=Zmf2)q_5%<lxd}j7okrtZkf;+*N
-zYQy|9(P+x{w9|;?Y4XRr#MgaZ+LAYLl*)g)zbPN+Mj>2*`eYG|HB7cM*TGSSXo1G4
-PGc?O@dF+p3`W(v}Gg2+L
-
-diff --git a/hw/xquartz/bundle/Resources/ar.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/ar.lproj/InfoPlist.strings
-deleted file mode 100644
-index 88e1f04ac78e9f0b14a2b6fa57a4a02ae91d8edd..0000000000000000000000000000000000000000
-GIT binary patch
-literal 0
-HcmV?d00001
-
-literal 276
-zcmZvXy9&ZU5Jhk8S1c)mn3%>wEHt19Vq;?~c`2F)Nfh+s)w5ez1X*_P?983nv+s`r
-z`7+w6R-%(`y6B}$DY*yQsv}dYLJgX8Zn@>e6E)7?sV95I{d6v$nIl%LwN|?0PVr^h
-zGrvTQ7Hm&PO<A7if4m!f{qLm%aSKPKV$eOLG>YH~HO3di*uZ2v3!NQhL@m^e>XMq}
-Mw><Vo34M;`3l6p|GXMYp
-
-diff --git a/hw/xquartz/bundle/Resources/ca.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/ca.lproj/InfoPlist.strings
-deleted file mode 100644
-index 95214ff3ef45d04a649d07287b470dd2901c7947..0000000000000000000000000000000000000000
-GIT binary patch
-literal 0
-HcmV?d00001
-
-literal 276
-zcmZvXI}5@<5QL}pR~#vWXiQ@v7Ah!$*x1-gUW%HNBnt6w+pFJQp&+vC%|2##=bkV1
-z70PHOt3*4UbkJRyQffD_QccCG1Pz$;F3ED@o-UqWtD$;?-FjBY&JH%yTvJ_Pr|>eZ
-z*?$I&#(1Eu23VlcAMOHP^SQJkuFz4c_?hmKe|0{{Vsu5g;l4#->n98Cy~>zgq#@l2
-OJ*VI4aX(6!@mk&;?k#r!
-
-diff --git a/hw/xquartz/bundle/Resources/cs.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/cs.lproj/InfoPlist.strings
-deleted file mode 100644
-index 0f74e7c578b704f2576d01364166a0665591cf92..0000000000000000000000000000000000000000
-GIT binary patch
-literal 0
-HcmV?d00001
-
-literal 272
-zcmZvXJqyAx6h+VMuLvEBXzk)44k{>uxVX4V`e9Mq(pEu#ym}MRK_n#i<-Pk}PM$A@
-zgcvqdSPq;ic#x7Pcat`>%2bq6Bh7TKb;}eFsJ*|XQ}!hH-Md1~>}f4nGUqCHB45f@
-z^Dk1vR6AhLNGo9S$GeiR`@XbO+=!zj|LOivI%Y#Grii{GE52Ght}Ey031ihF#;VR#
-ObL_6i{l==#bG!jgnJjq#
-
-diff --git a/hw/xquartz/bundle/Resources/da.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/da.lproj/InfoPlist.strings
-deleted file mode 100644
-index 88e1f04ac78e9f0b14a2b6fa57a4a02ae91d8edd..0000000000000000000000000000000000000000
-GIT binary patch
-literal 0
-HcmV?d00001
-
-literal 276
-zcmZvXy9&ZU5Jhk8S1c)mn3%>wEHt19Vq;?~c`2F)Nfh+s)w5ez1X*_P?983nv+s`r
-z`7+w6R-%(`y6B}$DY*yQsv}dYLJgX8Zn@>e6E)7?sV95I{d6v$nIl%LwN|?0PVr^h
-zGrvTQ7Hm&PO<A7if4m!f{qLm%aSKPKV$eOLG>YH~HO3di*uZ2v3!NQhL@m^e>XMq}
-Mw><Vo34M;`3l6p|GXMYp
-
-diff --git a/hw/xquartz/bundle/Resources/el.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/el.lproj/InfoPlist.strings
-deleted file mode 100644
-index 72eb2b16501302c8f917a4b89a04a40fe045bb33..0000000000000000000000000000000000000000
-GIT binary patch
-literal 0
-HcmV?d00001
-
-literal 274
-zcmZvXy9&ZU5JfL+=U0T3K{TeZ5DN_`g4o#DN**d|5|SwBKiLU_jfMZEo}{o4S$1c3
-z?w#4QueaKAWNE5YftK27qq8D~)Q-el1(j3@(IUp26K*kiOIhtNR8rmIKGiOVnGKe&
-zk%l_p4)H~rF@I0A)MwjTsKc_=`{NzsE59$z$#Xaot$w;Kb1`>wH4pPNH#83_S4}b>
-d!VIFSZ>4q3=%Kmlq7Kk1`iiFdPe5Ny@&PZjE|UNN
-
-diff --git a/hw/xquartz/bundle/Resources/fi.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/fi.lproj/InfoPlist.strings
-deleted file mode 100644
-index 8e4f6474fd29ef2edb5e82a98f879321a49cefd2..0000000000000000000000000000000000000000
-GIT binary patch
-literal 0
-HcmV?d00001
-
-literal 274
-zcmZvX%L>9U5Jm6WuLxZhv9%i);zA3GAa2~amA(}1gSHC#@#;wyf+8WglbJh{ljlo;
-zd>L(2E73t0o%B$ql-vz%)sd-Hp$5%4*W7aAks9ak)RR5qzB`xC%mFLbQVU&ir}#2$
-znO~wtGq$I_#w<_MKi(C-{`1m~xP_xq@zecHX%s;fYKSX_uz|?-6*@Y`h+3!#)j2gw
-MZ)xm*68ap;8>)3I#Q*>R
-
-diff --git a/hw/xquartz/bundle/Resources/he.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/he.lproj/InfoPlist.strings
-deleted file mode 100644
-index 3dd6946e12a66e64dc2abcefeb0f9ead8a160dcf..0000000000000000000000000000000000000000
-GIT binary patch
-literal 0
-HcmV?d00001
-
-literal 298
-zcmZvWyRLyz5QSGWjm9hNC`H^F#fid^5Q%6sT5*fGowy~uk;frOgh;4RtMU19Dw*t=
-zwPvrGS+~0)3d$+3o+>J<t)`}`sY-85?Q1}%r!Lh|>*O4)4i4+j(+@PH+d@6@R6%z7
-zh_o{L)d+PJT}=h{cc@NDUO*+qh=6{+XtU^s|Cfs3K0dl?e5RfMJ@0H`8#~#-mi)zW
-v6;%i{^H>y?0HyHybjx*{+tIGJN9k;9JMz-jpcQ*oc7dO54?1}){BrmJ&igy@
-
-diff --git a/hw/xquartz/bundle/Resources/hr.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/hr.lproj/InfoPlist.strings
-deleted file mode 100644
-index 7baab082c9e232e9448e4af78f924947821e801d..0000000000000000000000000000000000000000
-GIT binary patch
-literal 0
-HcmV?d00001
-
-literal 286
-zcmZvXJqyAx6h-gsuLvEBXzk)44k{>uxVX4VKg3qs(#C@Q@#<+n2a%B6mzR_G?t8v8
-zmM^27N<}*9s*5@$ipjNTt%gjg0ySvLx#gA;k5oCnktLf$KOE&#bHG|@t)=eJF<hcO
-z^>3)robBnT3Cq*$54(Z0-%bbO8XtwuKfgaNJ6<#D8-@4^G$dNk+v2mIAx8~<Ynax>
-UAylBL<0>~v@2sCKqJnev2Jkm84*&oF
-
-diff --git a/hw/xquartz/bundle/Resources/hu.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/hu.lproj/InfoPlist.strings
-deleted file mode 100644
-index 842ef04aece4ff0b8707238b2b8eadef364c3c57..0000000000000000000000000000000000000000
-GIT binary patch
-literal 0
-HcmV?d00001
-
-literal 278
-zcmZvXy9&ZU5Jhk8S1c)mkC?_nEHt19Vq;?~c`0fVOccy-+pA|+un-w`XLjby%-!cp
-z1NkyqsZ^|;PCBSns)XDPe^E`QRDn16jC;u|Bkrqme65D;5&G^ZpP3yj(p)oLp%b`N
-zYv!NvMiY*wt%jJV@gH^p*L*i^h%e|Ul>c-ah3E*>bDKYkTgZpHkP#{?RN3BKd#5vm
-T4m6@VrDlI%71=+<Omb@8bI~pE
-
-diff --git a/hw/xquartz/bundle/Resources/ko.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/ko.lproj/InfoPlist.strings
-deleted file mode 100644
-index 4c738f8b2cede8838240e77dd9579e4ff9cea110..0000000000000000000000000000000000000000
-GIT binary patch
-literal 0
-HcmV?d00001
-
-literal 266
-zcmZvXJqp4=5QSf1<tdhwK{TeZ5DN_`g4o#DO8yiz2__0!dn^y&snl<`un<{x-|Wmc
-zvu|H-_2kQFp;ECnI%ubxQYGXr=t(u1QUz+zjC0N{Bkrnle65D;9{TDipP6k|q^Tx4
-zLnm;lmdrn*MkBVTwfZbi!$0f{uKB*SB0k}xQ2x_x9`|R9T!@=M9ij+l6;3RlYwNs)
-U)B+8tj;UGK)`k5?OrLY`0d_DfIRF3v
-
-diff --git a/hw/xquartz/bundle/Resources/no.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/no.lproj/InfoPlist.strings
-deleted file mode 100644
-index eb1cfb002dc72e22621c7d4713ff8d708401109b..0000000000000000000000000000000000000000
-GIT binary patch
-literal 0
-HcmV?d00001
-
-literal 276
-zcmZvX%L>9U5Jm6WuLxZh(b|m*aiIl85I1hzN?+DTTiPn<$Ezn<D2RmQPG;^*PM$9f
-z<;!TTO0o7jtI$KK5^^`RQA?&$i5fKHTye{Y2dbUFRY&%O`|eymGkdH^3(a-Ko#0Eg
-zVg3a*nzB9ZG-7$0{P8aFb)T2E#0?y!@}KT6<<U_Zg>VJx<BQ1DFxk#r2S*uF3pA!W
-Pqh|RnkNr_hpJRCg4*xAQ
-
-diff --git a/hw/xquartz/bundle/Resources/pl.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/pl.lproj/InfoPlist.strings
-deleted file mode 100644
-index b9c9502149297d06b225625c20a74e31a4347144..0000000000000000000000000000000000000000
-GIT binary patch
-literal 0
-HcmV?d00001
-
-literal 274
-zcmZvXy9&ZU5Jhk8S1c)mXiQ@v78+0lv9Yn0yo`?|BvH|iSI=%?A+qe=*_k`DXJ2m(
-z<;!TTO0o7jtI$)a5^^`RQA?&$i5fKHTye{Y2dbUFRY&%O`{7(ZGkdH^3(a-Ko#0Eg
-zVg3a*nzB9ZG-7$0{P8aFb>Ek^#0?y!@}F*_J5Eb^WV%rZRiHjm1Yr%4?aOs=j3Ko^
-RW2!T1mfq6X|HSk;k`JdvEV%#x
-
-diff --git a/hw/xquartz/bundle/Resources/pt.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/pt.lproj/InfoPlist.strings
-deleted file mode 100644
-index 33c637448e0e489cb79e7d95fa78e79811090653..0000000000000000000000000000000000000000
-GIT binary patch
-literal 0
-HcmV?d00001
-
-literal 274
-zcmZvXy9&ZU5Jhk8S1c)mXiQ@v78+0lv9Yn0ybNj*k|^l!`XB1qEfhqC-Fe-aJ^OrV
-zC|^cvRf@IONrmo8l~B9l8?{s_m3V{CxL0Hu@j$iHx9X@KQQw@(XJ-$Kw9s4^)Csy&
-z8}^^^MpKTbokp0a$sg?!UH5ruOWeRwD*u`OQa&Iu3ZV+rCyK~xi0oXhgJTTo1sc<x
-P(X;fH#{MT}&XK$U%u6jl
-
-diff --git a/hw/xquartz/bundle/Resources/pt_PT.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/pt_PT.lproj/InfoPlist.strings
-deleted file mode 100644
-index 33c637448e0e489cb79e7d95fa78e79811090653..0000000000000000000000000000000000000000
-GIT binary patch
-literal 0
-HcmV?d00001
-
-literal 274
-zcmZvXy9&ZU5Jhk8S1c)mXiQ@v78+0lv9Yn0ybNj*k|^l!`XB1qEfhqC-Fe-aJ^OrV
-zC|^cvRf@IONrmo8l~B9l8?{s_m3V{CxL0Hu@j$iHx9X@KQQw@(XJ-$Kw9s4^)Csy&
-z8}^^^MpKTbokp0a$sg?!UH5ruOWeRwD*u`OQa&Iu3ZV+rCyK~xi0oXhgJTTo1sc<x
-P(X;fH#{MT}&XK$U%u6jl
-
-diff --git a/hw/xquartz/bundle/Resources/ro.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/ro.lproj/InfoPlist.strings
-deleted file mode 100644
-index dba225f5655532cdbfe499dc5a9c69aef7ab5cec..0000000000000000000000000000000000000000
-GIT binary patch
-literal 0
-HcmV?d00001
-
-literal 280
-zcmZvXJqyA>42Iv?UvYFSqP2^IIH;fq;^N{e*AI)@mbMD|<JISG5D^J?$t7=+=bkSO
-z70PI%N>&G*Rp_Bq3Ar1-QA?&$i8uI+d(A5&9;o*ERvp<B>bqBk%<N$cEj8B_b%HL{
-zmiZUF(UcQtuMrk#@<+Qu*L^nah#NRc<v-oulx|bX4x<>hNPQv;XAPI@&UN&pF||lz
-QsxxZt501(G%F^d~-rP_w9{>OV
-
-diff --git a/hw/xquartz/bundle/Resources/ru.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/ru.lproj/InfoPlist.strings
-deleted file mode 100644
-index 7f722e4b628764cddad52da2150429794eb0b00d..0000000000000000000000000000000000000000
-GIT binary patch
-literal 0
-HcmV?d00001
-
-literal 274
-zcmZvXy9&ZU5JhjXm0uB32GJN01rdw^MG!4)Y$Y#6O+pd{{dn~xg@wqnJF|1|%$|L{
-z)t4hnYvl@c&_yRb6)U24Czh(H<jRN^G2vWsOUQdFT7RXQ>KXT=bvexJumUYK*9~`s
-zFV=?nSE8jU+tywKmaWMj?-F1AeQ8Ht!jUQc>9&k#hGu4bGd5c^4=Pt(vH-#YqNXp^
-Xv1RnoT#ZnDw1&Q+Y5o(^*OGhyTJkHj
-
-diff --git a/hw/xquartz/bundle/Resources/sk.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/sk.lproj/InfoPlist.strings
-deleted file mode 100644
-index 53b3005ed3a967fcf39df30f63863830b06c842e..0000000000000000000000000000000000000000
-GIT binary patch
-literal 0
-HcmV?d00001
-
-literal 274
-zcmZvXJqyAx6h-gsuLvEBXzk)44q8wIadB}i{ZiDnv{kS_UOfruAQF=I^6q^vC(oD0
-z@@2GDr9`nVI;mHtl-ixxsHIY=BpPDQx#5<Rk5oH<tB&d!_rtk-W)4`9R$A(YJH?l2
-z$NVeNXwLR@(1hh__Q$)%*L`2wlQ(dbDt@{@ls#&U7D5$hNESg@LuC639UWtc7HEpP
-PK(q9g#{MUv&yl<VsIDx&
-
-diff --git a/hw/xquartz/bundle/Resources/sv.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/sv.lproj/InfoPlist.strings
-deleted file mode 100644
-index 1522655ddb03719cc2128ee998dba33663c39761..0000000000000000000000000000000000000000
-GIT binary patch
-literal 0
-HcmV?d00001
-
-literal 260
-zcmZvXI}5@<5QM+lUvZ=iqA`tySZF{I#Ky)}E)PZXAc=zhcy;ay3z6k+_GV{y=U#8d
-zgc!EeSdLsd^CTk`cNeyFVrnX(5$3u#dgaPTG+y7)i@iww@TyQV2a1FhOKwu9(q-&4
-zzZ4qgIspeJih$W4?OMA2yJ@eym5++zr`r(AN5oLPm8V7?oU-8LUB#+JOjTW|=KQ+-
-K?gv(Ve)k6-O)4z_
-
-diff --git a/hw/xquartz/bundle/Resources/th.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/th.lproj/InfoPlist.strings
-deleted file mode 100644
-index 51d294bdecb3c3a2c52f633dad46c453947b4237..0000000000000000000000000000000000000000
-GIT binary patch
-literal 0
-HcmV?d00001
-
-literal 270
-zcmZvXy9&ZU5Jhiok=|~JT@a0F6vRRUK0s`2Y{fhjH3>-+^yAf&Ei6Qq-8(yTXZGyt
-zt-d@Nt(EJby)HWGsaO%YJ6ftDlPg0FnsBbTCB!`y)?cY6d&d2+E{~ZlR;amVy5WxS
-z#o93ciW*JWu67!*T#f&D7x?P$OIzX+j!fxKw{beo$XPmV@&QD?x<ny#1vE`hs-xu#
-UsQDUFol<Ma8<OTP2l_0<2ds`OApigX
-
-diff --git a/hw/xquartz/bundle/Resources/tr.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/tr.lproj/InfoPlist.strings
-deleted file mode 100644
-index 2e003a768da504d4781185bf4a78ce744e0dc025..0000000000000000000000000000000000000000
-GIT binary patch
-literal 0
-HcmV?d00001
-
-literal 272
-zcmZvXy$ZrW5QL}pDUOsuG^Vi-3k@iO*x1-g{tRjok|^l22lcxvEJT*O+1r`joqN4C
-zmM^2ND#beLqC!ulN~qnzMlF>}C1}8md&4UuAE|cwRvpzd>W5SL%p4GrR$A(YIzg9e
-z$NVd3H0O9aXhL|J{n4(`b>B^U@&+HJ@}F+Q#vZO`vQdbqKtr+!e>Hw=SFV$D7{Udb
-R!Y<&fck9LeCZ^B%_yCzjEq4F_
-
-diff --git a/hw/xquartz/bundle/Resources/uk.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/uk.lproj/InfoPlist.strings
-deleted file mode 100644
-index 1153eafe52643ce3fda6c546782b6bf1f9299072..0000000000000000000000000000000000000000
-GIT binary patch
-literal 0
-HcmV?d00001
-
-literal 264
-zcmZvWy$ZrW5QL|=%BKhcn;;qkVj+T2Pz2FJ5L?NQh?+<e1$`r5QvGtEl^lDsJ3G5O
-zueUn#<Y=K>k#;)ipobF0a5u0}36m=W9WdpeQ>El>U97%T1$#t&w<?dF4c<gkjdevG
-zqf4}8{~2^NBwTIP<+&RC(az9Sze{WK0w0<7-)Ymd(~b#D&x}lHHfBXHz?H8S*^>xy
-VSbIz?Q~QqS*WCb>uRfK%{{fIcDH#9&
-
-diff --git a/hw/xquartz/bundle/Resources/zh_CN.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/zh_CN.lproj/InfoPlist.strings
-deleted file mode 100644
-index b5df36885021f7d532daf12f218eb64269305e58..0000000000000000000000000000000000000000
-GIT binary patch
-literal 0
-HcmV?d00001
-
-literal 260
-zcmZvXJqyAx6h-eW{)o`AgVrt%;-G>eh>MG>^vj|)(pI7Vc<V_92a!i|lb7?}yLtB-
-zE0obrR*6o!s?<xFQgTnURzt?BLJgX;Z@J~1N4k5yQA_p$-FYgc=YUvgt)(8&DO{#K
-z{cotzoE7M(2@z=ahuy%n-$@6~H9jg8Kh@4<jFYGzGSA|u^JJm3cNHrlrc^C>bAH`?
-K_k)BgKl=k<aVtUq
-
-diff --git a/hw/xquartz/bundle/Resources/zh_TW.lproj/InfoPlist.strings b/hw/xquartz/bundle/Resources/zh_TW.lproj/InfoPlist.strings
-deleted file mode 100644
-index d56e1de434a75d6492fb01fb823f01705bc9d9e7..0000000000000000000000000000000000000000
-GIT binary patch
-literal 0
-HcmV?d00001
-
-literal 264
-zcmZvXI}5@<5QM+lUvZ=iqA`tySZKfph>eY{<fW)dxI{sJygGM<g~)O@dponcbFVi;
-zLJS*fQVv`=@gyfx?Jl&ms?=0MBP?{U^(vGPXuQ6qQ}rzM!>dBg>?sl!%(+RONtd(L
-z{HxF~)d|=$QUpx?XqVD;-%UH^Rz51qpKe1e9}&i`=!;9_tC0_<E;)K<vG|Cw*qJ!z
-N*?DlkNY(52e*n@6D(3(I
-
-diff --git a/hw/xquartz/bundle/mk_bundke.sh b/hw/xquartz/bundle/mk_bundke.sh
-index 288c6a9..632e5f7 100755
---- a/hw/xquartz/bundle/mk_bundke.sh
-+++ b/hw/xquartz/bundle/mk_bundke.sh
-@@ -12,7 +12,7 @@ for lang in ${localities} ; do
- mkdir -p ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj/main.nib
- [ -d ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj/main.nib ] || exit 1
-
-- for f in InfoPlist.strings Localizable.strings main.nib/keyedobjects.nib ; do
-+ for f in Localizable.strings main.nib/keyedobjects.nib ; do
- install -m 644 ${SRCDIR}/Resources/${lang}.lproj/$f ${BUNDLE_ROOT}/Contents/Resources/${lang}.lproj/${f}
- done
- done
---
-2.6.1
-
</del></span></pre></div>
<a id="trunkdportsx11xorgserverfiles0008XQuartzFixhowwecalculatetheheightoftheOSXmpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/x11/xorg-server/files/0008-XQuartz-Fix-how-we-calculate-the-height-of-the-OSX-m.patch (141688 => 141689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/files/0008-XQuartz-Fix-how-we-calculate-the-height-of-the-OSX-m.patch 2015-10-26 20:27:01 UTC (rev 141688)
+++ trunk/dports/x11/xorg-server/files/0008-XQuartz-Fix-how-we-calculate-the-height-of-the-OSX-m.patch 2015-10-26 20:32:42 UTC (rev 141689)
</span><span class="lines">@@ -1,68 +0,0 @@
</span><del>-From 52506f60b6680e11fa418f4e59e7159eb5b7ec39 Mon Sep 17 00:00:00 2001
-From: Ken Thomases <ken@codeweavers.com>
-Date: Mon, 12 Oct 2015 16:45:41 -0700
-Subject: [PATCH 8/8] XQuartz: Fix how we calculate the height of the OSX menu
- bar
-
-+[NSScreen mainScreen] does not mean the primary display. It used to mean the
-one with the key window. When "Displays have separate spaces" is enabled, it
-means the active screen, the one whose menu bar is mostly opaque. As such, it
-may not be the screen whose lower-left corner is located at (0, 0). That's
-why its max-Y is not necessarily comparable to its height. That only works
-for the primary display.
-
-This code could use [[NSScreen screens] firstObject]. This is always the
-primary display, the one whose lower-left corner is at (0, 0).
-
-Once that's done, the above change should be reverted. The height of the
-visible frame would be the full height of the screen minus the menu bar _and
-the Dock_ if the Dock is along the bottom of the screen.
-
-Actually, there's a theoretically-simpler approach: use
--[NSMenu menuBarHeight]. That replaces a long-deprecated method
-+[NSMenuView menuBarHeight]. However, there was a bug in Tiger that led to
-the former not working while the latter still worked. I haven't actually
-checked recently.
-
-CrossOver's still-kicking X server code uses this code, which tries all of
-the above:
-
- NSScreen* primaryScreen = [[NSScreen screens] objectAtIndex:0];
- aquaMenuBarHeight = [[NSApp mainMenu] menuBarHeight];
- if (!aquaMenuBarHeight) aquaMenuBarHeight = [NSMenuView menuBarHeight];
- if (!aquaMenuBarHeight) aquaMenuBarHeight =
- NSHeight([primaryScreen frame]) - NSMaxY([primaryScreen visibleFrame]);
-
-Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Signed-off-by: Ken Thomases <ken@codeweavers.com>
-(cherry picked from commit 4513f924a7065edbd267cf96837af94ce5a58a6f)
----
- hw/xquartz/X11Application.m | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
-index 8a928ba..d2c5d30 100644
---- a/hw/xquartz/X11Application.m
-+++ b/hw/xquartz/X11Application.m
-@@ -1238,8 +1238,16 @@ X11ApplicationMain(int argc, char **argv, char **envp)
- QuartzModeBundleInit();
-
- /* Calculate the height of the menubar so we can avoid it. */
-- aquaMenuBarHeight = NSHeight([[NSScreen mainScreen] frame]) -
-- NSMaxY([[NSScreen mainScreen] visibleFrame]);
-+ aquaMenuBarHeight = [[NSApp mainMenu] menuBarHeight];
-+#if ! __LP64__
-+ if (!aquaMenuBarHeight) {
-+ aquaMenuBarHeight = [NSMenuView menuBarHeight];
-+ }
-+#endif
-+ if (!aquaMenuBarHeight) {
-+ NSScreen* primaryScreen = [[NSScreen screens] objectAtIndex:0];
-+ aquaMenuBarHeight = NSHeight([primaryScreen frame]) - NSMaxY([primaryScreen visibleFrame]);
-+ }
-
- #ifdef HAVE_LIBDISPATCH
- eventTranslationQueue = dispatch_queue_create(
---
-2.6.1
-
</del></span></pre></div>
<a id="trunkdportsx11xorgserverfiles1000XQuartzMakesurethatdarwin_all_modifier_mask_addipatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/x11/xorg-server/files/1000-XQuartz-Make-sure-that-darwin_all_modifier_mask_addi.patch (141688 => 141689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/files/1000-XQuartz-Make-sure-that-darwin_all_modifier_mask_addi.patch 2015-10-26 20:27:01 UTC (rev 141688)
+++ trunk/dports/x11/xorg-server/files/1000-XQuartz-Make-sure-that-darwin_all_modifier_mask_addi.patch 2015-10-26 20:32:42 UTC (rev 141689)
</span><span class="lines">@@ -1,93 +0,0 @@
</span><del>-From 3db7e332d374bf8cee581c31b7d50d7ac0509187 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Sun, 18 Oct 2015 23:03:23 -0700
-Subject: [PATCH] XQuartz: Make sure that darwin_all_modifier_mask_additions is
- 0-terminated
-
-Found by ASan
-
-X.Org X Server 1.17.99.901 Build Date: 20151018
-================================================================
-==40471==ERROR: AddressSanitizer: global-buffer-overflow on address 0x000101fed7a4 at pc 0x000101584030 bp 0x70000029f920 sp 0x70000029f918
-READ of size 4 at 0x000101fed7a4 thread T7
- #0 0x10158402f in DarwinEQInit darwinEvents.c:377
- #1 0x10157f3bc in InitInput darwin.c:566
- #2 0x101be87ad in dix_main main.c:268
- #3 0x10159131b in server_thread quartzStartup.c:66
- #4 0x7fff8a535c12 in _pthread_body (/usr/lib/system/libsystem_pthread.dylib+0x3c12)
- #5 0x7fff8a535b8f in _pthread_start (/usr/lib/system/libsystem_pthread.dylib+0x3b8f)
- #6 0x7fff8a533374 in thread_start (/usr/lib/system/libsystem_pthread.dylib+0x1374)
-
-0x000101fed7a4 is located 0 bytes to the right of global variable 'darwin_all_modifier_mask_additions' defined in 'darwinEvents.c:181:12'
-(0x101fed7a0) of size 4
-SUMMARY: AddressSanitizer: global-buffer-overflow darwinEvents.c:377 DarwinEQInit
-Shadow bytes around the buggy address:
- 0x1000203fdaa0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
- 0x1000203fdab0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
- 0x1000203fdac0: f9 f9 f9 f9 00 00 00 00 00 00 f9 f9 f9 f9 f9 f9
- 0x1000203fdad0: 00 00 00 00 00 00 00 00 f9 f9 f9 f9 00 00 00 00
- 0x1000203fdae0: 00 00 f9 f9 f9 f9 f9 f9 00 00 00 00 00 f9 f9 f9
-=>0x1000203fdaf0: f9 f9 f9 f9[04]f9 f9 f9 f9 f9 f9 f9 00 00 00 00
- 0x1000203fdb00: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
- 0x1000203fdb10: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
- 0x1000203fdb20: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
- 0x1000203fdb30: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
- 0x1000203fdb40: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-Shadow byte legend (one shadow byte represents 8 application bytes):
- Addressable: 00
- Partially addressable: 01 02 03 04 05 06 07
- Heap left redzone: fa
- Heap right redzone: fb
- Freed heap region: fd
- Stack left redzone: f1
- Stack mid redzone: f2
- Stack right redzone: f3
- Stack partial redzone: f4
- Stack after return: f5
- Stack use after scope: f8
- Global redzone: f9
- Global init order: f6
- Poisoned by user: f7
- Container overflow: fc
- Array cookie: ac
- Intra object redzone: bb
- ASan internal: fe
- Left alloca redzone: ca
- Right alloca redzone: cb
-Thread T7 created by T0 here:
- #0 0x10242ee99 in wrap_pthread_create
-(/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/7.0.0/lib/darwin/libclang_rt.asan_osx_dynamic.dylib+0x37e99)
- #1 0x101591089 in create_thread quartzStartup.c:78
- #2 0x101590ed9 in QuartzInitServer quartzStartup.c:95
- #3 0x1015697eb in X11ApplicationMain X11Application.m:1277
- #4 0x101575dc0 in X11ControllerMain X11Controller.m:984
- #5 0x10159171a in server_main quartzStartup.c:127
- #6 0x101540fc0 in do_start_x11_server bundle-main.c:436
- #7 0x101544869 in _Xstart_x11_server mach_startupServer.c:189
- #8 0x101545c96 in mach_startup_server mach_startupServer.c:398
- #9 0x7fff8d1b70f3 in mach_msg_server (/usr/lib/system/libsystem_kernel.dylib+0x110f3)
- #10 0x1015416e7 in main bundle-main.c:774
- #11 0x7fff8bd975ac in start (/usr/lib/system/libdyld.dylib+0x35ac)
- #12 0x0 (<unknown module>)
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
----
- hw/xquartz/darwinEvents.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hw/xquartz/darwinEvents.c b/hw/xquartz/darwinEvents.c
-index 9bf2f14..0c8e7c4 100644
---- a/hw/xquartz/darwinEvents.c
-+++ b/hw/xquartz/darwinEvents.c
-@@ -178,7 +178,7 @@ static int darwin_x11_modifier_mask_list[] = {
- 0
- };
-
--static int darwin_all_modifier_mask_additions[] = { NX_SECONDARYFNMASK, };
-+static int darwin_all_modifier_mask_additions[] = { NX_SECONDARYFNMASK, 0 };
-
- static void
- DarwinUpdateModifiers(int pressed, // KeyPress or KeyRelease
---
-2.6.2
-
</del></span></pre></div>
<a id="trunkdportsx11xorgserverfiles5000sdksymsshUseCPPFLAGSnotCFLAGSpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/xorg-server/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch (141688 => 141689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch 2015-10-26 20:27:01 UTC (rev 141688)
+++ trunk/dports/x11/xorg-server/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch 2015-10-26 20:32:42 UTC (rev 141689)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-From 9ba585c94cbea9a1446b5abad58eda529f70ad8d Mon Sep 17 00:00:00 2001
</del><ins>+From 6f240d1b8282a91e3e98a6e0832d1bebeaf936a8 Mon Sep 17 00:00:00 2001
</ins><span class="cx"> From: Jeremy Huddleston <jeremyhu@apple.com>
</span><span class="cx"> Date: Fri, 13 Jan 2012 12:00:57 -0800
</span><span class="cx"> Subject: [PATCH 5000/5003] sdksyms.sh: Use CPPFLAGS, not CFLAGS
</span><span class="lines">@@ -37,5 +37,5 @@
</span><span class="cx"> SDKSYMS_DEP = sdksyms.dep
</span><span class="cx"> -include $(SDKSYMS_DEP)
</span><span class="cx"> --
</span><del>-2.6.1
</del><ins>+2.6.2
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkdportsx11xorgserverfiles5001UseoldmiTrapezoidsandmiTrianglesroutinespatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/xorg-server/files/5001-Use-old-miTrapezoids-and-miTriangles-routines.patch (141688 => 141689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/files/5001-Use-old-miTrapezoids-and-miTriangles-routines.patch 2015-10-26 20:27:01 UTC (rev 141688)
+++ trunk/dports/x11/xorg-server/files/5001-Use-old-miTrapezoids-and-miTriangles-routines.patch 2015-10-26 20:32:42 UTC (rev 141689)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-From f78bd64ef12cffbf46327641ba7baa05bfa07a6b Mon Sep 17 00:00:00 2001
</del><ins>+From f82de0aedf8716e2dbca5827007ea543502e7093 Mon Sep 17 00:00:00 2001
</ins><span class="cx"> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="cx"> Date: Sat, 2 Nov 2013 11:00:23 -0700
</span><span class="cx"> Subject: [PATCH 5001/5003] Use old miTrapezoids and miTriangles routines
</span><span class="lines">@@ -19,10 +19,10 @@
</span><span class="cx"> 5 files changed, 201 insertions(+), 4 deletions(-)
</span><span class="cx">
</span><span class="cx"> diff --git a/fb/fbpict.c b/fb/fbpict.c
</span><del>-index c8378ad..cafb027 100644
</del><ins>+index 5f6c88e..936a11b 100644
</ins><span class="cx"> --- a/fb/fbpict.c
</span><span class="cx"> +++ b/fb/fbpict.c
</span><del>-@@ -499,10 +499,8 @@ fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
</del><ins>+@@ -508,10 +508,8 @@ fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
</ins><span class="cx"> ps->UnrealizeGlyph = fbUnrealizeGlyph;
</span><span class="cx"> ps->CompositeRects = miCompositeRects;
</span><span class="cx"> ps->RasterizeTrapezoid = fbRasterizeTrapezoid;
</span><span class="lines">@@ -293,5 +293,5 @@
</span><span class="cx"> +}
</span><span class="cx"> +
</span><span class="cx"> --
</span><del>-2.6.1
</del><ins>+2.6.2
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkdportsx11xorgserverfiles5002fbRevertfbchangesthatbrokeXQuartzpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/xorg-server/files/5002-fb-Revert-fb-changes-that-broke-XQuartz.patch (141688 => 141689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/files/5002-fb-Revert-fb-changes-that-broke-XQuartz.patch 2015-10-26 20:27:01 UTC (rev 141688)
+++ trunk/dports/x11/xorg-server/files/5002-fb-Revert-fb-changes-that-broke-XQuartz.patch 2015-10-26 20:32:42 UTC (rev 141689)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-From e35f1856819eaaa4f0cc4a0687ff1f4b518085dc Mon Sep 17 00:00:00 2001
</del><ins>+From d276e11261d1aac14570036cbf84993b7ab714eb Mon Sep 17 00:00:00 2001
</ins><span class="cx"> From: Jeremy Huddleston <jeremyhu@apple.com>
</span><span class="cx"> Date: Fri, 12 Feb 2010 19:48:52 -0800
</span><span class="cx"> Subject: [PATCH 5002/5003] fb: Revert fb changes that broke XQuartz
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> extern _X_EXPORT void free_pixman_pict(PicturePtr, pixman_image_t *);
</span><span class="cx">
</span><span class="cx"> diff --git a/fb/fbpict.c b/fb/fbpict.c
</span><del>-index cafb027..6ee63e9 100644
</del><ins>+index 936a11b..a99cee6 100644
</ins><span class="cx"> --- a/fb/fbpict.c
</span><span class="cx"> +++ b/fb/fbpict.c
</span><span class="cx"> @@ -46,23 +46,18 @@ fbComposite(CARD8 op,
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> stride * sizeof(FbStride));
</span><span class="cx">
</span><span class="cx"> if (!image)
</span><del>-@@ -321,57 +318,31 @@ create_bits_picture(PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
</del><ins>+@@ -321,28 +318,21 @@ create_bits_picture(PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
</ins><span class="cx"> if (pict->clientClip)
</span><span class="cx"> pixman_image_set_has_client_clip(image, TRUE);
</span><span class="cx">
</span><span class="lines">@@ -127,6 +127,10 @@
</span><span class="cx"> - int *xoff, int *yoff,
</span><span class="cx"> Bool is_alpha_map);
</span><span class="cx">
</span><ins>+ static void image_destroy(pixman_image_t *image, void *data)
+@@ -351,32 +341,13 @@ static void image_destroy(pixman_image_t *image, void *data)
+ }
+
</ins><span class="cx"> static void
</span><span class="cx"> -set_image_properties(pixman_image_t * image, PicturePtr pict, Bool has_clip,
</span><span class="cx"> - int *xoff, int *yoff, Bool is_alpha_map)
</span><span class="lines">@@ -159,7 +163,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch (pict->repeatType) {
</span><del>-@@ -399,10 +370,8 @@ set_image_properties(pixman_image_t * image, PicturePtr pict, Bool has_clip,
</del><ins>+@@ -404,10 +375,8 @@ set_image_properties(pixman_image_t * image, PicturePtr pict, Bool has_clip,
</ins><span class="cx"> * as the alpha map for this operation
</span><span class="cx"> */
</span><span class="cx"> if (pict->alphaMap && !is_alpha_map) {
</span><span class="lines">@@ -171,7 +175,7 @@
</span><span class="cx">
</span><span class="cx"> pixman_image_set_alpha_map(image, alpha_map, pict->alphaOrigin.x,
</span><span class="cx"> pict->alphaOrigin.y);
</span><del>-@@ -436,8 +405,7 @@ set_image_properties(pixman_image_t * image, PicturePtr pict, Bool has_clip,
</del><ins>+@@ -445,8 +414,7 @@ set_image_properties(pixman_image_t * image, PicturePtr pict, Bool has_clip,
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static pixman_image_t *
</span><span class="lines">@@ -181,7 +185,7 @@
</span><span class="cx"> {
</span><span class="cx"> pixman_image_t *image = NULL;
</span><span class="cx">
</span><del>-@@ -445,7 +413,7 @@ image_from_pict_internal(PicturePtr pict, Bool has_clip, int *xoff, int *yoff,
</del><ins>+@@ -454,7 +422,7 @@ image_from_pict_internal(PicturePtr pict, Bool has_clip, int *xoff, int *yoff,
</ins><span class="cx"> return NULL;
</span><span class="cx">
</span><span class="cx"> if (pict->pDrawable) {
</span><span class="lines">@@ -190,7 +194,7 @@
</span><span class="cx"> }
</span><span class="cx"> else if (pict->pSourcePict) {
</span><span class="cx"> SourcePict *sp = pict->pSourcePict;
</span><del>-@@ -463,19 +431,17 @@ image_from_pict_internal(PicturePtr pict, Bool has_clip, int *xoff, int *yoff,
</del><ins>+@@ -472,19 +440,17 @@ image_from_pict_internal(PicturePtr pict, Bool has_clip, int *xoff, int *yoff,
</ins><span class="cx"> else if (sp->type == SourcePictTypeConical)
</span><span class="cx"> image = create_conical_gradient_image(gradient);
</span><span class="cx"> }
</span><span class="lines">@@ -312,5 +316,5 @@
</span><span class="cx">
</span><span class="cx"> DamageRegionProcessPending(pDst->pDrawable);
</span><span class="cx"> --
</span><del>-2.6.1
</del><ins>+2.6.2
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkdportsx11xorgserverfiles5003fbRevertfbchangesthatbrokeXQuartzpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/xorg-server/files/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch (141688 => 141689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/files/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch 2015-10-26 20:27:01 UTC (rev 141688)
+++ trunk/dports/x11/xorg-server/files/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch 2015-10-26 20:32:42 UTC (rev 141689)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-From 942c11eb42beafd96f6dc96fd8e1e2a832c3e9d7 Mon Sep 17 00:00:00 2001
</del><ins>+From 890d8e7a5f91436543f1b3eb28b9c33f022376a5 Mon Sep 17 00:00:00 2001
</ins><span class="cx"> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span><span class="cx"> Date: Sat, 31 May 2014 13:14:20 -0700
</span><span class="cx"> Subject: [PATCH 5003/5003] fb: Revert fb changes that broke XQuartz
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> * fbpixmap.c
</span><span class="cx"> */
</span><span class="cx"> diff --git a/fb/fbpict.c b/fb/fbpict.c
</span><del>-index 6ee63e9..9c4cc42 100644
</del><ins>+index a99cee6..66dd633 100644
</ins><span class="cx"> --- a/fb/fbpict.c
</span><span class="cx"> +++ b/fb/fbpict.c
</span><span class="cx"> @@ -65,152 +65,6 @@ fbComposite(CARD8 op,
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx"> static pixman_image_t *
</span><span class="cx"> create_solid_fill_image(PicturePtr pict)
</span><span class="cx"> {
</span><del>-@@ -461,8 +315,7 @@ fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
</del><ins>+@@ -470,8 +324,7 @@ fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
</ins><span class="cx"> return FALSE;
</span><span class="cx"> ps = GetPictureScreen(pScreen);
</span><span class="cx"> ps->Composite = fbComposite;
</span><span class="lines">@@ -239,5 +239,5 @@
</span><span class="cx"> free(depths[d].vids);
</span><span class="cx"> free(depths);
</span><span class="cx"> --
</span><del>-2.6.1
</del><ins>+2.6.2
</ins><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>