[60161] trunk/dports/aqua/qtiplot

jonas at macports.org jonas at macports.org
Tue Nov 3 13:44:45 PST 2009


Revision: 60161
          http://trac.macports.org/changeset/60161
Author:   jonas at macports.org
Date:     2009-11-03 13:44:44 -0800 (Tue, 03 Nov 2009)
Log Message:
-----------
fixed building with sip-4.9

Modified Paths:
--------------
    trunk/dports/aqua/qtiplot/Portfile

Added Paths:
-----------
    trunk/dports/aqua/qtiplot/files/patch-qtiplot-src-scripting-scripting.pri

Modified: trunk/dports/aqua/qtiplot/Portfile
===================================================================
--- trunk/dports/aqua/qtiplot/Portfile	2009-11-03 21:06:39 UTC (rev 60160)
+++ trunk/dports/aqua/qtiplot/Portfile	2009-11-03 21:44:44 UTC (rev 60161)
@@ -31,7 +31,8 @@
                     sha1    ad83187af31172794771012072b57a67f9288628 \
                     rmd160  cd6cbef46b3474989bede96af04d1cef52dd6f48
 
-patchfiles          patch-qtiplot-qtiplot.pro
+patchfiles          patch-qtiplot-qtiplot.pro \
+                    patch-qtiplot-src-scripting-scripting.pri
 
 use_parallel_build  yes
 

Added: trunk/dports/aqua/qtiplot/files/patch-qtiplot-src-scripting-scripting.pri
===================================================================
--- trunk/dports/aqua/qtiplot/files/patch-qtiplot-src-scripting-scripting.pri	                        (rev 0)
+++ trunk/dports/aqua/qtiplot/files/patch-qtiplot-src-scripting-scripting.pri	2009-11-03 21:44:44 UTC (rev 60161)
@@ -0,0 +1,27 @@
+This fixes an issue with SIP >= 4.9
+It's already fixed upstream in versions > 0.9.7.10
+--- qtiplot/src/scripting/scripting.pri.orig	2009-11-03 22:25:47.000000000 +0100
++++ qtiplot/src/scripting/scripting.pri	2009-11-03 22:27:16.000000000 +0100
+@@ -80,7 +80,6 @@
+              $${SIP_DIR}/sipqtiPythonScript.cpp\
+              $${SIP_DIR}/sipqtiPythonScripting.cpp\
+              $${SIP_DIR}/sipqtiFolder.cpp\
+-             $${SIP_DIR}/sipqtiQList.cpp\
+              $${SIP_DIR}/sipqtiFit.cpp \
+              $${SIP_DIR}/sipqtiExponentialFit.cpp \
+              $${SIP_DIR}/sipqtiTwoExpFit.cpp \
+@@ -105,4 +104,14 @@
+ 			 $${SIP_DIR}/sipqtiCorrelation.cpp \
+ 			 $${SIP_DIR}/sipqtiConvolution.cpp \
+ 			 $${SIP_DIR}/sipqtiDeconvolution.cpp \
++
++exists(../../$${SIP_DIR}/sipqtiQList.cpp) {
++  # SIP < 4.9
++  SOURCES += $${SIP_DIR}/sipqtiQList.cpp
++} else {
++  SOURCES += \
++       $${SIP_DIR}/sipqtiQList0101Folder.cpp\
++       $${SIP_DIR}/sipqtiQList0101Graph.cpp\
++       $${SIP_DIR}/sipqtiQList0101MdiSubWindow.cpp\
++}
+ }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091103/2eba397e/attachment.html>


More information about the macports-changes mailing list