kdenlive_kf6, bump to (disabled still) 25.04.0 (#12216)

This commit is contained in:
Schrijvers Luc
2025-04-20 11:46:01 +02:00
committed by GitHub
parent 99e8f161fa
commit cd92f03b94
2 changed files with 20 additions and 27 deletions

View File

@@ -8,9 +8,8 @@ COPYRIGHT="2010-2025 KDE Organisation"
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/kdenlive-$portVersion.tar.xz"
CHECKSUM_SHA256="449c7e53d9501f434b955f228dcb29f3cb42642c41b053dd8e4cd30b8861843e"
CHECKSUM_SHA256="3f07e23e5e58441acd02b89d969b33940994d9d1a8a8006b15e61eb575abd519"
SOURCE_DIR="kdenlive-$portVersion"
PATCHES="kdenlive-$portVersion.patchset"
ADDITIONAL_FILES="kdenlive.rdef.in"
ARCHITECTURES="?all !x86_gcc2"
@@ -25,7 +24,14 @@ REQUIRES="
haiku$secondaryArchSuffix
frei0r$secondaryArchSuffix
cmd:mediainfo
lib:libavcodec$secondaryArchSuffix
lib:libavformat$secondaryArchSuffix
lib:libavutil$secondaryArchSuffix
lib:libImath_3_1$secondaryArchSuffix
lib:libmlt++_7$secondaryArchSuffix
lib:libopentime$secondaryArchSuffix
lib:libopentimelineio$secondaryArchSuffix
lib:libswresample$secondaryArchSuffix
# KF6
lib:libGL$secondaryArchSuffix
lib:libopenal$secondaryArchSuffix
@@ -41,7 +47,6 @@ REQUIRES="
lib:libKF6ConfigWidgets$secondaryArchSuffix
lib:libKF6CoreAddons$secondaryArchSuffix
lib:libKF6Crash$secondaryArchSuffix
# lib:libKF6DbusAddons$secondaryArchSuffix
lib:libKF6FileMetaData$secondaryArchSuffix
lib:libKF6GuiAddons$secondaryArchSuffix
lib:libKF6I18n$secondaryArchSuffix
@@ -84,11 +89,16 @@ CONFLICTS="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libavcodec$secondaryArchSuffix >= 60
devel:libavformat$secondaryArchSuffix >= 60
devel:libavutil$secondaryArchSuffix >= 58
devel:frei0r$secondaryArchSuffix
devel:libgdk_pixbuf_2.0$secondaryArchSuffix
devel:libImath_3_1$secondaryArchSuffix
devel:libmediainfo$secondaryArchSuffix
devel:libmlt++_7$secondaryArchSuffix
devel:libopentimelineio$secondaryArchSuffix
devel:libswresample$secondaryArchSuffix >= 4
# KF6
extra_cmake_modules$secondaryArchSuffix
devel:libKF6Archive$secondaryArchSuffix
@@ -101,7 +111,6 @@ BUILD_REQUIRES="
devel:libKF6ConfigWidgets$secondaryArchSuffix
devel:libKF6CoreAddons$secondaryArchSuffix
devel:libKF6Crash$secondaryArchSuffix
# devel:libKF6DbusAddons$secondaryArchSuffix
devel:libKF6FileMetaData$secondaryArchSuffix
devel:libKF6GuiAddons$secondaryArchSuffix
devel:libKF6IconThemes$secondaryArchSuffix
@@ -135,6 +144,12 @@ BUILD_PREREQUIRES="
cmd:python3
"
PATCH()
{
# use Haiku's icon theme
sed -e 's,\ KIconTheme::initTheme();,\// KIconTheme::initTheme();,g' -i src/main.cpp
}
BUILD()
{
cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
@@ -143,6 +158,7 @@ BUILD()
-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \
-DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
-DFETCH_OTIO=OFF \
-DBUILD_TESTING=OFF
make -C build $jobArgs

View File

@@ -1,23 +0,0 @@
From b2b173fccdc194e48bf768a420703166fab4181b Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Thu, 26 Dec 2024 17:44:51 +0100
Subject: Use Haiku icon style
diff --git a/src/main.cpp b/src/main.cpp
index b4d5107..5917bda 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -196,7 +196,9 @@ int main(int argc, char *argv[])
QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts, true);
// trigger initialisation of proper icon theme
+#if !defined(Q_OS_HAIKU)
KIconTheme::initTheme();
+#endif
QApplication app(argc, argv);
--
2.45.2