[126526] trunk/dports/www/QupZilla
ryandesign at macports.org
ryandesign at macports.org
Sat Oct 11 03:38:27 PDT 2014
Revision: 126526
https://trac.macports.org/changeset/126526
Author: ryandesign at macports.org
Date: 2014-10-11 03:38:27 -0700 (Sat, 11 Oct 2014)
Log Message:
-----------
QupZilla: update to 1.8.2
Modified Paths:
--------------
trunk/dports/www/QupZilla/Portfile
Removed Paths:
-------------
trunk/dports/www/QupZilla/files/patch-src-lib-app-browserwindow.cpp.diff
trunk/dports/www/QupZilla/files/patch-src-lib-history-historymenu.cpp.diff
trunk/dports/www/QupZilla/files/patch-src-lib-preferences-preferences.cpp.diff
Modified: trunk/dports/www/QupZilla/Portfile
===================================================================
--- trunk/dports/www/QupZilla/Portfile 2014-10-11 10:27:05 UTC (rev 126525)
+++ trunk/dports/www/QupZilla/Portfile 2014-10-11 10:38:27 UTC (rev 126526)
@@ -5,9 +5,8 @@
PortGroup github 1.0
PortGroup qmake 1.0
-github.setup QupZilla qupzilla 1.8.1 v
+github.setup QupZilla qupzilla 1.8.2 v
name QupZilla
-revision 2
categories www
platforms darwin
maintainers ryandesign openmaintainer
@@ -23,21 +22,13 @@
homepage http://www.qupzilla.com/
-checksums rmd160 64dffd7ffab66c2d2c4a8eb9edec2579f0474106 \
- sha256 2bc31479164b0a2a2d35fc31302542e19d018474702b1bade57190585b583d1c
+checksums rmd160 06f54bc7fad5d202f3fb1fe4b7adc982dd95c446 \
+ sha256 a70c04f7ac3c49be38c429b04a2eedc578214235c62f36dd3ebe4fe371ddc5b3
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-lib-history-historymenu.cpp.diff
-patchfiles-append patch-src-lib-preferences-preferences.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 {
Deleted: trunk/dports/www/QupZilla/files/patch-src-lib-app-browserwindow.cpp.diff
===================================================================
--- trunk/dports/www/QupZilla/files/patch-src-lib-app-browserwindow.cpp.diff 2014-10-11 10:27:05 UTC (rev 126525)
+++ trunk/dports/www/QupZilla/files/patch-src-lib-app-browserwindow.cpp.diff 2014-10-11 10:38:27 UTC (rev 126526)
@@ -1,14 +0,0 @@
-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));
-
Deleted: trunk/dports/www/QupZilla/files/patch-src-lib-history-historymenu.cpp.diff
===================================================================
--- trunk/dports/www/QupZilla/files/patch-src-lib-history-historymenu.cpp.diff 2014-10-11 10:27:05 UTC (rev 126525)
+++ trunk/dports/www/QupZilla/files/patch-src-lib-history-historymenu.cpp.diff 2014-10-11 10:38:27 UTC (rev 126526)
@@ -1,14 +0,0 @@
-Fix crash when clicking History menu with no browser window
-https://github.com/QupZilla/qupzilla/issues/1487
-https://github.com/QupZilla/qupzilla/commit/b6f913dafe2fce92f406ec3f21970df2151bde8d
---- src/lib/history/historymenu.cpp.orig
-+++ src/lib/history/historymenu.cpp
-@@ -81,7 +81,7 @@ void HistoryMenu::showHistoryManager()
- void HistoryMenu::aboutToShow()
- {
- // Set enabled states for Back/Forward actions according to current WebView
-- TabbedWebView* view = m_window->weView();
-+ TabbedWebView* view = m_window ? m_window->weView() : 0;
-
- if (view) {
- actions().at(0)->setEnabled(view->history()->canGoBack());
Deleted: trunk/dports/www/QupZilla/files/patch-src-lib-preferences-preferences.cpp.diff
===================================================================
--- trunk/dports/www/QupZilla/files/patch-src-lib-preferences-preferences.cpp.diff 2014-10-11 10:27:05 UTC (rev 126525)
+++ trunk/dports/www/QupZilla/files/patch-src-lib-preferences-preferences.cpp.diff 2014-10-11 10:38:27 UTC (rev 126526)
@@ -1,41 +0,0 @@
-Fix crash when opening Preferences with no browser window
-https://github.com/QupZilla/qupzilla/issues/1488
-https://github.com/QupZilla/qupzilla/commit/21fb7bff31a5b0d9cad1e4229ff3b03b84a9fefe
---- src/lib/preferences/preferences.cpp.orig
-+++ src/lib/preferences/preferences.cpp
-@@ -265,7 +265,7 @@ Preferences::Preferences(BrowserWindow* window, QWidget* parent)
- bool pbInABuseCC = settings.value("UseCustomProgressColor", false).toBool();
- ui->checkBoxCustomProgressColor->setChecked(pbInABuseCC);
- ui->progressBarColorSelector->setEnabled(pbInABuseCC);
-- QColor pbColor = settings.value("CustomProgressColor", m_window->palette().color(QPalette::Highlight)).value<QColor>();
-+ QColor pbColor = settings.value("CustomProgressColor", palette().color(QPalette::Highlight)).value<QColor>();
- setProgressBarColorIcon(pbColor);
- connect(ui->customColorToolButton, SIGNAL(clicked(bool)), SLOT(selectCustomProgressBarColor()));
- connect(ui->resetProgressBarcolor, SIGNAL(clicked()), SLOT(setProgressBarColorIcon()));
-@@ -592,11 +592,17 @@ void Preferences::allowCacheChanged(bool state)
-
- void Preferences::useActualHomepage()
- {
-+ if (!m_window)
-+ return;
-+
- ui->homepage->setText(m_window->weView()->url().toString());
- }
-
- void Preferences::useActualNewTab()
- {
-+ if (!m_window)
-+ return;
-+
- ui->newTabUrl->setText(m_window->weView()->url().toString());
- }
-
-@@ -1118,7 +1124,7 @@ void Preferences::setProgressBarColorIcon(QColor color)
- const int size = style()->pixelMetric(QStyle::PM_ToolBarIconSize);
- QPixmap pm(QSize(size, size));
- if (!color.isValid()) {
-- color = m_window->palette().color(QPalette::Highlight);
-+ color = palette().color(QPalette::Highlight);
- }
- pm.fill(color);
- ui->customColorToolButton->setIcon(pm);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141011/e241e4f0/attachment.html>
More information about the macports-changes
mailing list