falkon, bump version (for openssl3) (#10933)

This commit is contained in:
Schrijvers Luc
2024-08-27 12:43:46 +02:00
committed by GitHub
parent 39e4dbf083
commit 9124d53b7e
2 changed files with 44 additions and 22 deletions

View File

@@ -5,10 +5,10 @@ through all major platforms."
HOMEPAGE="https://falkon.org/"
COPYRIGHT="2009-2023 Falkon Browser Team"
LICENSE="GNU GPL v3"
REVISION="2"
SOURCE_URI="https://invent.kde.org/network/falkon/-/archive/v23.08.4/falkon-v${portVersion}.tar.bz2"
CHECKSUM_SHA256="c14b763603a58f295ccc70b5d27fb865047a2499e2d86e8966971e4373959417"
SOURCE_DIR="falkon-v${portVersion}"
REVISION="1"
SOURCE_URI="https://invent.kde.org/network/falkon/-/archive/v$portVersion/falkon-v$portVersion.tar.bz2"
CHECKSUM_SHA256="4c092cf4e1725571b9d43ed5d224ee7f0cc93d49552e375029fb3537ef2be4cf"
SOURCE_DIR="falkon-v$portVersion"
PATCHES="falkon-$portVersion.patchset"
ADDITIONAL_FILES="
falkon.rdef.in
@@ -24,12 +24,12 @@ PROVIDES="
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libcrypto$secondaryArchSuffix
lib:libintl$secondaryArchSuffix
lib:libcrypto$secondaryArchSuffix >= 3
# lib:libintl$secondaryArchSuffix
lib:libKF5Archive$secondaryArchSuffix
lib:libQt5Core$secondaryArchSuffix
lib:libQt5DBus$secondaryArchSuffix
lib:libQt5Gui$secondaryArchSuffix
lib:libKF5Archive$secondaryArchSuffix
lib:libQt5Network$secondaryArchSuffix
lib:libQt5Positioning$secondaryArchSuffix
lib:libQt5PrintSupport$secondaryArchSuffix
@@ -43,15 +43,37 @@ REQUIRES="
lib:libQt5WebEngineCore$secondaryArchSuffix
lib:libQt5WebEngineWidgets$secondaryArchSuffix
lib:libQt5Widgets$secondaryArchSuffix
lib:libssl$secondaryArchSuffix
lib:libssl$secondaryArchSuffix >= 3
lib:libstdc++$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libintl$secondaryArchSuffix
devel:libKF5I18n$secondaryArchSuffix
# devel:libintl$secondaryArchSuffix
devel:libssl$secondaryArchSuffix >= 3
# KF5
extra_cmake_modules$secondaryArchSuffix
devel:libKF5Archive$secondaryArchSuffix
devel:libKF5Auth$secondaryArchSuffix
devel:libKF5Bookmarks$secondaryArchSuffix
devel:libKF5Codecs$secondaryArchSuffix
devel:libKF5Completion$secondaryArchSuffix
devel:libKF5ConfigCore$secondaryArchSuffix
devel:libKF5ConfigWidgets$secondaryArchSuffix
devel:libKF5CoreAddons$secondaryArchSuffix
devel:libKF5Crash$secondaryArchSuffix
devel:libKF5I18n$secondaryArchSuffix
devel:libKF5ItemViews$secondaryArchSuffix
devel:libKF5JobWidgets$secondaryArchSuffix
devel:libKF5KIOCore$secondaryArchSuffix
devel:libKF5Purpose$secondaryArchSuffix
devel:libKF5Service$secondaryArchSuffix
devel:libKF5Solid$secondaryArchSuffix
devel:libKF5Wallet$secondaryArchSuffix
devel:libKF5WidgetsAddons$secondaryArchSuffix
devel:libKF5WindowSystem$secondaryArchSuffix
devel:libKF5XmlGui$secondaryArchSuffix
# Qt5
devel:libQt5Core$secondaryArchSuffix
devel:libQt5DBus$secondaryArchSuffix
devel:libQt5Gui$secondaryArchSuffix
@@ -68,12 +90,12 @@ BUILD_REQUIRES="
devel:libQt5WebEngineCore$secondaryArchSuffix
devel:libQt5WebEngineWidgets$secondaryArchSuffix
devel:libQt5Widgets$secondaryArchSuffix
devel:libssl$secondaryArchSuffix
extra_cmake_modules
"
BUILD_PREREQUIRES="
cmd:cmake
cmd:g++$secondaryArchSuffix
cmd:msgfmt
cmd:msgmerge
cmd:ninja
cmd:pkg_config$secondaryArchSuffix
cmd:qdbuscpp2xml$secondaryArchSuffix >= 5
@@ -104,22 +126,22 @@ BUILD()
-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
cd build
ninja $jobArgs
ninja -Cbuild $jobArgs
}
INSTALL()
{
cd build
ninja install
ninja -Cbuild install
mv $appsDir/Falkon/bin/falkon \
$appsDir/Falkon/Falkon
rm -rf $appsDir/Falkon/bin
# cleanup
rm -rf $dataDir/{applications,icons,metainfo}
mkdir -p $appsDir/Falkon/lib
cp $sourceDir/build/bin/libFalkonPrivate.so $appsDir/Falkon/lib

View File

@@ -1,11 +1,11 @@
From e98181b3260967cdaba317141c2fdf3e91986f1c Mon Sep 17 00:00:00 2001
From 0ebb8eaeddd7c1e5bd945e725117b0ec5f415bf9 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 17 Nov 2021 18:37:35 +0100
Subject: Haiku patch
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 32ab8d7..92f977a 100644
index 7760a7c..09c62a1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,7 +61,7 @@ if (NOT DISABLE_DBUS)
@@ -34,7 +34,7 @@ index 806800a..49169ea 100644
2.42.1
From 4563854c858f4bfacb85efd7312c717a462badde Mon Sep 17 00:00:00 2001
From f905870783836871b9a3f531c579ba8862daaf7a 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
@@ -57,7 +57,7 @@ index 5b51c3c..190491b 100644
2.42.1
From cba70506f83e5479d5eea9417f9d9b6ada69fdb0 Mon Sep 17 00:00:00 2001
From ac76e4e955e3a137a76db6bcef0cd52672bc9387 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