From 4036bbd94d3e91500678e1c82f253ed6e7abefe4 Mon Sep 17 00:00:00 2001 From: Calvin Hill Date: Wed, 25 Oct 2017 10:08:40 +0100 Subject: [PATCH] zeal: bump version (#1738) --- ...eal-0.3.1.patchset => zeal-0.4.0.patchset} | 56 +++++++++++-------- .../{zeal-0.3.1.recipe => zeal-0.4.0.recipe} | 26 ++++++--- 2 files changed, 51 insertions(+), 31 deletions(-) rename app-doc/zeal/patches/{zeal-0.3.1.patchset => zeal-0.4.0.patchset} (71%) mode change 100644 => 100755 rename app-doc/zeal/{zeal-0.3.1.recipe => zeal-0.4.0.recipe} (63%) diff --git a/app-doc/zeal/patches/zeal-0.3.1.patchset b/app-doc/zeal/patches/zeal-0.4.0.patchset old mode 100644 new mode 100755 similarity index 71% rename from app-doc/zeal/patches/zeal-0.3.1.patchset rename to app-doc/zeal/patches/zeal-0.4.0.patchset index c60356108..5c3136c1c --- a/app-doc/zeal/patches/zeal-0.3.1.patchset +++ b/app-doc/zeal/patches/zeal-0.4.0.patchset @@ -1,17 +1,31 @@ -From 0ad02f549ecf15428bfeb1f3ed1b0cdb14a6922c Mon Sep 17 00:00:00 2001 +From de0320e4d35afc0a3c8245f02553df8dc609649d Mon Sep 17 00:00:00 2001 From: Calvin Hill -Date: Wed, 22 Feb 2017 20:13:41 +0000 -Subject: [PATCH] Disable global shortcuts for haiku support +Date: Tue, 24 Oct 2017 19:15:13 +0000 +Subject: [PATCH] Disable keyboard shortcuts for Haiku. --- + src/libs/core/settings.cpp | 2 +- src/libs/ui/mainwindow.cpp | 15 ++++++++------- src/libs/ui/mainwindow.h | 4 ++-- src/libs/ui/qxtglobalshortcut/qxtglobalshortcut.pri | 2 +- src/libs/ui/ui.pri | 5 ++--- - 4 files changed, 13 insertions(+), 13 deletions(-) + 5 files changed, 14 insertions(+), 14 deletions(-) +diff --git a/src/libs/core/settings.cpp b/src/libs/core/settings.cpp +index d62bd73..e460fba 100644 +--- a/src/libs/core/settings.cpp ++++ b/src/libs/core/settings.cpp +@@ -106,7 +106,7 @@ void Settings::load() + docsetPath = settings->value(QStringLiteral("path")).toString(); + } else { + #ifndef PORTABLE_BUILD +- docsetPath = QStandardPaths::writableLocation(QStandardPaths::DataLocation) ++ docsetPath = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + + QLatin1String("/docsets"); + #else + docsetPath = QCoreApplication::applicationDirPath() + QLatin1String("/docsets"); diff --git a/src/libs/ui/mainwindow.cpp b/src/libs/ui/mainwindow.cpp -index d7766c6..a2f8c50 100644 +index b970a0f..0e714ef 100644 --- a/src/libs/ui/mainwindow.cpp +++ b/src/libs/ui/mainwindow.cpp @@ -28,7 +28,8 @@ @@ -24,7 +38,7 @@ index d7766c6..a2f8c50 100644 #include #include -@@ -179,7 +180,7 @@ MainWindow::MainWindow(Core::Application *app, QWidget *parent) : +@@ -157,13 +158,13 @@ MainWindow::MainWindow(Core::Application *app, QWidget *parent) : m_application(app), m_settings(app->settings()), m_zealListModel(new Registry::ListModel(app->docsetRegistry(), this)), @@ -33,8 +47,6 @@ index d7766c6..a2f8c50 100644 m_openDocsetTimer(new QTimer(this)) { ui->setupUi(this); -@@ -194,7 +195,7 @@ MainWindow::MainWindow(Core::Application *app, QWidget *parent) : - createTrayIcon(); // initialise key grabber - connect(m_globalShortcut, &QxtGlobalShortcut::activated, this, &MainWindow::toggleWindow); @@ -42,7 +54,7 @@ index d7766c6..a2f8c50 100644 setupTabBar(); -@@ -223,10 +224,10 @@ MainWindow::MainWindow(Core::Application *app, QWidget *parent) : +@@ -192,10 +193,10 @@ MainWindow::MainWindow(Core::Application *app, QWidget *parent) : connect(ui->actionFind, &QAction::triggered, ui->webView, &SearchableWebView::showSearchBar); connect(ui->actionPreferences, &QAction::triggered, [this]() { @@ -55,7 +67,7 @@ index d7766c6..a2f8c50 100644 }); ui->actionBack->setShortcut(QKeySequence::Back); -@@ -899,7 +900,7 @@ void MainWindow::keyPressEvent(QKeyEvent *keyEvent) +@@ -797,7 +798,7 @@ void MainWindow::keyPressEvent(QKeyEvent *keyEvent) void MainWindow::applySettings() { @@ -64,7 +76,7 @@ index d7766c6..a2f8c50 100644 if (m_settings->showSystrayIcon) createTrayIcon(); -@@ -909,7 +910,7 @@ void MainWindow::applySettings() +@@ -833,7 +834,7 @@ void MainWindow::applySettings() void MainWindow::toggleWindow() { @@ -72,23 +84,23 @@ index d7766c6..a2f8c50 100644 + const bool checkActive = sender(); //== m_globalShortcut; if (!isVisible() || (checkActive && !isActiveWindow())) { - #ifdef USE_APPINDICATOR + bringToFront(); diff --git a/src/libs/ui/mainwindow.h b/src/libs/ui/mainwindow.h -index 7d886d7..81f6c09 100644 +index 13d453f..df07674 100644 --- a/src/libs/ui/mainwindow.h +++ b/src/libs/ui/mainwindow.h -@@ -34,7 +34,7 @@ struct _AppIndicator; - struct _GtkWidget; - #endif +@@ -28,7 +28,7 @@ + + #include -class QxtGlobalShortcut; +//class QxtGlobalShortcut; class QModelIndex; class QSystemTrayIcon; -@@ -116,7 +116,7 @@ private: - - Zeal::Registry::CancellationToken m_cancelSearch; +@@ -105,7 +105,7 @@ private: + QMenu *m_backMenu = nullptr; + QMenu *m_forwardMenu = nullptr; - QxtGlobalShortcut *m_globalShortcut = nullptr; +// QxtGlobalShortcut *m_globalShortcut = nullptr; @@ -108,11 +120,11 @@ index d4c3e3c..7ce3d36 100644 win32:SOURCES += $$PWD/qxtglobalshortcut_win.cpp macx:SOURCES += $$PWD/qxtglobalshortcut_mac.cpp diff --git a/src/libs/ui/ui.pri b/src/libs/ui/ui.pri -index ca5169d..db95b89 100644 +index c38640d..a327f32 100644 --- a/src/libs/ui/ui.pri +++ b/src/libs/ui/ui.pri @@ -3,13 +3,12 @@ ZEAL_LIB_NAME = Ui - QT += widgets + QT += webkitwidgets # QxtGlobalShortcut dependencies -unix:!macx { @@ -128,5 +140,5 @@ index ca5169d..db95b89 100644 LIBS += -framework Carbon } -- -2.11.0 +2.14.2 diff --git a/app-doc/zeal/zeal-0.3.1.recipe b/app-doc/zeal/zeal-0.4.0.recipe similarity index 63% rename from app-doc/zeal/zeal-0.3.1.recipe rename to app-doc/zeal/zeal-0.4.0.recipe index 95e70897b..5a12b6f49 100644 --- a/app-doc/zeal/zeal-0.3.1.recipe +++ b/app-doc/zeal/zeal-0.4.0.recipe @@ -2,41 +2,49 @@ SUMMARY="A simple offline documentation browser inspired by Dash" DESCRIPTION="Zeal is a cross-platform, open source, offline \ documentation browser for software developers, inspired by Dash Docs \ for macOS and iOS. Zeal has over 195+ docsets and are all compatible \ -with Dash docsets. " +with Dash docsets." HOMEPAGE="https://zealdocs.org" COPYRIGHT="2013, 2017 Oleg Shparber" LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="https://github.com/zealdocs/zeal/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="55f8511977818612e00ae87a4fddaa346210189531469690f2e3961bb4c2c318" +CHECKSUM_SHA256="1f6b50026036923ae0cfbf3f4eb1066ee2fdaf0425d4c321203e0dd9506823fd" PATCHES="zeal-$portVersion.patchset" -ARCHITECTURES="!x86_gcc2 x86 ?x86_64" +ARCHITECTURES="!x86_gcc2 ?x86 x86_64" SECONDARY_ARCHITECTURES="?x86" PROVIDES=" zeal$secondaryArchSuffix = $portVersion - app:Zeal$secondaryArchSuffix = $portVersion + app:Zeal = $portVersion " REQUIRES=" haiku$secondaryArchSuffix - qt5$secondaryArchSuffix >= 5.5.1 lib:libarchive$secondaryArchSuffix + lib:libGL$secondaryArchSuffix + lib:libQt5Core$secondaryArchSuffix + lib:libQt5Gui$secondaryArchSuffix + lib:libQt5Network$secondaryArchSuffix + lib:libQt5WebKit$secondaryArchSuffix + lib:libsqlite3$secondaryArchSuffix lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - qt5${secondaryArchSuffix}_devel >= 5.5.1 devel:libarchive$secondaryArchSuffix + devel:libQt5Core$secondaryArchSuffix + devel:libQt5Gui$secondaryArchSuffix + devel:libQt5Network$secondaryArchSuffix + devel:libQt5WebKit$secondaryArchSuffix + devel:libsqlite3$secondaryArchSuffix devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" - cmd:gcc$secondaryArchSuffix cmd:g++$secondaryArchSuffix - cmd:ld + cmd:ld$secondaryArchSuffix cmd:make - cmd:qmake$secondaryArchSuffix >= 5.5.1 + cmd:qmake$secondaryArchSuffix >= 5 cmd:pkg_config$secondaryArchSuffix "