[118994] trunk/dports/www/QupZilla
ryandesign at macports.org
ryandesign at macports.org
Mon Apr 14 13:18:26 PDT 2014
Revision: 118994
https://trac.macports.org/changeset/118994
Author: ryandesign at macports.org
Date: 2014-04-14 13:18:26 -0700 (Mon, 14 Apr 2014)
Log Message:
-----------
QupZilla: fix crash on launch
Modified Paths:
--------------
trunk/dports/www/QupZilla/Portfile
trunk/dports/www/QupZilla/files/patch-src-lib-3rdparty-processinfo.diff
trunk/dports/www/QupZilla/files/patch-src-lib-app-mainapplication.cpp.diff
Added Paths:
-----------
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-14 20:14:02 UTC (rev 118993)
+++ trunk/dports/www/QupZilla/Portfile 2014-04-14 20:18:26 UTC (rev 118994)
@@ -6,6 +6,7 @@
PortGroup qt4 1.0
github.setup QupZilla qupzilla 1.6.4 v
+revision 1
name QupZilla
categories www
platforms darwin
@@ -28,6 +29,7 @@
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
Modified: trunk/dports/www/QupZilla/files/patch-src-lib-3rdparty-processinfo.diff
===================================================================
--- trunk/dports/www/QupZilla/files/patch-src-lib-3rdparty-processinfo.diff 2014-04-14 20:14:02 UTC (rev 118993)
+++ trunk/dports/www/QupZilla/files/patch-src-lib-3rdparty-processinfo.diff 2014-04-14 20:18:26 UTC (rev 118994)
@@ -1,3 +1,4 @@
+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
Modified: 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-14 20:14:02 UTC (rev 118993)
+++ trunk/dports/www/QupZilla/files/patch-src-lib-app-mainapplication.cpp.diff 2014-04-14 20:18:26 UTC (rev 118994)
@@ -1,3 +1,4 @@
+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
Added: trunk/dports/www/QupZilla/files/patch-src-lib-tools-combotabbar.cpp.diff
===================================================================
--- trunk/dports/www/QupZilla/files/patch-src-lib-tools-combotabbar.cpp.diff (rev 0)
+++ trunk/dports/www/QupZilla/files/patch-src-lib-tools-combotabbar.cpp.diff 2014-04-14 20:18:26 UTC (rev 118994)
@@ -0,0 +1,20 @@
+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/20140414/60a4ece4/attachment-0001.html>
More information about the macports-changes
mailing list