<!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>[118631] 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/118631">118631</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2014-04-06 04:15:27 -0700 (Sun, 06 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>xorg-server: Bump to 1.14.6 RC1</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsx11xorgserverPortfile">trunk/dports/x11/xorg-server/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsx11xorgserverfiles0001XQuartzBumpbundleversionto275patch">trunk/dports/x11/xorg-server/files/0001-XQuartz-Bump-bundle-version-to-2.7.5.patch</a></li>
<li><a href="#trunkdportsx11xorgserverfiles0002miextdamagePartialrevertofOnlywrapintotheGCpatch">trunk/dports/x11/xorg-server/files/0002-miext-damage-Partial-revert-of-Only-wrap-into-the-GC.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 (118630 => 118631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/Portfile 2014-04-06 11:09:43 UTC (rev 118630)
+++ trunk/dports/x11/xorg-server/Portfile 2014-04-06 11:15:27 UTC (rev 118631)
</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.14.4
</del><ins>+version 1.14.5.901
</ins><span class="cx"> categories x11 devel
</span><span class="cx"> license X11
</span><span class="cx"> maintainers jeremyhu openmaintainer
</span><span class="lines">@@ -20,9 +20,9 @@
</span><span class="cx"> dist_subdir ${my_name}
</span><span class="cx"> distname ${my_name}-${version}
</span><span class="cx">
</span><del>-checksums sha1 5ee112b52f0cec043aa68bd909457b2ea2a11380 \
- rmd160 24b3cc7848bf008d01a044f527471853942b1e4e \
- sha256 608ccfaafb845f6e559884a30f946d365209172416710d687b190e9e1ff65dc3
</del><ins>+checksums sha1 e186a14010656424aa208f1980f9d9198f63e839 \
+ rmd160 13548a6f3ed6f6d8a1844400b5bbfc40967048ae \
+ sha256 3ada4e9c048340dd70557dc8ff05334af5e12cc2f25eb7102c3469c8b2cd7b16
</ins><span class="cx">
</span><span class="cx"> use_bzip2 yes
</span><span class="cx"> use_parallel_build yes
</span><span class="lines">@@ -84,8 +84,6 @@
</span><span class="cx"> RAWCPP=${configure.cpp}
</span><span class="cx">
</span><span class="cx"> patchfiles \
</span><del>- 0001-XQuartz-Bump-bundle-version-to-2.7.5.patch \
- 0002-miext-damage-Partial-revert-of-Only-wrap-into-the-GC.patch \
</del><span class="cx"> 5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch \
</span><span class="cx"> 5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch \
</span><span class="cx"> 5002-fb-Revert-fb-changes-that-broke-XQuartz.patch \
</span></span></pre></div>
<a id="trunkdportsx11xorgserverfiles0001XQuartzBumpbundleversionto275patch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/x11/xorg-server/files/0001-XQuartz-Bump-bundle-version-to-2.7.5.patch (118630 => 118631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/files/0001-XQuartz-Bump-bundle-version-to-2.7.5.patch 2014-04-06 11:09:43 UTC (rev 118630)
+++ trunk/dports/x11/xorg-server/files/0001-XQuartz-Bump-bundle-version-to-2.7.5.patch 2014-04-06 11:15:27 UTC (rev 118631)
</span><span class="lines">@@ -1,29 +0,0 @@
</span><del>-From 0a1628bca7b6c85054041312987b73e701aecb80 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Tue, 29 Oct 2013 11:06:55 -0700
-Subject: [PATCH 1/2] XQuartz: Bump bundle version to 2.7.5
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
----
- hw/xquartz/bundle/Info.plist.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git xorg-server-1.14.4/hw/xquartz/bundle/Info.plist.cpp xorg-server-1.14.4/hw/xquartz/bundle/Info.plist.cpp
-index b0106c6..905952a 100644
---- xorg-server-1.14.4/hw/xquartz/bundle/Info.plist.cpp
-+++ xorg-server-1.14.4/hw/xquartz/bundle/Info.plist.cpp
-@@ -19,9 +19,9 @@
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleShortVersionString</key>
-- <string>2.7.4</string>
-+ <string>2.7.5</string>
- <key>CFBundleVersion</key>
-- <string>2.7.4</string>
-+ <string>2.7.5</string>
- <key>CFBundleSignature</key>
- <string>x11a</string>
- <key>CSResourcesFileMapped</key>
---
-1.8.4.1
-
</del></span></pre></div>
<a id="trunkdportsx11xorgserverfiles0002miextdamagePartialrevertofOnlywrapintotheGCpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/x11/xorg-server/files/0002-miext-damage-Partial-revert-of-Only-wrap-into-the-GC.patch (118630 => 118631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/x11/xorg-server/files/0002-miext-damage-Partial-revert-of-Only-wrap-into-the-GC.patch 2014-04-06 11:09:43 UTC (rev 118630)
+++ trunk/dports/x11/xorg-server/files/0002-miext-damage-Partial-revert-of-Only-wrap-into-the-GC.patch 2014-04-06 11:15:27 UTC (rev 118631)
</span><span class="lines">@@ -1,38 +0,0 @@
</span><del>-From 94b7f26aeda31cf55ff9b7c04f390ba6d35977e4 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Thu, 31 Oct 2013 08:57:56 -0700
-Subject: [PATCH 2/2] miext/damage: Partial revert of "Only wrap into the GC
- ops chain if there's a listener (v3)"
-
-Fixes regression from: 4dc2a76740d921c824a4d8193f39dd373475f02a
-
-http://lists.x.org/archives/xorg-devel/2013-May/036241.html
-https://trac.macports.org/ticket/38993
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Reviewed-by: Adam Jackson <ajax@redhat.com>
-Signed-off-by: Keith Packard <keithp@keithp.com>
-(cherry picked from commit abf5d5ac12437ebe156b4dd500c2acd69eea3654)
----
- miext/damage/damage.c | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git xorg-server-1.14.4/miext/damage/damage.c xorg-server-1.14.4/miext/damage/damage.c
-index a98c20e..3dc3180 100644
---- xorg-server-1.14.4/miext/damage/damage.c
-+++ xorg-server-1.14.4/miext/damage/damage.c
-@@ -439,10 +439,7 @@ damageValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)
- drawableDamage(pDrawable);
- DAMAGE_GC_FUNC_PROLOGUE(pGC);
- (*pGC->funcs->ValidateGC) (pGC, changes, pDrawable);
-- if (pDamage)
-- pGCPriv->ops = pGC->ops; /* so it's not NULL, so FUNC_EPILOGUE does work */
-- else
-- pGCPriv->ops = NULL;
-+ pGCPriv->ops = pGC->ops; /* just so it's not NULL */
- DAMAGE_GC_FUNC_EPILOGUE(pGC);
- }
-
---
-1.8.4.1
-
</del></span></pre>
</div>
</div>
</body>
</html>