From f3e5cacd6551fa6ed076710b4f299f932df9fea1 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Thu, 3 Aug 2017 00:06:02 +1000 Subject: [PATCH] QupZilla: Fix build for qtwebkit v5.212.x * Fix default theme * Remove round rects for OSD windows * Add haiku notification support * Add new application icon --- .../qupzilla/additional-files/qupzilla.rdef | 44 ++- .../qupzilla/patches/qupzilla-1.8.9.patchset | 322 +++++++++++++++++- www-client/qupzilla/qupzilla-1.8.9.recipe | 28 +- 3 files changed, 354 insertions(+), 40 deletions(-) diff --git a/www-client/qupzilla/additional-files/qupzilla.rdef b/www-client/qupzilla/additional-files/qupzilla.rdef index ae9970fb4..521601f31 100644 --- a/www-client/qupzilla/additional-files/qupzilla.rdef +++ b/www-client/qupzilla/additional-files/qupzilla.rdef @@ -29,28 +29,24 @@ resource file_types message { }; resource vector_icon { - $"6E63696603036FD4FC020106023E60000000000000003EF00049800046800000" - $"92B8EBFF1F5BA005FF03020DB9BBC274B8CBC34DBAF4C16CBDB140BC43C078BE" - $"3EBFE5BF61BFECBED2BFCBC128C040C45AC1FEC2CAC11DC60648C96AC4B9C7A7" - $"C3F4CA35C511CBE8C567CB0DC546CBA5C58ECB0CC5B1CB57C59FCA39C5E2C88A" - $"C619C965C614C77DC623C561C605C66BC640C3D64FC10BC44FC270C4FFC054C3" - $"F8BED5C370BF9BC39EBD96C325BB0CC391BC44C33AB9A9C3EFB711C526B861C4" - $"97B7D6C4240221BF00B422C023B422BDDEB423BBA6B4A0BCBBB44BB900B56DB5" - $"37B994B6ADB73AB50AB9DFB4B4BA77B4DBBA2AB496BAA9B473BB01B48BBACEB3" - $"48BDA9B423C382B328C0C5B521C660BA12CA16B755C8CCBC28CB16C0D4CB0BBE" - $"8CCB67C344CAAAC748C7AEC594C978C7BEC731C88AC619C835C6B0C77DC623C5" - $"61C605C66BC640C3D64FC10BC44FC270C4FFC054C3F8BED5C370BF9BC39EBD96" - $"C325BB0CC391BC44C33AB9A9C3EFB711C526B861C497B704C52CB6E0C53EB6EB" - $"C539B695C4E0B637C406B664C472B5ADC2AEB570BFCBB56CC13DB569BDDEB6C2" - $"BA3AB5D6BBEDB6E8B9E7B792B9A5B74231B935B8F3BCCDB911BB0DB8C9BF52B9" - $"6CC3F6BB87C1AEBA73C58BBC45C8BDBDB2C716BD1FC7F0BDB3C658BD9CC724BD" - $"98C358BD9FBDB140C056BE52BE3EBFE5BF61BFECBED2BFCBC128C040C45AC1FE" - $"C2CAC11CC60648C96AC4B9C7A7C3F4C9A0C40FCA1BC2C2C9EDC36FCACEC03DC9" - $"97BB12CAA0BD7AC98CBAFCC97BBAD4C983BAEAC953BA79C8F9B9E3C926BA36C7" - $"882BC25BB4A0C51FB576C145B44B020CB792B9A5B74231B935B8F3BCCDB911BB" - $"0DB8C9BF52B96CC3F6BB87C1AEBA73C58BBC45C8BDBDB2C716BD1FC7F0BDB3C6" - $"58BD9CC724BD98C358BD9FBDB140C056BE52BC43C078B9BBC274BAF4C16CB8CB" - $"C34DB711C526B7D6C424B704C52CB6E0C53EB6EBC539B695C4E0B637C406B664" - $"C472B5ADC2AEB570BFCBB56CC13DB569BDDEB6C2BA3AB5D6BBEDB6E8B9E7030A" - $"000100000A010101000A02010200" + $"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 index be68022de..f3118cde5 100644 --- a/www-client/qupzilla/patches/qupzilla-1.8.9.patchset +++ b/www-client/qupzilla/patches/qupzilla-1.8.9.patchset @@ -104,15 +104,15 @@ diff --git a/src/lib/app/qzcommon.h b/src/lib/app/qzcommon.h index a1ce10d..b61c59c 100644 --- a/src/lib/app/qzcommon.h +++ b/src/lib/app/qzcommon.h -@@ -127,6 +127,8 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(Qz::NewTabPositionFlags) +@@ -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_UNIX) - #define DEFAULT_THEME_NAME "linux" +#elif defined(Q_OS_HAIKU) +#define DEFAULT_THEME_NAME "haiku" + #elif defined(Q_OS_UNIX) + #define DEFAULT_THEME_NAME "linux" #else - #define DEFAULT_THEME_NAME "default" - #endif -- 2.13.1 @@ -201,3 +201,315 @@ index a90338d..652abbe 100644 -- 2.13.1 + +From 06c2423a8dc865848a60acaac1fcbf0ae62efc17 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.13.1 + + +From fd051dd53fec94166b9ac0b25b0a51cb3c5054d0 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.13.1 + + +From 04127654b1a411f28ac0ad3552798191f8cd10b6 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.13.1 + diff --git a/www-client/qupzilla/qupzilla-1.8.9.recipe b/www-client/qupzilla/qupzilla-1.8.9.recipe index 78569bf89..fb250cf60 100644 --- a/www-client/qupzilla/qupzilla-1.8.9.recipe +++ b/www-client/qupzilla/qupzilla-1.8.9.recipe @@ -10,13 +10,13 @@ positively received by reviewers: HOMEPAGE="https://www.qupzilla.com/" COPYRIGHT="2010-2015 David Rosca" LICENSE="GNU GPL v3" -REVISION="5" +REVISION="6" 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.1.tar.gz" -CHECKSUM_SHA256_2="2e8437c44c17f74d53ec26afc7535215e7aa337c7a994432d0e826ab9add8c80" -SOURCE_DIR_2="Qupzilla-Haiku-0.0.1" +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" @@ -26,9 +26,12 @@ SECONDARY_ARCHITECTURES="x86" PROVIDES=" qupzilla$secondaryArchSuffix = $portVersion app:QupZilla$secondaryArchSuffix = $portVersion + lib:libQupZilla$secondaryArchSuffix = $portVersion " REQUIRES=" haiku$secondaryArchSuffix + lib:libcrypto$secondaryArchSuffix + lib:libGL$secondaryArchSuffix lib:libQt5Core$secondaryArchSuffix lib:libQt5Gui$secondaryArchSuffix lib:libQt5Network$secondaryArchSuffix @@ -68,6 +71,8 @@ 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 } @@ -76,17 +81,22 @@ INSTALL() { cd $sourceDir - mkdir -p $appsDir/QupZilla/lib + 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.* $appsDir/QupZilla/lib + 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 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`" @@ -99,8 +109,4 @@ INSTALL() addResourcesToBinaries qupzilla.rdef $appsDir/QupZilla/QupZilla addAppDeskbarSymlink $appsDir/QupZilla/QupZilla - - # Haiku theme - mkdir -p $appsDir/QupZilla/themes - cp -dR $sourceDir2/haiku $appsDir/QupZilla/themes }