<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[118991] trunk/dports/www/QupZilla</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/118991">118991</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2014-04-14 12:34:54 -0700 (Mon, 14 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>QupZilla: update to 1.6.4</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportswwwQupZillaPortfile">trunk/dports/www/QupZilla/Portfile</a></li>
<li><a href="#trunkdportswwwQupZillafilespatchmacmacdeployshdiff">trunk/dports/www/QupZilla/files/patch-mac-macdeploy.sh.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportswwwQupZillafilespatchsrclib3rdpartyprocessinfodiff">trunk/dports/www/QupZilla/files/patch-src-lib-3rdparty-processinfo.diff</a></li>
<li><a href="#trunkdportswwwQupZillafilespatchsrclibappmainapplicationcppdiff">trunk/dports/www/QupZilla/files/patch-src-lib-app-mainapplication.cpp.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportswwwQupZillaPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/QupZilla/Portfile (118990 => 118991)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> PortGroup github 1.0
</span><span class="cx"> PortGroup qt4 1.0
</span><span class="cx">
</span><del>-github.setup QupZilla qupzilla 1.6.3 v
</del><ins>+github.setup QupZilla qupzilla 1.6.4 v
</ins><span class="cx"> name QupZilla
</span><span class="cx"> categories www
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -22,10 +22,12 @@
</span><span class="cx">
</span><span class="cx"> homepage http://www.qupzilla.com/
</span><span class="cx">
</span><del>-checksums rmd160 a3d1186d3e226d01bb69b3a81094808117e5b235 \
- sha256 5e872a2bf9df7dafb406d43a3d06185738c4128278695eb38013de04dae063a3
</del><ins>+checksums rmd160 2f28f4c2aeea94fc89c06a358b2638139a38dba2 \
+ sha256 915148b277a49aebff4265121398a107d097a9ed44a9c8a293454ca66aff6b59
</ins><span class="cx">
</span><span class="cx"> patchfiles patch-mac-macdeploy.sh.diff
</span><ins>+patchfiles-append patch-src-lib-3rdparty-processinfo.diff
+patchfiles-append patch-src-lib-app-mainapplication.cpp.diff
</ins><span class="cx">
</span><span class="cx"> configure.cmd ${prefix}/bin/qmake
</span><span class="cx"> configure.pre_args
</span></span></pre></div>
<a id="trunkdportswwwQupZillafilespatchmacmacdeployshdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/QupZilla/files/patch-mac-macdeploy.sh.diff (118990 => 118991)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,9 +1,10 @@
</span><del>---- 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 @@
</del><ins>+--- 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 @@
</ins><span class="cx"> # run macdeployqt
</span><span class="cx"> $MACDEPLOYQT QupZilla.app
</span><span class="cx">
</span><span class="cx"> -# create final dmg image
</span><ins>+-cd ../scripts
</ins><span class="cx"> -./create_dmg.sh
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportswwwQupZillafilespatchsrclib3rdpartyprocessinfodiff"></a>
<div class="addfile"><h4>Added: trunk/dports/www/QupZilla/files/patch-src-lib-3rdparty-processinfo.diff (0 => 118991)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+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;
</ins></span></pre></div>
<a id="trunkdportswwwQupZillafilespatchsrclibappmainapplicationcppdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/www/QupZilla/files/patch-src-lib-app-mainapplication.cpp.diff (0 => 118991)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+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
</ins></span></pre>
</div>
</div>
</body>
</html>