From d0dfcac14cd546721e7d4607a38c2bd64551abcc Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Tue, 29 Oct 2024 19:14:31 +0100 Subject: [PATCH] KF6 frameworks, bump to 6.7.0 (#11281) --- ...aloo6-6.5.0.recipe => baloo6-6.7.0.recipe} | 21 +++++++++----- ...t6-6.5.0.recipe => bluez_qt6-6.7.0.recipe} | 25 ++++++++-------- ...ipe => frameworkintegration6-6.7.0.recipe} | 23 +++++++++++---- ...5.0.recipe => kcalendarcore6-6.7.0.recipe} | 26 +++++++++++------ ...s6-6.5.0.recipe => kcmutils6-6.7.0.recipe} | 29 ++++++++++++------- ...{kdav6-6.5.0.recipe => kdav6-6.7.0.recipe} | 23 ++++++++++----- ....5.0.recipe => kdeclarative6-6.7.0.recipe} | 27 ++++++++++------- ...{kpty6-6.5.0.recipe => kpty6-6.7.0.recipe} | 27 +++++++++++------ ...pty-6.5.0.patchset => kpty-6.7.0.patchset} | 0 ...ipe => ksyntax_highlighting6-6.7.0.recipe} | 22 +++++++++----- ...0.patchset => threadweaver-6.7.0.patchset} | 0 ....5.0.recipe => threadweaver6-6.7.0.recipe} | 23 ++++++++++----- 12 files changed, 162 insertions(+), 84 deletions(-) rename kde-frameworks/baloo/{baloo6-6.5.0.recipe => baloo6-6.7.0.recipe} (87%) rename kde-frameworks/bluez-qt/{bluez_qt6-6.5.0.recipe => bluez_qt6-6.7.0.recipe} (80%) rename kde-frameworks/frameworkintegration/{frameworkintegration6-6.5.0.recipe => frameworkintegration6-6.7.0.recipe} (84%) rename kde-frameworks/kcalendarcore/{kcalendarcore6-6.5.0.recipe => kcalendarcore6-6.7.0.recipe} (80%) rename kde-frameworks/kcmutils/{kcmutils6-6.5.0.recipe => kcmutils6-6.7.0.recipe} (85%) rename kde-frameworks/kdav/{kdav6-6.5.0.recipe => kdav6-6.7.0.recipe} (84%) rename kde-frameworks/kdeclarative/{kdeclarative6-6.5.0.recipe => kdeclarative6-6.7.0.recipe} (80%) rename kde-frameworks/kpty/{kpty6-6.5.0.recipe => kpty6-6.7.0.recipe} (78%) rename kde-frameworks/kpty/patches/{kpty-6.5.0.patchset => kpty-6.7.0.patchset} (100%) rename kde-frameworks/ksyntax_highlighting/{ksyntax_highlighting6-6.5.0.recipe => ksyntax_highlighting6-6.7.0.recipe} (80%) rename kde-frameworks/threadweaver/patches/{threadweaver-6.5.0.patchset => threadweaver-6.7.0.patchset} (100%) rename kde-frameworks/threadweaver/{threadweaver6-6.5.0.recipe => threadweaver6-6.7.0.recipe} (79%) diff --git a/kde-frameworks/baloo/baloo6-6.5.0.recipe b/kde-frameworks/baloo/baloo6-6.7.0.recipe similarity index 87% rename from kde-frameworks/baloo/baloo6-6.5.0.recipe rename to kde-frameworks/baloo/baloo6-6.7.0.recipe index cbd894fec..952873bed 100644 --- a/kde-frameworks/baloo/baloo6-6.5.0.recipe +++ b/kde-frameworks/baloo/baloo6-6.7.0.recipe @@ -7,7 +7,7 @@ COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/baloo-$portVersion.tar.xz" -CHECKSUM_SHA256="d8046cb6e7df1d5b8310aed4e4dc71ec8379b602744b90d08fa9f14bda47a6af" +CHECKSUM_SHA256="ce8c18a21ed7acd5912c7d273cac5f6cb1adb524a0415d56c6fdde2e967f67cc" SOURCE_DIR="baloo-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -77,24 +77,31 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" cmd:cmake cmd:dot - cmd:doxygen >= 1.9 + cmd:doxygen cmd:g++$secondaryArchSuffix cmd:make - cmd:msgfmt - cmd:msgmerge + cmd:msgfmt$secondaryArchSuffix + cmd:msgmerge$secondaryArchSuffix cmd:pkg_config$secondaryArchSuffix " +defineDebugInfoPackage baloo6$secondaryArchSuffix \ + $libDir/libKF6Baloo.so.$libVersion \ + $libDir/libKF6BalooEngine.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 # no test provided + -DBUILD_TESTING=OFF \ + -Wno-dev make -C build $jobArgs } diff --git a/kde-frameworks/bluez-qt/bluez_qt6-6.5.0.recipe b/kde-frameworks/bluez-qt/bluez_qt6-6.7.0.recipe similarity index 80% rename from kde-frameworks/bluez-qt/bluez_qt6-6.5.0.recipe rename to kde-frameworks/bluez-qt/bluez_qt6-6.7.0.recipe index e853f1b93..031cfe69d 100644 --- a/kde-frameworks/bluez-qt/bluez_qt6-6.5.0.recipe +++ b/kde-frameworks/bluez-qt/bluez_qt6-6.7.0.recipe @@ -11,11 +11,11 @@ COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/bluez-qt-$portVersion.tar.xz" -CHECKSUM_SHA256="f0234766fc1af9410708d0886eef304175b09a5b99c48c0eb877a80fec6aa65e" +CHECKSUM_SHA256="b0640106986213e1b28f2cba13d9cc22ee3d259755f27521f2e861634338f93b" SOURCE_DIR="bluez-qt-$portVersion" -ARCHITECTURES="all !x86_gcc2" -SECONDARY_ARCHITECTURES="x86" +ARCHITECTURES="?all !x86_gcc2" +SECONDARY_ARCHITECTURES="?x86" libVersion="$portVersion" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" @@ -49,25 +49,26 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" cmd:cmake cmd:dot - cmd:doxygen >= 1.9 + cmd:doxygen cmd:g++$secondaryArchSuffix cmd:make - cmd:msgfmt - cmd:msgmerge + cmd:msgfmt$secondaryArchSuffix + cmd:msgmerge$secondaryArchSuffix cmd:pkg_config$secondaryArchSuffix " -#TEST_REQUIRES=" -# qthaikuplugins$secondaryArchSuffix -# lib:libdbus_1$secondaryArchSuffix # libQt6Core -# " +defineDebugInfoPackage bluez_qt6$secondaryArchSuffix \ + $libDir/libKF6BluezQt.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 \ diff --git a/kde-frameworks/frameworkintegration/frameworkintegration6-6.5.0.recipe b/kde-frameworks/frameworkintegration/frameworkintegration6-6.7.0.recipe similarity index 84% rename from kde-frameworks/frameworkintegration/frameworkintegration6-6.5.0.recipe rename to kde-frameworks/frameworkintegration/frameworkintegration6-6.7.0.recipe index 601456e9f..ca09d5874 100644 --- a/kde-frameworks/frameworkintegration/frameworkintegration6-6.5.0.recipe +++ b/kde-frameworks/frameworkintegration/frameworkintegration6-6.7.0.recipe @@ -8,7 +8,7 @@ COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/frameworkintegration-$portVersion.tar.xz" -CHECKSUM_SHA256="c57b55742e602d2c85c9002158e88fe077d3a164c68ed50c77672a74e11a0df4" +CHECKSUM_SHA256="890101854bbbb3937d321f2ac35b2a0a8f3ce833422297ddda59bda8c8cac69d" SOURCE_DIR="frameworkintegration-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -69,10 +69,12 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" cmd:cmake + cmd:dot + cmd:doxygen cmd:g++$secondaryArchSuffix cmd:make - cmd:msgfmt - cmd:msgmerge + cmd:msgfmt$secondaryArchSuffix + cmd:msgmerge$secondaryArchSuffix cmd:pkg_config$secondaryArchSuffix " @@ -80,13 +82,22 @@ TEST_REQUIRES=" qthaikuplugins$secondaryArchSuffix " +defineDebugInfoPackage frameworkintegration6$secondaryArchSuffix \ + $libDir/libKF6Style.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_TESTING=OFF + -DBUILD_QCH=ON \ + -DBUILD_TESTING=OFF \ + -Wno-dev make -C build $jobArgs } diff --git a/kde-frameworks/kcalendarcore/kcalendarcore6-6.5.0.recipe b/kde-frameworks/kcalendarcore/kcalendarcore6-6.7.0.recipe similarity index 80% rename from kde-frameworks/kcalendarcore/kcalendarcore6-6.5.0.recipe rename to kde-frameworks/kcalendarcore/kcalendarcore6-6.7.0.recipe index 8f5acf651..04b403997 100644 --- a/kde-frameworks/kcalendarcore/kcalendarcore6-6.5.0.recipe +++ b/kde-frameworks/kcalendarcore/kcalendarcore6-6.7.0.recipe @@ -12,7 +12,7 @@ LICENSE="BSD (3-clause) GNU LGPL v3" REVISION="1" SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kcalendarcore-${portVersion}.tar.xz" -CHECKSUM_SHA256="6da599f5ed15f6ce54c2f928026ee2f64edd2fe0d5203b4f50bbf89a8b21f522" +CHECKSUM_SHA256="8e5282d8d7a0ce0a1a1bdb32133ba4102d06070105513e712dafe76e32647dfb" SOURCE_DIR="kcalendarcore-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -53,33 +53,41 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" cmd:cmake cmd:dot - cmd:doxygen >= 1.9 + cmd:doxygen cmd:g++$secondaryArchSuffix cmd:make - cmd:msgfmt - cmd:msgmerge + cmd:msgfmt$secondaryArchSuffix + cmd:msgmerge$secondaryArchSuffix cmd:perl + cmd:pkg_config$secondaryArchSuffix " TEST_REQUIRES=" qthaikuplugins$secondaryArchSuffix " +defineDebugInfoPackage kcalendarcore6$secondaryArchSuffix \ + $libDir/libKF6CalendarCore.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 \ libKF6CalendarCore diff --git a/kde-frameworks/kcmutils/kcmutils6-6.5.0.recipe b/kde-frameworks/kcmutils/kcmutils6-6.7.0.recipe similarity index 85% rename from kde-frameworks/kcmutils/kcmutils6-6.5.0.recipe rename to kde-frameworks/kcmutils/kcmutils6-6.7.0.recipe index d59b85212..309ce8c94 100644 --- a/kde-frameworks/kcmutils/kcmutils6-6.5.0.recipe +++ b/kde-frameworks/kcmutils/kcmutils6-6.7.0.recipe @@ -6,7 +6,7 @@ COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kcmutils-${portVersion}.tar.xz" -CHECKSUM_SHA256="eb8474ec5ae620e361e6ef971e3ec14ac6807be2df8e02d27e7d8ae9badca993" +CHECKSUM_SHA256="4118388f8f62aa5f1139ed78823b58b009e9ebf7f3755e9a94ab5f9eba644cbe" SOURCE_DIR="kcmutils-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -87,12 +87,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=" @@ -100,21 +100,30 @@ TEST_REQUIRES=" lib:libKirigami$secondaryArchSuffix " +defineDebugInfoPackage kcmutils6$secondaryArchSuffix \ + $libDir/libKF6KCMUtils.so.$libVersion \ + $libDir/libKF6KCMUtilsCore.so.$libVersion \ + $libDir/libKF6KCMUtilsQuick.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 \ libKF6KCMUtils \ diff --git a/kde-frameworks/kdav/kdav6-6.5.0.recipe b/kde-frameworks/kdav/kdav6-6.7.0.recipe similarity index 84% rename from kde-frameworks/kdav/kdav6-6.5.0.recipe rename to kde-frameworks/kdav/kdav6-6.7.0.recipe index 99b3fdc49..975299c2d 100644 --- a/kde-frameworks/kdav/kdav6-6.5.0.recipe +++ b/kde-frameworks/kdav/kdav6-6.7.0.recipe @@ -8,7 +8,7 @@ COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kdav-${portVersion}.tar.xz" -CHECKSUM_SHA256="900fbb8b632d946cd35e826e64f50507346151f1b5fb40137890abc2896eefcf" +CHECKSUM_SHA256="6629f2af0042eb1e0dc0c08b5180ac7b48dae6b5999e1dd0b678aed8b874c1d7" SOURCE_DIR="kdav-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -71,25 +71,34 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" cmd:cmake cmd:dot - cmd:doxygen >= 1.9 + cmd:doxygen cmd:g++$secondaryArchSuffix cmd:make - cmd:msgfmt - cmd:msgmerge + cmd:msgfmt$secondaryArchSuffix + cmd:msgmerge$secondaryArchSuffix + cmd:pkg_config$secondaryArchSuffix " TEST_REQUIRES=" qthaikuplugins$secondaryArchSuffix " +defineDebugInfoPackage kdav6$secondaryArchSuffix \ + $libDir/libKF6DAV.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 + -DBUILD_TESTING=OFF \ + -Wno-dev make -C build $jobArgs } diff --git a/kde-frameworks/kdeclarative/kdeclarative6-6.5.0.recipe b/kde-frameworks/kdeclarative/kdeclarative6-6.7.0.recipe similarity index 80% rename from kde-frameworks/kdeclarative/kdeclarative6-6.5.0.recipe rename to kde-frameworks/kdeclarative/kdeclarative6-6.7.0.recipe index 195395047..fe052e996 100644 --- a/kde-frameworks/kdeclarative/kdeclarative6-6.5.0.recipe +++ b/kde-frameworks/kdeclarative/kdeclarative6-6.7.0.recipe @@ -8,7 +8,7 @@ COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kdeclarative-${portVersion}.tar.xz" -CHECKSUM_SHA256="b3c4152c972e3d53645f1c88757a78ce5b66fbf4ecb76e4d69df78d2ab38cf83" +CHECKSUM_SHA256="f1f804f6bac2b229503cfd165ebd8ae093533888ae15e0e61474c6e328d535b9" SOURCE_DIR="kdeclarative-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -51,33 +51,40 @@ 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=" qthaikuplugins$secondaryArchSuffix " +defineDebugInfoPackage kdeclarative6$secondaryArchSuffix \ + $libDir/libKF6CalendarEvents.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 \ libKF6CalendarEvents diff --git a/kde-frameworks/kpty/kpty6-6.5.0.recipe b/kde-frameworks/kpty/kpty6-6.7.0.recipe similarity index 78% rename from kde-frameworks/kpty/kpty6-6.5.0.recipe rename to kde-frameworks/kpty/kpty6-6.7.0.recipe index 2cfc0e800..624287502 100644 --- a/kde-frameworks/kpty/kpty6-6.5.0.recipe +++ b/kde-frameworks/kpty/kpty6-6.7.0.recipe @@ -7,7 +7,7 @@ COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kpty-${portVersion}.tar.xz" -CHECKSUM_SHA256="dc9365ba4a83b948a8326f2f75d46d4dea8327bc06b5ee2190306cbf8fdf5241" +CHECKSUM_SHA256="42cc1b1f70ee0bdacd26812857d31047d218e1f585ac35fe9165908501a9946a" SOURCE_DIR="kpty-$portVersion" PATCHES="kpty-$portVersion.patchset" @@ -53,28 +53,37 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" cmd:cmake cmd:dot - cmd:doxygen >= 1.9 + cmd:doxygen cmd:g++$secondaryArchSuffix cmd:make - cmd:msgfmt - cmd:msgmerge + cmd:msgfmt$secondaryArchSuffix + cmd:msgmerge$secondaryArchSuffix + cmd:pkg_config$secondaryArchSuffix " +defineDebugInfoPackage kpty6$secondaryArchSuffix \ + $libDir/libKF6Pty.so.$libVersion + BUILD() { - cmake -Bbuild -S. $cmakeDirArgs \ - -DCMAKE_BUILD_TYPE=Release \ + cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + $cmakeDirArgs \ -DCMAKE_CXX_FLAGS=-D_BSD_SOURCE \ + -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 \ libKF6Pty diff --git a/kde-frameworks/kpty/patches/kpty-6.5.0.patchset b/kde-frameworks/kpty/patches/kpty-6.7.0.patchset similarity index 100% rename from kde-frameworks/kpty/patches/kpty-6.5.0.patchset rename to kde-frameworks/kpty/patches/kpty-6.7.0.patchset diff --git a/kde-frameworks/ksyntax_highlighting/ksyntax_highlighting6-6.5.0.recipe b/kde-frameworks/ksyntax_highlighting/ksyntax_highlighting6-6.7.0.recipe similarity index 80% rename from kde-frameworks/ksyntax_highlighting/ksyntax_highlighting6-6.5.0.recipe rename to kde-frameworks/ksyntax_highlighting/ksyntax_highlighting6-6.7.0.recipe index 3edc35cb4..0cf5c116c 100644 --- a/kde-frameworks/ksyntax_highlighting/ksyntax_highlighting6-6.5.0.recipe +++ b/kde-frameworks/ksyntax_highlighting/ksyntax_highlighting6-6.7.0.recipe @@ -9,7 +9,7 @@ COPYRIGHT="2010-2023 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/syntax-highlighting-${portVersion}.tar.xz" -CHECKSUM_SHA256="3e1883dd51a3267e56cd3ace38620094a15ae6dbaecdd18d33b7d4fa2f18c378" +CHECKSUM_SHA256="6ef527a941740b9ddfe053eb08ead7e11c12a283aa88a5ddf1a18520cd9d2ca7" SOURCE_DIR="syntax-highlighting-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -51,27 +51,35 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" cmd:cmake cmd:dot - cmd:doxygen >= 1.9 + cmd:doxygen cmd:g++$secondaryArchSuffix cmd:make cmd:perl + cmd:pkg_config$secondaryArchSuffix " +defineDebugInfoPackage ksyntax_highlighting6$secondaryArchSuffix \ + $libDir/libKF6SyntaxHighlighting.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 \ libKF6SyntaxHighlighting diff --git a/kde-frameworks/threadweaver/patches/threadweaver-6.5.0.patchset b/kde-frameworks/threadweaver/patches/threadweaver-6.7.0.patchset similarity index 100% rename from kde-frameworks/threadweaver/patches/threadweaver-6.5.0.patchset rename to kde-frameworks/threadweaver/patches/threadweaver-6.7.0.patchset diff --git a/kde-frameworks/threadweaver/threadweaver6-6.5.0.recipe b/kde-frameworks/threadweaver/threadweaver6-6.7.0.recipe similarity index 79% rename from kde-frameworks/threadweaver/threadweaver6-6.5.0.recipe rename to kde-frameworks/threadweaver/threadweaver6-6.7.0.recipe index 4d4a9aeaf..4060fae7c 100644 --- a/kde-frameworks/threadweaver/threadweaver6-6.5.0.recipe +++ b/kde-frameworks/threadweaver/threadweaver6-6.7.0.recipe @@ -14,7 +14,7 @@ COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/threadweaver-${portVersion}.tar.xz" -CHECKSUM_SHA256="ae70d0936c438ebf4a3f7b2a708efb9cd30b5a4147d9b70ae5d4437dbb20bde8" +CHECKSUM_SHA256="1ac3fc8051f31ac4f76dfd5d157e5c375d183bc0762152a44e1831cf5816a956" SOURCE_DIR="threadweaver-$portVersion" PATCHES="threadweaver-$portVersion.patchset" @@ -50,25 +50,34 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" cmd:cmake cmd:dot - cmd:doxygen >= 1.9 + cmd:doxygen cmd:g++$secondaryArchSuffix cmd:make + cmd:pkg_config$secondaryArchSuffix " +defineDebugInfoPackage threadweaver6$secondaryArchSuffix \ + $libDir/libKF6ThreadWeaver.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 \ libKF6ThreadWeaver