From d7fa2ee2c9e75d34bd7370b8b1b9329138b0dbff Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Fri, 8 Dec 2023 13:48:06 +1000 Subject: [PATCH] Falkon: bump version --- ...kon-3.2.0.recipe => falkon-23.08.3.recipe} | 15 +++--- ...3.2.0.patchset => falkon-23.08.3.patchset} | 52 ++++++++++++++----- 2 files changed, 47 insertions(+), 20 deletions(-) rename www-client/falkon/{falkon-3.2.0.recipe => falkon-23.08.3.recipe} (91%) rename www-client/falkon/patches/{falkon-3.2.0.patchset => falkon-23.08.3.patchset} (50%) diff --git a/www-client/falkon/falkon-3.2.0.recipe b/www-client/falkon/falkon-23.08.3.recipe similarity index 91% rename from www-client/falkon/falkon-3.2.0.recipe rename to www-client/falkon/falkon-23.08.3.recipe index 9c3f40423..63762001c 100644 --- a/www-client/falkon/falkon-3.2.0.recipe +++ b/www-client/falkon/falkon-23.08.3.recipe @@ -3,11 +3,11 @@ DESCRIPTION="Falkon is a KDE web browser using QtWebEngine rendering engine, \ previously known as QupZilla. It aims to be a lightweight web browser available \ through all major platforms." HOMEPAGE="https://falkon.org/" -COPYRIGHT="2009-2019 Falkon Browser Team" +COPYRIGHT="2009-2023 Falkon Browser Team" LICENSE="GNU GPL v3" -REVISION="4" -SOURCE_URI="https://github.com/KDE/falkon/archive/refs/tags/v3.2.0.tar.gz" -CHECKSUM_SHA256="5b8fba93ca53b8e5f69ea913e36b01084b65ccb3f399281dbc1b0df89916f4ca" +REVISION="1" +SOURCE_URI="https://github.com/KDE/falkon/archive/refs/tags/v${portVersion}.tar.gz" +CHECKSUM_SHA256="d5a0851c5280c2a961629104f64857e63274b4b3a7fec7290c9f483e8fafe096" PATCHES="falkon-$portVersion.patchset" ADDITIONAL_FILES=" falkon.rdef.in @@ -80,7 +80,7 @@ BUILD_PREREQUIRES=" defineDebugInfoPackage falkon$secondaryArchSuffix \ "$appsDir"/Falkon/Falkon \ - "$appsDir"/Falkon/lib/libFalkonPrivate.so.$portVersion \ + "$appsDir"/Falkon/lib/libFalkonPrivate.so \ "$addOnsDir"/Qt5/falkon/AutoScroll.so \ "$addOnsDir"/Qt5/falkon/FlashCookieManager.so \ "$addOnsDir"/Qt5/falkon/GreaseMonkey.so \ @@ -115,8 +115,11 @@ INSTALL() mv $appsDir/Falkon/bin/falkon \ $appsDir/Falkon/Falkon - + rm -rf $appsDir/Falkon/bin + + mkdir -p $appsDir/Falkon/lib + cp $sourceDir/build/bin/libFalkonPrivate.so $appsDir/Falkon/lib local APP_SIGNATURE="application/x-vnd.falkon" local MAJOR="`echo "$portVersion" | cut -d. -f1`" diff --git a/www-client/falkon/patches/falkon-3.2.0.patchset b/www-client/falkon/patches/falkon-23.08.3.patchset similarity index 50% rename from www-client/falkon/patches/falkon-3.2.0.patchset rename to www-client/falkon/patches/falkon-23.08.3.patchset index 0b7b0c3b5..44e356c1d 100644 --- a/www-client/falkon/patches/falkon-3.2.0.patchset +++ b/www-client/falkon/patches/falkon-23.08.3.patchset @@ -1,14 +1,14 @@ -From b2de5b318456f2a045e247c25dc5512aebf28ec5 Mon Sep 17 00:00:00 2001 +From e98181b3260967cdaba317141c2fdf3e91986f1c 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 +index 32ab8d7..92f977a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -55,7 +55,7 @@ if (NOT DISABLE_DBUS) +@@ -61,7 +61,7 @@ if (NOT DISABLE_DBUS) find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS DBus) endif() @@ -18,30 +18,30 @@ index 7505747..4529ad0 100644 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 +index 806800a..49169ea 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt -@@ -362,7 +362,7 @@ if (HAVE_LIBINTL) +@@ -597,7 +597,7 @@ if (HAVE_LIBINTL) + target_link_libraries(FalkonPrivate ${Intl_LIBRARIES}) 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) +-if (UNIX AND NOT APPLE) ++if (UNIX AND NOT APPLE AND NOT HAIKU) + if (NOT NO_X11) + target_link_libraries(FalkonPrivate XCB::XCB Qt::X11Extras) endif() - -- -2.30.2 +2.42.1 -From 18fb7b7ed48d7cf3d2678f7d4af6ad02bc44cba3 Mon Sep 17 00:00:00 2001 +From 4563854c858f4bfacb85efd7312c717a462badde 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 +index 5b51c3c..190491b 100644 --- a/src/lib/app/qzcommon.h +++ b/src/lib/app/qzcommon.h @@ -117,6 +117,8 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(Qz::NewTabPositionFlags) @@ -54,5 +54,29 @@ index 92a453c..2c7e061 100644 #define DEFAULT_THEME_NAME QSL("linux") #else -- -2.30.2 +2.42.1 + + +From cba70506f83e5479d5eea9417f9d9b6ada69fdb0 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Fri, 8 Dec 2023 00:27:49 +1000 +Subject: Enable experimental features by default + + +diff --git a/src/main/main.cpp b/src/main/main.cpp +index 3315ef2..ab0ef04 100644 +--- a/src/main/main.cpp ++++ b/src/main/main.cpp +@@ -51,6 +51,9 @@ int main(int argc, char* argv[]) + #ifndef Q_OS_WIN + qInstallMessageHandler(&msgHandler); + #endif ++#ifdef Q_OS_HAIKU ++ qputenv("QTWEBENGINE_CHROMIUM_FLAGS", "--enable-experimental-web-platform-features"); ++#endif + + // Hack to fix QT_STYLE_OVERRIDE with QProxyStyle + const QByteArray style = qgetenv("QT_STYLE_OVERRIDE"); +-- +2.42.1