From 6187dcea9436f01b87034f2af894608065b18caa Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Sat, 11 Apr 2020 13:38:21 -0400 Subject: [PATCH] QupZilla: Remove. No code changes since 2018, and increasingly unstable. Otter should be used instead. --- .../qupzilla/additional-files/qupzilla.rdef | 52 -- .../qupzilla/patches/qupzilla-1.8.9.patchset | 722 ------------------ www-client/qupzilla/qupzilla-1.8.9.recipe | 113 --- 3 files changed, 887 deletions(-) delete mode 100644 www-client/qupzilla/additional-files/qupzilla.rdef delete mode 100644 www-client/qupzilla/patches/qupzilla-1.8.9.patchset delete mode 100644 www-client/qupzilla/qupzilla-1.8.9.recipe diff --git a/www-client/qupzilla/additional-files/qupzilla.rdef b/www-client/qupzilla/additional-files/qupzilla.rdef deleted file mode 100644 index 641797ead..000000000 --- a/www-client/qupzilla/additional-files/qupzilla.rdef +++ /dev/null @@ -1,52 +0,0 @@ - -resource app_flags B_MULTIPLE_LAUNCH; - -resource app_version { - major = @MAJOR@, - middle = @MIDDLE@, - minor = @MINOR@, - - variety = B_APPV_FINAL, - internal = 0, - - short_info = "QupZilla", - long_info = "QupZilla © 2010-2015 David Rosca." -}; - -resource app_signature "@APP_SIGNATURE@"; - -resource file_types message { - "types" = "text/html", - "types" = "multipart/related", - "types" = "image/gif", - "types" = "image/jpeg", - "types" = "image/png", - "types" = "image/svg+xml", - "types" = "application/xhtml+xml", - "types" = "application/x-vnd.Be.URL.file", - "types" = "application/x-vnd.Be.URL.http", - "types" = "application/x-vnd.Be.URL.https" -}; - -resource vector_icon { - $"6E63696605036FD4FC020106023E60000000000000003EF00049800046800000" - $"92B8EBFF1F5BA005FF050004005A04020DB9B9C272B8CBC34DBAF4C16CBDB140" - $"BC43C076BE3EBFE3BF61BFECBED0BFC9C126C03FC458C1FEC2CAC11DC60648C9" - $"69C4B9C7A5C3F2CA35C50FCBE7C567CB0BC544CBA3C58CCB0AC5B1CB55C59FCA" - $"37C5E2C888C619C965C614C77DC621C561C605C66BC63EC3D54FC10BC44FC270" - $"C4FFC054C3F6BED5C36FBF99C39EBD96C323BB0CC38FBC43C33AB9A9C3EFB70F" - $"C524B861C497B7D44B020CB792B9A3B74231B933B8F3BCCDB911BB0DB8C7BF50" - $"B96CC3F4BB85C1ACBA73C589BC43C8BBBDB2C716BD1DC7EEBDB3C656BD9BC722" - $"BD9849BD9DBDB140C056BE50BC43C076B9B9C272BAF4C16CB8CBC34DB70FC524" - $"B7D44BB702C52AB6E0C53CB6E9C539B695C4DEB636C406B663C470B5ADC2ACB5" - $"70BFC9B56CC13DB569BDDCB6C2BA38B5D6BBEBB6E8B9E702044030C34330BC38" - $"30304030BC3830C3434050BC3850C34350504050C34350BC38020A4844C83744" - $"BDA844304F30C34E30C8224559BC7659C27E59505DC4E3CB0C555E595EC83E5E" - $"5D5E5F5CCBBDCAF2CC5FCADE585B5C5CC817CA335259555AC628C97356575358" - $"C95AC89F604F60546049080A040103201F200A030102124102D2000000000000" - $"4111E1C845A5C893C301158200040A010102024102D20000000000004111E1C8" - $"45A5C893C30A030100123FAD440000000000003F5FB4426E0B4186BF01158300" - $"040A000100023FAD440000000000003F5FB4426E0B4186BF0A030101301E1C01" - $"158300040A040101023FEADD0000000000004000004320521365540A02010120" - $"1E1C" -}; diff --git a/www-client/qupzilla/patches/qupzilla-1.8.9.patchset b/www-client/qupzilla/patches/qupzilla-1.8.9.patchset deleted file mode 100644 index 03d367db5..000000000 --- a/www-client/qupzilla/patches/qupzilla-1.8.9.patchset +++ /dev/null @@ -1,722 +0,0 @@ -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 - - -diff --git a/src/lib/network/networkmanager.cpp b/src/lib/network/networkmanager.cpp -index a0f55df..c31de81 100644 ---- a/src/lib/network/networkmanager.cpp -+++ b/src/lib/network/networkmanager.cpp -@@ -107,7 +107,7 @@ void NetworkManager::loadSettings() - - m_acceptLanguage = AcceptLanguage::generateHeader(settings.value("Language/acceptLanguage", AcceptLanguage::defaultLanguage()).toStringList()); - --#if defined(Q_OS_WIN) || defined(Q_OS_HAIKU) || defined(Q_OS_OS2) -+#if defined(Q_OS_WIN) || defined(Q_OS_OS2) - QString certDir = DataPaths::currentProfilePath() + "/certificates"; - QString bundlePath = certDir + "/ca-bundle.crt"; - QString bundleVersionPath = certDir + "/bundle_version"; --- -2.16.2 - - -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 - - -diff --git a/src/lib/app/datapaths.cpp b/src/lib/app/datapaths.cpp -index fa6fe66..51e16ba 100644 ---- a/src/lib/app/datapaths.cpp -+++ b/src/lib/app/datapaths.cpp -@@ -123,6 +123,9 @@ void DataPaths::init() - #elif defined(Q_OS_MAC) - QDir confPath = QDir(QDir::homePath() + QLatin1String("/Library/Application Support/QupZilla")); - QDir oldConfPath = QDir(QDir::homePath() + QLatin1String("/.config/qupzilla")); -+#elif defined(__HAIKU__) -+ QDir confPath = QDir(QDir::homePath() + QLatin1String("/config/settings/Qt/.config/qupzilla")); -+ QDir oldConfPath = QDir(QDir::homePath() + QLatin1String("/config/settings/Qt/.config/qupzilla")); - #else // Unix - QDir confPath = QDir(QDir::homePath() + QLatin1String("/.config/qupzilla")); - QDir oldConfPath = QDir(QDir::homePath() + QLatin1String("/.qupzilla")); --- -2.16.2 - - -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 - - -diff --git a/src/lib/adblock/adblockaddsubscriptiondialog.cpp b/src/lib/adblock/adblockaddsubscriptiondialog.cpp -index fc68237..7571eb7 100644 ---- a/src/lib/adblock/adblockaddsubscriptiondialog.cpp -+++ b/src/lib/adblock/adblockaddsubscriptiondialog.cpp -@@ -1,6 +1,6 @@ - /* ============================================================ --* QupZilla - WebKit based browser --* Copyright (C) 2010-2014 David Rosca -+* QupZilla - Qt web browser -+* Copyright (C) 2010-2017 David Rosca - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by -@@ -25,23 +25,19 @@ AdBlockAddSubscriptionDialog::AdBlockAddSubscriptionDialog(QWidget* parent) - ui->setupUi(this); - - m_knownSubscriptions << Subscription("EasyList (English)", ADBLOCK_EASYLIST_URL) -- << Subscription("Adversity (English)", "http://adversity.googlecode.com/hg/Adversity.txt") - << Subscription("BSI Lista Polska (Polish)", "http://www.bsi.info.pl/filtrABP.txt") - << Subscription("Czech List (Czech)", "http://adblock.dajbych.net/adblock.txt") - << Subscription("dutchblock (Dutch)", "http://groenewoudt.net/dutchblock/list.txt") - << Subscription("Filtros Nauscopicos (Spanish)", "http://abp.mozilla-hispano.org/nauscopio/filtros.txt") -- << Subscription("hufilter (Hungarian)", "http://www.hufilter.hu/hufilter.txt") - << Subscription("IsraelList (Hebrew)", "http://secure.fanboy.co.nz/israelilist/IsraelList.txt") -- << Subscription("Lista Basa (Polish)", "http://plok.studentlive.pl/abp.txt") - << Subscription("NLBlock (Dutch)", "http://www.verzijlbergh.com/adblock/nlblock.txt") - << Subscription("Peter Lowe's list (English)", "http://pgl.yoyo.org/adservers/serverlist.php?hostformat=adblockplus&mimetype=plaintext") - << Subscription("PLgeneral (Polish)", "http://www.niecko.pl/adblock/adblock.txt") - << Subscription("Schacks Adblock Plus liste (Danish)", "http://adblock.schack.dk/block.txt") - << Subscription("Xfiles (Italian)", "http://mozilla.gfsolone.com/filtri.txt") - << Subscription("EasyPrivacy (English)", "http://easylist-downloads.adblockplus.org/easyprivacy.txt") -- << Subscription("Antisocial (English)", "http://adversity.googlecode.com/hg/Antisocial.txt") -- << Subscription("RU Adlist (Russian)", "https://ruadlist.googlecode.com/hg/advblock.txt") -- << Subscription("ABPindo (Indonesian)", "https://indonesianadblockrules.googlecode.com/hg/subscriptions/abpindo.txt") -+ << Subscription("RU Adlist (Russian)", "https://easylist-downloads.adblockplus.org/advblock.txt") -+ << Subscription("ABPindo (Indonesian)", "https://raw.githubusercontent.com/heradhis/indonesianadblockrules/master/subscriptions/abpindo.txt") - << Subscription("Easylist China (Chinese)", "https://easylist-downloads.adblockplus.org/easylistchina.txt") - << Subscription("Anti-Adblock Killer", "https://raw.githubusercontent.com/reek/anti-adblock-killer/master/anti-adblock-killer-filters.txt") - << Subscription(tr("Other..."), QString()); --- -2.16.2 - - -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..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) - #define DEFAULT_THEME_NAME "windows" - #elif defined(Q_OS_MAC) - #define DEFAULT_THEME_NAME "mac" -+#elif defined(Q_OS_HAIKU) -+#define DEFAULT_THEME_NAME "haiku" - #elif defined(Q_OS_UNIX) - #define DEFAULT_THEME_NAME "linux" - #else --- -2.16.2 - - -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 - - -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 -@@ -2,6 +2,63 @@ - "roots": { - "bookmark_bar": { - "children": [ -+ { -+ "children": [ -+ { -+ "description": "", -+ "keyword": "", -+ "name": "Haiku Project", -+ "type": "url", -+ "url": "https://www.haiku-os.org/", -+ "visit_count": 0 -+ }, -+ { -+ "description": "", -+ "keyword": "", -+ "name": "Haiku Trac", -+ "type": "url", -+ "url": "https://dev.haiku-os.org/timeline", -+ "visit_count": 0 -+ }, -+ { -+ "description": "", -+ "keyword": "", -+ "name": "Haiku Depot Web", -+ "type": "url", -+ "url": "https://depot.haiku-os.org/", -+ "visit_count": 2 -+ }, -+ { -+ "description": "", -+ "keyword": "", -+ "name": "Haiku's main repository", -+ "type": "url", -+ "url": "http://cgit.haiku-os.org/haiku/log/", -+ "visit_count": 0 -+ }, -+ { -+ "description": "", -+ "keyword": "", -+ "name": "Haikuports", -+ "type": "url", -+ "url": "https://github.com/haikuports/haikuports/commits/master", -+ "visit_count": 0 -+ }, -+ { -+ "description": "", -+ "keyword": "", -+ "name": "Haiku Software Archives", -+ "type": "url", -+ "url": "https://github.com/HaikuArchives", -+ "visit_count": 0 -+ } -+ ], -+ "description": "", -+ "expanded": true, -+ "expanded_sidebar": false, -+ "name": "Haiku", -+ "type": "folder" -+ }, - { - "description": "Source code of QupZilla", - "keyword": "qz-git", -@@ -70,4 +127,4 @@ - } - }, - "version": 1 --} -\ No newline at end of file -+} --- -2.16.2 - - -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 - - -diff --git a/src/lib/tools/html5permissions/html5permissionsmanager.cpp b/src/lib/tools/html5permissions/html5permissionsmanager.cpp -index fa991c6..16f0507 100644 ---- a/src/lib/tools/html5permissions/html5permissionsmanager.cpp -+++ b/src/lib/tools/html5permissions/html5permissionsmanager.cpp -@@ -28,7 +28,7 @@ HTML5PermissionsManager::HTML5PermissionsManager(QObject* parent) - loadSettings(); - } - --#if QTWEBKIT_FROM_2_2 -+#ifdef QTWEBKIT_FROM_2_2 - void HTML5PermissionsManager::requestPermissions(WebPage* page, QWebFrame* frame, const QWebPage::Feature &feature) - { - if (!frame || !page) { -@@ -49,12 +49,12 @@ void HTML5PermissionsManager::requestPermissions(WebPage* page, QWebFrame* frame - page->setFeaturePermission(frame, feature, QWebPage::PermissionDeniedByUser); - return; - } -- -+#ifdef USE_QTWEBKIT_2_2 - if (view) { - HTML5PermissionsNotification* notif = new HTML5PermissionsNotification(host, frame, feature); - view->addNotification(notif); - } -- -+#endif - break; - - case QWebPage::Geolocation: -@@ -68,10 +68,12 @@ void HTML5PermissionsManager::requestPermissions(WebPage* page, QWebFrame* frame - return; - } - -+#ifdef USE_QTWEBKIT_2_2 - if (view) { - HTML5PermissionsNotification* notif = new HTML5PermissionsNotification(host, frame, feature); - view->addNotification(notif); - } -+#endif - - break; - -diff --git a/src/lib/tools/html5permissions/html5permissionsmanager.h b/src/lib/tools/html5permissions/html5permissionsmanager.h -index 074113d..8da6573 100644 ---- a/src/lib/tools/html5permissions/html5permissionsmanager.h -+++ b/src/lib/tools/html5permissions/html5permissionsmanager.h -@@ -32,7 +32,7 @@ class QUPZILLA_EXPORT HTML5PermissionsManager : public QObject - public: - explicit HTML5PermissionsManager(QObject* parent); - --#if QTWEBKIT_FROM_2_2 -+#ifdef QTWEBKIT_FROM_2_2 - void requestPermissions(WebPage* page, QWebFrame* frame, const QWebPage::Feature &feature); - void rememberPermissions(const QString &host, const QWebPage::Feature &feature, - const QWebPage::PermissionPolicy &policy); -diff --git a/src/lib/webkit/webpage.cpp b/src/lib/webkit/webpage.cpp -index 9483ad4..9ce976f 100644 ---- a/src/lib/webkit/webpage.cpp -+++ b/src/lib/webkit/webpage.cpp -@@ -102,15 +102,15 @@ WebPage::WebPage(QObject* parent) - - connect(mainFrame(), SIGNAL(javaScriptWindowObjectCleared()), this, SLOT(addJavaScriptObject())); - --#if QTWEBKIT_FROM_2_2 -+#if defined(QTWEBKIT_FROM_2_2) - connect(this, SIGNAL(featurePermissionRequested(QWebFrame*,QWebPage::Feature)), - this, SLOT(featurePermissionRequested(QWebFrame*,QWebPage::Feature))); - #endif - --#if QTWEBKIT_FROM_2_3 -+#if defined(QTWEBKIT_FROM_2_3) - connect(this, SIGNAL(applicationCacheQuotaExceeded(QWebSecurityOrigin*,quint64,quint64)), - this, SLOT(appCacheQuotaExceeded(QWebSecurityOrigin*,quint64))); --#elif QTWEBKIT_FROM_2_2 -+#elif defined(QTWEBKIT_FROM_2_2) - connect(this, SIGNAL(applicationCacheQuotaExceeded(QWebSecurityOrigin*,quint64)), - this, SLOT(appCacheQuotaExceeded(QWebSecurityOrigin*,quint64))); - #endif --- -2.16.2 - - -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 - - -diff --git a/src/lib/notifications/desktopnotificationsfactory.cpp b/src/lib/notifications/desktopnotificationsfactory.cpp -index 54d42b2..5612c39 100644 ---- a/src/lib/notifications/desktopnotificationsfactory.cpp -+++ b/src/lib/notifications/desktopnotificationsfactory.cpp -@@ -23,6 +23,18 @@ - #include - #include - -+#if defined(Q_OS_HAIKU) -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#endif -+ - #if defined(Q_OS_UNIX) && !defined(DISABLE_DBUS) - #include - #endif -@@ -40,7 +52,7 @@ void DesktopNotificationsFactory::loadSettings() - settings.beginGroup("Notifications"); - m_enabled = settings.value("Enabled", true).toBool(); - m_timeout = settings.value("Timeout", 6000).toInt(); --#if defined(Q_OS_UNIX) && !defined(DISABLE_DBUS) -+#if (defined(Q_OS_UNIX) && !defined(DISABLE_DBUS)) || defined(Q_OS_HAIKU) - m_notifType = settings.value("UseNativeDesktop", true).toBool() ? DesktopNative : PopupWidget; - #else - m_notifType = PopupWidget; -@@ -51,7 +63,7 @@ void DesktopNotificationsFactory::loadSettings() - - bool DesktopNotificationsFactory::supportsNativeNotifications() const - { --#if defined(Q_OS_UNIX) && !defined(DISABLE_DBUS) -+#if (defined(Q_OS_UNIX) && !defined(DISABLE_DBUS)) || defined(Q_OS_HAIKU) - return true; - #else - return false; -@@ -77,7 +89,28 @@ void DesktopNotificationsFactory::showNotification(const QPixmap &icon, const QS - m_desktopNotif.data()->show(); - break; - case DesktopNative: --#if defined(Q_OS_UNIX) && !defined(DISABLE_DBUS) -+#if defined(Q_OS_HAIKU) -+ QFileInfo appFileInfo(QCoreApplication::applicationFilePath()); -+ BString stitle((const char *)(heading.toUtf8())); -+ BString smessage((const char *)(text.toUtf8())); -+ BString smessageId((const char *)(appFileInfo.fileName().toUtf8())); -+ BString group((const char*)(appFileInfo.baseName().toUtf8())); -+ -+ notification_type ntype = B_INFORMATION_NOTIFICATION; -+ BNotification notification(ntype); -+ notification.SetGroup(group); -+ notification.SetTitle(stitle); -+ notification.SetMessageID(smessageId); -+ notification.SetContent(smessage); -+ -+ QImage image = icon.toImage(); -+ BRect rect(0, 0, image.width() - 1, image.height() - 1); -+ BBitmap bitmap(rect, B_RGBA32); -+ memcpy(bitmap.Bits(), image.bits(), image.byteCount()); -+ notification.SetIcon(&bitmap); -+ -+ notification.Send(m_timeout * 1000); -+#elif defined(Q_OS_UNIX) && !defined(DISABLE_DBUS) - QFile tmp(DataPaths::path(DataPaths::Temp) + QLatin1String("/qupzilla_notif.png")); - tmp.open(QFile::WriteOnly); - icon.save(tmp.fileName()); -@@ -100,7 +133,31 @@ void DesktopNotificationsFactory::showNotification(const QPixmap &icon, const QS - - void DesktopNotificationsFactory::nativeNotificationPreview() - { --#if defined(Q_OS_UNIX) && !defined(DISABLE_DBUS) -+#if defined(Q_OS_HAIKU) -+ QFileInfo appFileInfo(QCoreApplication::applicationFilePath()); -+ QString title = QObject::tr("Native System Notification"); -+ BString stitle((const char *)(title.toUtf8())); -+ BString smessage((const char *)("")); -+ BString smessageId((const char *)(appFileInfo.fileName().toUtf8())); -+ BString group((const char*)(appFileInfo.baseName().toUtf8())); -+ -+ BRect rect(0, 0, B_LARGE_ICON - 1, B_LARGE_ICON -1); -+ BBitmap bitmap(rect, B_RGBA32); -+ -+ notification_type ntype = B_INFORMATION_NOTIFICATION; -+ BNotification notification(ntype); -+ notification.SetGroup(group); -+ notification.SetTitle(stitle); -+ notification.SetMessageID(smessageId); -+ notification.SetContent(smessage); -+ -+ QPixmap pixmap = QPixmap(":icons/preferences/dialog-question.png").scaled(B_LARGE_ICON, B_LARGE_ICON); -+ QImage image = pixmap.toImage(); -+ memcpy(bitmap.Bits(), image.bits(), image.byteCount()); -+ notification.SetIcon(&bitmap); -+ -+ notification.Send(m_timeout * 1000); -+#elif defined(Q_OS_UNIX) && !defined(DISABLE_DBUS) - QFile tmp(DataPaths::path(DataPaths::Temp) + "/qupzilla_notif.png"); - tmp.open(QFile::WriteOnly); - QPixmap(":icons/preferences/dialog-question.png").save(tmp.fileName()); -diff --git a/src/lib/plugins/qtwebkit/qtwebkit-plugins.pri b/src/lib/plugins/qtwebkit/qtwebkit-plugins.pri -index 1591433..034d1ca 100644 ---- a/src/lib/plugins/qtwebkit/qtwebkit-plugins.pri -+++ b/src/lib/plugins/qtwebkit/qtwebkit-plugins.pri -@@ -36,6 +36,11 @@ win32 { - } - } - -+# Haiku -+haiku { -+ buildPlugin = false -+} -+ - !equals(buildPlugin, false) { - HEADERS += $$PWD/qtwebkitplugin.h \ - $$[QT_INSTALL_HEADERS]/QtWebKit/qwebkitplatformplugin.h -diff --git a/src/lib/preferences/preferences.cpp b/src/lib/preferences/preferences.cpp -index 2f13d27..f4a80e5 100644 ---- a/src/lib/preferences/preferences.cpp -+++ b/src/lib/preferences/preferences.cpp -@@ -395,7 +395,7 @@ Preferences::Preferences(BrowserWindow* window, QWidget* parent) - DesktopNotificationsFactory::Type notifyType; - settings.beginGroup("Notifications"); - ui->notificationTimeout->setValue(settings.value("Timeout", 6000).toInt() / 1000); --#if defined(Q_OS_UNIX) && !defined(DISABLE_DBUS) -+#if (defined(Q_OS_UNIX) && !defined(DISABLE_DBUS)) || defined(Q_OS_HAIKU) - notifyType = settings.value("UseNativeDesktop", true).toBool() ? DesktopNotificationsFactory::DesktopNative : DesktopNotificationsFactory::PopupWidget; - #else - notifyType = DesktopNotificationsFactory::PopupWidget; --- -2.16.2 - - -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 - - -diff --git a/bin/themes/breathe/main.css b/bin/themes/breathe/main.css -index 2592506..d971040 100644 ---- a/bin/themes/breathe/main.css -+++ b/bin/themes/breathe/main.css -@@ -294,7 +294,6 @@ DesktopNotification - DesktopNotification #frame - { - border: 2px solid darkblue; -- border-radius: 20px; - background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,stop:0 #e4ecf1, stop:1 #d3e5f1); - } - -diff --git a/bin/themes/chrome/main.css b/bin/themes/chrome/main.css -index ab3765f..348d550 100644 ---- a/bin/themes/chrome/main.css -+++ b/bin/themes/chrome/main.css -@@ -329,7 +329,6 @@ DesktopNotification - DesktopNotification #frame - { - border: 2px solid darkblue; -- border-radius: 20px; - background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,stop:0 #e4ecf1, stop:1 #d3e5f1); - } - -diff --git a/bin/themes/default/main.css b/bin/themes/default/main.css -index b96601e..61a726a 100644 ---- a/bin/themes/default/main.css -+++ b/bin/themes/default/main.css -@@ -324,7 +324,6 @@ DesktopNotification - DesktopNotification #frame - { - border: 2px solid darkblue; -- border-radius: 20px; - background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,stop:0 #e4ecf1, stop:1 #d3e5f1); - } - -diff --git a/bin/themes/linux/main.css b/bin/themes/linux/main.css -index aa48b63..bb77e4e 100644 ---- a/bin/themes/linux/main.css -+++ b/bin/themes/linux/main.css -@@ -257,7 +257,6 @@ DesktopNotification - DesktopNotification #frame - { - border: 2px solid darkblue; -- border-radius: 20px; - background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,stop:0 #e4ecf1, stop:1 #d3e5f1); - } - -diff --git a/bin/themes/mac/main.css b/bin/themes/mac/main.css -index 0df4017..6e15c94 100644 ---- a/bin/themes/mac/main.css -+++ b/bin/themes/mac/main.css -@@ -314,7 +314,6 @@ DesktopNotification - DesktopNotification #frame - { - border: 2px solid darkblue; -- border-radius: 20px; - background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,stop:0 #e4ecf1, stop:1 #d3e5f1); - } - -diff --git a/bin/themes/windows/main.css b/bin/themes/windows/main.css -index 9e41d49..111cbbf 100644 ---- a/bin/themes/windows/main.css -+++ b/bin/themes/windows/main.css -@@ -329,7 +329,6 @@ DesktopNotification - DesktopNotification #frame - { - border: 2px solid darkblue; -- border-radius: 20px; - background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,stop:0 #e4ecf1, stop:1 #d3e5f1); - } - --- -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 deleted file mode 100644 index df3e08f7c..000000000 --- a/www-client/qupzilla/qupzilla-1.8.9.recipe +++ /dev/null @@ -1,113 +0,0 @@ -SUMMARY="A lightweight QtWebKit browser" -DESCRIPTION="QupZilla is a free and open-source web browser, \ -intended for general users. It allows seamless integration with \ -users' desktop environments and has several distinguishing features \ -positively received by reviewers: - - A unified interface for bookmarks, history and RSS reading. - - A themeable interface. - - Integrated Adblock. - - Speed dial." -HOMEPAGE="https://github.com/QupZilla/qupzilla/" -COPYRIGHT="2010-2015 David Rosca" -LICENSE="GNU GPL v3" -REVISION="10" -SOURCE_URI="https://github.com/QupZilla/qupzilla/releases/download/v$portVersion/QupZilla-$portVersion.tar.xz" -CHECKSUM_SHA256="620ffb10a3f6b3f596c2c38a84d9c320cb66dd2d5e6701e8e31945e26308fcac" -SOURCE_DIR="QupZilla-$portVersion" -SOURCE_URI_2="https://github.com/miqlas/Qupzilla-Haiku/archive/0.0.2.tar.gz" -CHECKSUM_SHA256_2="a64bd316d4067524a805da558558dadb9987234a4867a242d0670095bae6d6e1" -SOURCE_DIR_2="Qupzilla-Haiku-0.0.2" -PATCHES="qupzilla-$portVersion.patchset" -ADDITIONAL_FILES="qupzilla.rdef" - -ARCHITECTURES="!x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86" - -PROVIDES=" - qupzilla$secondaryArchSuffix = $portVersion - app:QupZilla$secondaryArchSuffix = $portVersion - lib:libQupZilla$secondaryArchSuffix = $portVersion - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:libcrypto$secondaryArchSuffix - lib:libexecinfo$secondaryArchSuffix - lib:libGL$secondaryArchSuffix - lib:libQt5Core$secondaryArchSuffix - lib:libQt5Gui$secondaryArchSuffix - lib:libQt5Network$secondaryArchSuffix - lib:libQt5PrintSupport$secondaryArchSuffix - lib:libQt5Script$secondaryArchSuffix - lib:libQt5Sql$secondaryArchSuffix - lib:libQt5WebKit$secondaryArchSuffix - lib:libQt5WebKitWidgets$secondaryArchSuffix - lib:libQt5Widgets$secondaryArchSuffix - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - devel:libcrypto$secondaryArchSuffix - devel:libexecinfo$secondaryArchSuffix - devel:libQt5Core$secondaryArchSuffix - devel:libQt5Gui$secondaryArchSuffix - devel:libQt5Network$secondaryArchSuffix - devel:libQt5PrintSupport$secondaryArchSuffix - devel:libQt5Script$secondaryArchSuffix - devel:libQt5Sql$secondaryArchSuffix - devel:libQt5WebKit$secondaryArchSuffix - devel:libQt5WebKitWidgets$secondaryArchSuffix - devel:libQt5Widgets$secondaryArchSuffix - devel:libssl$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - cmd:g++$secondaryArchSuffix - cmd:make - cmd:pkg_config$secondaryArchSuffix - cmd:qmake$secondaryArchSuffix >= 5 - cmd:sed - " - -BUILD() -{ - cd $sourceDir - export QUPZILLA_PREFIX=$appsDir/QupZilla - export DISABLE_UPDATES_CHECK="true" - export USE_QTWEBKIT_2_2="true" - export USE_QTWEBKIT_2_3="true" - qmake - make $jobArgs -} - -INSTALL() -{ - cd $sourceDir - - mkdir -p $libDir - mkdir -p $appsDir/QupZilla - cd bin - - cp qupzilla $appsDir/QupZilla/QupZilla - cp -R locale $appsDir/QupZilla - cp -R plugins $appsDir/QupZilla - cp -R themes $appsDir/QupZilla - cp -d libQupZilla.* $libDir - - # Haiku theme - mkdir -p $appsDir/QupZilla/themes - cp -dR $sourceDir2/haiku $appsDir/QupZilla/themes - - # Add Haiku resources - local APP_SIGNATURE="application/x-vnd.qt5-qupzilla" - local MAJOR="`echo "$portVersion" | cut -d. -f1`" - local MIDDLE="`echo "$portVersion" | cut -d. -f2`" - local MINOR="`echo "$portVersion" | cut -d. -f3`" - sed \ - -e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \ - -e "s|@MAJOR@|$MAJOR|" \ - -e "s|@MIDDLE@|$MIDDLE|" \ - -e "s|@MINOR@|$MINOR|" \ - $portDir/additional-files/qupzilla.rdef > qupzilla.rdef - - addResourcesToBinaries qupzilla.rdef $appsDir/QupZilla/QupZilla - addAppDeskbarSymlink $appsDir/QupZilla/QupZilla -}