[118631] trunk/dports/x11/xorg-server
jeremyhu at macports.org
jeremyhu at macports.org
Sun Apr 6 04:15:27 PDT 2014
Revision: 118631
https://trac.macports.org/changeset/118631
Author: jeremyhu at macports.org
Date: 2014-04-06 04:15:27 -0700 (Sun, 06 Apr 2014)
Log Message:
-----------
xorg-server: Bump to 1.14.6 RC1
Modified Paths:
--------------
trunk/dports/x11/xorg-server/Portfile
Removed Paths:
-------------
trunk/dports/x11/xorg-server/files/0001-XQuartz-Bump-bundle-version-to-2.7.5.patch
trunk/dports/x11/xorg-server/files/0002-miext-damage-Partial-revert-of-Only-wrap-into-the-GC.patch
Modified: trunk/dports/x11/xorg-server/Portfile
===================================================================
--- 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)
@@ -5,7 +5,7 @@
name xorg-server
conflicts xorg-server-devel
set my_name xorg-server
-version 1.14.4
+version 1.14.5.901
categories x11 devel
license X11
maintainers jeremyhu openmaintainer
@@ -20,9 +20,9 @@
dist_subdir ${my_name}
distname ${my_name}-${version}
-checksums sha1 5ee112b52f0cec043aa68bd909457b2ea2a11380 \
- rmd160 24b3cc7848bf008d01a044f527471853942b1e4e \
- sha256 608ccfaafb845f6e559884a30f946d365209172416710d687b190e9e1ff65dc3
+checksums sha1 e186a14010656424aa208f1980f9d9198f63e839 \
+ rmd160 13548a6f3ed6f6d8a1844400b5bbfc40967048ae \
+ sha256 3ada4e9c048340dd70557dc8ff05334af5e12cc2f25eb7102c3469c8b2cd7b16
use_bzip2 yes
use_parallel_build yes
@@ -84,8 +84,6 @@
RAWCPP=${configure.cpp}
patchfiles \
- 0001-XQuartz-Bump-bundle-version-to-2.7.5.patch \
- 0002-miext-damage-Partial-revert-of-Only-wrap-into-the-GC.patch \
5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch \
5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch \
5002-fb-Revert-fb-changes-that-broke-XQuartz.patch \
Deleted: trunk/dports/x11/xorg-server/files/0001-XQuartz-Bump-bundle-version-to-2.7.5.patch
===================================================================
--- 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)
@@ -1,29 +0,0 @@
-From 0a1628bca7b6c85054041312987b73e701aecb80 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at 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 at 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
-
Deleted: trunk/dports/x11/xorg-server/files/0002-miext-damage-Partial-revert-of-Only-wrap-into-the-GC.patch
===================================================================
--- 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)
@@ -1,38 +0,0 @@
-From 94b7f26aeda31cf55ff9b7c04f390ba6d35977e4 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at 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 at apple.com>
-Reviewed-by: Adam Jackson <ajax at redhat.com>
-Signed-off-by: Keith Packard <keithp at 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
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140406/9b5f5d3f/attachment.html>
More information about the macports-changes
mailing list