diff --git a/kde-frameworks/kio/kio-5.86.0.recipe b/kde-frameworks/kio/kio-5.93.0.recipe similarity index 92% rename from kde-frameworks/kio/kio-5.86.0.recipe rename to kde-frameworks/kio/kio-5.93.0.recipe index 079820cff..4951f886a 100644 --- a/kde-frameworks/kio/kio-5.86.0.recipe +++ b/kde-frameworks/kio/kio-5.93.0.recipe @@ -11,11 +11,11 @@ The framework can also be used to bridge a native protocol to a file-based \ interface. This makes the data accessible in all applications using the KDE \ file dialog or any other KIO enabled infrastructure." HOMEPAGE="https://github.com/KDE/kio/" -COPYRIGHT="2010-2021 KDE Organisation" +COPYRIGHT="2010-2022 KDE Organisation" LICENSE="GNU LGPL v2" REVISION="1" SOURCE_URI="https://github.com/KDE/kio/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="5fd50e508d621f82710600fc3315fd95fa9e3e64378267b91194bda122c39cc0" +CHECKSUM_SHA256="8f937fe14f692559e4833b06f66d242f23b3e8b3c329d409e9d991f01427c1dc" PATCHES="kio-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" @@ -113,11 +113,11 @@ BUILD_REQUIRES=" devel:libKF5WidgetsAddons$secondaryArchSuffix == $portVersion devel:libKF5WindowSystem$secondaryArchSuffix == $portVersion devel:libKF5XmlGui$secondaryArchSuffix == $portVersion - devel:libQt5Concurrent$secondaryArchSuffix >= 5.7 - devel:libQt5Core$secondaryArchSuffix >= 5.7 - devel:libQt5DBus$secondaryArchSuffix >= 5.7 - devel:libQt5Gui$secondaryArchSuffix >= 5.7 - devel:libQt5Network$secondaryArchSuffix >= 5.7 + devel:libQt5Concurrent$secondaryArchSuffix + devel:libQt5Core$secondaryArchSuffix + devel:libQt5DBus$secondaryArchSuffix + devel:libQt5Gui$secondaryArchSuffix + devel:libQt5Network$secondaryArchSuffix devel:libxml2$secondaryArchSuffix devel:libxslt$secondaryArchSuffix devel:libz$secondaryArchSuffix @@ -134,6 +134,14 @@ TEST_REQUIRES=" qthaikuplugins$secondaryArchSuffix #it opens windows during the tests, maybe we don't want that on the buildbots. " +PATCH() +{ + sed -e '/platforms:/ a \ \ \ \ - name: Haiku' -i $sourceDir/metainfo.yaml + # disable docs generation until libxml package is fixed + sed -e 's/add/#add/g' -i $sourceDir/docs/CMakeLists.txt + sed -e 's/kdoctools/#kdoctool/g' -i $sourceDir/CMakeLists.txt +} + BUILD() { mkdir -p build @@ -146,15 +154,12 @@ BUILD() -DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt5/mkspecs \ -DECM_DIR=/system/data/cmake/Modules/ECM/cmake \ -DBUILD_TESTING=ON + make $jobArgs } INSTALL() { - # disable docs generation until libxml package is fixed - sed -i s/add/#add/g docs/CMakeLists.txt - sed -i s/kdoctools/#kdoctool/g CMakeLists.txt - cd build make $jobArgs install diff --git a/kde-frameworks/kio/patches/kio-5.86.0.patchset b/kde-frameworks/kio/patches/kio-5.93.0.patchset similarity index 76% rename from kde-frameworks/kio/patches/kio-5.86.0.patchset rename to kde-frameworks/kio/patches/kio-5.93.0.patchset index 702e4246b..9f95b4613 100644 --- a/kde-frameworks/kio/patches/kio-5.86.0.patchset +++ b/kde-frameworks/kio/patches/kio-5.93.0.patchset @@ -1,14 +1,14 @@ -From 7944134c505c44e0e638fed89ff55a036161d235 Mon Sep 17 00:00:00 2001 +From 0b12dae8767915db687e76d6c56fe3c4ba287dfc 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/CMakeLists.txt b/CMakeLists.txt -index 84bc7db..d7fd65c 100644 +index e8b12ba..23ef4cc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -151,7 +151,7 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kio5\") +@@ -163,7 +163,7 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kio5\") ki18n_install(po) if (KF5DocTools_FOUND) @@ -18,10 +18,10 @@ index 84bc7db..d7fd65c 100644 if (KF5DocTools_FOUND) diff --git a/autotests/jobtest.cpp b/autotests/jobtest.cpp -index f567f3d..7a0f6ae 100644 +index 04814f1..0c5afa9 100644 --- a/autotests/jobtest.cpp +++ b/autotests/jobtest.cpp -@@ -1847,7 +1847,7 @@ void JobTest::statTimeResolution() +@@ -1908,7 +1908,7 @@ void JobTest::statTimeResolution() QFile dest_file(filePath); QVERIFY(dest_file.open(QIODevice::ReadOnly)); @@ -42,10 +42,10 @@ index b88f5d4..1fabc11 100644 +#add_subdirectory(kioslave5) +#add_subdirectory(kcontrol5) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt -index 7e43842..062a6b8 100644 +index 87551fa..d8fb416 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt -@@ -233,6 +233,10 @@ if (TARGET KF5::AuthCore) +@@ -239,6 +239,10 @@ if (TARGET KF5::AuthCore) target_link_libraries(KF5KIOCore PRIVATE KF5::AuthCore) #SlaveBase uses KAuth::Action endif() @@ -57,11 +57,11 @@ index 7e43842..062a6b8 100644 target_link_libraries(KF5KIOCore PRIVATE ${ACL_LIBS}) endif() diff --git a/src/ioslaves/file/CMakeLists.txt b/src/ioslaves/file/CMakeLists.txt -index fec216a..56def3b 100644 +index 25040b8..3041bed 100644 --- a/src/ioslaves/file/CMakeLists.txt +++ b/src/ioslaves/file/CMakeLists.txt @@ -34,6 +34,10 @@ if(UNIX) - target_link_libraries(kio_file Qt5::Network KF5::AuthCore) + target_link_libraries(kio_file Qt${QT_MAJOR_VERSION}::Network KF5::AuthCore) endif() +if (HAIKU) @@ -72,10 +72,10 @@ index fec216a..56def3b 100644 target_link_libraries(kio_file ${ACL_LIBS}) endif() diff --git a/src/ioslaves/file/file_unix.cpp b/src/ioslaves/file/file_unix.cpp -index fe00c11..9162199 100644 +index 957bf2a..7d73fb1 100644 --- a/src/ioslaves/file/file_unix.cpp +++ b/src/ioslaves/file/file_unix.cpp -@@ -59,6 +59,11 @@ +@@ -71,6 +71,11 @@ #include #endif @@ -87,7 +87,7 @@ index fe00c11..9162199 100644 using namespace KIO; /* 512 kB */ -@@ -950,7 +955,7 @@ void FileProtocol::copy(const QUrl &srcUrl, const QUrl &destUrl, int _mode, JobF +@@ -910,7 +915,7 @@ void FileProtocol::copy(const QUrl &srcUrl, const QUrl &destUrl, int _mode, JobF // copy access and modification time if (!wasKilled()) { @@ -95,14 +95,14 @@ index fe00c11..9162199 100644 +#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(Q_OS_HAIKU) // with nano secs precision struct timespec ut[2]; - ut[0] = buff_src.st_atim; + ut[0] = buffSrc.st_atim; diff --git a/src/ioslaves/file/kauth/CMakeLists.txt b/src/ioslaves/file/kauth/CMakeLists.txt -index 8b77a28..344c168 100644 +index 4dbe296..d9020f6 100644 --- a/src/ioslaves/file/kauth/CMakeLists.txt +++ b/src/ioslaves/file/kauth/CMakeLists.txt @@ -1,6 +1,10 @@ add_executable(file_helper filehelper.cpp fdsender.cpp) - target_link_libraries(file_helper Qt5::Network KF5::AuthCore KF5::I18n KF5::KIOCore) + target_link_libraries(file_helper Qt${QT_MAJOR_VERSION}::Network KF5::AuthCore KF5::I18n KF5::KIOCore) +if (HAIKU) + target_link_libraries(file_helper network) @@ -112,20 +112,21 @@ index 8b77a28..344c168 100644 #kauth_install_helper_files(file_helper org.kde.kio.file root) #kauth_install_actions(org.kde.kio.file file.actions) diff --git a/src/kpac/CMakeLists.txt b/src/kpac/CMakeLists.txt -index 505d339..79f48ce 100644 +index f158c8e..b5edd54 100644 --- a/src/kpac/CMakeLists.txt +++ b/src/kpac/CMakeLists.txt -@@ -51,6 +51,9 @@ if (Qt5Qml_FOUND) - if (HAVE_RESOLV_LIBRARY) - target_link_libraries(kded_proxyscout resolv) +@@ -52,6 +52,10 @@ if (TARGET Qt${QT_MAJOR_VERSION}::Qml) + target_link_libraries(kded_proxyscout PRIVATE resolv) endif () -+ if (HAIKU) -+ target_link_libraries(kded_proxyscout network) -+ endif () - endif() - set_package_properties(Qt5Qml PROPERTIES DESCRIPTION "QtQml, one of the Qt5 modules" -@@ -76,6 +79,10 @@ if (HAVE_SOCKET_LIBRARY) ++ if (HAIKU) ++ target_link_libraries(kded_proxyscout PRIVATE network) ++ endif () ++ + if (TARGET Qt6::Core5Compat) + target_link_libraries(kded_proxyscout PRIVATE Qt6::Core5Compat) # QTextCodec + endif() +@@ -87,6 +91,10 @@ if (HAVE_SOCKET_LIBRARY) target_link_libraries(kpac_dhcp_helper socket) endif () @@ -133,11 +134,11 @@ index 505d339..79f48ce 100644 + target_link_libraries(kpac_dhcp_helper network) +endif () + - install(TARGETS kpac_dhcp_helper DESTINATION ${KDE_INSTALL_LIBEXECDIR_KF5} ) + install(TARGETS kpac_dhcp_helper DESTINATION ${KDE_INSTALL_LIBEXECDIR_KF} ) ########### install files ############### diff --git a/src/widgets/previewjob.cpp b/src/widgets/previewjob.cpp -index 400e14b..ee8f6bb 100644 +index 4862515..cca39a8 100644 --- a/src/widgets/previewjob.cpp +++ b/src/widgets/previewjob.cpp @@ -11,7 +11,7 @@