diff options
Diffstat (limited to 'network/falkon')
-rw-r--r-- | network/falkon/falkon.SlackBuild | 7 | ||||
-rw-r--r-- | network/falkon/falkon.info | 6 | ||||
-rw-r--r-- | network/falkon/qt-5.14.patch | 24 | ||||
-rw-r--r-- | network/falkon/qt-5.15.patch | 26 |
4 files changed, 58 insertions, 5 deletions
diff --git a/network/falkon/falkon.SlackBuild b/network/falkon/falkon.SlackBuild index df6df2e5ae..89b55005c1 100644 --- a/network/falkon/falkon.SlackBuild +++ b/network/falkon/falkon.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for falkon -# Copyright 2018 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2018,2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=falkon -VERSION=${VERSION:-3.0.1} +VERSION=${VERSION:-3.1.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -69,6 +69,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/qt-5.14.patch +patch -p1 < $CWD/qt-5.15.patch + # Handling this directory requires the KDE5 Framework rm -fR po diff --git a/network/falkon/falkon.info b/network/falkon/falkon.info index 39afba46f1..08489ab024 100644 --- a/network/falkon/falkon.info +++ b/network/falkon/falkon.info @@ -1,8 +1,8 @@ PRGNAM="falkon" -VERSION="3.0.1" +VERSION="3.1.0" HOMEPAGE="https://www.falkon.org" -DOWNLOAD="https://download.kde.org/stable/falkon/3.0.1/falkon-3.0.1.tar.xz" -MD5SUM="c6fb6433ac0f228667e2f763c02317c5" +DOWNLOAD="https://download.kde.org/stable/falkon/3.1/falkon-3.1.0.tar.xz" +MD5SUM="9255fb335d3ba361dea44b7b297ddf7d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="extra-cmake-modules qt5" diff --git a/network/falkon/qt-5.14.patch b/network/falkon/qt-5.14.patch new file mode 100644 index 0000000000..b87eb31fd3 --- /dev/null +++ b/network/falkon/qt-5.14.patch @@ -0,0 +1,24 @@ +From bbde5c6955c43bc744ed2c4024598495de908f2a Mon Sep 17 00:00:00 2001 +From: Laurent Montel <montel@kde.org> +Date: Mon, 2 Dec 2019 13:30:36 +0100 +Subject: Add missing include in last qt5.14 + +--- + src/plugins/VerticalTabs/verticaltabsplugin.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/plugins/VerticalTabs/verticaltabsplugin.cpp b/src/plugins/VerticalTabs/verticaltabsplugin.cpp +index c1cfac4..d179bb1 100644 +--- a/src/plugins/VerticalTabs/verticaltabsplugin.cpp ++++ b/src/plugins/VerticalTabs/verticaltabsplugin.cpp +@@ -30,6 +30,7 @@ + #include "../config.h" + + #include <QSettings> ++#include <QFile> + + VerticalTabsPlugin::VerticalTabsPlugin() + : QObject() +-- +cgit v1.1 + diff --git a/network/falkon/qt-5.15.patch b/network/falkon/qt-5.15.patch new file mode 100644 index 0000000000..2b2bb38a26 --- /dev/null +++ b/network/falkon/qt-5.15.patch @@ -0,0 +1,26 @@ +From 2ca83509dbc72dfdfa9cc7103c2b29db31e07f3a Mon Sep 17 00:00:00 2001 +From: Heiko Becker <heirecka@exherbo.org> +Date: Sun, 29 Mar 2020 12:53:00 +0200 +Subject: [PATCH] Fix build with Qt 5.15 + +QPainterPath is no longer included via qtransform.h (since +5.15.0-beta2, 50d2acdc93b4de2ba56eb67787e2bdcb21dd4bea in qtbase.git). +--- + src/lib/tools/qztools.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/lib/tools/qztools.cpp b/src/lib/tools/qztools.cpp +index 499b22503..04f19b715 100644 +--- a/src/lib/tools/qztools.cpp ++++ b/src/lib/tools/qztools.cpp +@@ -25,6 +25,7 @@ + #include <QByteArray> + #include <QPixmap> + #include <QPainter> ++#include <QPainterPath> + #include <QBuffer> + #include <QFile> + #include <QDir> +-- +GitLab + |