mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 19:50:05 +02:00
kio-extras: bump version
This commit is contained in:
Gerasim Troeglazov
@@ -10,28 +10,25 @@ This package also supports the following protocols:
|
||||
* sftp
|
||||
* smb"
|
||||
HOMEPAGE="https://github.com/KDE/kio-extras/"
|
||||
COPYRIGHT="2010-2019 KDE Organisation"
|
||||
COPYRIGHT="2010-2022 KDE Organisation"
|
||||
LICENSE="GNU LGPL v2"
|
||||
REVISION="3"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://github.com/KDE/kio-extras/archive/v$portVersion.tar.gz"
|
||||
SOURCE_DIR="kio-extras-$portVersion"
|
||||
CHECKSUM_SHA256="5a0c97d699990bfe4200d15867d37125c8dbfe6e8a61106b2b34c3668060e844"
|
||||
CHECKSUM_SHA256="7efc886124d52f4b93b610743317f022f27af68b5064a5015f878d86cb7f823b"
|
||||
PATCHES="kio_extras-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
GLOBAL_WRITABLE_FILES="
|
||||
settings/xdg/kio-extras.categories keep-old
|
||||
"
|
||||
|
||||
PROVIDES="
|
||||
kio_extras$secondaryArchSuffix = $portVersion
|
||||
lib:libkioarchive$secondaryArchSuffix = $portVersion compat >= 5
|
||||
lib:libmolletnetwork5$secondaryArchSuffix = $portVersion compat >= 5
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libkdsoap$secondaryArchSuffix
|
||||
lib:libKDSoapWSDiscoveryClient$secondaryArchSuffix
|
||||
lib:libKF5Activities$secondaryArchSuffix
|
||||
lib:libKF5Archive$secondaryArchSuffix
|
||||
lib:libKF5Auth$secondaryArchSuffix
|
||||
@@ -52,6 +49,7 @@ REQUIRES="
|
||||
lib:libKF5Pty$secondaryArchSuffix
|
||||
lib:libKF5Service$secondaryArchSuffix
|
||||
lib:libKF5Solid$secondaryArchSuffix
|
||||
lib:libKF5SyntaxHighlighting$secondaryArchSuffix
|
||||
lib:libKF5WidgetsAddons$secondaryArchSuffix
|
||||
lib:libKF5WindowSystem$secondaryArchSuffix
|
||||
lib:libKF5XmlGui$secondaryArchSuffix
|
||||
@@ -76,6 +74,8 @@ REQUIRES_devel="
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
extra_cmake_modules$secondaryArchSuffix
|
||||
devel:libkdsoap$secondaryArchSuffix
|
||||
devel:libKDSoapWSDiscoveryClient$secondaryArchSuffix
|
||||
devel:libKF5Activities$secondaryArchSuffix
|
||||
devel:libKF5Archive$secondaryArchSuffix
|
||||
devel:libKF5Auth$secondaryArchSuffix
|
||||
@@ -97,16 +97,19 @@ BUILD_REQUIRES="
|
||||
devel:libKF5Pty$secondaryArchSuffix
|
||||
devel:libKF5Service$secondaryArchSuffix
|
||||
devel:libKF5Solid$secondaryArchSuffix
|
||||
devel:libKF5SyntaxHighlighting$secondaryArchSuffix
|
||||
devel:libKF5WidgetsAddons$secondaryArchSuffix
|
||||
devel:libKF5WindowSystem$secondaryArchSuffix
|
||||
devel:libKF5XmlGui$secondaryArchSuffix
|
||||
devel:libmtp$secondaryArchSuffix
|
||||
devel:libphonon4qt5$secondaryArchSuffix
|
||||
devel:libQt5Core$secondaryArchSuffix
|
||||
devel:libQt5DBus$secondaryArchSuffix
|
||||
devel:libQt5Gui$secondaryArchSuffix
|
||||
devel:libQt5Network$secondaryArchSuffix
|
||||
devel:libsmbclient$secondaryArchSuffix
|
||||
devel:libssh$secondaryArchSuffix
|
||||
devel:libtag$secondaryArchSuffix
|
||||
devel:libxml2$secondaryArchSuffix
|
||||
devel:libz$secondaryArchSuffix
|
||||
"
|
||||
@@ -114,7 +117,7 @@ BUILD_PREREQUIRES="
|
||||
cmd:cmake
|
||||
cmd:g++$secondaryArchSuffix
|
||||
cmd:gperf
|
||||
cmd:lrelease$secondaryArchSuffix
|
||||
cmd:lrelease$secondaryArchSuffix >= 5
|
||||
cmd:make
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
cmd:find
|
||||
@@ -137,8 +140,8 @@ BUILD()
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DKDE_INSTALL_PLUGINDIR=$addOnsDir/Qt5 \
|
||||
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
|
||||
-DLIBSSH_LIBRARIES="-lssh" \
|
||||
-DCMAKE_CXX_FLAGS="-fstack-protector"
|
||||
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
From 5ee7b8cf9f11ba8cdaa2163f905479e10bf32843 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Fri, 28 Jan 2022 10:13:34 +1000
|
||||
Subject: Fix build
|
||||
|
||||
|
||||
diff --git a/thumbnail/thumbnail.cpp b/thumbnail/thumbnail.cpp
|
||||
index c4db1d1..42b7ca0 100644
|
||||
--- a/thumbnail/thumbnail.cpp
|
||||
+++ b/thumbnail/thumbnail.cpp
|
||||
@@ -25,7 +25,7 @@
|
||||
#include <machine/param.h>
|
||||
#endif
|
||||
#include <sys/types.h>
|
||||
-#ifndef Q_OS_WIN
|
||||
+#if !defined(Q_OS_WIN) && !defined(Q_OS_HAIKU)
|
||||
#include <sys/ipc.h>
|
||||
#include <sys/shm.h>
|
||||
#include <unistd.h> // nice()
|
||||
@@ -333,7 +333,7 @@ void ThumbnailProtocol::get(const QUrl &url)
|
||||
data(imgData);
|
||||
}
|
||||
} else {
|
||||
-#ifndef Q_OS_WIN
|
||||
+#if !defined(Q_OS_WIN) && !defined(Q_OS_HAIKU)
|
||||
QByteArray imgData;
|
||||
QDataStream stream( &imgData, QIODevice::WriteOnly );
|
||||
//qDebug() << "IMAGE TO SHMID";
|
||||
--
|
||||
2.30.2
|
||||
|
||||
100
kde-apps/kio-extras/patches/kio_extras-22.04.0.patchset
Normal file
100
kde-apps/kio-extras/patches/kio_extras-22.04.0.patchset
Normal file
@@ -0,0 +1,100 @@
|
||||
From a242431fcdcf6c14612bd10c92fa16fd1cd47c0d Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Wed, 11 May 2022 10:49:55 +1000
|
||||
Subject: Disable shm for haiku
|
||||
|
||||
|
||||
diff --git a/thumbnail/thumbnail.cpp b/thumbnail/thumbnail.cpp
|
||||
index 3eb1fa6..166269e 100644
|
||||
--- a/thumbnail/thumbnail.cpp
|
||||
+++ b/thumbnail/thumbnail.cpp
|
||||
@@ -15,7 +15,9 @@
|
||||
#include <sys/types.h>
|
||||
#ifndef Q_OS_WIN
|
||||
#include <sys/ipc.h>
|
||||
+#ifndef Q_OS_HAIKU
|
||||
#include <sys/shm.h>
|
||||
+#endif
|
||||
#include <unistd.h> // nice()
|
||||
#endif
|
||||
|
||||
@@ -306,7 +308,7 @@ void ThumbnailProtocol::get(const QUrl &url)
|
||||
data(imgData);
|
||||
}
|
||||
} else {
|
||||
-#ifndef Q_OS_WIN
|
||||
+#if !defined(Q_OS_WIN) && !defined(Q_OS_HAIKU)
|
||||
QByteArray imgData;
|
||||
QDataStream stream( &imgData, QIODevice::WriteOnly );
|
||||
//qDebug() << "IMAGE TO SHMID";
|
||||
--
|
||||
2.30.2
|
||||
|
||||
|
||||
From e193b57c0ef31c5e3dfc4bb4fcd0cb2b3eab88da Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Wed, 11 May 2022 10:50:23 +1000
|
||||
Subject: Disable smbclient notify
|
||||
|
||||
|
||||
diff --git a/smb/kded/notifier.cpp b/smb/kded/notifier.cpp
|
||||
index 0bf4f63..7d74008 100644
|
||||
--- a/smb/kded/notifier.cpp
|
||||
+++ b/smb/kded/notifier.cpp
|
||||
@@ -96,12 +96,14 @@ public:
|
||||
if (m_url.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
+#ifndef Q_OS_HAIKU
|
||||
if (action == SMBC_NOTIFY_ACTION_OLD_NAME && url == m_url) {
|
||||
qCDebug(KIO_SMB_LOG) << "Discarding pending remove because it was followed by a move from the same url" << m_url;
|
||||
resetWithLock();
|
||||
} else {
|
||||
sendWithLock();
|
||||
}
|
||||
+#endif
|
||||
}
|
||||
|
||||
private:
|
||||
@@ -209,12 +211,14 @@ int main(int argc, char **argv)
|
||||
Frontend frontend;
|
||||
SMBContext smbcContext(new SMBAuthenticator(frontend));
|
||||
|
||||
+#ifndef Q_OS_HAIKU
|
||||
struct NotifyContext {
|
||||
const QUrl url;
|
||||
// Modification happens a lot, rate limit the notifications going through dbus.
|
||||
ModificationLimiter modificationLimiter;
|
||||
PendingRemove pendingRemove;
|
||||
};
|
||||
+
|
||||
NotifyContext context {QUrl(parser.positionalArguments().at(0)), {}, {}};
|
||||
|
||||
auto notify = [](const struct smbc_notify_callback_action *actions, size_t num_actions, void *private_data) -> int {
|
||||
@@ -244,7 +248,6 @@ int main(int argc, char **argv)
|
||||
}
|
||||
|
||||
context->pendingRemove.newEventFor(actions->action, url);
|
||||
-
|
||||
switch (actions->action) {
|
||||
case SMBC_NOTIFY_ACTION_ADDED:
|
||||
OrgKdeKDirNotifyInterface::emitFilesAdded(context->url /* dir */);
|
||||
@@ -293,7 +296,6 @@ int main(int argc, char **argv)
|
||||
// Values @ 2.2.35 SMB2 CHANGE_NOTIFY Request
|
||||
// https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-smb2/598f395a-e7a2-4cc8-afb3-ccb30dd2df7c
|
||||
// Not subscribing to stream changes see the callback handler for details.
|
||||
-
|
||||
const int nh = smbc_notify(dh,
|
||||
0 /* not recursive */,
|
||||
SMBC_NOTIFY_CHANGE_FILE_NAME |
|
||||
@@ -311,6 +313,7 @@ int main(int argc, char **argv)
|
||||
return 2;
|
||||
}
|
||||
Q_ASSERT(nh == 0);
|
||||
+#endif
|
||||
|
||||
return app.exec();
|
||||
}
|
||||
--
|
||||
2.30.2
|
||||
|
||||
Reference in New Issue
Block a user