From a47b9dfa17e777e0ab5e8a27a2bf6501cb45cf5d Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 6 May 2018 00:35:47 +1000 Subject: [PATCH] QupZilla: bump revision --- .../qupzilla/additional-files/qupzilla.rdef | 2 +- .../qupzilla/patches/qupzilla-1.8.9.patchset | 249 ++++++++++++++++-- www-client/qupzilla/qupzilla-1.8.9.recipe | 2 +- 3 files changed, 230 insertions(+), 23 deletions(-) diff --git a/www-client/qupzilla/additional-files/qupzilla.rdef b/www-client/qupzilla/additional-files/qupzilla.rdef index 521601f31..641797ead 100644 --- a/www-client/qupzilla/additional-files/qupzilla.rdef +++ b/www-client/qupzilla/additional-files/qupzilla.rdef @@ -1,5 +1,5 @@ -resource app_flags B_SINGLE_LAUNCH | B_ARGV_ONLY; +resource app_flags B_MULTIPLE_LAUNCH; resource app_version { major = @MAJOR@, diff --git a/www-client/qupzilla/patches/qupzilla-1.8.9.patchset b/www-client/qupzilla/patches/qupzilla-1.8.9.patchset index f3118cde5..03d367db5 100644 --- a/www-client/qupzilla/patches/qupzilla-1.8.9.patchset +++ b/www-client/qupzilla/patches/qupzilla-1.8.9.patchset @@ -1,4 +1,4 @@ -From 3e8510d353d0989a09eea4afeaf88f96406acc4c Mon Sep 17 00:00:00 2001 +From fc4ef4baab8a901888fb06a726a5b2f6bee295e1 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 5 Apr 2015 20:51:42 +1000 Subject: Turn on system certificates @@ -18,10 +18,10 @@ index a0f55df..c31de81 100644 QString bundlePath = certDir + "/ca-bundle.crt"; QString bundleVersionPath = certDir + "/bundle_version"; -- -2.13.1 +2.16.2 -From 70d867d457ebbfdffafb4cc7ffc195fe1645243d Mon Sep 17 00:00:00 2001 +From d17b6f790a604086478d768fca2bd4d57fdf8cd6 Mon Sep 17 00:00:00 2001 From: Zoltan Mizsei Date: Mon, 14 Mar 2016 21:13:13 +0000 Subject: Haiku config paths @@ -42,10 +42,10 @@ index fa6fe66..51e16ba 100644 QDir confPath = QDir(QDir::homePath() + QLatin1String("/.config/qupzilla")); QDir oldConfPath = QDir(QDir::homePath() + QLatin1String("/.qupzilla")); -- -2.13.1 +2.16.2 -From 3c760189c8f97bb1c1f0adec0aca3f4b08d17192 Mon Sep 17 00:00:00 2001 +From 583c79eb6fb9d8405498b93217f5ebb0198761dd Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Sat, 17 Jun 2017 09:43:22 +0300 Subject: Fix adblock subscription urls @@ -91,17 +91,17 @@ index fc68237..7571eb7 100644 << Subscription("Anti-Adblock Killer", "https://raw.githubusercontent.com/reek/anti-adblock-killer/master/anti-adblock-killer-filters.txt") << Subscription(tr("Other..."), QString()); -- -2.13.1 +2.16.2 -From 1a973dc987166605fe44709a16f055b68b704771 Mon Sep 17 00:00:00 2001 +From 5b93ae93429d52ca4123b2ce1e2f7831a3283f92 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Wed, 5 Jul 2017 14:59:35 +0300 Subject: Use Haiku theme by default diff --git a/src/lib/app/qzcommon.h b/src/lib/app/qzcommon.h -index a1ce10d..b61c59c 100644 +index a1ce10d..bcc5b23 100644 --- a/src/lib/app/qzcommon.h +++ b/src/lib/app/qzcommon.h @@ -125,6 +125,8 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(Qz::NewTabPositionFlags) @@ -114,10 +114,10 @@ index a1ce10d..b61c59c 100644 #define DEFAULT_THEME_NAME "linux" #else -- -2.13.1 +2.16.2 -From 8f841f924f9d85a9d873a948651a258dfcf79d37 Mon Sep 17 00:00:00 2001 +From 5dc3570550aff935dbbe1440ae2d50d32c88829b Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Wed, 26 Jul 2017 15:25:00 +0300 Subject: Add Haiku bookmarks @@ -127,10 +127,11 @@ diff --git a/src/lib/data/data/bookmarks.json b/src/lib/data/data/bookmarks.json index a90338d..652abbe 100644 --- a/src/lib/data/data/bookmarks.json +++ b/src/lib/data/data/bookmarks.json -@@ -3,6 +3,63 @@ +@@ -2,6 +2,63 @@ + "roots": { "bookmark_bar": { "children": [ - { ++ { + "children": [ + { + "description": "", @@ -187,10 +188,9 @@ index a90338d..652abbe 100644 + "name": "Haiku", + "type": "folder" + }, -+ { + { "description": "Source code of QupZilla", "keyword": "qz-git", - "name": "QupZilla Git", @@ -70,4 +127,4 @@ } }, @@ -199,10 +199,10 @@ index a90338d..652abbe 100644 \ No newline at end of file +} -- -2.13.1 +2.16.2 -From 06c2423a8dc865848a60acaac1fcbf0ae62efc17 Mon Sep 17 00:00:00 2001 +From 19d9b150a170be2047c8e6c60a2933906f452842 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Wed, 2 Aug 2017 22:16:30 +1000 Subject: Fix build for WebKit >= 2.2 version @@ -286,10 +286,10 @@ index 9483ad4..9ce976f 100644 this, SLOT(appCacheQuotaExceeded(QWebSecurityOrigin*,quint64))); #endif -- -2.13.1 +2.16.2 -From fd051dd53fec94166b9ac0b25b0a51cb3c5054d0 Mon Sep 17 00:00:00 2001 +From 2ab8dc4efc557908e6dc7201800b63298c9fa67e Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Wed, 2 Aug 2017 22:40:27 +1000 Subject: Enable webkit notifications @@ -429,10 +429,10 @@ index 2f13d27..f4a80e5 100644 #else notifyType = DesktopNotificationsFactory::PopupWidget; -- -2.13.1 +2.16.2 -From 04127654b1a411f28ac0ad3552798191f8cd10b6 Mon Sep 17 00:00:00 2001 +From f07e210cef235ba2593f14e2628573b570aeb14b Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Wed, 2 Aug 2017 22:41:29 +1000 Subject: Remove round rect for OSD windows @@ -511,5 +511,212 @@ index 9e41d49..111cbbf 100644 } -- -2.13.1 +2.16.2 + + +From 35c40d1edde595d5832238b59d2fde48a5bd3cfb Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Mon, 30 Apr 2018 15:05:30 +1000 +Subject: Fix fuild for Qt 5.10 + + +diff --git a/src/lib/webtab/searchtoolbar.cpp b/src/lib/webtab/searchtoolbar.cpp +index 61d0b84..a1b9634 100644 +--- a/src/lib/webtab/searchtoolbar.cpp ++++ b/src/lib/webtab/searchtoolbar.cpp +@@ -35,7 +35,9 @@ SearchToolBar::SearchToolBar(WebView* view, QWidget* parent) + + ui->closeButton->setIcon(IconProvider::standardIcon(QStyle::SP_DialogCloseButton)); + ui->next->setIcon(IconProvider::standardIcon(QStyle::SP_ArrowDown)); ++ ui->next->setShortcut(QKeySequence("Ctrl+G")); + ui->previous->setIcon(IconProvider::standardIcon(QStyle::SP_ArrowUp)); ++ ui->previous->setShortcut(QKeySequence("Ctrl+Shift+G")); + + connect(ui->closeButton, SIGNAL(clicked()), this, SLOT(hide())); + connect(ui->lineEdit, SIGNAL(textChanged(QString)), this, SLOT(findNext())); +diff --git a/src/lib/webtab/searchtoolbar.ui b/src/lib/webtab/searchtoolbar.ui +index f35e927..f1fe92c 100644 +--- a/src/lib/webtab/searchtoolbar.ui ++++ b/src/lib/webtab/searchtoolbar.ui +@@ -64,9 +64,6 @@ + 0 + + +- +- Ctrl+Shift+G +- + + true + +@@ -80,9 +77,6 @@ + 0 + + +- +- Ctrl+G +- + + true + +-- +2.16.2 + + +From a06bcb1b52ff9e6d4fa506663bf9bbbda6dd66ad Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Mon, 30 Apr 2018 15:05:49 +1000 +Subject: Enable signal handler + + +diff --git a/src/main/main.cpp b/src/main/main.cpp +index 14d2ee5..3edb648 100644 +--- a/src/main/main.cpp ++++ b/src/main/main.cpp +@@ -173,7 +173,7 @@ int main(int argc, char* argv[]) + QApplication::setGraphicsSystem(QSL("raster")); + #endif + +-#if defined(Q_OS_LINUX) || defined(__GLIBC__) || defined(__FreeBSD__) ++#if defined(Q_OS_LINUX) || defined(__GLIBC__) || defined(__FreeBSD__) || defined(__HAIKU__) + signal(SIGSEGV, qupzilla_signal_handler); + #endif + +-- +2.16.2 + + +From ca54f33b5dc0b5420230f26fa3032bd9e80ed965 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Mon, 30 Apr 2018 15:07:21 +1000 +Subject: Enable QtSingleApplication + + +diff --git a/src/lib/3rdparty/qtsingleapplication/qtsingleapplication.cpp b/src/lib/3rdparty/qtsingleapplication/qtsingleapplication.cpp +index 6bab7d0..ea78c30 100644 +--- a/src/lib/3rdparty/qtsingleapplication/qtsingleapplication.cpp ++++ b/src/lib/3rdparty/qtsingleapplication/qtsingleapplication.cpp +@@ -192,11 +192,7 @@ QtSingleApplication::QtSingleApplication(const QString &appId, int &argc, char** + + bool QtSingleApplication::isRunning() + { +-#ifdef Q_OS_HAIKU +- return false; +-#else + return (peer && peer->isClient()); +-#endif + } + + void QtSingleApplication::setAppId(const QString &id) +@@ -220,11 +216,7 @@ void QtSingleApplication::setAppId(const QString &id) + */ + bool QtSingleApplication::sendMessage(const QString &message, int timeout) + { +-#ifdef Q_OS_HAIKU +- return false; +-#else + return (peer && peer->sendMessage(message, timeout)); +-#endif + } + + +-- +2.16.2 + + +From c141f004f71c9bc26497dfdc1f67c691c7af1f4e Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Mon, 30 Apr 2018 19:14:28 +1000 +Subject: Add unlock.sh script for unlocking app after crash + + +diff --git a/src/main/main.cpp b/src/main/main.cpp +index 3edb648..3e0e0f7 100644 +--- a/src/main/main.cpp ++++ b/src/main/main.cpp +@@ -168,6 +168,10 @@ int main(int argc, char* argv[]) + #endif + #endif + ++#ifdef Q_OS_HAIKU ++ system("/system/apps/QupZilla/unlock.sh"); ++#endif ++ + #if defined(QZ_WS_X11) && QT_VERSION < 0x050000 + // Better overall performance on X11 + QApplication::setGraphicsSystem(QSL("raster")); +-- +2.16.2 + + +From 41cd4d8fcdf049d97bf9cadbcd90f7d98246d49d Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Tue, 1 May 2018 23:31:52 +1000 +Subject: Fix execution from read-only volume + + +diff --git a/src/main/main.cpp b/src/main/main.cpp +index 3e0e0f7..c9cb487 100644 +--- a/src/main/main.cpp ++++ b/src/main/main.cpp +@@ -169,7 +169,7 @@ int main(int argc, char* argv[]) + #endif + + #ifdef Q_OS_HAIKU +- system("/system/apps/QupZilla/unlock.sh"); ++ system("cp -f /system/apps/QupZilla/unlock.sh /tmp ; /tmp/unlock.sh ; rm /tmp/unlock.sh"); + #endif + + #if defined(QZ_WS_X11) && QT_VERSION < 0x050000 +-- +2.16.2 + + +From 229c160b5af8032bf6fcb09ec31f40b06ff23093 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Wed, 2 May 2018 00:11:25 +1000 +Subject: Add unlock script generator + + +diff --git a/src/main/main.cpp b/src/main/main.cpp +index c9cb487..d2c20c7 100644 +--- a/src/main/main.cpp ++++ b/src/main/main.cpp +@@ -22,7 +22,11 @@ + #include // For QT_REQUIRE_VERSION + #include + +-#if defined(Q_OS_LINUX) || defined(__GLIBC__) || defined(__FreeBSD__) || defined(__HAIKU__) ++#if defined(Q_OS_HAIKU) ++#include ++#endif ++ ++#if defined(Q_OS_LINUX) || defined(__GLIBC__) || defined(__FreeBSD__) || defined(Q_OS_HAIKU) + #include + #include + +@@ -169,7 +173,21 @@ int main(int argc, char* argv[]) + #endif + + #ifdef Q_OS_HAIKU +- system("cp -f /system/apps/QupZilla/unlock.sh /tmp ; /tmp/unlock.sh ; rm /tmp/unlock.sh"); ++ QFile file("/tmp/unlock.sh"); ++ if (file.open(QFile::WriteOnly | QFile::Truncate)) { ++ QTextStream stream(&file); ++ stream << "#!/bin/sh" << endl; ++ stream << "TIMESTAMP=`date \"+%Y%m%d-%H%M%S\"`" << endl; ++ stream << "count=`ps | grep -v grep | grep \"QupZilla\" | wc -l`" << endl; ++ stream << "if [ \"${count}\" -eq \"1\" ] ; then" << endl; ++ stream << " for f in /tmp/qtsingleapp-QupZil*-lockfile; do" << endl; ++ stream << " mv \"$f\" \"$f.$TIMESTAMP\"" << endl; ++ stream << " done" << endl; ++ stream << "fi" << endl; ++ file.close(); ++ chmod("/tmp/unlock.sh", S_IRWXU | S_IRWXG | S_IRWXO); ++ system("/tmp/unlock.sh ; rm /tmp/unlock.sh"); ++ } + #endif + + #if defined(QZ_WS_X11) && QT_VERSION < 0x050000 +-- +2.16.2 diff --git a/www-client/qupzilla/qupzilla-1.8.9.recipe b/www-client/qupzilla/qupzilla-1.8.9.recipe index 9f5e5f4e9..94d532209 100644 --- a/www-client/qupzilla/qupzilla-1.8.9.recipe +++ b/www-client/qupzilla/qupzilla-1.8.9.recipe @@ -10,7 +10,7 @@ positively received by reviewers: HOMEPAGE="https://www.qupzilla.com/" COPYRIGHT="2010-2015 David Rosca" LICENSE="GNU GPL v3" -REVISION="8" +REVISION="9" SOURCE_URI="https://github.com/QupZilla/qupzilla/releases/download/v$portVersion/QupZilla-$portVersion.tar.xz" CHECKSUM_SHA256="620ffb10a3f6b3f596c2c38a84d9c320cb66dd2d5e6701e8e31945e26308fcac" SOURCE_DIR="QupZilla-$portVersion"