QupZilla: new icon and Haiku theme

This commit is contained in:
Sergei Reznikov
2017-06-18 08:53:26 +03:00
parent 998e11ea70
commit 125d8a1929
9 changed files with 191 additions and 465 deletions

View File

@@ -0,0 +1,56 @@
resource app_flags B_SINGLE_LAUNCH | B_ARGV_ONLY;
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 {
$"6E63696603036FD4FC020106023E60000000000000003EF00049800046800000"
$"92B8EBFF1F5BA005FF03020DB9BBC274B8CBC34DBAF4C16CBDB140BC43C078BE"
$"3EBFE5BF61BFECBED2BFCBC128C040C45AC1FEC2CAC11DC60648C96AC4B9C7A7"
$"C3F4CA35C511CBE8C567CB0DC546CBA5C58ECB0CC5B1CB57C59FCA39C5E2C88A"
$"C619C965C614C77DC623C561C605C66BC640C3D64FC10BC44FC270C4FFC054C3"
$"F8BED5C370BF9BC39EBD96C325BB0CC391BC44C33AB9A9C3EFB711C526B861C4"
$"97B7D6C4240221BF00B422C023B422BDDEB423BBA6B4A0BCBBB44BB900B56DB5"
$"37B994B6ADB73AB50AB9DFB4B4BA77B4DBBA2AB496BAA9B473BB01B48BBACEB3"
$"48BDA9B423C382B328C0C5B521C660BA12CA16B755C8CCBC28CB16C0D4CB0BBE"
$"8CCB67C344CAAAC748C7AEC594C978C7BEC731C88AC619C835C6B0C77DC623C5"
$"61C605C66BC640C3D64FC10BC44FC270C4FFC054C3F8BED5C370BF9BC39EBD96"
$"C325BB0CC391BC44C33AB9A9C3EFB711C526B861C497B704C52CB6E0C53EB6EB"
$"C539B695C4E0B637C406B664C472B5ADC2AEB570BFCBB56CC13DB569BDDEB6C2"
$"BA3AB5D6BBEDB6E8B9E7B792B9A5B74231B935B8F3BCCDB911BB0DB8C9BF52B9"
$"6CC3F6BB87C1AEBA73C58BBC45C8BDBDB2C716BD1FC7F0BDB3C658BD9CC724BD"
$"98C358BD9FBDB140C056BE52BE3EBFE5BF61BFECBED2BFCBC128C040C45AC1FE"
$"C2CAC11CC60648C96AC4B9C7A7C3F4C9A0C40FCA1BC2C2C9EDC36FCACEC03DC9"
$"97BB12CAA0BD7AC98CBAFCC97BBAD4C983BAEAC953BA79C8F9B9E3C926BA36C7"
$"882BC25BB4A0C51FB576C145B44B020CB792B9A5B74231B935B8F3BCCDB911BB"
$"0DB8C9BF52B96CC3F6BB87C1AEBA73C58BBC45C8BDBDB2C716BD1FC7F0BDB3C6"
$"58BD9CC724BD98C358BD9FBDB140C056BE52BC43C078B9BBC274BAF4C16CB8CB"
$"C34DB711C526B7D6C424B704C52CB6E0C53EB6EBC539B695C4E0B637C406B664"
$"C472B5ADC2AEB570BFCBB56CC13DB569BDDEB6C2BA3AB5D6BBEDB6E8B9E7030A"
$"000100000A010101000A02010200"
};

View File

@@ -1,119 +0,0 @@
From 49c386fa4bd03dfe7e102c1d0635743d966b75b7 Mon Sep 17 00:00:00 2001
From: "Arfonzo J. Coward" <art@poorcoding.com>
Date: Thu, 5 Dec 2013 00:04:04 +0000
Subject: QupZilla sources and build definitions modified for Haiku.
diff --git a/src/defines.pri b/src/defines.pri
index 18a234a..7c33ba5 100644
--- a/src/defines.pri
+++ b/src/defines.pri
@@ -19,6 +19,13 @@ win32-msvc* {
LIBS += User32.lib Ole32.lib Shell32.lib ShlWapi.lib Gdi32.lib ComCtl32.lib
}
+#DEFINES *= QUPZILLA_PREFIX="`finddir B_USER_APPS_DIRECTORY`/QupZilla/"
+DEFINES *= QUPZILLA_PREFIX="/boot/home/config/apps/QupZilla/"
+DEFINES *= DISABLE_DBUS
+DEFINES *= NO_SYSTEM_DATAPATH
+DEFINES *= NO_X11
+
+
# Check for pkg-config availability
!mac:unix:system(pkg-config --version > /dev/null) {
isEqual(QT_MAJOR_VERSION, 5) {
diff --git a/src/lib/3rdparty/processinfo.cpp b/src/lib/3rdparty/processinfo.cpp
index 6131d62..ba96c63 100644
--- a/src/lib/3rdparty/processinfo.cpp
+++ b/src/lib/3rdparty/processinfo.cpp
@@ -30,6 +30,10 @@
#include <cstdarg>
#endif
+#ifdef __HAIKU__
+#define DT_DIR 4
+#endif
+
ProcessInfo::ProcessInfo(const QString &name)
: m_name(name)
{
@@ -75,7 +79,8 @@ pid_t ProcessInfo::GetPIDbyName(const char* cchrptr_ProcessName) const
}
// Loop while not NULL
- while ((de_DirEntity = readdir(dir_proc))) {
+ while ((de_DirEntity = readdir(dir_proc))) {
+#ifndef __HAIKU__
if (de_DirEntity->d_type == DT_DIR) {
if (IsNumeric(de_DirEntity->d_name)) {
strcpy(chrarry_CommandLinePath, "/proc/") ;
@@ -104,6 +109,7 @@ pid_t ProcessInfo::GetPIDbyName(const char* cchrptr_ProcessName) const
}
}
}
+#endif
}
closedir(dir_proc) ;
diff --git a/src/main/main.cpp b/src/main/main.cpp
index e6a56ea..e4ac880 100644
--- a/src/main/main.cpp
+++ b/src/main/main.cpp
@@ -20,10 +20,12 @@
#include <QMessageBox> // For QT_REQUIRE_VERSION
-#if defined(Q_OS_LINUX) || defined(__GLIBC__)
+#if defined(Q_OS_LINUX) || defined(__GLIBC__) || defined(__HAIKU__)
#include <iostream>
#include <signal.h>
+#ifndef __HAIKU__
#include <execinfo.h>
+#endif
#include "qupzilla.h"
@@ -56,6 +58,7 @@ void qupzilla_signal_handler(int s)
}
sigSegvServed = true;
+#ifndef __HAIKU__
std::cout << "QupZilla: Crashed :( Saving backtrace in " << qPrintable(mApp->PROFILEDIR) << "crashlog ..." << std::endl;
void* array[100];
@@ -105,6 +108,9 @@ void qupzilla_signal_handler(int s)
file.close();
std::cout << "Backtrace successfuly saved in " << qPrintable(dir.absoluteFilePath(file.fileName())) << std::endl;
+#else
+ std::cout << "QupZilla: Crashed :(" << std::endl;
+#endif
}
default:
--
1.8.3.4
From 002f7d5e1da83f0e0db8129ae05ebf805abec4fe Mon Sep 17 00:00:00 2001
From: "Arfonzo J. Coward" <art@poorcoding.com>
Date: Thu, 5 Dec 2013 08:00:47 +0000
Subject: Remove QUPZILLA_PREFIX definition. We set thisbuild time instead.
diff --git a/src/defines.pri b/src/defines.pri
index 7c33ba5..96093af 100644
--- a/src/defines.pri
+++ b/src/defines.pri
@@ -19,8 +19,6 @@ win32-msvc* {
LIBS += User32.lib Ole32.lib Shell32.lib ShlWapi.lib Gdi32.lib ComCtl32.lib
}
-#DEFINES *= QUPZILLA_PREFIX="`finddir B_USER_APPS_DIRECTORY`/QupZilla/"
-DEFINES *= QUPZILLA_PREFIX="/boot/home/config/apps/QupZilla/"
DEFINES *= DISABLE_DBUS
DEFINES *= NO_SYSTEM_DATAPATH
DEFINES *= NO_X11
--
1.8.3.4

View File

@@ -1,19 +1,96 @@
From 10f89aae0669c723caea8d06f14e98aff338b9cc Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 16 Feb 2017 22:17:01 +0100
Subject: fix app signature on qt5.
From 1e80d74ca4a7b205916bc218d46a1f8922ba4527 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/haiku/QupZilla.rdef b/haiku/QupZilla.rdef
index 5470444..7fdf185 100644
--- a/haiku/QupZilla.rdef
+++ b/haiku/QupZilla.rdef
@@ -1,4 +1,4 @@
-resource app_signature "application/x-vnd.QupZilla";
+resource app_signature "application/x-vnd.qt5-QupZilla";
resource app_flags B_SINGLE_LAUNCH;
resource app_version {
major = 1,
diff --git a/src/lib/network/networkmanager.cpp b/src/lib/network/networkmanager.cpp
index 6497289..b2e1d98 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.10.2
2.2.2
From 70271396e7b076d96324cf7c535dc95bc211e474 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
---
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
--- 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.7.0
From 4e54f24baa2bf02dad09e95690987fc17b2d3c26 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
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 <nowrep@gmail.com>
+* QupZilla - Qt web browser
+* Copyright (C) 2010-2017 David Rosca <nowrep@gmail.com>
*
* 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.12.2

View File

@@ -1,22 +0,0 @@
From 1e80d74ca4a7b205916bc218d46a1f8922ba4527 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
--- 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.2.2

View File

@@ -1,66 +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="http://www.qupzilla.com"
COPYRIGHT="2010-2013 David Rosca"
LICENSE="GNU GPL v3"
REVISION="1"
SOURCE_URI="git://github.com/QupZilla/qupzilla.git#4f3aba95ff4194c9b756d196f54d50ff30161f46"
PATCHES="qupzilla-1.4.x.patchset"
ARCHITECTURES="!x86_gcc2 x86"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
qupzilla${secondaryArchSuffix} = $portVersion
app:qupzilla${secondaryArchSuffix} = $portVersion
"
# TODO: update requirements to be more specific about which Qt
# libraries are required.
REQUIRES="
haiku${secondaryArchSuffix}
qtcore${secondaryArchSuffix} >= 4.8.0
"
BUILD_PREREQUIRES="
cmd:qmake${secondaryArchSuffix}
cmd:make
cmd:g++${secondaryArchSuffix}
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
openssl${secondaryArchSuffix}_devel
qtcore${secondaryArchSuffix} >= 4.8.0
qtcore${secondaryArchSuffix}_devel >= 4.8.0
"
BUILD()
{
qmake QUPZILLA_PREFIX=${appsDir}/QupZilla
make $jobArgs
}
INSTALL()
{
echo "Installing QupZilla..."
mkdir -p ${appsDir}/QupZilla/
mkdir -p ${appsDir}/QupZilla/lib/
cd bin/
cp qupzilla ${appsDir}/QupZilla/
cp -R locale ${appsDir}/QupZilla/
cp -R plugins ${appsDir}/QupZilla/
cp -R themes ${appsDir}/QupZilla/
cp libQupZilla.* ${appsDir}/QupZilla/lib/
echo "Linking QupZilla..."
addAppDeskbarSymlink ${appsDir}/QupZilla/qupzilla "QupZilla"
}

View File

@@ -1,72 +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="http://www.qupzilla.com"
COPYRIGHT="2010-2014 David Rosca"
LICENSE="GNU GPL v3"
REVISION="6"
SOURCE_URI="https://github.com/QupZilla/qupzilla/archive/eee3895f6954617f8eb1f15df18b33a9745491ba.zip"
CHECKSUM_SHA256="1ed2b9f1edd6908349d047e932114e7a0215c6dfe6290fe4a6f3bc1a4dd05e25"
SOURCE_DIR="qupzilla-eee3895f6954617f8eb1f15df18b33a9745491ba"
ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
qupzilla${secondaryArchSuffix} = $portVersion
app:QupZilla${secondaryArchSuffix} = $portVersion
"
# TODO: update requirements to be more specific about which Qt
# libraries are required.
REQUIRES="
haiku${secondaryArchSuffix}
libqt4${secondaryArchSuffix} >= 4.8.0
lib:libexecinfo${secondaryArchSuffix}
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
libqt4${secondaryArchSuffix}_devel >= 4.8.0
devel:libssl${secondaryArchSuffix}
devel:libcrypto${secondaryArchSuffix}
devel:libexecinfo${secondaryArchSuffix}
"
BUILD_PREREQUIRES="
cmd:qmake${secondaryArchSuffix}
cmd:make
cmd:g++${secondaryArchSuffix}
cmd:pkg_config$secondaryArchSuffix
"
BUILD()
{
qmake QUPZILLA_PREFIX=${appsDir}/QupZilla
make $jobArgs
}
INSTALL()
{
mkdir -p ${appsDir}/QupZilla/
mkdir -p ${appsDir}/QupZilla/lib/
cd bin/
# Add Haiku resources.
rc -o ../haiku/QupZilla.rsrc ../haiku/QupZilla.rdef
xres -o qupzilla ../haiku/QupZilla.rsrc
mimeset -f qupzilla
cp qupzilla ${appsDir}/QupZilla/QupZilla
cp -R locale ${appsDir}/QupZilla/
cp -R plugins ${appsDir}/QupZilla/
cp -R themes ${appsDir}/QupZilla/
cp libQupZilla.* ${appsDir}/QupZilla/lib/
addAppDeskbarSymlink ${appsDir}/QupZilla/QupZilla "QupZilla"
}

View File

@@ -1,73 +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="http://www.qupzilla.com"
COPYRIGHT="2010-2015 David Rosca"
LICENSE="GNU GPL v3"
REVISION="1"
SOURCE_URI="https://github.com/QupZilla/qupzilla/releases/download/v$portVersion/QupZilla-$portVersion.tar.xz"
CHECKSUM_SHA256="aecda29f8994c9dc4d6b5f76ce5b1ba947272a0d5a40b5d83a54023dd5d7a6a5"
SOURCE_DIR="QupZilla-$portVersion"
PATCHES="qupzilla-1.8.x-system_certificates.patchset"
ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
qupzilla$secondaryArchSuffix = $portVersion
app:QupZilla$secondaryArchSuffix = $portVersion
"
# TODO: update requirements to be more specific about which Qt
# libraries are required.
REQUIRES="
haiku${secondaryArchSuffix}
libqt4$secondaryArchSuffix >= 4.8.0
lib:libexecinfo$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:qmake$secondaryArchSuffix
cmd:make
cmd:g++$secondaryArchSuffix
cmd:pkg_config$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
libqt4${secondaryArchSuffix}_devel >= 4.8.0
devel:libssl$secondaryArchSuffix
devel:libcrypto$secondaryArchSuffix
devel:libexecinfo$secondaryArchSuffix
"
BUILD()
{
export QUPZILLA_PREFIX=$appsDir/QupZilla
qmake
make $jobArgs
}
INSTALL()
{
mkdir -p $appsDir/QupZilla/lib
cd bin
# Add Haiku resources
rc -o ../haiku/QupZilla.rsrc ../haiku/QupZilla.rdef
xres -o qupzilla ../haiku/QupZilla.rsrc
mimeset -f qupzilla
cp qupzilla $appsDir/QupZilla/QupZilla
cp -R locale $appsDir/QupZilla
cp -R plugins $appsDir/QupZilla
cp -R themes $appsDir/QupZilla
cp libQupZilla.* $appsDir/QupZilla/lib
addAppDeskbarSymlink $appsDir/QupZilla/QupZilla "QupZilla"
}

View File

@@ -1,73 +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="http://www.qupzilla.com"
COPYRIGHT="2010-2015 David Rosca"
LICENSE="GNU GPL v3"
REVISION="1"
SOURCE_URI="https://github.com/QupZilla/qupzilla/releases/download/v$portVersion/QupZilla-$portVersion.tar.xz"
CHECKSUM_SHA256="1823f36520a3e5d0164f4ad185f29cd80600d3e8010e3acf9b33e536e61049fd"
SOURCE_DIR="QupZilla-$portVersion"
PATCHES="qupzilla-1.8.x-system_certificates.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
qupzilla$secondaryArchSuffix = $portVersion
app:QupZilla$secondaryArchSuffix = $portVersion
"
# TODO: update requirements to be more specific about which Qt
# libraries are required.
REQUIRES="
haiku${secondaryArchSuffix}
libqt4$secondaryArchSuffix >= 4.8.0
lib:libexecinfo$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:qmake$secondaryArchSuffix
cmd:make
cmd:g++$secondaryArchSuffix
cmd:pkg_config$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
libqt4${secondaryArchSuffix}_devel >= 4.8.0
devel:libssl$secondaryArchSuffix
devel:libcrypto$secondaryArchSuffix
devel:libexecinfo$secondaryArchSuffix
"
BUILD()
{
export QUPZILLA_PREFIX=$appsDir/QupZilla
qmake
make $jobArgs
}
INSTALL()
{
mkdir -p $appsDir/QupZilla/lib
cd bin
# Add Haiku resources
rc -o ../haiku/QupZilla.rsrc ../haiku/QupZilla.rdef
xres -o qupzilla ../haiku/QupZilla.rsrc
mimeset -f qupzilla
cp qupzilla $appsDir/QupZilla/QupZilla
cp -R locale $appsDir/QupZilla
cp -R plugins $appsDir/QupZilla
cp -R themes $appsDir/QupZilla
cp libQupZilla.* $appsDir/QupZilla/lib
addAppDeskbarSymlink $appsDir/QupZilla/QupZilla "QupZilla"
}

View File

@@ -7,40 +7,48 @@ positively received by reviewers:
- A themeable interface.
- Integrated Adblock.
- Speed dial."
HOMEPAGE="http://www.qupzilla.com"
HOMEPAGE="https://www.qupzilla.com/"
COPYRIGHT="2010-2015 David Rosca"
LICENSE="GNU GPL v3"
REVISION="2"
REVISION="3"
SOURCE_URI="https://github.com/QupZilla/qupzilla/releases/download/v$portVersion/QupZilla-$portVersion.tar.xz"
CHECKSUM_SHA256="620ffb10a3f6b3f596c2c38a84d9c320cb66dd2d5e6701e8e31945e26308fcac"
SOURCE_DIR="QupZilla-$portVersion"
PATCHES="qupzilla-1.8.x-system_certificates.patchset
qupzilla-1.8.9.patchset"
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"
PATCHES="qupzilla-$portVersion.patchset"
ADDITIONAL_FILES="qupzilla.rdef"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="?x86"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
qupzilla$secondaryArchSuffix = $portVersion
app:QupZilla$secondaryArchSuffix = $portVersion
"
REQUIRES="
haiku${secondaryArchSuffix}
lib:libcrypto$secondaryArchSuffix
haiku$secondaryArchSuffix
# lib:libexecinfo$secondaryArchSuffix
lib:libQt5Core$secondaryArchSuffix
lib:libQt5Gui$secondaryArchSuffix
lib:libQt5Network$secondaryArchSuffix
lib:libQt5PrintSupport$secondaryArchSuffix
lib:libQt5Script$secondaryArchSuffix
lib:libQt5Sql$secondaryArchSuffix
lib:libQt5PrintSupport$secondaryArchSuffix
lib:libQt5WebKit$secondaryArchSuffix
lib:libQt5WebKitWidgets$secondaryArchSuffix
lib:libQt5Widgets$secondaryArchSuffix
lib:libGL$secondaryArchSuffix
#
# lib:libexecinfo$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:qmake$secondaryArchSuffix
cmd:make
cmd:g++$secondaryArchSuffix
cmd:pkg_config$secondaryArchSuffix
cmd:sed
# coreutils
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libQt5Core$secondaryArchSuffix
@@ -56,36 +64,46 @@ BUILD_REQUIRES="
devel:libcrypto$secondaryArchSuffix
devel:libexecinfo$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:g++$secondaryArchSuffix
cmd:make
cmd:pkg_config$secondaryArchSuffix
cmd:qmake$secondaryArchSuffix >= 5
"
BUILD()
{
cd $sourceDir
export QUPZILLA_PREFIX=$appsDir/QupZilla
export DISABLE_UPDATES_CHECK="true"
export NO_X11="true"
qmake
make $jobArgs
}
INSTALL()
{
cd $sourceDir
mkdir -p $appsDir/QupZilla/lib
cd bin
# Add Haiku resources
rc -o ../haiku/QupZilla.rsrc ../haiku/QupZilla.rdef
xres -o qupzilla ../haiku/QupZilla.rsrc
mimeset -f qupzilla
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 libQupZilla.* $appsDir/QupZilla/lib
addAppDeskbarSymlink $appsDir/QupZilla/QupZilla "QupZilla"
# 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
# Haiku theme
mkdir -p $appsDir/QupZilla/themes
cp -dR $sourceDir2/haiku $appsDir/QupZilla/themes
}