From 5c8363cbf52aa0c8ff492c017b759cefe5c63a78 Mon Sep 17 00:00:00 2001 From: extrowerk <5569059+extrowerk@users.noreply.github.com> Date: Sat, 12 Feb 2022 16:36:14 +0100 Subject: [PATCH] Falkon: bump (#6614) --- ...alkon-3.1.0.recipe => falkon-3.2.0.recipe} | 8 +- .../falkon/patches/falkon-3.1.0.patchset | 105 ------------------ .../falkon/patches/falkon-3.2.0.patchset | 58 ++++++++++ 3 files changed, 64 insertions(+), 107 deletions(-) rename www-client/falkon/{falkon-3.1.0.recipe => falkon-3.2.0.recipe} (92%) delete mode 100644 www-client/falkon/patches/falkon-3.1.0.patchset create mode 100644 www-client/falkon/patches/falkon-3.2.0.patchset diff --git a/www-client/falkon/falkon-3.1.0.recipe b/www-client/falkon/falkon-3.2.0.recipe similarity index 92% rename from www-client/falkon/falkon-3.1.0.recipe rename to www-client/falkon/falkon-3.2.0.recipe index e714c1a0f..9c3f40423 100644 --- a/www-client/falkon/falkon-3.1.0.recipe +++ b/www-client/falkon/falkon-3.2.0.recipe @@ -6,8 +6,8 @@ HOMEPAGE="https://falkon.org/" COPYRIGHT="2009-2019 Falkon Browser Team" LICENSE="GNU GPL v3" REVISION="4" -SOURCE_URI="https://download.kde.org/stable/falkon/3.1/falkon-$portVersion.tar.xz" -CHECKSUM_SHA256="ce743cd80c0e2d525a784e29c9b487f73480119b0567f9ce8ef1f44cca527587" +SOURCE_URI="https://github.com/KDE/falkon/archive/refs/tags/v3.2.0.tar.gz" +CHECKSUM_SHA256="5b8fba93ca53b8e5f69ea913e36b01084b65ccb3f399281dbc1b0df89916f4ca" PATCHES="falkon-$portVersion.patchset" ADDITIONAL_FILES=" falkon.rdef.in @@ -24,9 +24,11 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix + lib:libintl$secondaryArchSuffix lib:libQt5Core$secondaryArchSuffix lib:libQt5DBus$secondaryArchSuffix lib:libQt5Gui$secondaryArchSuffix + lib:libKF5Archive$secondaryArchSuffix lib:libQt5Network$secondaryArchSuffix lib:libQt5Positioning$secondaryArchSuffix lib:libQt5PrintSupport$secondaryArchSuffix @@ -45,7 +47,9 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel + devel:libintl$secondaryArchSuffix devel:libKF5I18n$secondaryArchSuffix + devel:libKF5Archive$secondaryArchSuffix devel:libQt5Core$secondaryArchSuffix devel:libQt5DBus$secondaryArchSuffix devel:libQt5Gui$secondaryArchSuffix diff --git a/www-client/falkon/patches/falkon-3.1.0.patchset b/www-client/falkon/patches/falkon-3.1.0.patchset deleted file mode 100644 index f493c1cac..000000000 --- a/www-client/falkon/patches/falkon-3.1.0.patchset +++ /dev/null @@ -1,105 +0,0 @@ -From 495e96a778ae2529fd9e28bf0aa4ff384660f207 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Wed, 17 Nov 2021 18:37:27 +0100 -Subject: upstream patches - - -diff --git a/src/lib/tools/qztools.cpp b/src/lib/tools/qztools.cpp -index 499b225..04f19b7 100644 ---- a/src/lib/tools/qztools.cpp -+++ b/src/lib/tools/qztools.cpp -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/src/plugins/VerticalTabs/verticaltabsplugin.cpp b/src/plugins/VerticalTabs/verticaltabsplugin.cpp -index 7320925..44cb57e 100644 ---- a/src/plugins/VerticalTabs/verticaltabsplugin.cpp -+++ b/src/plugins/VerticalTabs/verticaltabsplugin.cpp -@@ -31,6 +31,7 @@ - #include "desktopfile.h" - - #include -+#include - - VerticalTabsPlugin::VerticalTabsPlugin() - : QObject() --- -2.30.2 - - -From 1ec5a48b8bf54552db3a1b59f066fcfc8826fefe Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Wed, 17 Nov 2021 18:37:35 +0100 -Subject: Haiku patch - - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9b637fb..1575c7c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -53,7 +53,7 @@ if (NOT DISABLE_DBUS) - find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS DBus) - endif() - --if (UNIX AND NOT APPLE AND NOT NO_X11) -+if (UNIX AND NOT APPLE AND NOT HAIKU AND NOT NO_X11) - add_definitions(-DQZ_WS_X11) - find_package(XCB REQUIRED COMPONENTS XCB UTIL) - find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS X11Extras) -diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt -index b4aff59..92f79d5 100644 ---- a/src/lib/CMakeLists.txt -+++ b/src/lib/CMakeLists.txt -@@ -352,7 +352,7 @@ target_link_libraries(FalkonPrivate - ) - - if (UNIX AND NOT APPLE) -- if (NOT NO_X11) -+ if (NOT NO_X11 AND NOT HAIKU) - target_link_libraries(FalkonPrivate XCB::XCB Qt5::X11Extras) - endif() - -diff --git a/src/main/main.cpp b/src/main/main.cpp -index c1af1b6..0deeb7c 100644 ---- a/src/main/main.cpp -+++ b/src/main/main.cpp -@@ -22,7 +22,7 @@ - #include // For QT_REQUIRE_VERSION - #include - --#if defined(Q_OS_LINUX) || defined(__GLIBC__) || defined(__FreeBSD__) || defined(__HAIKU__) -+#if defined(Q_OS_LINUX) || defined(__GLIBC__) || defined(__FreeBSD__) - #include - #include - --- -2.30.2 - - -From e95f12835484656b0237d90d30ff20dac4daaa8c Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Sat, 27 Nov 2021 22:09:34 +1000 -Subject: Set default theme for Haiku - - -diff --git a/src/lib/app/qzcommon.h b/src/lib/app/qzcommon.h -index 92a453c..2c7e061 100644 ---- a/src/lib/app/qzcommon.h -+++ b/src/lib/app/qzcommon.h -@@ -117,6 +117,8 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(Qz::NewTabPositionFlags) - #define DEFAULT_THEME_NAME QSL("windows") - #elif defined(Q_OS_MACOS) - #define DEFAULT_THEME_NAME QSL("mac") -+#elif defined(Q_OS_HAIKU) -+#define DEFAULT_THEME_NAME QSL("haiku") - #elif defined(Q_OS_UNIX) - #define DEFAULT_THEME_NAME QSL("linux") - #else --- -2.30.2 - diff --git a/www-client/falkon/patches/falkon-3.2.0.patchset b/www-client/falkon/patches/falkon-3.2.0.patchset new file mode 100644 index 000000000..0b7b0c3b5 --- /dev/null +++ b/www-client/falkon/patches/falkon-3.2.0.patchset @@ -0,0 +1,58 @@ +From b2de5b318456f2a045e247c25dc5512aebf28ec5 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Wed, 17 Nov 2021 18:37:35 +0100 +Subject: Haiku patch + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7505747..4529ad0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -55,7 +55,7 @@ if (NOT DISABLE_DBUS) + find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS DBus) + endif() + +-if (UNIX AND NOT APPLE AND NOT NO_X11) ++if (UNIX AND NOT APPLE AND NOT HAIKU AND NOT NO_X11) + add_definitions(-DQZ_WS_X11) + find_package(XCB REQUIRED COMPONENTS XCB UTIL) + find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS X11Extras) +diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt +index 3b7efff..03d61c2 100644 +--- a/src/lib/CMakeLists.txt ++++ b/src/lib/CMakeLists.txt +@@ -362,7 +362,7 @@ if (HAVE_LIBINTL) + endif() + + if (UNIX AND NOT APPLE) +- if (NOT NO_X11) ++ if (NOT NO_X11 AND NOT HAIKU) + target_link_libraries(FalkonPrivate XCB::XCB Qt5::X11Extras) + endif() + +-- +2.30.2 + + +From 18fb7b7ed48d7cf3d2678f7d4af6ad02bc44cba3 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Sat, 27 Nov 2021 22:09:34 +1000 +Subject: Set default theme for Haiku + + +diff --git a/src/lib/app/qzcommon.h b/src/lib/app/qzcommon.h +index 92a453c..2c7e061 100644 +--- a/src/lib/app/qzcommon.h ++++ b/src/lib/app/qzcommon.h +@@ -117,6 +117,8 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(Qz::NewTabPositionFlags) + #define DEFAULT_THEME_NAME QSL("windows") + #elif defined(Q_OS_MACOS) + #define DEFAULT_THEME_NAME QSL("mac") ++#elif defined(Q_OS_HAIKU) ++#define DEFAULT_THEME_NAME QSL("haiku") + #elif defined(Q_OS_UNIX) + #define DEFAULT_THEME_NAME QSL("linux") + #else +-- +2.30.2 +