From 6083fdd19f4f96adf928de891e3025e642cc9123 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Wed, 19 Feb 2025 11:46:22 +0100 Subject: [PATCH] KF6 frameworks, part5 (#11798) --- ...loo6-6.9.0.recipe => baloo6-6.11.0.recipe} | 25 +++-- ...6-6.9.0.recipe => bluez_qt6-6.11.0.recipe} | 20 +++- ...pe => frameworkintegration6-6.11.0.recipe} | 8 +- ....0.recipe => kcalendarcore6-6.11.0.recipe} | 20 +++- ...6-6.9.0.recipe => kcmutils6-6.11.0.recipe} | 23 ++-- ...ts6-6.9.0.recipe => kparts6-6.11.0.recipe} | 20 +++- ...kpty6-6.9.0.recipe => kpty6-6.11.0.recipe} | 20 +++- ...ty-6.9.0.patchset => kpty-6.11.0.patchset} | 0 .../kpty/patches/kpty_utmpx-5.80.0.patchset | 106 ------------------ ...pe => ksyntax_highlighting6-6.11.0.recipe} | 23 ++-- ...9.0.recipe => threadweaver6-6.11.0.recipe} | 20 +++- 11 files changed, 118 insertions(+), 167 deletions(-) rename kde-frameworks/baloo/{baloo6-6.9.0.recipe => baloo6-6.11.0.recipe} (88%) rename kde-frameworks/bluez-qt/{bluez_qt6-6.9.0.recipe => bluez_qt6-6.11.0.recipe} (87%) rename kde-frameworks/frameworkintegration/{frameworkintegration6-6.9.0.recipe => frameworkintegration6-6.11.0.recipe} (92%) rename kde-frameworks/kcalendarcore/{kcalendarcore6-6.9.0.recipe => kcalendarcore6-6.11.0.recipe} (87%) rename kde-frameworks/kcmutils/{kcmutils6-6.9.0.recipe => kcmutils6-6.11.0.recipe} (90%) rename kde-frameworks/kparts/{kparts6-6.9.0.recipe => kparts6-6.11.0.recipe} (91%) rename kde-frameworks/kpty/{kpty6-6.9.0.recipe => kpty6-6.11.0.recipe} (87%) rename kde-frameworks/kpty/patches/{kpty-6.9.0.patchset => kpty-6.11.0.patchset} (100%) delete mode 100644 kde-frameworks/kpty/patches/kpty_utmpx-5.80.0.patchset rename kde-frameworks/ksyntax_highlighting/{ksyntax_highlighting6-6.9.0.recipe => ksyntax_highlighting6-6.11.0.recipe} (86%) rename kde-frameworks/threadweaver/{threadweaver6-6.9.0.recipe => threadweaver6-6.11.0.recipe} (86%) diff --git a/kde-frameworks/baloo/baloo6-6.9.0.recipe b/kde-frameworks/baloo/baloo6-6.11.0.recipe similarity index 88% rename from kde-frameworks/baloo/baloo6-6.9.0.recipe rename to kde-frameworks/baloo/baloo6-6.11.0.recipe index 482c6e41b..5bb0d14d1 100644 --- a/kde-frameworks/baloo/baloo6-6.9.0.recipe +++ b/kde-frameworks/baloo/baloo6-6.11.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="d1f4e759d14074e365965222076c87539f21e24d8e8768be7c9f9603885360d0" +CHECKSUM_SHA256="bb87d40534a00cc363d29e3d7d0f37a9dcdd0d831db1a57bbf8b8e395507560a" SOURCE_DIR="baloo-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -43,6 +43,15 @@ REQUIRES_devel=" devel:libKF6FileMetaData$secondaryArchSuffix == $libVersion " +ARCHITECTURES_doc="any" + +PROVIDES_doc=" + baloo6${secondaryArchSuffix}_doc = $portVersion + " +REQUIRES_doc=" + baloo6$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel extra_cmake_modules$secondaryArchSuffix @@ -71,10 +80,6 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " -#defineDebugInfoPackage baloo6$secondaryArchSuffix \ -# $libDir/libKF6Baloo.so.$libVersion \ -# $libDir/libKF6BalooEngine.so.$libVersion - BUILD() { cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ @@ -82,7 +87,7 @@ BUILD() -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \ -DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \ -DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \ - -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \ + -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6_base \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ -DCMAKE_SKIP_RPATH=YES \ -DBUILD_QCH=ON \ @@ -101,7 +106,9 @@ INSTALL() fixPkgconfig packageEntries devel \ - $libDir/cmake \ - $documentationDir \ - $developDir + $developDir \ + $libDir/cmake + + packageEntries doc \ + $documentationDir } diff --git a/kde-frameworks/bluez-qt/bluez_qt6-6.9.0.recipe b/kde-frameworks/bluez-qt/bluez_qt6-6.11.0.recipe similarity index 87% rename from kde-frameworks/bluez-qt/bluez_qt6-6.9.0.recipe rename to kde-frameworks/bluez-qt/bluez_qt6-6.11.0.recipe index a8df9ae87..51786097d 100644 --- a/kde-frameworks/bluez-qt/bluez_qt6-6.9.0.recipe +++ b/kde-frameworks/bluez-qt/bluez_qt6-6.11.0.recipe @@ -11,7 +11,7 @@ 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="106deb7a531b2ab8106f4fc1ea661d8457cb8ff793c436a2ebb9f1827c0217c8" +CHECKSUM_SHA256="93810ba70a7cac043b227b23ac6a907c52fa2f8aa90ceb4acfe8d6d46b7eae8b" SOURCE_DIR="bluez-qt-$portVersion" ARCHITECTURES="?all !x86_gcc2" @@ -39,6 +39,15 @@ REQUIRES_devel=" bluez_qt6$secondaryArchSuffix == $portVersion base " +ARCHITECTURES_doc="any" + +PROVIDES_doc=" + bluez_qt6${secondaryArchSuffix}_doc = $portVersion + " +REQUIRES_doc=" + bluez_qt6$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel extra_cmake_modules$secondaryArchSuffix @@ -62,9 +71,6 @@ BUILD_PREREQUIRES=" # lib:libdbus_1$secondaryArchSuffix # " -#defineDebugInfoPackage bluez_qt6$secondaryArchSuffix \ -# $libDir/libKF6BluezQt.so.$libVersion - BUILD() { cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ @@ -72,7 +78,7 @@ BUILD() -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \ -DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \ -DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \ - -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \ + -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6_base \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ -DCMAKE_SKIP_RPATH=YES \ -DBUILD_QCH=ON \ @@ -91,8 +97,10 @@ INSTALL() packageEntries devel \ $developDir \ - $documentationDir \ $libDir/cmake + + packageEntries doc \ + $documentationDir } TEST() diff --git a/kde-frameworks/frameworkintegration/frameworkintegration6-6.9.0.recipe b/kde-frameworks/frameworkintegration/frameworkintegration6-6.11.0.recipe similarity index 92% rename from kde-frameworks/frameworkintegration/frameworkintegration6-6.9.0.recipe rename to kde-frameworks/frameworkintegration/frameworkintegration6-6.11.0.recipe index 96dca52ce..d8605d42e 100644 --- a/kde-frameworks/frameworkintegration/frameworkintegration6-6.9.0.recipe +++ b/kde-frameworks/frameworkintegration/frameworkintegration6-6.11.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="b9afb3d94dca1a9e404cb19c99bacae7e4da687e0f154b9e3969f2f9c38e9db8" +CHECKSUM_SHA256="a7447a587040284463846a479e01b7d821c89b5f3b8683cbb367f568cea81fb2" SOURCE_DIR="frameworkintegration-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -72,9 +72,7 @@ TEST_REQUIRES=" qthaikuplugins$secondaryArchSuffix " -#defineDebugInfoPackage frameworkintegration6$secondaryArchSuffix \ -# $libDir/libKF6Style.so.$libVersion - +# no Qt documentation (yet?) BUILD() { cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ @@ -82,7 +80,7 @@ BUILD() -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \ -DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \ -DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \ - -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \ + -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6_base \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ -DCMAKE_SKIP_RPATH=YES \ -DBUILD_QCH=ON \ diff --git a/kde-frameworks/kcalendarcore/kcalendarcore6-6.9.0.recipe b/kde-frameworks/kcalendarcore/kcalendarcore6-6.11.0.recipe similarity index 87% rename from kde-frameworks/kcalendarcore/kcalendarcore6-6.9.0.recipe rename to kde-frameworks/kcalendarcore/kcalendarcore6-6.11.0.recipe index 6dd76f7be..eaeb3ef8f 100644 --- a/kde-frameworks/kcalendarcore/kcalendarcore6-6.9.0.recipe +++ b/kde-frameworks/kcalendarcore/kcalendarcore6-6.11.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="861727f95368e9739c1135f89d17a0b499da6b70e16f1ef5e3a56522e5a6410c" +CHECKSUM_SHA256="ea261324d1b80ef4786b86cf86bfa32c332aa0357b05ba299b13f54be69a7380" SOURCE_DIR="kcalendarcore-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -41,6 +41,15 @@ REQUIRES_devel=" kcalendarcore6$secondaryArchSuffix == $portVersion base " +ARCHITECTURES_doc="any" + +PROVIDES_doc=" + kcalendarcore6${secondaryArchSuffix}_doc = $portVersion + " +REQUIRES_doc=" + kcalendarcore6$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel extra_cmake_modules$secondaryArchSuffix @@ -66,9 +75,6 @@ TEST_REQUIRES=" qthaikuplugins$secondaryArchSuffix " -#defineDebugInfoPackage kcalendarcore6$secondaryArchSuffix \ -# $libDir/libKF6CalendarCore.so.$libVersion - BUILD() { cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ @@ -76,7 +82,7 @@ BUILD() -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \ -DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \ -DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \ - -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \ + -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6_base \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ -DCMAKE_SKIP_RPATH=YES \ -DBUILD_QCH=ON \ @@ -95,8 +101,10 @@ INSTALL() packageEntries devel \ $developDir \ - $documentationDir \ $libDir/cmake + + packageEntries doc \ + $documentationDir } TEST() diff --git a/kde-frameworks/kcmutils/kcmutils6-6.9.0.recipe b/kde-frameworks/kcmutils/kcmutils6-6.11.0.recipe similarity index 90% rename from kde-frameworks/kcmutils/kcmutils6-6.9.0.recipe rename to kde-frameworks/kcmutils/kcmutils6-6.11.0.recipe index 07fbc0c5b..3836d55b5 100644 --- a/kde-frameworks/kcmutils/kcmutils6-6.9.0.recipe +++ b/kde-frameworks/kcmutils/kcmutils6-6.11.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="79bf2a18ab4ea8e1752b14f5964ce44907b51e1c5fc8dcb620c66fd5fdb36a27" +CHECKSUM_SHA256="64d2c5cd8165189c2d741bb543aab72b5bc8db5c540ca4e88c2f8d0f93e77990" SOURCE_DIR="kcmutils-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -54,6 +54,15 @@ REQUIRES_devel=" kcmutils6$secondaryArchSuffix == $portVersion base " +ARCHITECTURES_doc="any" + +PROVIDES_doc=" + kcmutils6${secondaryArchSuffix}_doc = $portVersion + " +REQUIRES_doc=" + kcmutils6$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel extra_cmake_modules$secondaryArchSuffix @@ -86,12 +95,6 @@ TEST_REQUIRES=" lib:libKirigami$secondaryArchSuffix " -#defineDebugInfoPackage kcmutils6$secondaryArchSuffix \ -# $binDir/kcmshell6 \ -# $libDir/libKF6KCMUtils.so.$libVersion \ -# $libDir/libKF6KCMUtilsCore.so.$libVersion \ -# $libDir/libKF6KCMUtilsQuick.so.$libVersion - BUILD() { cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ @@ -99,7 +102,7 @@ BUILD() -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \ -DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \ -DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \ - -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \ + -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6_base \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ -DCMAKE_SKIP_RPATH=YES \ -DBUILD_QCH=ON \ @@ -119,8 +122,10 @@ INSTALL() packageEntries devel \ $developDir \ - $documentationDir \ $libDir/cmake + + packageEntries doc \ + $documentationDir } TEST() diff --git a/kde-frameworks/kparts/kparts6-6.9.0.recipe b/kde-frameworks/kparts/kparts6-6.11.0.recipe similarity index 91% rename from kde-frameworks/kparts/kparts6-6.9.0.recipe rename to kde-frameworks/kparts/kparts6-6.11.0.recipe index b93e6164a..3ee754c36 100644 --- a/kde-frameworks/kparts/kparts6-6.9.0.recipe +++ b/kde-frameworks/kparts/kparts6-6.11.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%.*}/kparts-${portVersion}.tar.xz" -CHECKSUM_SHA256="afc9c4e897b371a51589342ed0573889bf4fab79b81b9a6950a45cd9faedd788" +CHECKSUM_SHA256="3995f3556aba434de7b13dae099b51a0a86aeade60ba1e06592836d40669bb6a" SOURCE_DIR="kparts-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -53,6 +53,15 @@ REQUIRES_devel=" devel:libKF6XmlGui$secondaryArchSuffix == $libVersion " +ARCHITECTURES_doc="any" + +PROVIDES_doc=" + kparts6${secondaryArchSuffix}_doc = $portVersion + " +REQUIRES_doc=" + kparts6$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel extra_cmake_modules$secondaryArchSuffix @@ -89,9 +98,6 @@ TEST_REQUIRES=" qthaikuplugins$secondaryArchSuffix " -#defineDebugInfoPackage kparts6$secondaryArchSuffix \ -# $libDir/libKF6Parts.so.$libVersion - BUILD() { cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ @@ -99,7 +105,7 @@ BUILD() -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \ -DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \ -DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \ - -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \ + -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6_base \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ -DCMAKE_SKIP_RPATH=YES \ -DBUILD_QCH=ON \ @@ -117,8 +123,10 @@ INSTALL() packageEntries devel \ $developDir \ - $documentationDir \ $libDir/cmake + + packageEntries doc \ + $documentationDir } TEST() diff --git a/kde-frameworks/kpty/kpty6-6.9.0.recipe b/kde-frameworks/kpty/kpty6-6.11.0.recipe similarity index 87% rename from kde-frameworks/kpty/kpty6-6.9.0.recipe rename to kde-frameworks/kpty/kpty6-6.11.0.recipe index 80820272f..52692e4e6 100644 --- a/kde-frameworks/kpty/kpty6-6.9.0.recipe +++ b/kde-frameworks/kpty/kpty6-6.11.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="5351b01585adfe9954256d9377fe5d96e0c943aaaeeb78357a238f984304a23d" +CHECKSUM_SHA256="f1d985bf0a14061a764c7c01bcb6cf284a59ad82de13e72cfd1bd268819eebc2" SOURCE_DIR="kpty-$portVersion" PATCHES="kpty-$portVersion.patchset" @@ -36,6 +36,15 @@ REQUIRES_devel=" kpty6$secondaryArchSuffix == $portVersion base " +ARCHITECTURES_doc="any" + +PROVIDES_doc=" + kpty6${secondaryArchSuffix}_doc = $portVersion + " +REQUIRES_doc=" + kpty6$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel extra_cmake_modules$secondaryArchSuffix @@ -55,9 +64,6 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " -#defineDebugInfoPackage kpty6$secondaryArchSuffix \ -# $libDir/libKF6Pty.so.$libVersion - BUILD() { cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ @@ -66,7 +72,7 @@ BUILD() -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \ -DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \ -DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \ - -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \ + -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6_base \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ -DCMAKE_SKIP_RPATH=YES \ -DBUILD_QCH=ON \ @@ -84,8 +90,10 @@ INSTALL() packageEntries devel \ $developDir \ - $documentationDir \ $libDir/cmake + + packageEntries doc \ + $documentationDir } TEST() diff --git a/kde-frameworks/kpty/patches/kpty-6.9.0.patchset b/kde-frameworks/kpty/patches/kpty-6.11.0.patchset similarity index 100% rename from kde-frameworks/kpty/patches/kpty-6.9.0.patchset rename to kde-frameworks/kpty/patches/kpty-6.11.0.patchset diff --git a/kde-frameworks/kpty/patches/kpty_utmpx-5.80.0.patchset b/kde-frameworks/kpty/patches/kpty_utmpx-5.80.0.patchset deleted file mode 100644 index 087f0a274..000000000 --- a/kde-frameworks/kpty/patches/kpty_utmpx-5.80.0.patchset +++ /dev/null @@ -1,106 +0,0 @@ -From 2704ef9f79a04e9f4f71e9cc7b5a1e33050482ae Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Tue, 5 Jan 2021 13:36:16 +1000 -Subject: Fixes for haiku - - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index e348996..e3b9bcf 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -26,7 +26,8 @@ target_link_libraries(KF5Pty PUBLIC Qt5::Core - PRIVATE - ${UTIL_LIBRARY} - ${kpty_OPTIONAL_LIBS} -- KF5::I18n) -+ KF5::I18n -+ bsd) - - target_include_directories(KF5Pty PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/..) - -diff --git a/src/kpty.cpp b/src/kpty.cpp -index 55b057b..7e3ae34 100644 ---- a/src/kpty.cpp -+++ b/src/kpty.cpp -@@ -69,7 +69,9 @@ public: - int cmdFd; - }; - #else -+# if HAVE_UTMP - # include -+# endif - # if HAVE_UTMPX - # include - # endif -@@ -318,6 +320,10 @@ grantedpt: - fcntl(d->masterFd, F_SETFD, FD_CLOEXEC); - fcntl(d->slaveFd, F_SETFD, FD_CLOEXEC); - -+#ifdef __HAIKU__ -+ setEcho(true); -+#endif -+ - return true; - } - -@@ -358,6 +364,10 @@ bool KPty::open(int fd) - return false; - } - -+#ifdef __HAIKU__ -+ setEcho(true); -+#endif -+ - return true; - #endif - } -diff --git a/src/kpty_p.h b/src/kpty_p.h -index 730ef98..9581a11 100644 ---- a/src/kpty_p.h -+++ b/src/kpty_p.h -@@ -12,6 +12,19 @@ - - #include - -+#ifdef __HAIKU__ -+#undef HAVE_OPENPTY -+#define HAVE_OPENPTY 1 -+#undef HAVE_UTMP -+#define HAVE_UTMP 0 -+#define ut_name ut_user -+#define ut_host ut_line -+#define _PATH_UTMPX "" -+#define _PATH_WTMPX "" -+#define utmpxname(a) -+#define updwtmpx(a, b) -+#endif -+ - #include - #include - --- -2.28.0 - - -From 2cefbabf9ff75582842d0bd6e208037cf7752c31 Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Tue, 5 Jan 2021 13:45:26 +1000 -Subject: Fixes for haiku2 - - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index e3b9bcf..a28557f 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -81,7 +81,7 @@ endif() - - ########### next target ############### - --if (NOT HAVE_OPENPTY) -+if (NOT HAVE_OPENPTY AND NOT HAIKU) - add_executable(kgrantpty kgrantpty.c) - ecm_mark_nongui_executable(kgrantpty) - install(TARGETS kgrantpty DESTINATION ${KDE_INSTALL_LIBEXECDIR_KF5}) --- -2.28.0 - diff --git a/kde-frameworks/ksyntax_highlighting/ksyntax_highlighting6-6.9.0.recipe b/kde-frameworks/ksyntax_highlighting/ksyntax_highlighting6-6.11.0.recipe similarity index 86% rename from kde-frameworks/ksyntax_highlighting/ksyntax_highlighting6-6.9.0.recipe rename to kde-frameworks/ksyntax_highlighting/ksyntax_highlighting6-6.11.0.recipe index eda4eb2e1..4cb695d26 100644 --- a/kde-frameworks/ksyntax_highlighting/ksyntax_highlighting6-6.9.0.recipe +++ b/kde-frameworks/ksyntax_highlighting/ksyntax_highlighting6-6.11.0.recipe @@ -7,9 +7,9 @@ QSyntaxHighlighter sub-class." HOMEPAGE="https://invent.kde.org/frameworks/syntax-highlighting" COPYRIGHT="2010-2024 KDE Organisation" LICENSE="GNU LGPL v2" -REVISION="2" +REVISION="1" SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/syntax-highlighting-${portVersion}.tar.xz" -CHECKSUM_SHA256="d6fd07020ee57917517a1c03bdf36e661b083c8455c489cf94ad77a90ec29c70" +CHECKSUM_SHA256="b23dbbe195030a2927caafc5fdf4ca7a372c44ca95013d6115037fe62e1fcb51" SOURCE_DIR="syntax-highlighting-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -39,6 +39,15 @@ REQUIRES_devel=" ksyntax_highlighting6$secondaryArchSuffix == $portVersion base " +ARCHITECTURES_doc="any" + +PROVIDES_doc=" + ksyntax_highlighting6${secondaryArchSuffix}_doc = $portVersion + " +REQUIRES_doc=" + ksyntax_highlighting6$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel extra_cmake_modules$secondaryArchSuffix @@ -58,10 +67,6 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " -#defineDebugInfoPackage ksyntax_highlighting6$secondaryArchSuffix \ -# $binDir/ksyntaxhighlighter6 \ -# $libDir/libKF6SyntaxHighlighting.so.$libVersion - BUILD() { cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ @@ -69,7 +74,7 @@ BUILD() -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \ -DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \ -DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \ - -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \ + -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6_base \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ -DCMAKE_SKIP_RPATH=YES \ -DBUILD_QCH=ON \ @@ -87,8 +92,10 @@ INSTALL() packageEntries devel \ $developDir \ - $documentationDir \ $libDir/cmake + + packageEntries doc \ + $documentationDir } TEST() diff --git a/kde-frameworks/threadweaver/threadweaver6-6.9.0.recipe b/kde-frameworks/threadweaver/threadweaver6-6.11.0.recipe similarity index 86% rename from kde-frameworks/threadweaver/threadweaver6-6.9.0.recipe rename to kde-frameworks/threadweaver/threadweaver6-6.11.0.recipe index 00a459590..35ab9c138 100644 --- a/kde-frameworks/threadweaver/threadweaver6-6.9.0.recipe +++ b/kde-frameworks/threadweaver/threadweaver6-6.11.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%.*}/threadweaver-${portVersion}.tar.xz" -CHECKSUM_SHA256="d249181d21aa89ad6f5108db3b188c25c9415c9834110f8d15f6bab2df39c190" +CHECKSUM_SHA256="c408d9ef3c13e9906e6ef1a162def5bf7459f099197b1788eb3d96df4505dd8f" SOURCE_DIR="threadweaver-$portVersion" ARCHITECTURES="all !x86_gcc2" @@ -39,6 +39,15 @@ REQUIRES_devel=" threadweaver6$secondaryArchSuffix == $portVersion base " +ARCHITECTURES_doc="any" + +PROVIDES_doc=" + threadweaver6${secondaryArchSuffix}_doc = $portVersion + " +REQUIRES_doc=" + threadweaver6$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel extra_cmake_modules$secondaryArchSuffix @@ -54,9 +63,6 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " -#defineDebugInfoPackage threadweaver6$secondaryArchSuffix \ -# $libDir/libKF6ThreadWeaver.so.$libVersion - BUILD() { cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ @@ -64,7 +70,7 @@ BUILD() -DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt6 \ -DKDE_INSTALL_QMLDIR=$dataDir/Qt6/qml \ -DKDE_INSTALL_QTPLUGINDIR=$addOnsDir/Qt6 \ - -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6 \ + -DKDE_INSTALL_QTQCHDIR=$documentationDir/packages/qt6_base \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ -DCMAKE_SKIP_RPATH=YES \ -DBUILD_QCH=ON \ @@ -82,8 +88,10 @@ INSTALL() packageEntries devel \ $developDir \ - $documentationDir \ $libDir/cmake + + packageEntries doc \ + $documentationDir } TEST()