[91368] trunk/dports/x11/xorg-server

[jeremyhu at macports.org]

Revision: 91368
          https://trac.macports.org/changeset/91368
Author:   jeremyhu at macports.org
Date:     2012-03-30 15:04:07 -0700 (Fri, 30 Mar 2012)
Log Message:
-----------
xorg-server: Tiger build fix, #33818

Modified Paths:
--------------
    trunk/dports/x11/xorg-server/Portfile

Added Paths:
-----------
    trunk/dports/x11/xorg-server/files/tiger.patch

Modified: trunk/dports/x11/xorg-server/Portfile
===================================================================
--- trunk/dports/x11/xorg-server/Portfile	2012-03-30 21:44:39 UTC (rev 91367)
+++ trunk/dports/x11/xorg-server/Portfile	2012-03-30 22:04:07 UTC (rev 91368)
@@ -81,6 +81,7 @@
 	RAWCPP=${configure.cpp}
 
 patchfiles \
+        tiger.patch \
         5002-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch \
         5003-fb-Revert-fb-changes-that-broke-XQuartz.patch
 

Added: trunk/dports/x11/xorg-server/files/tiger.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/tiger.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-server/files/tiger.patch	2012-03-30 22:04:07 UTC (rev 91368)
@@ -0,0 +1,60 @@
+commit c27279f59296c79910bfe4c87c7144b90f8c866f
+Author: Jeremy Huddleston <jeremyhu at apple.com>
+Date:   Fri Mar 30 14:29:48 2012 -0700
+
+    XQuartz: Tiger build fix
+    
+    Fixes: https://trac.macports.org/ticket/33818
+    
+    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
+
+diff --git a/hw/xquartz/mach-startup/Makefile.am b/hw/xquartz/mach-startup/Makefile.am
+index 21ad5b5..77962b1 100644
+--- a/hw/xquartz/mach-startup/Makefile.am
++++ b/hw/xquartz/mach-startup/Makefile.am
+@@ -23,7 +23,7 @@ nodist_X11_bin_SOURCES = \
+ 	mach_startupServer.c \
+ 	mach_startupUser.c
+ 
+-X11_bin_LDADD = \
++X11_bin_DEPENDENCIES = \
+ 	$(top_builddir)/hw/xquartz/libXquartz.la \
+ 	$(top_builddir)/hw/xquartz/xpr/libXquartzXpr.la \
+ 	$(top_builddir)/dix/dixfonts.lo \
+@@ -31,8 +31,12 @@ X11_bin_LDADD = \
+ 	$(top_builddir)/hw/xquartz/pbproxy/libxpbproxy.la \
+ 	$(XQUARTZ_LIBS) $(XSERVER_LIBS)
+ 
++# $(XSERVER_SYS_LIBS) is placed here in order to set command line ordering
++# to work around build issues on Tiger.
++X11_bin_LDADD = $(X11_bin_DEPENDENCIES) $(XSERVER_SYS_LIBS)
++
+ X11_bin_LDFLAGS =  \
+-	$(XSERVER_SYS_LIBS) -lXplugin \
++	-lXplugin \
+ 	-XCClinker -Objc \
+ 	-Wl,-u,_miDCInitialize \
+ 	-Wl,-framework,Carbon \
+@@ -41,7 +45,7 @@ X11_bin_LDFLAGS =  \
+ 	-Wl,-framework,IOKit
+ 
+ if GLX
+-X11_bin_LDADD += \
++X11_bin_DEPENDENCIES += \
+ 	$(top_builddir)/hw/xquartz/GL/libCGLCore.la \
+ 	$(top_builddir)/glx/libglx.la
+ 
+@@ -55,12 +59,10 @@ X11_bin_LDFLAGS += \
+ endif
+ 
+ if RECORD
+-X11_bin_LDADD += \
++X11_bin_DEPENDENCIES += \
+ 	$(top_builddir)/record/librecord.la
+ endif
+ 
+-X11_bin_DEPENDENCIES = $(X11_bin_LDADD)
+-
+ bin_PROGRAMS = Xquartz
+ 
+ dist_Xquartz_SOURCES = \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120330/7504c29e/attachment.html>