QupZilla: Use Haiku theme by default

This commit is contained in:
Sergei Reznikov
2017-07-05 15:05:32 +03:00
parent 37357da276
commit d2839689d4
2 changed files with 35 additions and 14 deletions

View File

@@ -1,11 +1,11 @@
From 1e80d74ca4a7b205916bc218d46a1f8922ba4527 Mon Sep 17 00:00:00 2001
From 3e8510d353d0989a09eea4afeaf88f96406acc4c 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 6497289..b2e1d98 100644
index a0f55df..c31de81 100644
--- a/src/lib/network/networkmanager.cpp
+++ b/src/lib/network/networkmanager.cpp
@@ -107,7 +107,7 @@ void NetworkManager::loadSettings()
@@ -18,16 +18,14 @@ index 6497289..b2e1d98 100644
QString bundlePath = certDir + "/ca-bundle.crt";
QString bundleVersionPath = certDir + "/bundle_version";
--
2.2.2
2.12.2
From 70271396e7b076d96324cf7c535dc95bc211e474 Mon Sep 17 00:00:00 2001
From 70d867d457ebbfdffafb4cc7ffc195fe1645243d Mon Sep 17 00:00:00 2001
From: Zoltan Mizsei <miqlas@gmail.com>
Date: Mon, 14 Mar 2016 21:13:13 +0000
Subject: [PATCH] Haiku config paths
Subject: Haiku config paths
---
src/lib/app/datapaths.cpp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/lib/app/datapaths.cpp b/src/lib/app/datapaths.cpp
index fa6fe66..51e16ba 100644
@@ -44,9 +42,10 @@ index fa6fe66..51e16ba 100644
QDir confPath = QDir(QDir::homePath() + QLatin1String("/.config/qupzilla"));
QDir oldConfPath = QDir(QDir::homePath() + QLatin1String("/.qupzilla"));
--
2.7.0
2.12.2
From 4e54f24baa2bf02dad09e95690987fc17b2d3c26 Mon Sep 17 00:00:00 2001
From 3c760189c8f97bb1c1f0adec0aca3f4b08d17192 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Sat, 17 Jun 2017 09:43:22 +0300
Subject: Fix adblock subscription urls
@@ -94,3 +93,26 @@ index fc68237..7571eb7 100644
--
2.12.2
From 1a973dc987166605fe44709a16f055b68b704771 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
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
--- a/src/lib/app/qzcommon.h
+++ b/src/lib/app/qzcommon.h
@@ -127,6 +127,8 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(Qz::NewTabPositionFlags)
#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"
#else
#define DEFAULT_THEME_NAME "default"
#endif
--
2.12.2

View File

@@ -10,7 +10,7 @@ positively received by reviewers:
HOMEPAGE="https://www.qupzilla.com/"
COPYRIGHT="2010-2015 David Rosca"
LICENSE="GNU GPL v3"
REVISION="4"
REVISION="5"
SOURCE_URI="https://github.com/QupZilla/qupzilla/releases/download/v$portVersion/QupZilla-$portVersion.tar.xz"
CHECKSUM_SHA256="620ffb10a3f6b3f596c2c38a84d9c320cb66dd2d5e6701e8e31945e26308fcac"
SOURCE_DIR="QupZilla-$portVersion"
@@ -49,6 +49,8 @@ BUILD_PREREQUIRES="
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libcrypto$secondaryArchSuffix
devel:libexecinfo$secondaryArchSuffix
devel:libQt5Core$secondaryArchSuffix
devel:libQt5Gui$secondaryArchSuffix
devel:libQt5Network$secondaryArchSuffix
@@ -59,8 +61,6 @@ BUILD_REQUIRES="
devel:libQt5WebKitWidgets$secondaryArchSuffix
devel:libQt5Widgets$secondaryArchSuffix
devel:libssl$secondaryArchSuffix
devel:libcrypto$secondaryArchSuffix
devel:libexecinfo$secondaryArchSuffix
"
BUILD()
@@ -68,7 +68,6 @@ BUILD()
cd $sourceDir
export QUPZILLA_PREFIX=$appsDir/QupZilla
export DISABLE_UPDATES_CHECK="true"
export NO_X11="true"
qmake
make $jobArgs
}