[126297] trunk/dports/www/QupZilla

[ryandesign at macports.org]

Revision: 126297
          https://trac.macports.org/changeset/126297
Author:   ryandesign at macports.org
Date:     2014-10-07 02:57:08 -0700 (Tue, 07 Oct 2014)
Log Message:
-----------
QupZilla: add dependency on required qt4-mac-sqlite3-plugin plugin; fix crash at startup; add version number to Info.plist

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

Added Paths:
-----------
    trunk/dports/www/QupZilla/files/patch-src-lib-app-browserwindow.cpp.diff
    trunk/dports/www/QupZilla/files/patch-src-main-Info.plist.diff

Modified: trunk/dports/www/QupZilla/Portfile
===================================================================
--- trunk/dports/www/QupZilla/Portfile	2014-10-07 09:19:37 UTC (rev 126296)
+++ trunk/dports/www/QupZilla/Portfile	2014-10-07 09:57:08 UTC (rev 126297)
@@ -7,6 +7,7 @@
 
 github.setup        QupZilla qupzilla 1.8.1 v
 name                QupZilla
+revision            1
 categories          www
 platforms           darwin
 maintainers         ryandesign openmaintainer
@@ -25,8 +26,16 @@
 checksums           rmd160  64dffd7ffab66c2d2c4a8eb9edec2579f0474106 \
                     sha256  2bc31479164b0a2a2d35fc31302542e19d018474702b1bade57190585b583d1c
 
+depends_run-append  port:qt4-mac-sqlite3-plugin
+
 patchfiles          patch-mac-macdeploy.sh.diff
+patchfiles-append   patch-src-lib-app-browserwindow.cpp.diff
+patchfiles-append   patch-src-main-Info.plist.diff
 
+post-patch {
+    reinplace "s/@VERSION@/${version}/g" ${worksrcpath}/src/main/Info.plist
+}
+
 build.args-append   QUPZILLA_PREFIX=${prefix}/
 
 destroot {

Added: trunk/dports/www/QupZilla/files/patch-src-lib-app-browserwindow.cpp.diff
===================================================================
--- trunk/dports/www/QupZilla/files/patch-src-lib-app-browserwindow.cpp.diff	                        (rev 0)
+++ trunk/dports/www/QupZilla/files/patch-src-lib-app-browserwindow.cpp.diff	2014-10-07 09:57:08 UTC (rev 126297)
@@ -0,0 +1,14 @@
+Fix crash on startup
+https://github.com/QupZilla/qupzilla/issues/1485
+https://github.com/QupZilla/qupzilla/commit/6390eb215b28e95419b29b6556091c719f118d71
+--- src/lib/app/browserwindow.cpp.orig
++++ src/lib/app/browserwindow.cpp
+@@ -361,6 +361,8 @@ void BrowserWindow::setupMenu()
+     else {
+         macMainMenu->setWindow(this);
+     }
++
++    m_mainMenu = macMainMenu;
+ #else
+     setMenuBar(new MenuBar(this));
+ 

Added: trunk/dports/www/QupZilla/files/patch-src-main-Info.plist.diff
===================================================================
--- trunk/dports/www/QupZilla/files/patch-src-main-Info.plist.diff	                        (rev 0)
+++ trunk/dports/www/QupZilla/files/patch-src-main-Info.plist.diff	2014-10-07 09:57:08 UTC (rev 126297)
@@ -0,0 +1,16 @@
+Add version number
+https://github.com/QupZilla/qupzilla/issues/1486
+https://github.com/QupZilla/qupzilla/commit/dac236d70b0d1023718227919d949c78d3b78b6e
+--- src/main/Info.plist.orig	2014-10-05 09:27:06.000000000 -0500
++++ src/main/Info.plist	2014-10-07 04:33:21.000000000 -0500
+@@ -7,7 +7,9 @@
+     <key>CFBundlePackageType</key>
+     <string>APPL</string>
+     <key>CFBundleGetInfoString</key>
+-    <string>Created by Qt/QMake</string>
++    <string>@VERSION@</string>
++    <key>CFBundleVersion</key>
++    <string>@VERSION@</string>
+     <key>CFBundleSignature</key>
+     <string>@TYPEINFO@</string>
+     <key>CFBundleExecutable</key>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141007/127ed073/attachment.html>