From 34e486fe5b66feef7a6ae3ecd7f7968a2ddc8744 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Mon, 16 Dec 2024 15:45:09 +0100 Subject: [PATCH] KF6 frameworks, bump to 6.9.0 Part1 (#11451) --- ...e6-6.7.0.recipe => karchive6-6.9.0.recipe} | 10 ++++----- ...cs6-6.7.0.recipe => kcodecs6-6.9.0.recipe} | 10 ++++----- ....7.0.recipe => kcolorscheme6-6.9.0.recipe} | 16 +++++++------- ...ig6-6.7.0.recipe => kconfig6-6.9.0.recipe} | 18 +++++++++------- ...6.7.0.recipe => kcoreaddons6-6.9.0.recipe} | 11 +++++----- ....0.patchset => kcoreaddons-6.9.0.patchset} | 12 +++++------ ...-6.7.0.recipe => kguiaddons6-6.9.0.recipe} | 15 +++++++------ ...i18n6-6.7.0.recipe => ki18n6-6.9.0.recipe} | 21 ++++++++++++------- ....0.recipe => kwidgetsaddons6-6.9.0.recipe} | 10 ++++----- 9 files changed, 66 insertions(+), 57 deletions(-) rename kde-frameworks/karchive/{karchive6-6.7.0.recipe => karchive6-6.9.0.recipe} (89%) rename kde-frameworks/kcodecs/{kcodecs6-6.7.0.recipe => kcodecs6-6.9.0.recipe} (88%) rename kde-frameworks/kcolorscheme/{kcolorscheme6-6.7.0.recipe => kcolorscheme6-6.9.0.recipe} (83%) rename kde-frameworks/kconfig/{kconfig6-6.7.0.recipe => kconfig6-6.9.0.recipe} (88%) rename kde-frameworks/kcoreaddons/{kcoreaddons6-6.7.0.recipe => kcoreaddons6-6.9.0.recipe} (88%) rename kde-frameworks/kcoreaddons/patches/{kcoreaddons-6.7.0.patchset => kcoreaddons-6.9.0.patchset} (89%) rename kde-frameworks/kguiaddons/{kguiaddons6-6.7.0.recipe => kguiaddons6-6.9.0.recipe} (84%) rename kde-frameworks/ki18n/{ki18n6-6.7.0.recipe => ki18n6-6.9.0.recipe} (83%) rename kde-frameworks/kwidgetsaddons/{kwidgetsaddons6-6.7.0.recipe => kwidgetsaddons6-6.9.0.recipe} (89%) diff --git a/kde-frameworks/karchive/karchive6-6.7.0.recipe b/kde-frameworks/karchive/karchive6-6.9.0.recipe similarity index 89% rename from kde-frameworks/karchive/karchive6-6.7.0.recipe rename to kde-frameworks/karchive/karchive6-6.9.0.recipe index ece7b4655..7273369bc 100644 --- a/kde-frameworks/karchive/karchive6-6.7.0.recipe +++ b/kde-frameworks/karchive/karchive6-6.9.0.recipe @@ -9,7 +9,7 @@ COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/karchive-${portVersion}.tar.xz" -CHECKSUM_SHA256="eb4243e627f51f1224a99af5d0a6f8e309f9e5dbb7478f7a78e34e2b8541398a" +CHECKSUM_SHA256="246ad8dd2b5fb83df1cb05ff1fd3934f8a52be94d124350f9e6b7c3420e9c474" SOURCE_DIR="karchive-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -58,19 +58,19 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " -defineDebugInfoPackage karchive6$secondaryArchSuffix \ - $libDir/libKF6Archive.so.$libVersion +#defineDebugInfoPackage karchive6$secondaryArchSuffix \ +# $libDir/libKF6Archive.so.$libVersion BUILD() { - cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ $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 \ + -DCMAKE_SKIP_RPATH=YES \ -DBUILD_QCH=ON \ -DBUILD_TESTING=OFF \ -Wno-dev diff --git a/kde-frameworks/kcodecs/kcodecs6-6.7.0.recipe b/kde-frameworks/kcodecs/kcodecs6-6.9.0.recipe similarity index 88% rename from kde-frameworks/kcodecs/kcodecs6-6.7.0.recipe rename to kde-frameworks/kcodecs/kcodecs6-6.9.0.recipe index 4c4ac2c54..70c275923 100644 --- a/kde-frameworks/kcodecs/kcodecs6-6.7.0.recipe +++ b/kde-frameworks/kcodecs/kcodecs6-6.9.0.recipe @@ -10,7 +10,7 @@ COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kcodecs-${portVersion}.tar.xz" -CHECKSUM_SHA256="9ab494055e06bdce45568b7c47edb2aa9ecaa9dec0c0fb152367b4321921b9f2" +CHECKSUM_SHA256="c88a4def4564a746bb8a6a7c127094ae9b7e47e1a5ad24f87ffb6643d42b0cb1" SOURCE_DIR="kcodecs-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -52,19 +52,19 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " -defineDebugInfoPackage kcodecs6$secondaryArchSuffix \ - $libDir/libKF6Codecs.so.$libVersion +#defineDebugInfoPackage kcodecs6$secondaryArchSuffix \ +# $libDir/libKF6Codecs.so.$libVersion BUILD() { - cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ $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 \ + -DCMAKE_SKIP_RPATH=YES \ -DBUILD_QCH=ON \ -DBUILD_TESTING=OFF \ -Wno-dev diff --git a/kde-frameworks/kcolorscheme/kcolorscheme6-6.7.0.recipe b/kde-frameworks/kcolorscheme/kcolorscheme6-6.9.0.recipe similarity index 83% rename from kde-frameworks/kcolorscheme/kcolorscheme6-6.7.0.recipe rename to kde-frameworks/kcolorscheme/kcolorscheme6-6.9.0.recipe index 07ecdbf64..a85da334f 100644 --- a/kde-frameworks/kcolorscheme/kcolorscheme6-6.7.0.recipe +++ b/kde-frameworks/kcolorscheme/kcolorscheme6-6.9.0.recipe @@ -5,7 +5,7 @@ COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kcolorscheme-${portVersion}.tar.xz" -CHECKSUM_SHA256="1b4c6e84f1dd96b2ee62be755f60da60d61ba80d6709eeb3186d8882e72e2130" +CHECKSUM_SHA256="71beaae08b294b5ebf25c5174a1d55cacdce5e8991e9167d143a448b9574281a" SOURCE_DIR="kcolorscheme-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -41,9 +41,9 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel extra_cmake_modules$secondaryArchSuffix >= $portVersion qt6_tools${secondaryArchSuffix}_devel - devel:libKF6ConfigCore$secondaryArchSuffix == $portVersion - devel:libKF6GuiAddons$secondaryArchSuffix == $portVersion - devel:libKF6I18n$secondaryArchSuffix == $portVersion + devel:libKF6ConfigCore$secondaryArchSuffix == $libVersion + devel:libKF6GuiAddons$secondaryArchSuffix == $libVersion + devel:libKF6I18n$secondaryArchSuffix == $libVersion devel:libQt6Core$secondaryArchSuffix devel:libQt6Qml$secondaryArchSuffix " @@ -62,19 +62,19 @@ TEST_REQUIRES=" qthaikuplugins$secondaryArchSuffix " -defineDebugInfoPackage kcolorscheme6$secondaryArchSuffix \ - $libDir/libKF6ColorScheme.so.$libVersion +#defineDebugInfoPackage kcolorscheme6$secondaryArchSuffix \ +# $libDir/libKF6ColorScheme.so.$libVersion BUILD() { - cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ $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 \ + -DCMAKE_SKIP_RPATH=YES \ -DBUILD_QCH=ON \ -DBUILD_TESTING=OFF \ -Wno-dev diff --git a/kde-frameworks/kconfig/kconfig6-6.7.0.recipe b/kde-frameworks/kconfig/kconfig6-6.9.0.recipe similarity index 88% rename from kde-frameworks/kconfig/kconfig6-6.7.0.recipe rename to kde-frameworks/kconfig/kconfig6-6.9.0.recipe index 76e8be765..f03d6dff4 100644 --- a/kde-frameworks/kconfig/kconfig6-6.7.0.recipe +++ b/kde-frameworks/kconfig/kconfig6-6.9.0.recipe @@ -19,8 +19,7 @@ COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kconfig-${portVersion}.tar.xz" -CHECKSUM_SHA256="be2d5ddb63e56703bc097e5d9912b39abc513ac51654de2e0d83a1aed2c54b1b" -#PATCHES="kconfig-$portVersion.patchset" +CHECKSUM_SHA256="b8b9dfb0bc5bc0f9c45164e02c988dd8ab10a34aea0c80b1945fd0b3267ac6f9" SOURCE_DIR="kconfig-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -55,6 +54,7 @@ PROVIDES_devel=" " REQUIRES_devel=" kconfig6$secondaryArchSuffix == $portVersion base + devel:libQt6Qml$secondaryArchSuffix " BUILD_REQUIRES=" @@ -77,21 +77,23 @@ TEST_REQUIRES=" qthaikuplugins$secondaryArchSuffix " -defineDebugInfoPackage kconfig6$secondaryArchSuffix \ - $libDir/libKF6ConfigCore.so.$libVersion \ - $libDir/libKF6ConfigGui.so.$libVersion \ - $libDir/libKF6ConfigQml.so.$libVersion +#defineDebugInfoPackage kconfig6$secondaryArchSuffix \ +# $binDir/kreadconfig6 \ +# $binDir/kwriteconfig6 \ +# $libDir/libKF6ConfigCore.so.$libVersion \ +# $libDir/libKF6ConfigGui.so.$libVersion \ +# $libDir/libKF6ConfigQml.so.$libVersion BUILD() { - cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ $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 \ + -DCMAKE_SKIP_RPATH=YES \ -DBUILD_QCH=ON \ -DBUILD_TESTING=OFF \ -Wno-dev diff --git a/kde-frameworks/kcoreaddons/kcoreaddons6-6.7.0.recipe b/kde-frameworks/kcoreaddons/kcoreaddons6-6.9.0.recipe similarity index 88% rename from kde-frameworks/kcoreaddons/kcoreaddons6-6.7.0.recipe rename to kde-frameworks/kcoreaddons/kcoreaddons6-6.9.0.recipe index 250e54ed7..078e98353 100644 --- a/kde-frameworks/kcoreaddons/kcoreaddons6-6.7.0.recipe +++ b/kde-frameworks/kcoreaddons/kcoreaddons6-6.9.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%.*}/kcoreaddons-${portVersion}.tar.xz" -CHECKSUM_SHA256="48511e9dab1f2e80b3c4822bb87c2e981186de3b8977d92082d34d003b1283c5" +CHECKSUM_SHA256="9ce79eeeff62c0df46be1db17630344e9bee7f63655441e626923d3d4f986fbd" SOURCE_DIR="kcoreaddons-$portVersion" PATCHES="kcoreaddons-$portVersion.patchset" @@ -20,7 +20,6 @@ libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" kcoreaddons6$secondaryArchSuffix = $portVersion - cmd:desktoptojson$secondaryArchSuffix = $portVersion lib:libKF6coreaddons$secondaryArchSuffix = $libVersionCompat " REQUIRES=" @@ -59,19 +58,19 @@ TEST_REQUIRES=" qthaikuplugins$secondaryArchSuffix " -defineDebugInfoPackage kcoreaddons6$secondaryArchSuffix \ - $libDir/libKF6CoreAddons.so.$libVersion +#defineDebugInfoPackage kcoreaddons6$secondaryArchSuffix \ +# $libDir/libKF6CoreAddons.so.$libVersion BUILD() { - cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ $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 \ + -DCMAKE_SKIP_RPATH=YES \ -DBUILD_QCH=ON \ -DBUILD_TESTING=OFF \ -Wno-dev diff --git a/kde-frameworks/kcoreaddons/patches/kcoreaddons-6.7.0.patchset b/kde-frameworks/kcoreaddons/patches/kcoreaddons-6.9.0.patchset similarity index 89% rename from kde-frameworks/kcoreaddons/patches/kcoreaddons-6.7.0.patchset rename to kde-frameworks/kcoreaddons/patches/kcoreaddons-6.9.0.patchset index 4fc83bba6..ba1e4360a 100644 --- a/kde-frameworks/kcoreaddons/patches/kcoreaddons-6.7.0.patchset +++ b/kde-frameworks/kcoreaddons/patches/kcoreaddons-6.9.0.patchset @@ -1,4 +1,4 @@ -From 8b0356308b856a8d6a6b3f812ea1c501db660d2b Mon Sep 17 00:00:00 2001 +From 67b317c0d1738f31b7a12d1c67cb1839f5af7611 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Sat, 23 Sep 2017 02:08:00 +0300 Subject: Fix build on Haiku @@ -39,21 +39,21 @@ index fe3631f..d84337f 100644 2.45.2 -From dea02d505faa3110ab76455fc8ae52af6bb7610c Mon Sep 17 00:00:00 2001 +From 34d7b16573470aa0c97f4868ce11c802f6249c32 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 8 May 2022 21:42:30 +1000 Subject: Link with libnetwork diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt -index 00ab870..90294df 100644 +index 0c43d4e..9a9caa3 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt -@@ -256,6 +256,10 @@ if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") +@@ -263,6 +263,10 @@ if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") target_link_libraries(KF6CoreAddons PRIVATE kvm) endif() -+if(CMAKE_SYSTEM_NAME MATCHES "Haiku") ++if(HAIKU) + target_link_libraries(KF6CoreAddons PRIVATE network) +endif() + @@ -64,7 +64,7 @@ index 00ab870..90294df 100644 2.45.2 -From 80071ffbdd155aec13758d8e0ead49dc2be7de8e Mon Sep 17 00:00:00 2001 +From 83b3a86e4d722ad157508e6d8516769e9dd1b20b Mon Sep 17 00:00:00 2001 From: Begasus Date: Mon, 4 Dec 2023 11:19:46 +0100 Subject: Build fix(?) diff --git a/kde-frameworks/kguiaddons/kguiaddons6-6.7.0.recipe b/kde-frameworks/kguiaddons/kguiaddons6-6.9.0.recipe similarity index 84% rename from kde-frameworks/kguiaddons/kguiaddons6-6.7.0.recipe rename to kde-frameworks/kguiaddons/kguiaddons6-6.9.0.recipe index 2b3144550..261d81a5d 100644 --- a/kde-frameworks/kguiaddons/kguiaddons6-6.7.0.recipe +++ b/kde-frameworks/kguiaddons/kguiaddons6-6.9.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%.*}/kguiaddons-${portVersion}.tar.xz" -CHECKSUM_SHA256="ac437ca6baf50b0178bc8bf0b4dd1e6e70e0e4ef1ac770259738a1c42d035bcc" +CHECKSUM_SHA256="f7c320bea5fb0fcc247e04e1092e19206a1298853112a87c65072d33adc8468a" SOURCE_DIR="kguiaddons-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -25,6 +25,8 @@ REQUIRES=" lib:libGL$secondaryArchSuffix lib:libQt6Core$secondaryArchSuffix lib:libQt6Gui$secondaryArchSuffix + lib:libQt6Network$secondaryArchSuffix + lib:libQt6Qml$secondaryArchSuffix " PROVIDES_devel=" @@ -41,6 +43,7 @@ BUILD_REQUIRES=" qt6_tools${secondaryArchSuffix}_devel devel:libQt6Core$secondaryArchSuffix devel:libQt6Gui$secondaryArchSuffix + devel:libQt6Qml$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:cmake @@ -55,20 +58,20 @@ TEST_REQUIRES=" qthaikuplugins$secondaryArchSuffix " -defineDebugInfoPackage kguiaddons6$secondaryArchSuffix \ - $libDir/libKF6GuiAddons.so.$libVersion +#defineDebugInfoPackage kguiaddons6$secondaryArchSuffix \ +# $binDir/kde-geo-uri-handler \ +# $libDir/libKF6GuiAddons.so.$libVersion BUILD() { - cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ $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 \ - -DWITH_WAYLAND=OFF \ + -DCMAKE_SKIP_RPATH=YES \ -DBUILD_QCH=ON \ -DBUILD_TESTING=OFF \ -Wno-dev diff --git a/kde-frameworks/ki18n/ki18n6-6.7.0.recipe b/kde-frameworks/ki18n/ki18n6-6.9.0.recipe similarity index 83% rename from kde-frameworks/ki18n/ki18n6-6.7.0.recipe rename to kde-frameworks/ki18n/ki18n6-6.9.0.recipe index d81f5a84f..13191705d 100644 --- a/kde-frameworks/ki18n/ki18n6-6.7.0.recipe +++ b/kde-frameworks/ki18n/ki18n6-6.9.0.recipe @@ -13,7 +13,7 @@ COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/ki18n-${portVersion}.tar.xz" -CHECKSUM_SHA256="555b5bc19546c3a791c69724e238c5d1710a9575cf8740012f8fc546f354122b" +CHECKSUM_SHA256="736ae10e3a8c5dced155d3347f9dbd91c34f485d7495815f85f4d624681a1860" SOURCE_DIR="ki18n-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -26,18 +26,21 @@ PROVIDES=" ki18n6$secondaryArchSuffix = $portVersion lib:libKF6I18n$secondaryArchSuffix = $libVersionCompat lib:libKF6I18nLocaleData$secondaryArchSuffix = $libVersionCompat + lib:libKF6I18nQml$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix iso_codes lib:libintl$secondaryArchSuffix lib:libQt6Core$secondaryArchSuffix + lib:libQt6Qml$secondaryArchSuffix " PROVIDES_devel=" ki18n6${secondaryArchSuffix}_devel = $portVersion devel:libKF6I18n$secondaryArchSuffix = $libVersionCompat devel:libKF6I18nLocaleData$secondaryArchSuffix = $libVersionCompat + devel:libKF6I18nQml$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" ki18n6$secondaryArchSuffix == $portVersion base @@ -52,6 +55,7 @@ BUILD_REQUIRES=" devel:libQt6Qml$secondaryArchSuffix " BUILD_PREREQUIRES=" + iso_codes cmd:cmake cmd:dot cmd:doxygen @@ -60,23 +64,23 @@ BUILD_PREREQUIRES=" cmd:msgfmt$secondaryArchSuffix cmd:msgmerge$secondaryArchSuffix cmd:pkg_config$secondaryArchSuffix - iso_codes " -defineDebugInfoPackage ki18n6$secondaryArchSuffix \ - $libDir/libKF6I18n.so.$libVersion \ - $libDir/libKF6I18nLocaleData.so.$libVersion +#defineDebugInfoPackage ki18n6$secondaryArchSuffix \ +# $libDir/libKF6I18n.so.$libVersion \ +# $libDir/libKF6I18nLocaleData.so.$libVersion \ +# $libDir/libKF6I18nQml.so.$libVersion BUILD() { - cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ $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 \ + -DCMAKE_SKIP_RPATH=YES \ -DBUILD_QCH=ON \ -DBUILD_TESTING=OFF \ -Wno-dev @@ -89,7 +93,8 @@ INSTALL() prepareInstalledDevelLibs \ libKF6I18n \ - libKF6I18nLocaleData + libKF6I18nLocaleData \ + libKF6I18nQml packageEntries devel \ $developDir \ diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons6-6.7.0.recipe b/kde-frameworks/kwidgetsaddons/kwidgetsaddons6-6.9.0.recipe similarity index 89% rename from kde-frameworks/kwidgetsaddons/kwidgetsaddons6-6.7.0.recipe rename to kde-frameworks/kwidgetsaddons/kwidgetsaddons6-6.9.0.recipe index 56066ef73..eb419e03d 100644 --- a/kde-frameworks/kwidgetsaddons/kwidgetsaddons6-6.7.0.recipe +++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons6-6.9.0.recipe @@ -12,7 +12,7 @@ COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kwidgetsaddons-${portVersion}.tar.xz" -CHECKSUM_SHA256="bd36342893863e6110c5f1245f8ae0b3a338275f4eaf124b15585d2fe492329a" +CHECKSUM_SHA256="bda7d5cef310ad3b8e0aa9accf319c3349e2b7cbead673bd25a39af593787a48" SOURCE_DIR="kwidgetsaddons-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -60,19 +60,19 @@ TEST_REQUIRES=" qthaikuplugins$secondaryArchSuffix " -defineDebugInfoPackage kwidgetsaddons6$secondaryArchSuffix \ - $libDir/libKF6WidgetsAddons.so.$libVersion +#defineDebugInfoPackage kwidgetsaddons6$secondaryArchSuffix \ +# $libDir/libKF6WidgetsAddons.so.$libVersion BUILD() { - cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ $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 \ + -DCMAKE_SKIP_RPATH=YES \ -DBUILD_QCH=ON \ -DBUILD_TESTING=OFF \ -Wno-dev