haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 03:30:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

kio: bump version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2024-03-01 23:49:41 +10:00
parent 477f67a791
commit 559aa676ff
2 changed files with 61 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
kde-frameworks/kio/kio-5.93.0.recipe → kde-frameworks/kio/kio-5.115.0.recipe
View File

@@ -10,12 +10,12 @@ There is a variety of plugins available, e.g. to support access via SSH.
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-2022 KDE Organisation"
HOMEPAGE="https://invent.kde.org/frameworks/kio/"
COPYRIGHT="2010-2024 KDE Organisation"
LICENSE="GNU LGPL v2"
REVISION="2"
SOURCE_URI="https://github.com/KDE/kio/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="8f937fe14f692559e4833b06f66d242f23b3e8b3c329d409e9d991f01427c1dc"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/frameworks/${portVersion%.*}/kio-${portVersion}.tar.xz"
CHECKSUM_SHA256="0f53387b5a883fcef3db10b7c1062485a314d42d9584d9119056e571568ff90b"
PATCHES="kio-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2"
@@ -127,7 +127,7 @@ BUILD_PREREQUIRES="
cmd:g++$secondaryArchSuffix
cmd:lrelease$secondaryArchSuffix >= 5
cmd:make
cmd:python2
cmd:python3.10
"
TEST_REQUIRES="
@@ -153,7 +153,8 @@ BUILD()
-DKAUTH_HELPER_INSTALL_DIR:PATH=$addOnsDir/Qt5/kauth/helper \
-DECM_MKSPECS_INSTALL_DIR=$dataDir/Qt5/mkspecs \
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
-DBUILD_TESTING=ON
-DBUILD_TESTING=ON \
-DWITH_X11=OFF
make $jobArgs
}

82
kde-frameworks/kio/patches/kio-5.93.0.patchset → kde-frameworks/kio/patches/kio-5.115.0.patchset
View File

@@ -1,14 +1,14 @@
From 5d1e31acdab3a153a6995473e0ecb737e138ec9d Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Sun, 31 Oct 2021 13:15:08 +0300
From 29234dea4de3bfdbf5a3713f6a4e652e4bd17ecf Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 25 Feb 2024 22:58:08 +1000
Subject: Fix build on Haiku
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e8b12ba..23ef4cc 100644
index 17b2a03..bf60ebe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -163,7 +163,7 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kio5\")
@@ -174,7 +174,7 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kio5\")
ki18n_install(po)
if (KF5DocTools_FOUND)
@@ -18,10 +18,10 @@ index e8b12ba..23ef4cc 100644
if (KF5DocTools_FOUND)
diff --git a/autotests/jobtest.cpp b/autotests/jobtest.cpp
index 04814f1..0c5afa9 100644
index 46e4f38..4acdb8e 100644
--- a/autotests/jobtest.cpp
+++ b/autotests/jobtest.cpp
@@ -1908,7 +1908,7 @@ void JobTest::statTimeResolution()
@@ -1946,7 +1946,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 87551fa..d8fb416 100644
index ddfdc02..2eecf7b 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -239,6 +239,10 @@ if (TARGET KF5::AuthCore)
@@ -245,6 +245,10 @@ if (TARGET KF5::AuthCore)
target_link_libraries(KF5KIOCore PRIVATE KF5::AuthCore) #SlaveBase uses KAuth::Action
endif()
@@ -57,7 +57,7 @@ index 87551fa..d8fb416 100644
target_link_libraries(KF5KIOCore PRIVATE ${ACL_LIBS})
endif()
diff --git a/src/ioslaves/file/CMakeLists.txt b/src/ioslaves/file/CMakeLists.txt
index 25040b8..3041bed 100644
index 88aa396..982532e 100644
--- a/src/ioslaves/file/CMakeLists.txt
+++ b/src/ioslaves/file/CMakeLists.txt
@@ -34,6 +34,10 @@ if(UNIX)
@@ -72,10 +72,10 @@ index 25040b8..3041bed 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 957bf2a..7d73fb1 100644
index c0bc643..af87f8d 100644
--- a/src/ioslaves/file/file_unix.cpp
+++ b/src/ioslaves/file/file_unix.cpp
@@ -71,6 +71,11 @@
@@ -73,6 +73,11 @@
#include <sys/extattr.h>
#endif
@@ -87,7 +87,7 @@ index 957bf2a..7d73fb1 100644
using namespace KIO;
/* 512 kB */
@@ -910,7 +915,7 @@ void FileProtocol::copy(const QUrl &srcUrl, const QUrl &destUrl, int _mode, JobF
@@ -927,7 +932,7 @@ void FileProtocol::copy(const QUrl &srcUrl, const QUrl &destUrl, int _mode, JobF
// copy access and modification time
if (!wasKilled()) {
@@ -138,7 +138,7 @@ index f158c8e..b5edd54 100644
########### install files ###############
diff --git a/src/widgets/previewjob.cpp b/src/widgets/previewjob.cpp
index 4862515..cca39a8 100644
index 214e3b3..2429b34 100644
--- a/src/widgets/previewjob.cpp
+++ b/src/widgets/previewjob.cpp
@@ -11,7 +11,7 @@
@@ -151,20 +151,20 @@ index 4862515..cca39a8 100644
#else
#define WITH_SHM 0
--
2.30.2
2.43.2
From bb6f7a38cdbc77ae74db6d761ded6445c8a92d04 Mon Sep 17 00:00:00 2001
From 2786f270b6116eea92b129f1720aaf2e7054cdd4 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 17 May 2022 21:28:27 +1000
Date: Sun, 25 Feb 2024 22:59:02 +1000
Subject: Add OpenWith handler for Haiku
diff --git a/src/gui/openurljob.cpp b/src/gui/openurljob.cpp
index 6b18f1a..1b5a099 100644
index 35d45ae..ac7945a 100644
--- a/src/gui/openurljob.cpp
+++ b/src/gui/openurljob.cpp
@@ -163,7 +163,7 @@ void KIO::OpenUrlJob::start()
@@ -160,7 +160,7 @@ void KIO::OpenUrlJob::start()
emitResult();
};
@@ -174,10 +174,10 @@ index 6b18f1a..1b5a099 100644
// 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 763f1d5..4ff18c1 100644
index 3ad2b72..419e491 100644
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/CMakeLists.txt
@@ -158,6 +158,10 @@ if(ACL_FOUND)
@@ -159,6 +159,10 @@ if(ACL_FOUND)
target_link_libraries(KF5KIOWidgets PRIVATE ${ACL_LIBS})
endif()
@@ -189,10 +189,10 @@ index 763f1d5..4ff18c1 100644
ecm_generate_headers(KIOWidgets_HEADERS
HEADER_NAMES
diff --git a/src/widgets/krun.cpp b/src/widgets/krun.cpp
index ea2410b..c8953e0 100644
index 3faab31..90e6377 100644
--- a/src/widgets/krun.cpp
+++ b/src/widgets/krun.cpp
@@ -68,6 +68,10 @@
@@ -70,6 +70,10 @@
#include "widgetsopenwithhandler_win.cpp" // displayNativeOpenWithDialog
#endif
@@ -203,7 +203,7 @@ index ea2410b..c8953e0 100644
KRunPrivate::KRunPrivate(KRun *parent)
: q(parent)
, m_showingDialog(false)
@@ -200,7 +204,7 @@ bool KRun::displayOpenWithDialog(const QList<QUrl> &lst, QWidget *window, bool t
@@ -197,7 +201,7 @@ bool KRun::displayOpenWithDialog(const QList<QUrl> &lst, QWidget *window, bool t
return false;
}
@@ -213,7 +213,7 @@ index ea2410b..c8953e0 100644
if (cfgGroup.readEntry("Native", true)) {
return displayNativeOpenWithDialog(lst, window);
diff --git a/src/widgets/widgetsopenwithhandler.cpp b/src/widgets/widgetsopenwithhandler.cpp
index a7c3e09..f1be915 100644
index ce51f52..bef7d0a 100644
--- a/src/widgets/widgetsopenwithhandler.cpp
+++ b/src/widgets/widgetsopenwithhandler.cpp
@@ -20,6 +20,10 @@
@@ -227,9 +227,9 @@ index a7c3e09..f1be915 100644
KIO::WidgetsOpenWithHandler::WidgetsOpenWithHandler(QObject *parent)
: KIO::OpenWithHandlerInterface(parent)
{
@@ -31,7 +35,7 @@ void KIO::WidgetsOpenWithHandler::promptUserForApplication(KJob *job, const QLis
{
QWidget *parentWidget = job ? KJobWidgets::window(job) : qApp->activeWindow();
@@ -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)
@@ -281,5 +281,29 @@ index 0000000..9614b87
+ return false;
+}
--
2.30.2
2.43.2
From 2d6def5caf97636cf08e74f27362999adfa4d638 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/ioslaves/file/file_unix.cpp b/src/ioslaves/file/file_unix.cpp
index af87f8d..0de6b05 100644
--- a/src/ioslaves/file/file_unix.cpp
+++ b/src/ioslaves/file/file_unix.cpp
@@ -76,6 +76,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.43.2