diff --git a/kde-frameworks/kauth/kauth6-6.7.0.recipe b/kde-frameworks/kauth/kauth6-6.9.0.recipe similarity index 84% rename from kde-frameworks/kauth/kauth6-6.7.0.recipe rename to kde-frameworks/kauth/kauth6-6.9.0.recipe index e7628157b1a..3a7da8e01ca 100644 --- a/kde-frameworks/kauth/kauth6-6.7.0.recipe +++ b/kde-frameworks/kauth/kauth6-6.9.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%.*}/kauth-${portVersion}.tar.xz" -CHECKSUM_SHA256="173654eee2891acd41538d31ace8b9d7ae60863bc7faef1cacec7e21c7eb1223" +CHECKSUM_SHA256="84cf15729bd248aa9d78c1bfecf68161782d521ac14a9b6a5bdacc29cbe3dec6" SOURCE_DIR="kauth-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -39,9 +39,9 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix >= $portVersion + extra_cmake_modules$secondaryArchSuffix qt6_tools${secondaryArchSuffix}_devel - devel:libKF6CoreAddons$secondaryArchSuffix == $portVersion + devel:libKF6CoreAddons$secondaryArchSuffix == $libVersion devel:libQt6Core$secondaryArchSuffix " BUILD_PREREQUIRES=" @@ -57,19 +57,19 @@ TEST_REQUIRES=" lib:libdbus_1$secondaryArchSuffix " -defineDebugInfoPackage kauth6$secondaryArchSuffix \ - $libDir/libKF6AuthCore.so.$libVersion +#defineDebugInfoPackage kauth6$secondaryArchSuffix \ +# $libDir/libKF6AuthCore.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/kbookmarks/kbookmarks6-6.7.0.recipe b/kde-frameworks/kbookmarks/kbookmarks6-6.9.0.recipe similarity index 63% rename from kde-frameworks/kbookmarks/kbookmarks6-6.7.0.recipe rename to kde-frameworks/kbookmarks/kbookmarks6-6.9.0.recipe index ef01b2dd35d..f219e02d11f 100644 --- a/kde-frameworks/kbookmarks/kbookmarks6-6.7.0.recipe +++ b/kde-frameworks/kbookmarks/kbookmarks6-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%.*}/kbookmarks-${portVersion}.tar.xz" -CHECKSUM_SHA256="bd41a39df76515ee34e7df07b2600e1e5b67b1812cc959ec51585f2ebcc56573" +CHECKSUM_SHA256="932234bedbf5a5887f23c610010c8c70b36b5dce4f4c4c5d76f47a92ce8e577a" SOURCE_DIR="kbookmarks-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -26,19 +26,11 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix lib:libGL$secondaryArchSuffix - lib:libKF6Codecs$secondaryArchSuffix - lib:libKF6ColorScheme$secondaryArchSuffix lib:libKF6ConfigCore$secondaryArchSuffix - lib:libKF6ConfigGui$secondaryArchSuffix - lib:libKF6ConfigWidgets$secondaryArchSuffix lib:libKF6CoreAddons$secondaryArchSuffix - lib:libKF6IconThemes$secondaryArchSuffix lib:libKF6WidgetsAddons$secondaryArchSuffix lib:libQt6Core$secondaryArchSuffix - lib:libQt6DBus$secondaryArchSuffix - lib:libQt6Gui$secondaryArchSuffix - lib:libQt6Widgets$secondaryArchSuffix - lib:libQt6Xml$secondaryArchSuffix + lib:libQt6Qml$secondaryArchSuffix " PROVIDES_devel=" @@ -48,26 +40,18 @@ PROVIDES_devel=" " REQUIRES_devel=" kbookmarks6$secondaryArchSuffix == $portVersion base + devel:libKF6WidgetsAddons$secondaryArchSuffix == $libVersion " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix >= $portVersion + extra_cmake_modules$secondaryArchSuffix qt6_tools${secondaryArchSuffix}_devel - devel:libKF6Codecs$secondaryArchSuffix == $portVersion - devel:libKF6ColorScheme$secondaryArchSuffix == $portVersion - devel:libKF6ConfigCore$secondaryArchSuffix == $portVersion - devel:libKF6ConfigGui$secondaryArchSuffix == $portVersion - devel:libKF6ConfigWidgets$secondaryArchSuffix == $portVersion - devel:libKF6CoreAddons$secondaryArchSuffix == $portVersion - devel:libKF6IconThemes$secondaryArchSuffix == $portVersion - devel:libKF6WidgetsAddons$secondaryArchSuffix == $portVersion + devel:libKF6ConfigCore$secondaryArchSuffix == $libVersion + devel:libKF6CoreAddons$secondaryArchSuffix == $libVersion + devel:libKF6WidgetsAddons$secondaryArchSuffix == $libVersion devel:libQt6Core$secondaryArchSuffix - devel:libQt6DBus$secondaryArchSuffix - devel:libQt6Gui$secondaryArchSuffix devel:libQt6Qml$secondaryArchSuffix - devel:libQt6Widgets$secondaryArchSuffix - devel:libQt6Xml$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:cmake @@ -82,20 +66,20 @@ TEST_REQUIRES=" qthaikuplugins " -defineDebugInfoPackage kbookmarks6$secondaryArchSuffix \ - $libDir/libKF6Bookmarks.so.$libVersion \ - $libDir/libKF6BookmarksWidgets.so.$libVersion +#defineDebugInfoPackage kbookmarks6$secondaryArchSuffix \ +# $libDir/libKF6Bookmarks.so.$libVersion \ +# $libDir/libKF6BookmarksWidgets.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/kded/kded6-6.7.0.recipe b/kde-frameworks/kded/kded6-6.9.0.recipe similarity index 80% rename from kde-frameworks/kded/kded6-6.7.0.recipe rename to kde-frameworks/kded/kded6-6.9.0.recipe index 137edab97a7..280bd958f1e 100644 --- a/kde-frameworks/kded/kded6-6.7.0.recipe +++ b/kde-frameworks/kded/kded6-6.9.0.recipe @@ -24,12 +24,14 @@ COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kded-${portVersion}.tar.xz" -CHECKSUM_SHA256="22aa1b6543b40e094346138516131c0f7eb78a70e87296938457fd1386680a2f" +CHECKSUM_SHA256="39d74343db901b8419244738ef4c6d9e8b1a3331278d55f57811b016adb02a9f" SOURCE_DIR="kded-$portVersion" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" +libVersion="$portVersion" + PROVIDES=" kded6$secondaryArchSuffix = $portVersion cmd:kded6$secondaryArchSuffix = $portVersion @@ -58,17 +60,20 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix >= $portVersion - devel:libKF6ConfigCore$secondaryArchSuffix == $portVersion - devel:libKF6CoreAddons$secondaryArchSuffix == $portVersion - devel:libKF6Crash$secondaryArchSuffix == $portVersion - devel:libKF6DBusAddons$secondaryArchSuffix == $portVersion - devel:libKF6Service$secondaryArchSuffix == $portVersion + extra_cmake_modules$secondaryArchSuffix + qt6_tools${secondaryArchSuffix}_devel + devel:libKF6ConfigCore$secondaryArchSuffix == $libVersion + devel:libKF6CoreAddons$secondaryArchSuffix == $libVersion + devel:libKF6Crash$secondaryArchSuffix == $libVersion + devel:libKF6DBusAddons$secondaryArchSuffix == $libVersion + devel:libKF6Service$secondaryArchSuffix == $libVersion devel:libQt6Core$secondaryArchSuffix devel:libQt6Qml$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:cmake + cmd:dot + cmd:doxygen cmd:g++$secondaryArchSuffix cmd:make cmd:msgfmt$secondaryArchSuffix @@ -76,8 +81,8 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " -defineDebugInfoPackage kded6$secondaryArchSuffix \ - $binDir/kded6 +#defineDebugInfoPackage kded6$secondaryArchSuffix \ +# $binDir/kded6 BUILD() { @@ -87,8 +92,8 @@ BUILD() -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 @@ -105,3 +110,10 @@ INSTALL() packageEntries devel \ $libDir/cmake } + +TEST() +{ + # no test cases + export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}" + ctest --test-dir build --output-on-failure +} diff --git a/kde-frameworks/kglobalaccel/kglobalaccel6-6.7.0.recipe b/kde-frameworks/kglobalaccel/kglobalaccel6-6.9.0.recipe similarity index 61% rename from kde-frameworks/kglobalaccel/kglobalaccel6-6.7.0.recipe rename to kde-frameworks/kglobalaccel/kglobalaccel6-6.9.0.recipe index e797143311b..4affa60d100 100644 --- a/kde-frameworks/kglobalaccel/kglobalaccel6-6.7.0.recipe +++ b/kde-frameworks/kglobalaccel/kglobalaccel6-6.9.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%.*}/kglobalaccel-${portVersion}.tar.xz" -CHECKSUM_SHA256="2a35b9e06c6601d602b3a45e278c49e11e4627939cfacffb1fdee0826a6f6e0b" +CHECKSUM_SHA256="061a506f5ccefe62c5d92a6ed109b4f01e14a4c8bd5d42b622c8c8447f75e1fd" SOURCE_DIR="kglobalaccel-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -18,26 +18,16 @@ libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" kglobalaccel6$secondaryArchSuffix = $portVersion - cmd:kglobalaccel6$secondaryArchSuffix = $portVersion lib:libKF6GlobalAccel$secondaryArchSuffix = $libVersionCompat lib:libKF6GlobalAccelPrivate$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix lib:libGL$secondaryArchSuffix - lib:libKF6ConfigCore$secondaryArchSuffix - lib:libKF6CoreAddons$secondaryArchSuffix - lib:libKF6Crash$secondaryArchSuffix - lib:libKF6DBusAddons$secondaryArchSuffix - lib:libKF6I18n$secondaryArchSuffix - lib:libKF6Service$secondaryArchSuffix - lib:libKF6WindowSystem$secondaryArchSuffix - lib:libQt6Concurrent$secondaryArchSuffix lib:libQt6Core$secondaryArchSuffix lib:libQt6DBus$secondaryArchSuffix - lib:libQt6Test$secondaryArchSuffix + lib:libQt6Gui$secondaryArchSuffix lib:libQt6Widgets$secondaryArchSuffix - lib:libQt6Xml$secondaryArchSuffix " PROVIDES_devel=" @@ -50,22 +40,9 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix >= $portVersion + extra_cmake_modules$secondaryArchSuffix qt6_tools${secondaryArchSuffix}_devel - devel:libKF6ConfigCore$secondaryArchSuffix == $portVersion - devel:libKF6CoreAddons$secondaryArchSuffix == $portVersion - devel:libKF6Crash$secondaryArchSuffix == $portVersion - devel:libKF6DBusAddons$secondaryArchSuffix == $portVersion - devel:libKF6I18n$secondaryArchSuffix == $portVersion - devel:libKF6Service$secondaryArchSuffix == $portVersion - devel:libKF6WindowSystem$secondaryArchSuffix == $portVersion - devel:libQt6Concurrent$secondaryArchSuffix devel:libQt6Core$secondaryArchSuffix - devel:libQt6DBus$secondaryArchSuffix - devel:libQt6Qml$secondaryArchSuffix - devel:libQt6Test$secondaryArchSuffix - devel:libQt6Widgets$secondaryArchSuffix - devel:libQt6Xml$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:cmake @@ -80,21 +57,22 @@ TEST_REQUIRES=" qthaikuplugins$secondaryArchSuffix " -defineDebugInfoPackage kglobalaccel6$secondaryArchSuffix \ - $libDir/libKF6GlobalAccel.so.$libVersion +#defineDebugInfoPackage kglobalaccel6$secondaryArchSuffix \ +# $libDir/libKF6GlobalAccel.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 \ + -DWITH_X11=OFF \ -Wno-dev make -C build $jobArgs } diff --git a/kde-frameworks/kio/kio6-6.7.0.recipe b/kde-frameworks/kio/kio6-6.9.0.recipe similarity index 62% rename from kde-frameworks/kio/kio6-6.7.0.recipe rename to kde-frameworks/kio/kio6-6.9.0.recipe index 64e471c90f2..3db62f56712 100644 --- a/kde-frameworks/kio/kio6-6.7.0.recipe +++ b/kde-frameworks/kio/kio6-6.9.0.recipe @@ -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="df235019a07acd579920f6c655050e02dacf847c706f4b8279e755be46f9d990" +CHECKSUM_SHA256="5360962b0b9bc06d01f86888c896ca591ccd2d0bca79b7f5cc4367a6e31b368b" SOURCE_DIR="kio-$portVersion" PATCHES="kio-$portVersion.patchset" @@ -38,18 +38,13 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix lib:libGL$secondaryArchSuffix - lib:libKF6Archive$secondaryArchSuffix lib:libKF6AuthCore$secondaryArchSuffix lib:libKF6Bookmarks$secondaryArchSuffix - lib:libKF6Codecs$secondaryArchSuffix lib:libKF6ColorScheme$secondaryArchSuffix lib:libKF6Completion$secondaryArchSuffix lib:libKF6ConfigCore$secondaryArchSuffix - lib:libKF6ConfigGui$secondaryArchSuffix - lib:libKF6ConfigWidgets$secondaryArchSuffix lib:libKF6CoreAddons$secondaryArchSuffix lib:libKF6Crash$secondaryArchSuffix - lib:libKF6DBusAddons$secondaryArchSuffix lib:libKF6GuiAddons$secondaryArchSuffix lib:libKF6I18n$secondaryArchSuffix lib:libKF6IconThemes$secondaryArchSuffix @@ -59,13 +54,7 @@ REQUIRES=" lib:libKF6Solid$secondaryArchSuffix lib:libKF6WidgetsAddons$secondaryArchSuffix lib:libKF6WindowSystem$secondaryArchSuffix - lib:libQt6Concurrent$secondaryArchSuffix lib:libQt6Core$secondaryArchSuffix - lib:libQt6Core5Compat$secondaryArchSuffix - lib:libQt6DBus$secondaryArchSuffix - lib:libQt6Gui$secondaryArchSuffix - lib:libQt6Network$secondaryArchSuffix - lib:libQt6Xml$secondaryArchSuffix " PROVIDES_devel=" @@ -77,44 +66,42 @@ PROVIDES_devel=" " REQUIRES_devel=" kio6$secondaryArchSuffix == $portVersion base + devel:libKF6Bookmarks$secondaryArchSuffix == $libVersion + devel:libKF6Completion$secondaryArchSuffix == $libVersion + devel:libKF6ConfigCore$secondaryArchSuffix == $libVersion + devel:libKF6CoreAddons$secondaryArchSuffix == $libVersion + devel:libKF6ItemViews$secondaryArchSuffix == $libVersion + devel:libKF6JobWidgets$secondaryArchSuffix == $libVersion + devel:libKF6Service$secondaryArchSuffix == $libVersion + devel:libKF6Solid$secondaryArchSuffix == $libVersion + devel:libKF6WidgetsAddons$secondaryArchSuffix == $libVersion + devel:libKF6WindowSystem$secondaryArchSuffix == $libVersion " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix >= $portVersion + extra_cmake_modules$secondaryArchSuffix qt6_tools${secondaryArchSuffix}_devel # devel:libacl$secondaryArchSuffix -# devel:kded6$secondaryArchSuffix - devel:libKF6Archive$secondaryArchSuffix == $portVersion - devel:libKF6AuthCore$secondaryArchSuffix == $portVersion - devel:libKF6Bookmarks$secondaryArchSuffix == $portVersion - devel:libKF6Codecs$secondaryArchSuffix == $portVersion - devel:libKF6ColorScheme$secondaryArchSuffix == $portVersion - devel:libKF6Completion$secondaryArchSuffix == $portVersion - devel:libKF6ConfigCore$secondaryArchSuffix == $portVersion - devel:libKF6ConfigGui$secondaryArchSuffix == $portVersion - devel:libKF6ConfigWidgets$secondaryArchSuffix == $portVersion - devel:libKF6CoreAddons$secondaryArchSuffix == $portVersion - devel:libKF6Crash$secondaryArchSuffix == $portVersion - devel:libKF6DBusAddons$secondaryArchSuffix == $portVersion - devel:libKF6GuiAddons$secondaryArchSuffix == $portVersion - devel:libKF6DocTools$secondaryArchSuffix == $portVersion - devel:libKF6I18n$secondaryArchSuffix == $portVersion - devel:libKF6IconThemes$secondaryArchSuffix == $portVersion - devel:libKF6ItemViews$secondaryArchSuffix == $portVersion - devel:libKF6JobWidgets$secondaryArchSuffix == $portVersion - devel:libKF6Notifications$secondaryArchSuffix == $portVersion - devel:libKF6Service$secondaryArchSuffix == $portVersion - devel:libKF6Solid$secondaryArchSuffix == $portVersion - devel:libKF6Wallet$secondaryArchSuffix == $portVersion - devel:libKF6WidgetsAddons$secondaryArchSuffix == $portVersion - devel:libKF6WindowSystem$secondaryArchSuffix == $portVersion - devel:libQt6Concurrent$secondaryArchSuffix + devel:kded6$secondaryArchSuffix + devel:libKF6Archive$secondaryArchSuffix == $libVersion + devel:libKF6AuthCore$secondaryArchSuffix == $libVersion + devel:libKF6Bookmarks$secondaryArchSuffix == $libVersion + devel:libKF6ColorScheme$secondaryArchSuffix == $libVersion + devel:libKF6Completion$secondaryArchSuffix == $libVersion + devel:libKF6ConfigCore$secondaryArchSuffix == $libVersion + devel:libKF6CoreAddons$secondaryArchSuffix == $libVersion + devel:libKF6Crash$secondaryArchSuffix == $libVersion + devel:libKF6GuiAddons$secondaryArchSuffix == $libVersion + devel:libKF6I18n$secondaryArchSuffix == $libVersion + devel:libKF6IconThemes$secondaryArchSuffix == $libVersion + devel:libKF6ItemViews$secondaryArchSuffix == $libVersion + devel:libKF6JobWidgets$secondaryArchSuffix == $libVersion + devel:libKF6Service$secondaryArchSuffix == $libVersion + devel:libKF6Solid$secondaryArchSuffix == $libVersion + devel:libKF6WidgetsAddons$secondaryArchSuffix == $libVersion + devel:libKF6WindowSystem$secondaryArchSuffix == $libVersion devel:libQt6Core$secondaryArchSuffix - devel:libQt6Core5Compat$secondaryArchSuffix - devel:libQt6DBus$secondaryArchSuffix - devel:libQt6Gui$secondaryArchSuffix - devel:libQt6Network$secondaryArchSuffix devel:libQt6Qml$secondaryArchSuffix devel:libxml2$secondaryArchSuffix devel:libxslt$secondaryArchSuffix @@ -142,25 +129,25 @@ 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 +#defineDebugInfoPackage kio6$secondaryArchSuffix \ +# $binDir/ktelnetservice6 \ +# $binDir/ktrash6 \ +# $libDir/libKF6KIOCore.so.$libVersion \ +# $libDir/libKF6KIOFileWidgets.so.$libVersion \ +# $libDir/libKF6KIOGui.so.$libVersion \ +# $libDir/libKF6KIOWidgets.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 \ -DKAUTH_HELPER_INSTALL_DIR:PATH=$addOnsDir/Qt6/kauth/helper \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ - -DWITH_X11=OFF \ - -DWITH_WAYLAND=OFF \ + -DCMAKE_SKIP_RPATH=YES \ -DBUILD_QCH=ON \ -DBUILD_TESTING=OFF \ -Wno-dev @@ -188,7 +175,7 @@ INSTALL() TEST() { - # 39% tests passed, 37 tests failed out of 61 + # 48% tests passed, 32 tests failed out of 61 export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}" ctest --test-dir build --output-on-failure } diff --git a/kde-frameworks/kio/patches/kio-6.7.0.patchset b/kde-frameworks/kio/patches/kio-6.7.0.patchset deleted file mode 100644 index af25ea413b3..00000000000 --- a/kde-frameworks/kio/patches/kio-6.7.0.patchset +++ /dev/null @@ -1,259 +0,0 @@ -From 542b8c450c0e6059808f8b5535d0d398fe561849 Mon Sep 17 00:00:00 2001 -From: Sergei Reznikov -Date: Sun, 31 Oct 2021 13:15:08 +0300 -Subject: Fix build on Haiku - - -diff --git a/autotests/jobtest.cpp b/autotests/jobtest.cpp -index 124e827..183c897 100644 ---- a/autotests/jobtest.cpp -+++ b/autotests/jobtest.cpp -@@ -1977,7 +1977,7 @@ void JobTest::statTimeResolution() - - QFile dest_file(filePath); - QVERIFY(dest_file.open(QIODevice::ReadOnly)); --#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) -+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(Q_OS_HAIKU) - // with nano secs precision - struct timespec ut[2]; - ut[0].tv_sec = early70sTime; -diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt -index 3d67b34..89d8440 100644 ---- a/src/core/CMakeLists.txt -+++ b/src/core/CMakeLists.txt -@@ -214,6 +214,10 @@ if (TARGET KF6::AuthCore) - target_link_libraries(KF6KIOCore PRIVATE KF6::AuthCore) #SlaveBase uses KAuth::Action - endif() - -+if (HAIKU) -+ target_link_libraries(KF6KIOCore PRIVATE network) -+endif () -+ - if(ACL_FOUND) - target_link_libraries(KF6KIOCore PRIVATE ${ACL_LIBS}) - endif() -diff --git a/src/gui/previewjob.cpp b/src/gui/previewjob.cpp -index d4da3e4..fe48479 100644 ---- a/src/gui/previewjob.cpp -+++ b/src/gui/previewjob.cpp -@@ -14,7 +14,7 @@ - #include "standardthumbnailjob_p.h" - #include "statjob.h" - --#if defined(Q_OS_UNIX) && !defined(Q_OS_ANDROID) -+#if defined(Q_OS_UNIX) && !defined(Q_OS_ANDROID) && !defined(Q_OS_HAIKU) - #define WITH_SHM 1 - #else - #define WITH_SHM 0 -diff --git a/src/kioworkers/file/CMakeLists.txt b/src/kioworkers/file/CMakeLists.txt -index a8a393a..93c6fea 100644 ---- a/src/kioworkers/file/CMakeLists.txt -+++ b/src/kioworkers/file/CMakeLists.txt -@@ -35,6 +35,10 @@ if(UNIX) - target_link_libraries(kio_file Qt6::Network KF6::AuthCore) - endif() - -+if (HAIKU) -+ target_link_libraries(kio_file gnu network) -+endif () -+ - if(ACL_FOUND) - 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 56808dc..c8ecd79 100644 ---- a/src/kioworkers/file/file_unix.cpp -+++ b/src/kioworkers/file/file_unix.cpp -@@ -69,6 +69,11 @@ - #include - #endif - -+#ifdef __HAIKU__ -+#undef HAVE_DIRENT_D_TYPE -+#undef HAVE_SYS_XATTR_H -+#endif -+ - using namespace KIO; - - /* 512 kB */ -@@ -789,7 +794,7 @@ WorkerResult FileProtocol::copy(const QUrl &srcUrl, const QUrl &destUrl, int _mo - - // copy access and modification time - if (!wasKilled()) { --#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) -+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(Q_OS_HAIKU) - // with nano secs precision - struct timespec ut[2]; - ut[0] = buffSrc.st_atim; -diff --git a/src/kioworkers/file/kauth/CMakeLists.txt b/src/kioworkers/file/kauth/CMakeLists.txt -index 8d8c0ed..aa164e1 100644 ---- a/src/kioworkers/file/kauth/CMakeLists.txt -+++ b/src/kioworkers/file/kauth/CMakeLists.txt -@@ -1,6 +1,10 @@ - add_executable(file_helper filehelper.cpp fdsender.cpp) - target_link_libraries(file_helper Qt6::Network KF6::AuthCore KF6::I18n KF6::KIOCore) - -+if (HAIKU) -+ target_link_libraries(file_helper network) -+endif () -+ - #install(TARGETS file_helper DESTINATION ${KAUTH_HELPER_INSTALL_DIR}) - #kauth_install_helper_files(file_helper org.kde.kio.file root) - #kauth_install_actions(org.kde.kio.file file.actions) --- -2.45.2 - - -From 1b71ba3d2d5fb880136447fc78adef6a51a36893 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 - - -diff --git a/src/gui/openurljob.cpp b/src/gui/openurljob.cpp -index 551bdac..b15f826 100644 ---- a/src/gui/openurljob.cpp -+++ b/src/gui/openurljob.cpp -@@ -160,7 +160,7 @@ void KIO::OpenUrlJob::start() - emitResult(); - }; - --#if defined(Q_OS_WIN) || defined(Q_OS_MACOS) -+#if defined(Q_OS_WIN) || defined(Q_OS_MACOS) || defined(Q_OS_HAIKU) - if (d->m_externalBrowserEnabled) { - // For Windows and MacOS, the mimetypes handling is different, so use QDesktopServices - qtOpenUrl(); -diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt -index bc91f9e..1268d6b 100644 ---- a/src/widgets/CMakeLists.txt -+++ b/src/widgets/CMakeLists.txt -@@ -137,6 +137,10 @@ if(ACL_FOUND) - target_link_libraries(KF6KIOWidgets PRIVATE ${ACL_LIBS}) - endif() - -+if(HAIKU) -+ target_link_libraries(KF6KIOWidgets PRIVATE be tracker) -+endif() -+ - # Headers not prefixed with KIO/ - ecm_generate_headers(KIOWidgets_HEADERS - HEADER_NAMES -diff --git a/src/widgets/widgetsopenwithhandler.cpp b/src/widgets/widgetsopenwithhandler.cpp -index 8133c2e..f8c853a 100644 ---- a/src/widgets/widgetsopenwithhandler.cpp -+++ b/src/widgets/widgetsopenwithhandler.cpp -@@ -20,6 +20,10 @@ - #include "widgetsopenwithhandler_win.cpp" // displayNativeOpenWithDialog - #endif - -+#ifdef Q_OS_HAIKU -+#include "widgetsopenwithhandler_haiku.cpp" -+#endif -+ - KIO::WidgetsOpenWithHandler::WidgetsOpenWithHandler(QObject *parent) - : KIO::OpenWithHandlerInterface(parent) - { -@@ -48,7 +52,7 @@ void KIO::WidgetsOpenWithHandler::promptUserForApplication(KJob *job, const QLis - parentWidget = qApp->activeWindow(); - } - --#ifdef Q_OS_WIN -+#if defined(Q_OS_WIN) || defined(Q_OS_HAIKU) - KConfigGroup cfgGroup(KSharedConfig::openConfig(), QStringLiteral("KOpenWithDialog Settings")); - if (cfgGroup.readEntry("Native", true)) { - // Implemented in applicationlauncherjob_win.cpp -diff --git a/src/widgets/widgetsopenwithhandler_haiku.cpp b/src/widgets/widgetsopenwithhandler_haiku.cpp -new file mode 100644 -index 0000000..9614b87 ---- /dev/null -+++ b/src/widgets/widgetsopenwithhandler_haiku.cpp -@@ -0,0 +1,38 @@ -+/* -+ This file is part of the KDE libraries -+ SPDX-FileCopyrightText: 2022 Gerasim Troeglazov <3dEyes@gmail.com> -+ -+ SPDX-License-Identifier: LGPL-2.0-or-later -+*/ -+ -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+ -+static bool displayNativeOpenWithDialog(const QList &lst, QWidget *window) -+{ -+ BMessenger trackerMessenger("application/x-vnd.Be-TRAK"); -+ if (trackerMessenger.IsValid()) { -+ BMessage openCommand(B_REFS_RECEIVED); -+ for (const QUrl &url : lst) { -+ if (!url.isLocalFile()) -+ return false; -+ QString filepath = QDir::toNativeSeparators(url.toLocalFile()); -+ BEntry fileEntry(filepath.toUtf8().data()); -+ entry_ref fileRef; -+ if (fileEntry.GetRef(&fileRef) == B_OK) { -+ update_mime_info(filepath.toUtf8().data(), false, true, false); -+ openCommand.AddRef("refs", &fileRef); -+ } -+ } -+ openCommand.AddInt32("launchUsingSelector", 0); -+ if (trackerMessenger.SendMessage(&openCommand) == B_OK) -+ return true; -+ } -+ return false; -+} --- -2.45.2 - - -From 1e8892f0562913b1403163961a05b706cb64fc2d 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 c8ecd79..e773c37 100644 ---- a/src/kioworkers/file/file_unix.cpp -+++ b/src/kioworkers/file/file_unix.cpp -@@ -72,6 +72,9 @@ - #ifdef __HAIKU__ - #undef HAVE_DIRENT_D_TYPE - #undef HAVE_SYS_XATTR_H -+#define HAVE_SYS_XATTR_H 0 -+#undef HAVE_SYS_EXTATTR_H -+#define HAVE_SYS_EXTATTR_H 0 - #endif - - using namespace KIO; --- -2.45.2 - - -From 2dc82096ef875c9cc1ccee51a73183dc7a3bdec1 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 - OpenBSD and Haiku (https://bugs.kde.org/show_bug.cgi?id=463796) - - -diff --git a/src/core/worker.cpp b/src/core/worker.cpp -index 24d06bb..2b726a5 100644 ---- a/src/core/worker.cpp -+++ b/src/core/worker.cpp -@@ -355,7 +355,7 @@ Worker *Worker::createWorker(const QString &protocol, const QUrl &url, int &erro - const auto useThreads = []() { - return qgetenv("KIO_ENABLE_WORKER_THREADS") != "0"; - }; -- static bool bUseThreads = useThreads(); -+ static bool bUseThreads = false; - - // Threads have performance benefits, but degrade robustness - // (a worker crashing kills the app). So let's only enable the feature for kio_file, for now. --- -2.45.2 - diff --git a/kde-frameworks/kio/patches/kio-6.9.0.patchset b/kde-frameworks/kio/patches/kio-6.9.0.patchset new file mode 100644 index 00000000000..97f7c4eaeb6 --- /dev/null +++ b/kde-frameworks/kio/patches/kio-6.9.0.patchset @@ -0,0 +1,129 @@ +From 308ea34c56d5d56dcfbb19dcdb91f6c07b9bcd2b 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 + + +diff --git a/src/gui/openurljob.cpp b/src/gui/openurljob.cpp +index ce2b161..c5fa282 100644 +--- a/src/gui/openurljob.cpp ++++ b/src/gui/openurljob.cpp +@@ -160,7 +160,7 @@ void KIO::OpenUrlJob::start() + emitResult(); + }; + +-#if defined(Q_OS_WIN) || defined(Q_OS_MACOS) ++#if defined(Q_OS_WIN) || defined(Q_OS_MACOS) || defined(Q_OS_HAIKU) + if (d->m_externalBrowserEnabled) { + // For Windows and MacOS, the mimetypes handling is different, so use QDesktopServices + qtOpenUrl(); +diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt +index bc91f9e..1268d6b 100644 +--- a/src/widgets/CMakeLists.txt ++++ b/src/widgets/CMakeLists.txt +@@ -137,6 +137,10 @@ if(ACL_FOUND) + target_link_libraries(KF6KIOWidgets PRIVATE ${ACL_LIBS}) + endif() + ++if(HAIKU) ++ target_link_libraries(KF6KIOWidgets PRIVATE be tracker) ++endif() ++ + # Headers not prefixed with KIO/ + ecm_generate_headers(KIOWidgets_HEADERS + HEADER_NAMES +diff --git a/src/widgets/widgetsopenwithhandler.cpp b/src/widgets/widgetsopenwithhandler.cpp +index 8133c2e..f8c853a 100644 +--- a/src/widgets/widgetsopenwithhandler.cpp ++++ b/src/widgets/widgetsopenwithhandler.cpp +@@ -20,6 +20,10 @@ + #include "widgetsopenwithhandler_win.cpp" // displayNativeOpenWithDialog + #endif + ++#ifdef Q_OS_HAIKU ++#include "widgetsopenwithhandler_haiku.cpp" ++#endif ++ + KIO::WidgetsOpenWithHandler::WidgetsOpenWithHandler(QObject *parent) + : KIO::OpenWithHandlerInterface(parent) + { +@@ -48,7 +52,7 @@ void KIO::WidgetsOpenWithHandler::promptUserForApplication(KJob *job, const QLis + parentWidget = qApp->activeWindow(); + } + +-#ifdef Q_OS_WIN ++#if defined(Q_OS_WIN) || defined(Q_OS_HAIKU) + KConfigGroup cfgGroup(KSharedConfig::openConfig(), QStringLiteral("KOpenWithDialog Settings")); + if (cfgGroup.readEntry("Native", true)) { + // Implemented in applicationlauncherjob_win.cpp +diff --git a/src/widgets/widgetsopenwithhandler_haiku.cpp b/src/widgets/widgetsopenwithhandler_haiku.cpp +new file mode 100644 +index 0000000..9614b87 +--- /dev/null ++++ b/src/widgets/widgetsopenwithhandler_haiku.cpp +@@ -0,0 +1,38 @@ ++/* ++ This file is part of the KDE libraries ++ SPDX-FileCopyrightText: 2022 Gerasim Troeglazov <3dEyes@gmail.com> ++ ++ SPDX-License-Identifier: LGPL-2.0-or-later ++*/ ++ ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++ ++static bool displayNativeOpenWithDialog(const QList &lst, QWidget *window) ++{ ++ BMessenger trackerMessenger("application/x-vnd.Be-TRAK"); ++ if (trackerMessenger.IsValid()) { ++ BMessage openCommand(B_REFS_RECEIVED); ++ for (const QUrl &url : lst) { ++ if (!url.isLocalFile()) ++ return false; ++ QString filepath = QDir::toNativeSeparators(url.toLocalFile()); ++ BEntry fileEntry(filepath.toUtf8().data()); ++ entry_ref fileRef; ++ if (fileEntry.GetRef(&fileRef) == B_OK) { ++ update_mime_info(filepath.toUtf8().data(), false, true, false); ++ openCommand.AddRef("refs", &fileRef); ++ } ++ } ++ openCommand.AddInt32("launchUsingSelector", 0); ++ if (trackerMessenger.SendMessage(&openCommand) == B_OK) ++ return true; ++ } ++ return false; ++} +-- +2.45.2 + + +From d37bbb9485a0802dd9d238578444c3896e90fe98 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 + OpenBSD and Haiku (https://bugs.kde.org/show_bug.cgi?id=463796) + + +diff --git a/src/core/worker.cpp b/src/core/worker.cpp +index 4855c64..86e4d64 100644 +--- a/src/core/worker.cpp ++++ b/src/core/worker.cpp +@@ -411,7 +411,7 @@ Worker *Worker::createWorker(const QString &protocol, const QUrl &url, int &erro + const auto useThreads = []() { + return qgetenv("KIO_ENABLE_WORKER_THREADS") != "0"; + }; +- static bool bUseThreads = useThreads(); ++ static bool bUseThreads = false; + + // Threads have performance benefits, but degrade robustness + // (a worker crashing kills the app). So let's only enable the feature for kio_file, for now. +-- +2.45.2 + diff --git a/kde-frameworks/kirigami/kirigami6-6.7.0.recipe b/kde-frameworks/kirigami/kirigami6-6.9.0.recipe similarity index 79% rename from kde-frameworks/kirigami/kirigami6-6.7.0.recipe rename to kde-frameworks/kirigami/kirigami6-6.9.0.recipe index bbaf4f8bfb2..ba21757541e 100644 --- a/kde-frameworks/kirigami/kirigami6-6.7.0.recipe +++ b/kde-frameworks/kirigami/kirigami6-6.9.0.recipe @@ -10,9 +10,8 @@ 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="4d645a0374d33b9465e79e3e17170882e2cbda1526f45bc5b6b176dadda77d76" +CHECKSUM_SHA256="a3429c8bcf40e252d11b0a4c35a43c0433a9835ea1b333580707379b7b5c82c0" SOURCE_DIR="kirigami-$portVersion" -PATCHES="1582.patch" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" @@ -28,12 +27,17 @@ PROVIDES=" lib:libKirigamiLayouts$secondaryArchSuffix = $libVersionCompat lib:libKirigamiPlatform$secondaryArchSuffix = $libVersionCompat lib:libKirigamiPrimitives$secondaryArchSuffix = $libVersionCompat + lib:libKirigamiPrivate$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix lib:libGL$secondaryArchSuffix lib:libgomp$secondaryArchSuffix lib:libQt6Core$secondaryArchSuffix + lib:libQt6Concurrent$secondaryArchSuffix + lib:libQt6Gui$secondaryArchSuffix + lib:libQt6Network$secondaryArchSuffix + lib:libQt6OpenGL$secondaryArchSuffix lib:libQt6Qml$secondaryArchSuffix lib:libQt6Quick$secondaryArchSuffix " @@ -46,6 +50,7 @@ PROVIDES_devel=" devel:libKirigamiLayouts$secondaryArchSuffix = $libVersionCompat devel:libKirigamiPlatform$secondaryArchSuffix = $libVersionCompat devel:libKirigamiPrimitives$secondaryArchSuffix = $libVersionCompat + devel:libKirigamiPrivate$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" kirigami6$secondaryArchSuffix == $portVersion base @@ -53,13 +58,12 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix >= $portVersion + extra_cmake_modules$secondaryArchSuffix qt6_tools${secondaryArchSuffix}_devel # devel:libgomp$secondaryArchSuffix devel:libQt6Core$secondaryArchSuffix devel:libQt6Qml$secondaryArchSuffix devel:libQt6Quick$secondaryArchSuffix - devel:libQt6QuickTest$secondaryArchSuffix devel:libQt6ShaderTools$secondaryArchSuffix devel:libQt6Svg$secondaryArchSuffix " @@ -76,25 +80,26 @@ 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 +#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 \ +# $libDir/libKirigamiPrivate.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 \ - -DDESKTOP_ENABLED=OFF \ + -DCMAKE_SKIP_RPATH=YES \ + -DDESKTOP_ENABLED=ON \ -DBUILD_EXAMPLES=OFF \ -DBUILD_QCH=ON \ -DBUILD_TESTING=OFF \ @@ -112,7 +117,8 @@ INSTALL() libKirigamiDialogs \ libKirigamiLayouts \ libKirigamiPlatform \ - libKirigamiPrimitives + libKirigamiPrimitives \ + libKirigamiPrivate packageEntries devel \ $developDir \ diff --git a/kde-frameworks/kirigami/patches/1582.patch b/kde-frameworks/kirigami/patches/1582.patch deleted file mode 100644 index 771eb1410f7..00000000000 --- a/kde-frameworks/kirigami/patches/1582.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 25c036ca59978e9c07a0a60b9efcbd7e99cae7b3 Mon Sep 17 00:00:00 2001 -From: Carl Schwan -Date: Sun, 7 Jul 2024 23:35:50 +0200 -Subject: [PATCH] Make KirigamiPrivate a static lib - -So we don't need to install it and add a soversion. This also simplify a -bit the code. ---- - src/CMakeLists.txt | 15 ++++++--------- - 1 file changed, 6 insertions(+), 9 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index d6be28437..c668c6544 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -24,7 +24,7 @@ endif() - - # Module: org.kde.kirigami.private - --add_library(KirigamiPrivate) -+add_library(KirigamiPrivate STATIC) - ecm_add_qml_module(KirigamiPrivate - URI "org.kde.kirigami.private" - GENERATE_PLUGIN_SOURCE -@@ -37,18 +37,15 @@ target_sources(KirigamiPrivate PRIVATE - actionhelper.h - ) - --include_static_dependencies(KirigamiPrivate EXPORT KirigamiTargets) -- - target_link_libraries(KirigamiPrivate PRIVATE Qt6::Gui) -- --ecm_finalize_qml_module(KirigamiPrivate DESTINATION ${KDE_INSTALL_QMLDIR}) -+set_target_properties(KirigamiPrivate PROPERTIES POSITION_INDEPENDENT_CODE ON) -+set_target_properties(KirigamiPrivateplugin PROPERTIES POSITION_INDEPENDENT_CODE ON) - - if (NOT BUILD_SHARED_LIBS) - install(TARGETS KirigamiPrivateplugin EXPORT KirigamiTargets ${KF_INSTALL_TARGETS_DEFAULT_ARGS}) -+ install(TARGETS KirigamiPrivate EXPORT KirigamiTargets ${KF_INSTALL_TARGETS_DEFAULT_ARGS}) - endif() - --install(TARGETS KirigamiPrivate EXPORT KirigamiTargets ${KF_INSTALL_TARGETS_DEFAULT_ARGS}) -- - # Module: org.kde.kirigami - - ecm_add_qml_module(Kirigami URI "org.kde.kirigami" VERSION 2.0 -@@ -263,6 +260,8 @@ target_link_libraries(Kirigami - Qt6::Quick - PRIVATE - Qt6::Concurrent -+ KirigamiPrivate -+ KirigamiPrivateplugin - ${Kirigami_EXTRA_LIBS} - ) - -@@ -280,7 +279,6 @@ if (NOT BUILD_SHARED_LIBS) - KirigamiPrimitivesplugin - KirigamiDialogsplugin - KirigamiLayoutsplugin -- KirigamiPrivateplugin - ) - install(TARGETS Kirigamiplugin EXPORT KirigamiTargets ${KF_INSTALL_TARGETS_DEFAULT_ARGS}) - else() -@@ -292,7 +290,6 @@ else() - KirigamiPrimitives - KirigamiDialogs - KirigamiLayouts -- KirigamiPrivate - ) - endif() - --- -GitLab - diff --git a/kde-frameworks/kjobwidgets/kjobwidgets6-6.7.0.recipe b/kde-frameworks/kjobwidgets/kjobwidgets6-6.9.0.recipe similarity index 72% rename from kde-frameworks/kjobwidgets/kjobwidgets6-6.7.0.recipe rename to kde-frameworks/kjobwidgets/kjobwidgets6-6.9.0.recipe index 250ea1f308b..08253d32ffc 100644 --- a/kde-frameworks/kjobwidgets/kjobwidgets6-6.7.0.recipe +++ b/kde-frameworks/kjobwidgets/kjobwidgets6-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%.*}/kjobwidgets-${portVersion}.tar.xz" -CHECKSUM_SHA256="16d7e7ab54235d6fa1eb213d3d637182e22fcbdbcb7b4b14032430a02a2f888a" +CHECKSUM_SHA256="81867978a3add5c2539e6ac4cfd1711ae44ceb50f4654f598c5dd0ab05553716" SOURCE_DIR="kjobwidgets-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -26,9 +26,6 @@ REQUIRES=" lib:libKF6Notifications$secondaryArchSuffix lib:libKF6WidgetsAddons$secondaryArchSuffix lib:libQt6Core$secondaryArchSuffix - lib:libQt6DBus$secondaryArchSuffix - lib:libQt6Gui$secondaryArchSuffix - lib:libQt6Widgets$secondaryArchSuffix " PROVIDES_devel=" @@ -41,15 +38,12 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix >= $portVersion + extra_cmake_modules$secondaryArchSuffix qt6_tools${secondaryArchSuffix}_devel - devel:libKF6CoreAddons$secondaryArchSuffix == $portVersion - devel:libKF6Notifications$secondaryArchSuffix == $portVersion - devel:libKF6WidgetsAddons$secondaryArchSuffix == $portVersion + devel:libKF6CoreAddons$secondaryArchSuffix == $libVersion + devel:libKF6Notifications$secondaryArchSuffix == $libVersion + devel:libKF6WidgetsAddons$secondaryArchSuffix == $libVersion devel:libQt6Core$secondaryArchSuffix - devel:libQt6DBus$secondaryArchSuffix - devel:libQt6Gui$secondaryArchSuffix - devel:libQt6Widgets$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:cmake @@ -64,19 +58,19 @@ TEST_REQUIRES=" qthaikuplugins " -defineDebugInfoPackage kjobwidgets6$secondaryArchSuffix \ - $libDir/libKF6JobWidgets.so.$libVersion +#defineDebugInfoPackage kjobwidgets6$secondaryArchSuffix \ +# $libDir/libKF6JobWidgets.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 @@ -95,3 +89,10 @@ INSTALL() $documentationDir \ $libDir/cmake } + +TEST() +{ + # HAVE_QTDBUS disabled, so no tests provided + export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}" + ctest --test-dir build --output-on-failure +} diff --git a/kde-frameworks/kwallet/kwallet6-6.7.0.recipe b/kde-frameworks/kwallet/kwallet6-6.9.0.recipe similarity index 59% rename from kde-frameworks/kwallet/kwallet6-6.7.0.recipe rename to kde-frameworks/kwallet/kwallet6-6.9.0.recipe index c4676f17214..8d5e68fc944 100644 --- a/kde-frameworks/kwallet/kwallet6-6.7.0.recipe +++ b/kde-frameworks/kwallet/kwallet6-6.9.0.recipe @@ -5,9 +5,8 @@ COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kwallet-${portVersion}.tar.xz" -CHECKSUM_SHA256="ffb319ce0dfeea95389e1a2f4833d1099b894c81f1df7ab50dcfb796ea87ffa2" +CHECKSUM_SHA256="52311e656445bf6e16caed5146898b2d23309dcc35bfd1ce4c91c0bbd040537c" SOURCE_DIR="kwallet-$portVersion" -PATCHES="kwallet-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" @@ -29,25 +28,17 @@ REQUIRES=" lib:libGL$secondaryArchSuffix lib:libgpgme$secondaryArchSuffix lib:libgpgmepp$secondaryArchSuffix - lib:libKF6Codecs$secondaryArchSuffix lib:libKF6ColorScheme$secondaryArchSuffix lib:libKF6ConfigCore$secondaryArchSuffix - lib:libKF6ConfigWidgets$secondaryArchSuffix lib:libKF6CoreAddons$secondaryArchSuffix lib:libKF6Crash$secondaryArchSuffix lib:libKF6DBusAddons$secondaryArchSuffix lib:libKF6I18n$secondaryArchSuffix - lib:libKF6IconThemes$secondaryArchSuffix lib:libKF6Notifications$secondaryArchSuffix - lib:libKF6Service$secondaryArchSuffix lib:libKF6WidgetsAddons$secondaryArchSuffix lib:libKF6WindowSystem$secondaryArchSuffix lib:libqca_qt6$secondaryArchSuffix lib:libQt6Core$secondaryArchSuffix - lib:libQt6DBus$secondaryArchSuffix - lib:libQt6Gui$secondaryArchSuffix - lib:libQt6Widgets$secondaryArchSuffix - lib:libQt6Xml$secondaryArchSuffix " PROVIDES_devel=" @@ -61,31 +52,22 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix >= $portVersion + extra_cmake_modules$secondaryArchSuffix qt6_tools${secondaryArchSuffix}_devel devel:libgcrypt$secondaryArchSuffix devel:libgpgmepp$secondaryArchSuffix - devel:libKF6Codecs$secondaryArchSuffix == $portVersion - devel:libKF6ColorScheme$secondaryArchSuffix == $portVersion - devel:libKF6ConfigCore$secondaryArchSuffix == $portVersion - devel:libKF6ConfigWidgets$secondaryArchSuffix == $portVersion - devel:libKF6CoreAddons$secondaryArchSuffix == $portVersion - devel:libKF6Crash$secondaryArchSuffix == $portVersion - devel:libKF6DBusAddons$secondaryArchSuffix == $portVersion -# devel:libKF6DocTools$secondaryArchSuffix == $portVersion - devel:libKF6I18n$secondaryArchSuffix == $portVersion - devel:libKF6IconThemes$secondaryArchSuffix == $portVersion - devel:libKF6Notifications$secondaryArchSuffix == $portVersion - devel:libKF6Service$secondaryArchSuffix == $portVersion - devel:libKF6WidgetsAddons$secondaryArchSuffix == $portVersion - devel:libKF6WindowSystem$secondaryArchSuffix == $portVersion + devel:libKF6ColorScheme$secondaryArchSuffix == $libVersion + devel:libKF6ConfigCore$secondaryArchSuffix == $libVersion + devel:libKF6CoreAddons$secondaryArchSuffix == $libVersion + devel:libKF6Crash$secondaryArchSuffix == $libVersion + devel:libKF6DBusAddons$secondaryArchSuffix == $libVersion + devel:libKF6I18n$secondaryArchSuffix == $libVersion + devel:libKF6Notifications$secondaryArchSuffix == $libVersion + devel:libKF6WidgetsAddons$secondaryArchSuffix == $libVersion + devel:libKF6WindowSystem$secondaryArchSuffix == $libVersion devel:libqca_qt6$secondaryArchSuffix devel:libQt6Core$secondaryArchSuffix - devel:libQt6DBus$secondaryArchSuffix - devel:libQt6Gui$secondaryArchSuffix devel:libQt6Qml$secondaryArchSuffix - devel:libQt6Widgets$secondaryArchSuffix - devel:libQt6Xml$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:cmake @@ -104,20 +86,22 @@ TEST_REQUIRES=" devel:libnss3$secondaryArchSuffix " -defineDebugInfoPackage kwallet6$secondaryArchSuffix \ - $libDir/libKF6Wallet.so.$libVersion \ - $libDir/libKF6WalletBackend.so.$libVersion +#defineDebugInfoPackage kwallet6$secondaryArchSuffix \ +# $binDir/kwallet-query \ +# $binDir/kwalletd6 \ +# $libDir/libKF6Wallet.so.$libVersion \ +# $libDir/libKF6WalletBackend.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 @@ -128,6 +112,9 @@ INSTALL() { make -C build install + # cleanup + rm -rf $dataDir/applications + prepareInstalledDevelLibs \ libKF6Wallet \ libKF6WalletBackend @@ -140,9 +127,6 @@ INSTALL() TEST() { - # 2024-07-10 18:32:58 KERN: runtime_loader: /boot/system/add-ons/Qt6/crypto/libqca-nss.so: Version dependency "/packages/nss-3.73.1-1/.self/develop/lib/libnss3.so" not found - # 2024-07-10 18:32:58 KERN: vm_soft_fault: va 0x82db7d9000 not covered by area in address space - # 50% tests passed, 1 tests failed out of 2 (1 crash) export LIBRARY_PATH="$sourceDir/build/bin${LIBRARY_PATH:+:$LIBRARY_PATH}" ctest --test-dir build --output-on-failure } diff --git a/kde-frameworks/kwallet/patches/kwallet-6.7.0.patchset b/kde-frameworks/kwallet/patches/kwallet-6.7.0.patchset deleted file mode 100644 index 563ec7b3135..00000000000 --- a/kde-frameworks/kwallet/patches/kwallet-6.7.0.patchset +++ /dev/null @@ -1,47 +0,0 @@ -From 1f3dacb20835c4da4c54f5d67783f0f1d0e65ede Mon Sep 17 00:00:00 2001 -From: Sergei Reznikov -Date: Wed, 15 Sep 2021 11:17:06 +0300 -Subject: Fix build on Haiku - - -diff --git a/src/runtime/kwalletd/CMakeLists.txt b/src/runtime/kwalletd/CMakeLists.txt -index 2a0c3da..e541855 100644 ---- a/src/runtime/kwalletd/CMakeLists.txt -+++ b/src/runtime/kwalletd/CMakeLists.txt -@@ -142,6 +142,10 @@ install( - DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR} - ) - -+if (HAIKU) -+ target_link_libraries(kwalletd6 network) -+endif () -+ - target_link_libraries(kwalletd6 - KF6WalletBackend - KF6Wallet --- -2.45.2 - - -From 10ebc35010c2135597daf5af83dc3398f65f5bb4 Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Sun, 25 Feb 2024 22:49:23 +1000 -Subject: Disable HAVE_X11 - - -diff --git a/src/runtime/kwalletd/kwalletd.cpp b/src/runtime/kwalletd/kwalletd.cpp -index f6fd29a..16eedca 100644 ---- a/src/runtime/kwalletd/kwalletd.cpp -+++ b/src/runtime/kwalletd/kwalletd.cpp -@@ -36,7 +36,7 @@ - #include - #include - --#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC) -+#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC) && !defined(Q_OS_HAIKU) - #define HAVE_X11 1 - #include - #else --- -2.45.2 - diff --git a/kde-frameworks/solid/patches/solid-6.7.0.patchset b/kde-frameworks/solid/patches/solid-6.7.0.patchset deleted file mode 100644 index f0764dd3035..00000000000 --- a/kde-frameworks/solid/patches/solid-6.7.0.patchset +++ /dev/null @@ -1,22 +0,0 @@ -From c885c45079e8eff5e2a9fd8859ce5a2ae0054e16 Mon Sep 17 00:00:00 2001 -From: Sergei Reznikov -Date: Sat, 14 Dec 2019 17:49:04 +0300 -Subject: Fix build on Haiku - - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 824fac5..5a49055 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -139,7 +139,7 @@ elseif (APPLE) - add_device_backend(iokit) - elseif (WIN32) - add_device_backend(win) --elseif (NOT ANDROID) -+elseif (NOT ANDROID AND NOT HAIKU) - add_device_backend(upower) - add_device_backend(fstab) - --- -2.45.2 - diff --git a/kde-frameworks/solid/solid6-6.7.0.recipe b/kde-frameworks/solid/solid6-6.9.0.recipe similarity index 80% rename from kde-frameworks/solid/solid6-6.7.0.recipe rename to kde-frameworks/solid/solid6-6.9.0.recipe index 76a7c6f1791..263b06668c6 100644 --- a/kde-frameworks/solid/solid6-6.7.0.recipe +++ b/kde-frameworks/solid/solid6-6.9.0.recipe @@ -13,9 +13,8 @@ COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/solid-${portVersion}.tar.xz" -CHECKSUM_SHA256="3673f17776c30d9523fe40b8f38e62be1037610050f782c136da1ac04b20e6e7" +CHECKSUM_SHA256="8db2540498697847ee7f93afe4c307320f2cfee26fbdfca0133bf8cacfea42f5" SOURCE_DIR="solid-$portVersion" -PATCHES="solid-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" @@ -32,10 +31,6 @@ REQUIRES=" haiku$secondaryArchSuffix lib:libGL$secondaryArchSuffix lib:libQt6Core$secondaryArchSuffix - lib:libQt6DBus$secondaryArchSuffix - lib:libQt6Gui$secondaryArchSuffix - lib:libQt6Widgets$secondaryArchSuffix - lib:libQt6Xml$secondaryArchSuffix " PROVIDES_devel=" @@ -48,7 +43,7 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix >= $portVersion + extra_cmake_modules$secondaryArchSuffix qt6_tools${secondaryArchSuffix}_devel devel:libQt6Core$secondaryArchSuffix " @@ -63,19 +58,20 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " -defineDebugInfoPackage solid6$secondaryArchSuffix \ - $libDir/libKF6Solid.so.$libVersion +#defineDebugInfoPackage solid6$secondaryArchSuffix \ +# $binDir/solid-hardware6 \ +# $libDir/libKF6Solid.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/sonnet/patches/sonnet-6.7.0.patchset b/kde-frameworks/sonnet/patches/sonnet-6.9.0.patchset similarity index 91% rename from kde-frameworks/sonnet/patches/sonnet-6.7.0.patchset rename to kde-frameworks/sonnet/patches/sonnet-6.9.0.patchset index 588be531e48..506f1b8e88b 100644 --- a/kde-frameworks/sonnet/patches/sonnet-6.7.0.patchset +++ b/kde-frameworks/sonnet/patches/sonnet-6.9.0.patchset @@ -1,4 +1,4 @@ -From 7661299086600dfb5dc507c027584de145b05cc0 Mon Sep 17 00:00:00 2001 +From 807d23fb08d0908d5933b48dfcbd7a860377a58b Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sat, 2 Mar 2019 23:57:01 +1000 Subject: Add hunspell dictionary paths for Haiku @@ -22,7 +22,7 @@ index b9359f8..b63bba3 100644 2.45.2 -From 630c3f81572fff6c42973df5b05cb13244ff24bb Mon Sep 17 00:00:00 2001 +From 7b01430caba18f808c2b26d1cd4757b250b85d5d Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Mon, 14 Dec 2020 16:14:26 +0300 Subject: Set en_US as default language diff --git a/kde-frameworks/sonnet/sonnet6-6.7.0.recipe b/kde-frameworks/sonnet/sonnet6-6.9.0.recipe similarity index 86% rename from kde-frameworks/sonnet/sonnet6-6.7.0.recipe rename to kde-frameworks/sonnet/sonnet6-6.9.0.recipe index ead39a4de02..00c0e030e1f 100644 --- a/kde-frameworks/sonnet/sonnet6-6.7.0.recipe +++ b/kde-frameworks/sonnet/sonnet6-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%.*}/sonnet-${portVersion}.tar.xz" -CHECKSUM_SHA256="2f970d490effd668e64dd93ffef344a80db7e63130bb23df4fa0d6b14150e588" +CHECKSUM_SHA256="158f38af459676ecf7f5dbbe39014ebf9bfae29557ca149c1d6ff5575a6d600d" SOURCE_DIR="sonnet-$portVersion" PATCHES="sonnet-$portVersion.patchset" @@ -25,7 +25,6 @@ libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" sonnet6$secondaryArchSuffix = $portVersion - cmd:gentrigrams$secondaryArchSuffix = $portVersion cmd:parsetrigrams6$secondaryArchSuffix = $portVersion lib:libKF6SonnetCore$secondaryArchSuffix = $libVersionCompat lib:libKF6SonnetUi$secondaryArchSuffix = $libVersionCompat @@ -52,7 +51,7 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix >= $portVersion + extra_cmake_modules$secondaryArchSuffix qt6_tools${secondaryArchSuffix}_devel devel:libaspell$secondaryArchSuffix devel:libhunspell_1.7$secondaryArchSuffix @@ -72,20 +71,21 @@ TEST_REQUIRES=" qthaikuplugins$secondaryArchSuffix " -defineDebugInfoPackage sonnet6$secondaryArchSuffix \ - $libDir/libKF6SonnetCore.so.$libVersion \ - $libDir/libKF6SonnetUi.so.$libVersion +#defineDebugInfoPackage sonnet6$secondaryArchSuffix \ +# $binDir/parsetrigrams6 \ +# $libDir/libKF6SonnetCore.so.$libVersion \ +# $libDir/libKF6SonnetUi.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