[112873] trunk/dports/www/phantomjs
royliu at macports.org
royliu at macports.org
Sat Nov 2 23:54:13 PDT 2013
Revision: 112873
https://trac.macports.org/changeset/112873
Author: royliu at macports.org
Date: 2013-11-02 23:54:13 -0700 (Sat, 02 Nov 2013)
Log Message:
-----------
phantomjs: fix build for 10.9
Modified Paths:
--------------
trunk/dports/www/phantomjs/Portfile
Added Paths:
-----------
trunk/dports/www/phantomjs/files/patch-QtWebKit.pro.diff
trunk/dports/www/phantomjs/files/patch-qglobal.h.diff
trunk/dports/www/phantomjs/files/patch-qt_cocoa_helpers_mac_p.h.diff
Modified: trunk/dports/www/phantomjs/Portfile
===================================================================
--- trunk/dports/www/phantomjs/Portfile 2013-11-03 06:22:21 UTC (rev 112872)
+++ trunk/dports/www/phantomjs/Portfile 2013-11-03 06:54:13 UTC (rev 112873)
@@ -12,7 +12,8 @@
maintainers stromnov openmaintainer
homepage http://www.phantomjs.org/
-master_sites googlecode
+master_sites googlecode \
+ http://trac.webkit.org/export/158483/trunk/WebKitLibraries/
description minimalistic headless WebKit
long_description \
@@ -27,13 +28,24 @@
usages.
use_zip yes
+
distname ${name}-${version}-source
+distfiles ${distname}${extract.suffix} \
+ libWebKitSystemInterfaceMavericks.a
+
worksrcdir ${name}-${version}
-checksums rmd160 483e8ab7bf4a1dd849be2d8ab91c61987c0f0707 \
- sha256 5755bb5b0942b018a41003b4b8be740b9356948f437617d933b8b8b9a8f339e1
+checksums ${distname}${extract.suffix} \
+ rmd160 483e8ab7bf4a1dd849be2d8ab91c61987c0f0707 \
+ sha256 5755bb5b0942b018a41003b4b8be740b9356948f437617d933b8b8b9a8f339e1 \
+ libWebKitSystemInterfaceMavericks.a \
+ rmd160 b99bb61b3c433811ffa0ce68cf92ce4d51eef433 \
+ sha256 d5026704ae94ba6b2d6574aa35e61c83de8e2c256df1b95e4abb3495dca8f5f7
-patchfiles patch-build.diff
+patchfiles patch-build.diff \
+ patch-QtWebKit.pro.diff \
+ patch-qglobal.h.diff \
+ patch-qt_cocoa_helpers_mac_p.h.diff
use_configure no
@@ -42,6 +54,14 @@
build.args --confirm \
--jobs ${build.jobs}
+extract {
+ system "unzip -q ${distpath}/${distname}${extract.suffix} -d ${workpath}"
+ platform darwin 13 {
+ copy ${distpath}/libWebKitSystemInterfaceMavericks.a \
+ ${worksrcpath}/src/qt/src/3rdparty/webkit/WebKitLibraries
+ }
+}
+
destroot {
set docdir ${prefix}/share/doc/${name}
xinstall -d ${destroot}${docdir}
Added: trunk/dports/www/phantomjs/files/patch-QtWebKit.pro.diff
===================================================================
--- trunk/dports/www/phantomjs/files/patch-QtWebKit.pro.diff (rev 0)
+++ trunk/dports/www/phantomjs/files/patch-QtWebKit.pro.diff 2013-11-03 06:54:13 UTC (rev 112873)
@@ -0,0 +1,11 @@
+--- src/qt/src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro.orig 2013-06-07 07:16:58.000000000 +0200
++++ src/qt/src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro 2013-10-30 10:10:17.000000000 +0100
+@@ -278,6 +278,8 @@
+ LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceLion.a
+ } else: equals(DARWIN_MAJOR_VERSION, "12") | contains(QMAKE_MAC_SDK, "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk") {
+ LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceMountainLion.a
++ } else: equals(DARWIN_MAJOR_VERSION, "13") | contains(QMAKE_MAC_SDK, "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk") {
++ LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceMavericks.a
+ }
+ }
+ }
Added: trunk/dports/www/phantomjs/files/patch-qglobal.h.diff
===================================================================
--- trunk/dports/www/phantomjs/files/patch-qglobal.h.diff (rev 0)
+++ trunk/dports/www/phantomjs/files/patch-qglobal.h.diff 2013-11-03 06:54:13 UTC (rev 112873)
@@ -0,0 +1,14 @@
+--- src/qt/src/corelib/global/qglobal.h.orig 2013-06-07 07:16:52.000000000 +0200
++++ src/qt/src/corelib/global/qglobal.h 2013-10-27 14:05:22.000000000 +0100
+@@ -327,7 +327,10 @@
+ # if !defined(MAC_OS_X_VERSION_10_8)
+ # define MAC_OS_X_VERSION_10_8 MAC_OS_X_VERSION_10_7 + 1
+ # endif
+-# if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_8)
++# if !defined(MAC_OS_X_VERSION_10_9)
++# define MAC_OS_X_VERSION_10_9 MAC_OS_X_VERSION_10_8 + 1
++# endif
++# if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_9)
+ # warning "This version of Mac OS X is unsupported"
+ # endif
+ #endif
Added: trunk/dports/www/phantomjs/files/patch-qt_cocoa_helpers_mac_p.h.diff
===================================================================
--- trunk/dports/www/phantomjs/files/patch-qt_cocoa_helpers_mac_p.h.diff (rev 0)
+++ trunk/dports/www/phantomjs/files/patch-qt_cocoa_helpers_mac_p.h.diff 2013-11-03 06:54:13 UTC (rev 112873)
@@ -0,0 +1,11 @@
+--- src/qt/src/gui/kernel/qt_cocoa_helpers_mac_p.h.orig 2013-09-05 23:36:02.000000000 -0400
++++ src/qt/src/gui/kernel/qt_cocoa_helpers_mac_p.h 2013-11-03 00:48:49.000000000 -0400
+@@ -155,7 +155,7 @@
+ void qt_dispatchModifiersChanged(void * /*NSEvent * */flagsChangedEvent, QWidget *widgetToGetEvent);
+ bool qt_mac_handleTabletEvent(void * /*QCocoaView * */view, void * /*NSEvent * */event);
+ inline QApplication *qAppInstance() { return static_cast<QApplication *>(QCoreApplication::instance()); }
+-struct ::TabletProximityRec;
++struct TabletProximityRec;
+ void qt_dispatchTabletProximityEvent(const ::TabletProximityRec &proxRec);
+ Qt::KeyboardModifiers qt_cocoaModifiers2QtModifiers(ulong modifierFlags);
+ Qt::KeyboardModifiers qt_cocoaDragOperation2QtModifiers(uint dragOperations);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131102/8be520b8/attachment.html>
More information about the macports-changes
mailing list