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

kio, fix patchset (#11284)

Browse Source
This commit is contained in:
Schrijvers Luc
2024-10-29 18:17:29 +01:00
committed by GitHub
parent 33e83e1b4d
commit 92677c973c
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
kde-frameworks/kio/patches/kio-6.7.0.patchset
View File

@@ -1,4 +1,4 @@
From ca1e6933b9cda36e4ca026132f07d0e9a5c0a92e Mon Sep 17 00:00:00 2001
From 542b8c450c0e6059808f8b5535d0d398fe561849 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Sun, 31 Oct 2021 13:15:08 +0300
Subject: Fix build on Haiku
@@ -18,7 +18,7 @@ index 124e827..183c897 100644
struct timespec ut[2];
ut[0].tv_sec = early70sTime;
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index bb6935b..d8a3400 100644
index 3d67b34..89d8440 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -214,6 +214,10 @@ if (TARGET KF6::AuthCore)
@@ -33,11 +33,11 @@ index bb6935b..d8a3400 100644
target_link_libraries(KF6KIOCore PRIVATE ${ACL_LIBS})
endif()
diff --git a/src/gui/previewjob.cpp b/src/gui/previewjob.cpp
index 9ff3c1c..f45a0de 100644
index d4da3e4..fe48479 100644
--- a/src/gui/previewjob.cpp
+++ b/src/gui/previewjob.cpp
@@ -13,7 +13,7 @@
#include "kiogui_debug.h"
@@ -14,7 +14,7 @@
#include "standardthumbnailjob_p.h"
#include "statjob.h"
-#if defined(Q_OS_UNIX) && !defined(Q_OS_ANDROID)
@@ -61,7 +61,7 @@ index a8a393a..93c6fea 100644
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 3ebf67d..d672114 100644
index 56808dc..c8ecd79 100644
--- a/src/kioworkers/file/file_unix.cpp
+++ b/src/kioworkers/file/file_unix.cpp
@@ -69,6 +69,11 @@
@@ -76,7 +76,7 @@ index 3ebf67d..d672114 100644
using namespace KIO;
/* 512 kB */
@@ -791,7 +796,7 @@ WorkerResult FileProtocol::copy(const QUrl &srcUrl, const QUrl &destUrl, int _mo
@@ -789,7 +794,7 @@ WorkerResult FileProtocol::copy(const QUrl &srcUrl, const QUrl &destUrl, int _mo
// copy access and modification time
if (!wasKilled()) {
@@ -104,7 +104,7 @@ index 8d8c0ed..aa164e1 100644
2.45.2
From ec511e01a35a6f9a2e013d404232ffe7237d45a9 Mon Sep 17 00:00:00 2001
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
@@ -210,14 +210,14 @@ index 0000000..9614b87
2.45.2
From f6ddb8c2cb4c9d8b883396efc1712aaf2ffbe295 Mon Sep 17 00:00:00 2001
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 d672114..34778b7 100644
index c8ecd79..e773c37 100644
--- a/src/kioworkers/file/file_unix.cpp
+++ b/src/kioworkers/file/file_unix.cpp
@@ -72,6 +72,9 @@
@@ -234,7 +234,7 @@ index d672114..34778b7 100644
2.45.2
From 4cc5e8331021f1b37324bc7f03b5b72f2de10c86 Mon Sep 17 00:00:00 2001
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
@@ -242,10 +242,10 @@ Subject: Disable threads kio_file support for now. It's totally broken on
diff --git a/src/core/worker.cpp b/src/core/worker.cpp
index 08c0938..3333ce2 100644
index 24d06bb..2b726a5 100644
--- a/src/core/worker.cpp
+++ b/src/core/worker.cpp
@@ -360,7 +360,7 @@ Worker *Worker::createWorker(const QString &protocol, const QUrl &url, int &erro
@@ -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";
};