[118991] trunk/dports/www/QupZilla

[ryandesign at macports.org]

Revision: 118991
          https://trac.macports.org/changeset/118991
Author:   ryandesign at macports.org
Date:     2014-04-14 12:34:54 -0700 (Mon, 14 Apr 2014)
Log Message:
-----------
QupZilla: update to 1.6.4

Modified Paths:
--------------
    trunk/dports/www/QupZilla/Portfile
    trunk/dports/www/QupZilla/files/patch-mac-macdeploy.sh.diff

Added Paths:
-----------
    trunk/dports/www/QupZilla/files/patch-src-lib-3rdparty-processinfo.diff
    trunk/dports/www/QupZilla/files/patch-src-lib-app-mainapplication.cpp.diff

Modified: trunk/dports/www/QupZilla/Portfile
===================================================================
--- trunk/dports/www/QupZilla/Portfile	2014-04-14 19:30:30 UTC (rev 118990)
+++ trunk/dports/www/QupZilla/Portfile	2014-04-14 19:34:54 UTC (rev 118991)
@@ -5,7 +5,7 @@
 PortGroup           github 1.0
 PortGroup           qt4 1.0
 
-github.setup        QupZilla qupzilla 1.6.3 v
+github.setup        QupZilla qupzilla 1.6.4 v
 name                QupZilla
 categories          www
 platforms           darwin
@@ -22,10 +22,12 @@
 
 homepage            http://www.qupzilla.com/
 
-checksums           rmd160  a3d1186d3e226d01bb69b3a81094808117e5b235 \
-                    sha256  5e872a2bf9df7dafb406d43a3d06185738c4128278695eb38013de04dae063a3
+checksums           rmd160  2f28f4c2aeea94fc89c06a358b2638139a38dba2 \
+                    sha256  915148b277a49aebff4265121398a107d097a9ed44a9c8a293454ca66aff6b59
 
 patchfiles          patch-mac-macdeploy.sh.diff
+patchfiles-append   patch-src-lib-3rdparty-processinfo.diff
+patchfiles-append   patch-src-lib-app-mainapplication.cpp.diff
 
 configure.cmd       ${prefix}/bin/qmake
 configure.pre_args

Modified: trunk/dports/www/QupZilla/files/patch-mac-macdeploy.sh.diff
===================================================================
--- trunk/dports/www/QupZilla/files/patch-mac-macdeploy.sh.diff	2014-04-14 19:30:30 UTC (rev 118990)
+++ trunk/dports/www/QupZilla/files/patch-mac-macdeploy.sh.diff	2014-04-14 19:34:54 UTC (rev 118991)
@@ -1,9 +1,10 @@
---- mac/macdeploy.sh.orig	2014-02-14 04:42:43.000000000 -0600
-+++ mac/macdeploy.sh	2014-02-14 16:24:39.000000000 -0600
-@@ -35,6 +35,4 @@
+--- mac/macdeploy.sh.orig	2014-04-14 05:10:24.000000000 -0500
++++ mac/macdeploy.sh	2014-04-14 12:51:30.000000000 -0500
+@@ -35,7 +35,4 @@
  # run macdeployqt
  $MACDEPLOYQT QupZilla.app
  
 -# create final dmg image
+-cd ../scripts
 -./create_dmg.sh
  

Added: trunk/dports/www/QupZilla/files/patch-src-lib-3rdparty-processinfo.diff
===================================================================
--- trunk/dports/www/QupZilla/files/patch-src-lib-3rdparty-processinfo.diff	                        (rev 0)
+++ trunk/dports/www/QupZilla/files/patch-src-lib-3rdparty-processinfo.diff	2014-04-14 19:34:54 UTC (rev 118991)
@@ -0,0 +1,42 @@
+https://github.com/QupZilla/qupzilla/issues/1294
+https://github.com/QupZilla/qupzilla/commit/ae527bf591eb0b4f882e3799c3f97b8f19e34bb2.diff
+--- src/lib/3rdparty/processinfo.cpp.orig
++++ src/lib/3rdparty/processinfo.cpp
+@@ -17,7 +17,7 @@
+ * ============================================================ */
+ #include "processinfo.h"
+ 
+-#ifdef Q_OS_UNIX
++#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
+ #include <dirent.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -36,7 +36,7 @@ ProcessInfo::ProcessInfo(const QString &name)
+ 
+ bool ProcessInfo::isRunning() const
+ {
+-#ifdef Q_OS_UNIX
++#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
+     pid_t pid = GetPIDbyName(qPrintable(m_name));
+     // -1 = process not found
+     // -2 = /proc fs access error
+@@ -46,7 +46,7 @@ bool ProcessInfo::isRunning() const
+ #endif
+ }
+ 
+-#ifdef Q_OS_UNIX
++#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
+ bool ProcessInfo::IsNumeric(const char* ccharptr_CharacterList) const
+ {
+     for (; *ccharptr_CharacterList; ccharptr_CharacterList++) {
+--- src/lib/3rdparty/processinfo.h.orig
++++ src/lib/3rdparty/processinfo.h
+@@ -39,7 +39,7 @@ class QT_QUPZILLA_EXPORT ProcessInfo
+     bool isRunning() const;
+ 
+ private:
+-#ifdef Q_OS_UNIX
++#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
+     bool IsNumeric(const char* ccharptr_CharacterList) const;
+ 
+     pid_t GetPIDbyName(const char* cchrptr_ProcessName) const;

Added: trunk/dports/www/QupZilla/files/patch-src-lib-app-mainapplication.cpp.diff
===================================================================
--- trunk/dports/www/QupZilla/files/patch-src-lib-app-mainapplication.cpp.diff	                        (rev 0)
+++ trunk/dports/www/QupZilla/files/patch-src-lib-app-mainapplication.cpp.diff	2014-04-14 19:34:54 UTC (rev 118991)
@@ -0,0 +1,13 @@
+https://github.com/QupZilla/qupzilla/issues/1293
+https://github.com/QupZilla/qupzilla/commit/ca44302727bc216f102b89de828851deed418978
+--- src/lib/app/mainapplication.cpp.orig
++++ src/lib/app/mainapplication.cpp
+@@ -123,7 +123,7 @@ MainApplication::MainApplication(int &argc, char** argv)
+     setOrganizationDomain("qupzilla");
+ 
+ #ifdef Q_OS_MAC
+-    DATADIR qApp->applicationDirPath() + QLatin1String("/../Resources/");
++    DATADIR = qApp->applicationDirPath() + QLatin1String("/../Resources/");
+ #elif defined(Q_OS_UNIX) && !defined(NO_SYSTEM_DATAPATH)
+     DATADIR = USE_DATADIR "/";
+ #else
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140414/037d1b67/attachment.html>