diff --git a/www-client/falkon/additional-files/falkon.rdef.in b/www-client/falkon/additional-files/falkon.rdef.in new file mode 100644 index 000000000..793535e4f --- /dev/null +++ b/www-client/falkon/additional-files/falkon.rdef.in @@ -0,0 +1,30 @@ + +resource app_flags B_MULTIPLE_LAUNCH; + +resource app_version { + major = @MAJOR@, + middle = @MIDDLE@, + minor = @MINOR@, + variety = B_APPV_FINAL, + internal = 0, + short_info = "Otter Browser", + long_info = "A lightweight QtWebEngine browser" +}; + +resource app_signature "@APP_SIGNATURE@"; + +resource("QT:QPA_FLAGS") "Q_KILL_ON_EXIT|Q_REF_TO_ARGV|Q_REF_TO_FORK"; + +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.ftp", + "types" = "application/x-vnd.Be.URL.http", + "types" = "application/x-vnd.Be.URL.https" +}; diff --git a/www-client/falkon/falkon-3.1.0.recipe b/www-client/falkon/falkon-3.1.0.recipe new file mode 100644 index 000000000..f28f03e7e --- /dev/null +++ b/www-client/falkon/falkon-3.1.0.recipe @@ -0,0 +1,115 @@ +SUMMARY="A QtWebEngine browser" +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" +LICENSE="GNU GPL v3" +REVISION="1" +SOURCE_URI="https://download.kde.org/stable/falkon/3.1/falkon-$portVersion.tar.xz" +CHECKSUM_SHA256="ce743cd80c0e2d525a784e29c9b487f73480119b0567f9ce8ef1f44cca527587" +PATCHES="falkon-$portVersion.patchset" +ADDITIONAL_FILES=" + falkon.rdef.in + " + +ARCHITECTURES="all !x86_gcc2" +SECONDARY_ARCHITECTURES="?x86" + +PROVIDES=" + falkon$secondaryArchSuffix = $portVersion + app:Falkon$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libcrypto$secondaryArchSuffix + lib:libQt5Core$secondaryArchSuffix + lib:libQt5DBus$secondaryArchSuffix + lib:libQt5Gui$secondaryArchSuffix + lib:libQt5Network$secondaryArchSuffix + lib:libQt5Positioning$secondaryArchSuffix + lib:libQt5PrintSupport$secondaryArchSuffix + lib:libQt5Qml$secondaryArchSuffix + lib:libQt5QmlModels$secondaryArchSuffix + lib:libQt5Quick$secondaryArchSuffix + lib:libQt5QuickWidgets$secondaryArchSuffix + lib:libQt5Sql$secondaryArchSuffix + lib:libQt5WebChannel$secondaryArchSuffix + lib:libQt5WebEngine$secondaryArchSuffix + lib:libQt5WebEngineCore$secondaryArchSuffix + lib:libQt5WebEngineWidgets$secondaryArchSuffix + lib:libQt5Widgets$secondaryArchSuffix + lib:libssl$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libKF5I18n$secondaryArchSuffix + devel:libQt5Core$secondaryArchSuffix + devel:libQt5DBus$secondaryArchSuffix + devel:libQt5Gui$secondaryArchSuffix + devel:libQt5Network$secondaryArchSuffix + devel:libQt5PrintSupport$secondaryArchSuffix + devel:libQt5Positioning$secondaryArchSuffix + devel:libQt5Qml$secondaryArchSuffix + devel:libQt5QmlModels$secondaryArchSuffix + devel:libQt5Quick$secondaryArchSuffix + devel:libQt5QuickWidgets$secondaryArchSuffix + devel:libQt5Sql$secondaryArchSuffix + devel:libQt5WebChannel$secondaryArchSuffix + devel:libQt5WebEngine$secondaryArchSuffix + devel:libQt5WebEngineCore$secondaryArchSuffix + devel:libQt5WebEngineWidgets$secondaryArchSuffix + devel:libQt5Widgets$secondaryArchSuffix + devel:libssl$secondaryArchSuffix + extra_cmake_modules + " +BUILD_PREREQUIRES=" + cmd:cmake + cmd:g++$secondaryArchSuffix + cmd:make + cmd:pkg_config$secondaryArchSuffix + cmd:qdbuscpp2xml$secondaryArchSuffix >= 5 + cmd:sed + " + +defineDebugInfoPackage falkon$secondaryArchSuffix \ + "$appsDir"/Falkon/Falkon + +BUILD() +{ + cmake -S . -B build \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_INSTALL_PREFIX:PATH="$appsDir/Falkon" \ + -DCMAKE_INSTALL_DATAROOTDIR:PATH="$dataDir" \ + -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt5 \ + -DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt5/mkspecs \ + -DECM_DIR=/system/data/cmake/Modules/ECM/cmake + make -C build $jobArgs +} + +INSTALL() +{ + make -C build install + + mv $appsDir/Falkon/bin/falkon \ + $appsDir/Falkon/Falkon + + rm -rf $appsDir/Otter-Browser/bin + + local APP_SIGNATURE="application/x-vnd.falkon" + 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/falkon.rdef.in > falkon.rdef + + addResourcesToBinaries falkon.rdef \ + $appsDir/Falkon/Falkon + + addAppDeskbarSymlink $appsDir/Falkon/Falkon "Falkon" +} diff --git a/www-client/falkon/patches/falkon-3.1.0.patchset b/www-client/falkon/patches/falkon-3.1.0.patchset new file mode 100644 index 000000000..5600b12ce --- /dev/null +++ b/www-client/falkon/patches/falkon-3.1.0.patchset @@ -0,0 +1,82 @@ +From 633abc593c41a007f431e9fde1dd89b03bb004d1 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 ebdaaab69ea0b7da4d813ab83f31aa3e20a79dd8 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 +