[116608] trunk/dports/www/phantomjs

30 Jan 2014

Revision: 116608
          https://trac.macports.org/changeset/116608
Author:   stromnov@macports.org
Date:     2014-01-30 05:13:55 -0800 (Thu, 30 Jan 2014)
Log Message:
-----------
phantomjs: update to version 1.9.7

Modified Paths:
--------------
    trunk/dports/www/phantomjs/Portfile

Added Paths:
-----------
    trunk/dports/www/phantomjs/files/patch-src_qt_preconfig.sh.diff
    trunk/dports/www/phantomjs/files/patch-src_qt_src_corelib_global_qglobal.h.diff
    trunk/dports/www/phantomjs/files/patch-src_qt_src_gui_kernel_qt_cocoa_helpers_mac_p.h.diff
    trunk/dports/www/phantomjs/files/patch-tools_preconfig.sh.diff

Removed Paths:
-------------
    trunk/dports/www/phantomjs/files/patch-QtWebKit.pro.diff
    trunk/dports/www/phantomjs/files/patch-build.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	2014-01-30 10:31:44 UTC (rev 116607)
+++ trunk/dports/www/phantomjs/Portfile	2014-01-30 13:13:55 UTC (rev 116608)
@@ -5,47 +5,37 @@
 
 name                phantomjs
 
-version             1.9.2
+version             1.9.7
+revision            0
 categories          www
 license             BSD
 platforms           darwin
 maintainers         stromnov openmaintainer
 
 homepage            http://www.phantomjs.org/
-master_sites        googlecode \
-                    http://trac.webkit.org/export/158483/trunk/WebKitLibraries/
+master_sites        https://bitbucket.org/ariya/phantomjs/downloads/
 
-description         minimalistic headless WebKit
-long_description \
-    PhantomJS is a minimalistic headless WebKit. \
-    \
-    It has fast and native support for various web standards: \
-    DOM handling, CSS selector, JSON, Canvas, and SVG. \
-    \
-    PhantomJS can be fully scripted using JavaScript. It is an optimal \
-    solution for headless testing of web-based applications, site \
-    scraping, pages capture, SVG renderer, PDF converter and many other \
-    usages.
+description         PhantomJS is a minimalistic headless WebKit.
 
+long_description    PhantomJS is a headless WebKit scriptable with a \
+                    JavaScript API. It has fast and native support for \
+                    various web standards: DOM handling, CSS selector, \
+                    JSON, Canvas, and SVG.
+
 use_zip             yes
 
 distname            ${name}-${version}-source
-distfiles           ${distname}${extract.suffix} \
-                    libWebKitSystemInterfaceMavericks.a
+distfiles           ${distname}${extract.suffix}
 
 worksrcdir          ${name}-${version}
 
-checksums           ${distname}${extract.suffix} \
-                    rmd160  483e8ab7bf4a1dd849be2d8ab91c61987c0f0707 \
-                    sha256  5755bb5b0942b018a41003b4b8be740b9356948f437617d933b8b8b9a8f339e1 \
-                    libWebKitSystemInterfaceMavericks.a \
-                    rmd160  b99bb61b3c433811ffa0ce68cf92ce4d51eef433 \
-                    sha256  d5026704ae94ba6b2d6574aa35e61c83de8e2c256df1b95e4abb3495dca8f5f7
+checksums           rmd160  2ed98fa736af2b9ed105a70f112ea717219aa805 \
+                    sha256  0f6c50ff24c1c4a8ccd7fedef62feef5e45195c7ba5ef6c84434448544877ff3
 
-patchfiles          patch-build.diff \
-                    patch-QtWebKit.pro.diff \
-                    patch-qglobal.h.diff \
-                    patch-qt_cocoa_helpers_mac_p.h.diff
+patchfiles          patch-tools_preconfig.sh.diff \
+                    patch-src_qt_preconfig.sh.diff \
+                    patch-src_qt_src_corelib_global_qglobal.h.diff \
+                    patch-src_qt_src_gui_kernel_qt_cocoa_helpers_mac_p.h.diff
 
 use_configure       no
 
@@ -54,14 +44,6 @@
 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}
@@ -70,3 +52,7 @@
     xinstall -W ${worksrcpath} ChangeLog README.md ${destroot}${docdir}
     move ${worksrcpath}/examples ${destroot}${docdir}/examples
 }
+
+livecheck.type      regex
+livecheck.url       https://bitbucket.org/ariya/phantomjs/downloads/
+livecheck.regex     {phantomjs-(\d+(?:\.\d+)*)-source\.[tz]}

Deleted: trunk/dports/www/phantomjs/files/patch-QtWebKit.pro.diff
===================================================================
--- trunk/dports/www/phantomjs/files/patch-QtWebKit.pro.diff	2014-01-30 10:31:44 UTC (rev 116607)
+++ trunk/dports/www/phantomjs/files/patch-QtWebKit.pro.diff	2014-01-30 13:13:55 UTC (rev 116608)
@@ -1,11 +0,0 @@
---- 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
-         }
-     }
- }

Deleted: trunk/dports/www/phantomjs/files/patch-build.diff
===================================================================
--- trunk/dports/www/phantomjs/files/patch-build.diff	2014-01-30 10:31:44 UTC (rev 116607)
+++ trunk/dports/www/phantomjs/files/patch-build.diff	2014-01-30 13:13:55 UTC (rev 116608)
@@ -1,20 +0,0 @@
---- src/qt/preconfig.sh.orig	2012-10-24 04:39:11.000000000 -0400
-+++ src/qt/preconfig.sh	2012-10-24 04:39:11.000000000 -0400
-@@ -9,7 +9,6 @@
- QT_CFG+=' -static'
- 
- if [[ $OSTYPE = darwin* ]]; then
--    QT_CFG+=' -arch x86'
-     QT_CFG+=' -cocoa'           # Cocoa only, ignore Carbon
-     QT_CFG+=' -no-dwarf2'
- else
---- tools/preconfig.sh.orig	2012-10-24 04:39:11.000000000 -0400
-+++ tools/preconfig.sh	2012-10-24 04:39:11.000000000 -0400
-@@ -9,7 +9,6 @@
- 
- if [[ $OSTYPE = darwin* ]]; then
-     QT_CFG+=' -static'          # Static build on Mac OS X only
--    QT_CFG+=' -arch x86'
-     QT_CFG+=' -cocoa'           # Cocoa only, ignore Carbon
-     QT_CFG+=' -no-dwarf2'
- else

Deleted: trunk/dports/www/phantomjs/files/patch-qglobal.h.diff
===================================================================
--- trunk/dports/www/phantomjs/files/patch-qglobal.h.diff	2014-01-30 10:31:44 UTC (rev 116607)
+++ trunk/dports/www/phantomjs/files/patch-qglobal.h.diff	2014-01-30 13:13:55 UTC (rev 116608)
@@ -1,14 +0,0 @@
---- 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

Deleted: 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	2014-01-30 10:31:44 UTC (rev 116607)
+++ trunk/dports/www/phantomjs/files/patch-qt_cocoa_helpers_mac_p.h.diff	2014-01-30 13:13:55 UTC (rev 116608)
@@ -1,11 +0,0 @@
---- 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);

Added: trunk/dports/www/phantomjs/files/patch-src_qt_preconfig.sh.diff
===================================================================
--- trunk/dports/www/phantomjs/files/patch-src_qt_preconfig.sh.diff	                        (rev 0)
+++ trunk/dports/www/phantomjs/files/patch-src_qt_preconfig.sh.diff	2014-01-30 13:13:55 UTC (rev 116608)
@@ -0,0 +1,10 @@
+--- src/qt/preconfig.sh.orig	2014-01-30 13:47:51.000000000 +0400
++++ src/qt/preconfig.sh	2014-01-30 13:48:40.000000000 +0400
+@@ -9,7 +9,6 @@
+ QT_CFG+=' -static'
+ 
+ if [[ $OSTYPE = darwin* ]]; then
+-    QT_CFG+=' -arch x86'
+     QT_CFG+=' -cocoa'           # Cocoa only, ignore Carbon
+     QT_CFG+=' -no-dwarf2'
+ else

Added: trunk/dports/www/phantomjs/files/patch-src_qt_src_corelib_global_qglobal.h.diff
===================================================================
--- trunk/dports/www/phantomjs/files/patch-src_qt_src_corelib_global_qglobal.h.diff	                        (rev 0)
+++ trunk/dports/www/phantomjs/files/patch-src_qt_src_corelib_global_qglobal.h.diff	2014-01-30 13:13:55 UTC (rev 116608)
@@ -0,0 +1,14 @@
+--- src/qt/src/corelib/global/qglobal.h.orig	2014-01-24 20:23:52.000000000 +0400
++++ src/qt/src/corelib/global/qglobal.h	2014-01-30 13:52:32.000000000 +0400
+@@ -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

Copied: trunk/dports/www/phantomjs/files/patch-src_qt_src_gui_kernel_qt_cocoa_helpers_mac_p.h.diff (from rev 116507, trunk/dports/www/phantomjs/files/patch-qt_cocoa_helpers_mac_p.h.diff)
===================================================================
--- trunk/dports/www/phantomjs/files/patch-src_qt_src_gui_kernel_qt_cocoa_helpers_mac_p.h.diff	                        (rev 0)
+++ trunk/dports/www/phantomjs/files/patch-src_qt_src_gui_kernel_qt_cocoa_helpers_mac_p.h.diff	2014-01-30 13:13:55 UTC (rev 116608)
@@ -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);

Added: trunk/dports/www/phantomjs/files/patch-tools_preconfig.sh.diff
===================================================================
--- trunk/dports/www/phantomjs/files/patch-tools_preconfig.sh.diff	                        (rev 0)
+++ trunk/dports/www/phantomjs/files/patch-tools_preconfig.sh.diff	2014-01-30 13:13:55 UTC (rev 116608)
@@ -0,0 +1,10 @@
+--- tools/preconfig.sh.orig	2014-01-30 13:49:25.000000000 +0400
++++ tools/preconfig.sh	2014-01-30 13:49:39.000000000 +0400
+@@ -9,7 +9,6 @@
+ 
+ if [[ $OSTYPE = darwin* ]]; then
+     QT_CFG+=' -static'          # Static build on Mac OS X only
+-    QT_CFG+=' -arch x86'
+     QT_CFG+=' -cocoa'           # Cocoa only, ignore Carbon
+     QT_CFG+=' -no-dwarf2'
+ else

    

[116608] trunk/dports/www/phantomjs

stromnov＠macports.org