Skip to content

Commit

Permalink
KF6 frameworks, bump to 6.7.0 (#11279)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Begasus
Begasus authored Oct 29, 2024
1 parent a7f659c commit 33e83e1
Show file tree
Hide file tree
Showing 14 changed files with 182 additions and 93 deletions.
20 changes: 14 additions & 6 deletions kde-frameworks/kauth/kauth6-6.5.0.recipe → kde-frameworks/kauth/kauth6-6.7.0.recipe
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ COPYRIGHT="2010-2024 KDE Organisation"
LICENSE="GNU LGPL v2"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kauth-${portVersion}.tar.xz"
CHECKSUM_SHA256="1af517a509da1c5ddb4420d7430894b751562e07cc4c134abe0dcb606358d394"
CHECKSUM_SHA256="173654eee2891acd41538d31ace8b9d7ae60863bc7faef1cacec7e21c7eb1223"
SOURCE_DIR="kauth-$portVersion"

ARCHITECTURES="all !x86_gcc2"
Expand Down Expand Up @@ -47,30 +47,38 @@ BUILD_REQUIRES="
BUILD_PREREQUIRES="
cmd:cmake
cmd:dot
cmd:doxygen >= 1.9
cmd:doxygen
cmd:g++$secondaryArchSuffix
cmd:make
cmd:pkg_config$secondaryArchSuffix
"

TEST_REQUIRES="
lib:libdbus_1$secondaryArchSuffix
"

defineDebugInfoPackage kauth6$secondaryArchSuffix \
$libDir/libKF6AuthCore.so.$libVersion

BUILD()
{
cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \
$cmakeDirArgs \
-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \
-DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \
-DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \
-DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \
-DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt6/mkspecs \
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
-DBUILD_QCH=ON \
-DBUILD_TESTING=OFF
make -Cbuild $jobArgs
-DBUILD_TESTING=OFF \
-Wno-dev
make -C build $jobArgs
}

INSTALL()
{
make -Cbuild install
make -C build install

prepareInstalledDevelLib \
libKF6AuthCore
Expand Down
24 changes: 17 additions & 7 deletions ...works/kbookmarks/kbookmarks6-6.5.0.recipe → ...works/kbookmarks/kbookmarks6-6.7.0.recipe
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ COPYRIGHT="2010-2024 KDE Organisation"
LICENSE="GNU LGPL v2"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kbookmarks-${portVersion}.tar.xz"
CHECKSUM_SHA256="97dabceae5b0eac1107c49c50d1d7d9a7d26b9246c9ab53d123990525c55fbec"
CHECKSUM_SHA256="bd41a39df76515ee34e7df07b2600e1e5b67b1812cc959ec51585f2ebcc56573"
SOURCE_DIR="kbookmarks-$portVersion"

ARCHITECTURES="all !x86_gcc2"
Expand Down Expand Up @@ -72,29 +72,39 @@ BUILD_REQUIRES="
BUILD_PREREQUIRES="
cmd:cmake
cmd:dot
cmd:doxygen >= 1.9
cmd:doxygen
cmd:g++$secondaryArchSuffix
cmd:make
cmd:pkg_config$secondaryArchSuffix
"

TEST_REQUIRES="
qthaikuplugins
"

defineDebugInfoPackage kbookmarks6$secondaryArchSuffix \
$libDir/libKF6Bookmarks.so.$libVersion \
$libDir/libKF6BookmarksWidgets.so.$libVersion

BUILD()
{
cmake -Bbuild -S. $cmakeDirArgs \
-DCMAKE_BUILD_TYPE=Release \
cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \
$cmakeDirArgs \
-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \
-DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \
-DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \
-DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \
-DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt6/mkspecs \
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
-DBUILD_QCH=ON \
-DBUILD_TESTING=OFF
make -Cbuild $jobArgs
-DBUILD_TESTING=OFF \
-Wno-dev
make -C build $jobArgs
}

INSTALL()
{
make -Cbuild install
make -C build install

prepareInstalledDevelLibs \
libKF6Bookmarks \
Expand Down
23 changes: 16 additions & 7 deletions ...s/kglobalaccel/kglobalaccel6-6.5.0.recipe → ...s/kglobalaccel/kglobalaccel6-6.7.0.recipe
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ COPYRIGHT="2010-2024 KDE Organisation"
LICENSE="GNU LGPL v2"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kglobalaccel-${portVersion}.tar.xz"
CHECKSUM_SHA256="883a1cf48fc4b8ce22ab9f143b6bdd546ac30fbe29c90d4035fb2adf38a339a4"
CHECKSUM_SHA256="2a35b9e06c6601d602b3a45e278c49e11e4627939cfacffb1fdee0826a6f6e0b"
SOURCE_DIR="kglobalaccel-$portVersion"

ARCHITECTURES="all !x86_gcc2"
Expand Down Expand Up @@ -70,29 +70,38 @@ BUILD_REQUIRES="
BUILD_PREREQUIRES="
cmd:cmake
cmd:dot
cmd:doxygen >= 1.9
cmd:doxygen
cmd:g++$secondaryArchSuffix
cmd:make
cmd:pkg_config$secondaryArchSuffix
"

TEST_REQUIRES="
qthaikuplugins$secondaryArchSuffix
"

defineDebugInfoPackage kglobalaccel6$secondaryArchSuffix \
$libDir/libKF6GlobalAccel.so.$libVersion

BUILD()
{
cmake -Bbuild -S. $cmakeDirArgs \
-DCMAKE_BUILD_TYPE=Release \
cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \
$cmakeDirArgs \
-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \
-DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \
-DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \
-DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \
-DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt6/mkspecs \
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
-DBUILD_QCH=ON \
-DBUILD_TESTING=OFF
make -Cbuild $jobArgs
-DBUILD_TESTING=OFF \
-Wno-dev
make -C build $jobArgs
}

INSTALL()
{
make -Cbuild install
make -C build install

prepareInstalledDevelLib \
libKF6GlobalAccel
Expand Down
29 changes: 19 additions & 10 deletions kde-frameworks/kio/kio6-6.5.0.recipe → kde-frameworks/kio/kio6-6.7.0.recipe
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ COPYRIGHT="2010-2024 KDE Organisation"
LICENSE="GNU LGPL v2"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kio-${portVersion}.tar.xz"
CHECKSUM_SHA256="9c8bf83534577a322d4633d241d9770bc8ba8a45624e2f041e1b8dbdbc198a13"
CHECKSUM_SHA256="df235019a07acd579920f6c655050e02dacf847c706f4b8279e755be46f9d990"
SOURCE_DIR="kio-$portVersion"
PATCHES="kio-$portVersion.patchset"

Expand Down Expand Up @@ -123,12 +123,12 @@ BUILD_REQUIRES="
BUILD_PREREQUIRES="
cmd:cmake
cmd:dot
cmd:doxygen >= 1.9
cmd:doxygen
cmd:g++$secondaryArchSuffix
cmd:make
cmd:msgfmt
cmd:msgmerge
cmd:python3
cmd:msgfmt$secondaryArchSuffix
cmd:msgmerge$secondaryArchSuffix
cmd:pkg_config$secondaryArchSuffix
"

TEST_REQUIRES="
Expand All @@ -142,25 +142,34 @@ PATCH()
sed -e 's/kdoctools/#kdoctool/g' -i $sourceDir/CMakeLists.txt
}

defineDebugInfoPackage kio6$secondaryArchSuffix \
$libDir/libKF6KIOCore.so.$libVersion \
$libDir/libKF6KIOFileWidgets.so.$libVersion \
$libDir/libKF6KIOGui.so.$libVersion \
$libDir/libKF6KIOWidgets.so.$libVersion

BUILD()
{
cmake -Bbuild -S. $cmakeDirArgs \
-DCMAKE_BUILD_TYPE=Release \
cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \
$cmakeDirArgs \
-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \
-DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \
-DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \
-DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \
-DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt6/mkspecs \
-DKAUTH_HELPER_INSTALL_DIR:PATH=$addOnsDir/Qt6/kauth/helper \
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
-DWITH_X11=OFF \
-DWITH_WAYLAND=OFF \
-DBUILD_QCH=ON \
-DBUILD_TESTING=OFF
make -Cbuild $jobArgs
-DBUILD_TESTING=OFF \
-Wno-dev
make -C build $jobArgs
}

INSTALL()
{
make -Cbuild install
make -C build install

# cleanup
rm -rf $dataDir/applications
Expand Down
18 changes: 9 additions & 9 deletions ...frameworks/kio/patches/kio-6.5.0.patchset → ...frameworks/kio/patches/kio-6.7.0.patchset
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 09214c74d519605f95115cbdd7df7574a6729bc9 Mon Sep 17 00:00:00 2001
From ca1e6933b9cda36e4ca026132f07d0e9a5c0a92e Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Sun, 31 Oct 2021 13:15:08 +0300
Subject: Fix build on Haiku
Expand All @@ -18,10 +18,10 @@ index 124e827..183c897 100644
struct timespec ut[2];
ut[0].tv_sec = early70sTime;
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 7b1cb88..9422ab9 100644
index bb6935b..d8a3400 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -215,6 +215,10 @@ if (TARGET KF6::AuthCore)
@@ -214,6 +214,10 @@ if (TARGET KF6::AuthCore)
target_link_libraries(KF6KIOCore PRIVATE KF6::AuthCore) #SlaveBase uses KAuth::Action
endif()

Expand Down Expand Up @@ -61,7 +61,7 @@ index a8a393a..93c6fea 100644
target_link_libraries(kio_file ${ACL_LIBS})
endif()
diff --git a/src/kioworkers/file/file_unix.cpp b/src/kioworkers/file/file_unix.cpp
index 9999857..8bc8447 100644
index 3ebf67d..d672114 100644
--- a/src/kioworkers/file/file_unix.cpp
+++ b/src/kioworkers/file/file_unix.cpp
@@ -69,6 +69,11 @@
Expand All @@ -76,7 +76,7 @@ index 9999857..8bc8447 100644
using namespace KIO;

/* 512 kB */
@@ -784,7 +789,7 @@ WorkerResult FileProtocol::copy(const QUrl &srcUrl, const QUrl &destUrl, int _mo
@@ -791,7 +796,7 @@ WorkerResult FileProtocol::copy(const QUrl &srcUrl, const QUrl &destUrl, int _mo

// copy access and modification time
if (!wasKilled()) {
Expand Down Expand Up @@ -104,7 +104,7 @@ index 8d8c0ed..aa164e1 100644
2.45.2


From b8441d70218f01e8fd7314e531dfe3610bba59ad Mon Sep 17 00:00:00 2001
From ec511e01a35a6f9a2e013d404232ffe7237d45a9 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 17 May 2022 21:28:27 +1000
Subject: Add OpenWith handler for Haiku
Expand Down Expand Up @@ -210,14 +210,14 @@ index 0000000..9614b87
2.45.2


From 56f192dbd65bfb283e4624e972d0ab57b287f266 Mon Sep 17 00:00:00 2001
From f6ddb8c2cb4c9d8b883396efc1712aaf2ffbe295 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 25 Feb 2024 23:14:26 +1000
Subject: Fix build


diff --git a/src/kioworkers/file/file_unix.cpp b/src/kioworkers/file/file_unix.cpp
index 8bc8447..7a62ee1 100644
index d672114..34778b7 100644
--- a/src/kioworkers/file/file_unix.cpp
+++ b/src/kioworkers/file/file_unix.cpp
@@ -72,6 +72,9 @@
Expand All @@ -234,7 +234,7 @@ index 8bc8447..7a62ee1 100644
2.45.2


From 7d81047dfc2059311bef0f37c87338551ff75d40 Mon Sep 17 00:00:00 2001
From 4cc5e8331021f1b37324bc7f03b5b72f2de10c86 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 10 Mar 2024 15:28:06 +1000
Subject: Disable threads kio_file support for now. It's totally broken on
Expand Down
31 changes: 21 additions & 10 deletions ...rameworks/kirigami/kirigami6-6.5.0.recipe → ...rameworks/kirigami/kirigami6-6.7.0.recipe
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ COPYRIGHT="2010-2024 KDE Organisation"
LICENSE="GNU LGPL v2"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kirigami-${portVersion}.tar.xz"
CHECKSUM_SHA256="43a73b161e1c85da3eadc63e7cc6c1b3c686aa56951b0d0e2df4a2cc1334759c"
CHECKSUM_SHA256="4d645a0374d33b9465e79e3e17170882e2cbda1526f45bc5b6b176dadda77d76"
SOURCE_DIR="kirigami-$portVersion"
PATCHES="1582.patch"

Expand Down Expand Up @@ -66,34 +66,45 @@ BUILD_REQUIRES="
BUILD_PREREQUIRES="
cmd:cmake
cmd:dot
cmd:doxygen >= 1.9
cmd:doxygen
cmd:g++$secondaryArchSuffix
cmd:make
cmd:pkg_config$secondaryArchSuffix
"

TEST_REQUIRES="
qthaikuplugins$secondaryArchSuffix
"

defineDebugInfoPackage kirigami6$secondaryArchSuffix \
$libDir/libKirigami.so.$libVersion \
$libDir/libKirigamiDelegates.so.$libVersion \
$libDir/libKirigamiDialogs.so.$libVersion \
$libDir/libKirigamiLayouts.so.$libVersion \
$libDir/libKirigamiPlatform.so.$libVersion \
$libDir/libKirigamiPrimitives.so.$libVersion

BUILD()
{
cmake -Bbuild -S. $cmakeDirArgs \
-DCMAKE_BUILD_TYPE=Release \
-DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \
cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \
$cmakeDirArgs \
-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \
-DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \
-DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \
-DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \
-DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt6/mkspecs \
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
-DDESKTOP_ENABLED=OFF \
-DUSE_DBUS=OFF \
-DBUILD_QCH=ON \
-DBUILD_EXAMPLES=OFF \
-DBUILD_TESTING=OFF
make -Cbuild $jobArgs
-DBUILD_QCH=ON \
-DBUILD_TESTING=OFF \
-Wno-dev
make -C build $jobArgs
}

INSTALL()
{
make -Cbuild install
make -C build install

prepareInstalledDevelLibs \
libKirigami \
Expand Down
Loading

0 comments on commit 33e83e1

Please sign in to comment.