falkon: update to 3.0.1, turn qupzilla into transitional package

Closes #14274.

Signed-off-by: Enno Boland <gottox@voidlinux.eu>
This commit is contained in:
Helmut Pozimski 2018-05-09 23:46:05 +02:00 committed by Enno Boland
parent 4b5fb08dfa
commit 2a2b9b881b
No known key found for this signature in database
GPG Key ID: D09964719BDE9971
5 changed files with 15 additions and 53 deletions

View File

@ -1,4 +0,0 @@
If you were using QupZilla previously and want to keep using your
profiles in Falkon, you can manually migrate your profiles by moving
or copying the config directory which usually is in ~/.config/qupzilla
to ~/.config/falkon. There is no automatic migration.

View File

@ -1,18 +1,26 @@
# Template file for 'falkon'
pkgname=falkon
version=3.0.0
revision=2
version=3.0.1
revision=1
build_style=cmake
hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools"
hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
python"
makedepends="qt5-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
qt5-plugin-sqlite qt5-plugin-tds qt5-declarative-devel qt5-webchannel-devel
qt5-webengine-devel qt5-location-devel qt5-x11extras-devel qt5-tools-devel
python3-devel kwallet-devel"
short_desc="Cross-platform Qt Web Browser"
maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="GPL-3"
license="GPL-3.0-or-later"
homepage="https://github.com/KDE/falkon"
distfiles="https://download.kde.org/stable/falkon/3.0/src/falkon-${version}.tar.xz"
checksum=4e42a091e6ae434d7c3146adb876a8a5dc29d9354560087a905a0bd7fb58d7a6
distfiles="${KDE_SITE}/falkon/${version}/falkon-${version}.tar.xz"
checksum=7b6ed54986543dd5462602943fb824df12f15d2061996310c4c4b891433f1a83
LDFLAGS+=" -Wl,--no-fatal-warnings"
qupzilla_package() {
build_style=meta
noarch=yes
depends="falkon>=${version}"
short_desc+=" - transitional dummy package"
}

1
srcpkgs/qupzilla Symbolic link
View File

@ -0,0 +1 @@
falkon

View File

@ -1,20 +0,0 @@
--- src/main/main.cpp 2015-01-26 15:26:15.000000000 +0100
+++ src/main/main.cpp 2015-07-06 09:35:37.741814165 +0200
@@ -22,7 +22,7 @@
#include <QMessageBox> // For QT_REQUIRE_VERSION
#include <iostream>
-#if defined(Q_OS_LINUX) || defined(__GLIBC__) || defined(__FreeBSD__) || defined(__HAIKU__)
+#if (defined(Q_OS_LINUX) && defined(__GLIBC__)) || defined(__FreeBSD__) || defined(__HAIKU__)
#include <signal.h>
#include <execinfo.h>
@@ -166,7 +166,7 @@
QApplication::setGraphicsSystem(QSL("raster"));
#endif
-#if defined(Q_OS_LINUX) || defined(__GLIBC__) || defined(__FreeBSD__)
+#if (defined(Q_OS_LINUX) && defined(__GLIBC__)) || defined(__FreeBSD__)
signal(SIGSEGV, qupzilla_signal_handler);
#endif

View File

@ -1,23 +0,0 @@
# Template file for 'qupzilla'
pkgname=qupzilla
version=2.2.6
revision=2
wrksrc=QupZilla-${version}
build_style=qmake
hostmakedepends="pkg-config qt5-tools"
makedepends="hunspell-devel qt5-script-devel qt5-declarative-devel
qt5-location-devel qt5-webchannel-devel qt5-webengine-devel qt5-webview-devel
qt5-svg-devel qt5-x11extras-devel xcb-util-devel"
depends="qt5-plugin-sqlite"
short_desc="Lightweight multiplatform browser"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="GPL-3"
homepage="https://qupzilla.com/"
distfiles="https://github.com/QupZilla/${pkgname}/releases/download/v${version}/QupZilla-${version}.tar.xz"
checksum=ef88afbaa85df9ed01e7848be1a82d910a9a62933f0f22acce299226dc4aeed4
conflicts="qupzilla1>=0"
if [ $CROSS_BUILD ]; then
hostmakedepends+=" qt5-declarative-devel qt5-location-devel
qt5-webchannel-devel qt5-webengine-devel qt5-x11extras-devel"
fi