[88719] trunk/dports/www/QupZilla

[ryandesign at macports.org]

Revision: 88719
          http://trac.macports.org/changeset/88719
Author:   ryandesign at macports.org
Date:     2012-01-09 12:20:18 -0800 (Mon, 09 Jan 2012)
Log Message:
-----------
QupZilla: update to 1.1.5

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

Added Paths:
-----------
    trunk/dports/www/QupZilla/files/patch-autoquit.diff

Removed Paths:
-------------
    trunk/dports/www/QupZilla/files/patch-src-app-commandlineoptions.cpp.diff
    trunk/dports/www/QupZilla/files/patch-src-src.pro.diff

Modified: trunk/dports/www/QupZilla/Portfile
===================================================================
--- trunk/dports/www/QupZilla/Portfile	2012-01-09 20:05:39 UTC (rev 88718)
+++ trunk/dports/www/QupZilla/Portfile	2012-01-09 20:20:18 UTC (rev 88719)
@@ -5,8 +5,7 @@
 PortGroup           qt4 1.0
 
 name                QupZilla
-version             1.1.0
-revision            3
+version             1.1.5
 categories          www
 platforms           darwin
 maintainers         ryandesign openmaintainer
@@ -23,17 +22,14 @@
 homepage            http://www.qupzilla.com/
 master_sites        https://github.com/nowrep/QupZilla/tarball/v${version}
 
-checksums           rmd160  92b481d1dacc3a572a29a2e2cdc07245f52c257a \
-                    sha256  5dfa45dbcf3c93fdaa461f64be70132464eda3886600db9a2067afad53113432
+checksums           rmd160  ec0fd37d1530ac2f7d3b4cdd19a701877b1415ae \
+                    sha256  cd4da034b46e05505b023c0316cb684714c8304576629d9bf982aa230046cc43
 
-depends_build-append port:makeicns
-
 post-extract {
     move [glob ${workpath}/*] ${worksrcpath}
 }
 
-patchfiles          patch-src-app-commandlineoptions.cpp.diff \
-                    patch-src-src.pro.diff
+patchfiles          patch-autoquit.diff
 
 configure.cmd       ${prefix}/bin/qmake
 configure.pre_args
@@ -41,10 +37,6 @@
 
 variant universal {}
 
-pre-build {
-    system -W ${worksrcpath} "${prefix}/bin/makeicns -256 linux/hicolor/256x256/qupzilla.png -128 linux/hicolor/128x128/qupzilla.png -32 linux/hicolor/32x32/qupzilla.png -16 linux/hicolor/16x16/qupzilla.png -out src/qupzilla.icns"
-}
-
 build.args          CC="${configure.cc} [get_canonical_archflags cc]" \
                     CXX="${configure.cxx} [get_canonical_archflags cxx]" \
                     LINK="${configure.cxx} [get_canonical_archflags cxx]" \

Added: trunk/dports/www/QupZilla/files/patch-autoquit.diff
===================================================================
--- trunk/dports/www/QupZilla/files/patch-autoquit.diff	                        (rev 0)
+++ trunk/dports/www/QupZilla/files/patch-autoquit.diff	2012-01-09 20:20:18 UTC (rev 88719)
@@ -0,0 +1,30 @@
+Undo the fix for https://github.com/nowrep/QupZilla/issues/129 which doesn't work right yet
+--- src/app/mainapplication.cpp.orig	2012-01-07 05:43:18.000000000 -0600
++++ src/app/mainapplication.cpp	2012-01-09 14:10:34.000000000 -0600
+@@ -152,11 +152,7 @@
+ 
+     connect(this, SIGNAL(messageReceived(QString)), this, SLOT(receiveAppMessage(QString)));
+ 
+-#ifdef Q_WS_MAC
+-    setQuitOnLastWindowClosed(false);
+-#else
+     setQuitOnLastWindowClosed(true);
+-#endif
+ 
+     setApplicationName("QupZilla");
+     setApplicationVersion(QupZilla::VERSION);
+--- src/app/qupzilla.cpp.orig	2012-01-07 05:43:18.000000000 -0600
++++ src/app/qupzilla.cpp	2012-01-09 14:10:01.000000000 -0600
+@@ -1442,12 +1442,10 @@
+     mApp->saveStateSlot();
+     mApp->aboutToCloseWindow(this);
+ 
+-#ifndef Q_WS_MAC
+     if (mApp->windowCount() == 0) {
+         quitApp() ? event->accept() : event->ignore();
+         return;
+     }
+-#endif
+ 
+     event->accept();
+ }

Deleted: trunk/dports/www/QupZilla/files/patch-src-app-commandlineoptions.cpp.diff
===================================================================
--- trunk/dports/www/QupZilla/files/patch-src-app-commandlineoptions.cpp.diff	2012-01-09 20:05:39 UTC (rev 88718)
+++ trunk/dports/www/QupZilla/files/patch-src-app-commandlineoptions.cpp.diff	2012-01-09 20:20:18 UTC (rev 88719)
@@ -1,14 +0,0 @@
---- src/app/commandlineoptions.cpp.orig	2011-12-14 11:09:43.000000000 -0600
-+++ src/app/commandlineoptions.cpp	2012-01-04 17:26:20.000000000 -0600
-@@ -131,6 +131,11 @@
-             pair.text = "";
-             m_actions.append(pair);
-         }
-+
-+        if (arg.startsWith("-psn_")) {
-+            // The OS X process serial number, which we don't need, but which OS X will pass us anyway
-+            found = true;
-+        }
-     }
- 
-     QString url(m_argv[m_argc - 1]);

Deleted: trunk/dports/www/QupZilla/files/patch-src-src.pro.diff
===================================================================
--- trunk/dports/www/QupZilla/files/patch-src-src.pro.diff	2012-01-09 20:05:39 UTC (rev 88718)
+++ trunk/dports/www/QupZilla/files/patch-src-src.pro.diff	2012-01-09 20:20:18 UTC (rev 88719)
@@ -1,7 +0,0 @@
---- src/src.pro.orig	2011-12-14 11:09:43.000000000 -0600
-+++ src/src.pro	2012-01-03 20:53:55.000000000 -0600
-@@ -418,3 +418,4 @@
- message($$DEFINES)
- 
- 
-+macx:ICON = qupzilla.icns
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120109/01ec2cca/attachment.html>