[119212] trunk/dports/www/QupZilla

[ryandesign at macports.org]

Revision: 119212
          https://trac.macports.org/changeset/119212
Author:   ryandesign at macports.org
Date:     2014-04-20 11:41:19 -0700 (Sun, 20 Apr 2014)
Log Message:
-----------
QupZilla: update to 1.6.5

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

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

Modified: trunk/dports/www/QupZilla/Portfile
===================================================================
--- trunk/dports/www/QupZilla/Portfile	2014-04-20 18:40:40 UTC (rev 119211)
+++ trunk/dports/www/QupZilla/Portfile	2014-04-20 18:41:19 UTC (rev 119212)
@@ -5,8 +5,7 @@
 PortGroup           github 1.0
 PortGroup           qt4 1.0
 
-github.setup        QupZilla qupzilla 1.6.4 v
-revision            1
+github.setup        QupZilla qupzilla 1.6.5 v
 name                QupZilla
 categories          www
 platforms           darwin
@@ -23,13 +22,10 @@
 
 homepage            http://www.qupzilla.com/
 
-checksums           rmd160  2f28f4c2aeea94fc89c06a358b2638139a38dba2 \
-                    sha256  915148b277a49aebff4265121398a107d097a9ed44a9c8a293454ca66aff6b59
+checksums           rmd160  71ad4482f520c400298749f92aad699e9f85efc7 \
+                    sha256  98d27d4f45ed11db4ca388d4573036c268c787804c33dc540882b18232649903
 
 patchfiles          patch-mac-macdeploy.sh.diff
-patchfiles-append   patch-src-lib-3rdparty-processinfo.diff
-patchfiles-append   patch-src-lib-app-mainapplication.cpp.diff
-patchfiles-append   patch-src-lib-tools-combotabbar.cpp.diff
 
 configure.cmd       ${prefix}/bin/qmake
 configure.pre_args

Deleted: trunk/dports/www/QupZilla/files/patch-src-lib-3rdparty-processinfo.diff
===================================================================
--- trunk/dports/www/QupZilla/files/patch-src-lib-3rdparty-processinfo.diff	2014-04-20 18:40:40 UTC (rev 119211)
+++ trunk/dports/www/QupZilla/files/patch-src-lib-3rdparty-processinfo.diff	2014-04-20 18:41:19 UTC (rev 119212)
@@ -1,43 +0,0 @@
-Fix build error: error: unknown type name 'pid_t'
-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;

Deleted: trunk/dports/www/QupZilla/files/patch-src-lib-app-mainapplication.cpp.diff
===================================================================
--- trunk/dports/www/QupZilla/files/patch-src-lib-app-mainapplication.cpp.diff	2014-04-20 18:40:40 UTC (rev 119211)
+++ trunk/dports/www/QupZilla/files/patch-src-lib-app-mainapplication.cpp.diff	2014-04-20 18:41:19 UTC (rev 119212)
@@ -1,14 +0,0 @@
-Fix build failure: error: type 'QString' does not provide a call operator
-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

Deleted: trunk/dports/www/QupZilla/files/patch-src-lib-tools-combotabbar.cpp.diff
===================================================================
--- trunk/dports/www/QupZilla/files/patch-src-lib-tools-combotabbar.cpp.diff	2014-04-20 18:40:40 UTC (rev 119211)
+++ trunk/dports/www/QupZilla/files/patch-src-lib-tools-combotabbar.cpp.diff	2014-04-20 18:41:19 UTC (rev 119212)
@@ -1,20 +0,0 @@
-Fix crash on launch
-https://github.com/QupZilla/qupzilla/issues/1294#issuecomment-40409042
---- src/lib/tools/combotabbar.cpp.orig
-+++ src/lib/tools/combotabbar.cpp
-@@ -615,6 +615,7 @@ void ComboTabBar::paintEvent(QPaintEvent* ev)
- {
-     QWidget::paintEvent(ev);
-
-+#ifndef Q_OS_MAC
-     // Draw tabbar base even on parts of ComboTabBar that are not directly QTabBar
-     QPainter p(this);
-     QStyleOptionTabBarBaseV2 opt;
-@@ -643,6 +644,7 @@ void ComboTabBar::paintEvent(QPaintEvent* ev)
-         opt.rect.setWidth(scrollButtonWidth);
-         style()->drawPrimitive(QStyle::PE_FrameTabBarBase, &opt, &p);
-     }
-+#endif
- }
-
- int ComboTabBar::comboTabBarPixelMetric(ComboTabBar::SizeType sizeType) const
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140420/1f59d4b0/attachment-0001.html>