mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 03:30:05 +02:00
nextcloud_client, revbump for openssl3, add documentation (#10923)
This commit is contained in:
Schrijvers Luc
GitHub
@@ -3,7 +3,7 @@ DESCRIPTION="This Nextcloud client is a tool to synchronize files with a Nextclo
|
||||
HOMEPAGE="https://nextcloud.com"
|
||||
COPYRIGHT="Nextcloud GmbH"
|
||||
LICENSE="GNU GPL v2"
|
||||
REVISION="3"
|
||||
REVISION="4"
|
||||
SOURCE_URI="https://github.com/nextcloud/desktop/archive/refs/tags/v$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="9f60a6707d31e82357780dff11168ede88d1f859481a22f2d04c827e656f3fba"
|
||||
SOURCE_DIR="desktop-$portVersion"
|
||||
@@ -78,11 +78,19 @@ REQUIRES_devel="
|
||||
devel:libQt5Gui$secondaryArchSuffix
|
||||
"
|
||||
|
||||
ARCHITECTURES_doc="any"
|
||||
PROVIDES_doc="
|
||||
nextcloud_client${secondaryArchSuffix}_doc = $portVersion
|
||||
"
|
||||
REQUIRES_doc="
|
||||
nextcloud_client$secondaryArchSuffix == $portVersion base
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
extra_cmake_modules$secondaryArchSuffix
|
||||
devel:libcmocka$secondaryArchSuffix # only needed during configure and testing
|
||||
devel:libcrypto$secondaryArchSuffix
|
||||
devel:libcrypto$secondaryArchSuffix >= 3
|
||||
devel:libkf5archive$secondaryArchSuffix
|
||||
devel:libQt5Concurrent$secondaryArchSuffix
|
||||
devel:libQt5Core$secondaryArchSuffix
|
||||
@@ -103,7 +111,7 @@ BUILD_REQUIRES="
|
||||
devel:libQt5Widgets$secondaryArchSuffix
|
||||
devel:libQt5Xml$secondaryArchSuffix
|
||||
devel:libsqlite3$secondaryArchSuffix
|
||||
devel:libssl$secondaryArchSuffix
|
||||
devel:libssl$secondaryArchSuffix >= 3
|
||||
devel:libz$secondaryArchSuffix
|
||||
#optional
|
||||
devel:libQt5Core$secondaryArchSuffix
|
||||
@@ -118,8 +126,14 @@ BUILD_PREREQUIRES="
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:make
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
cmd:python3
|
||||
cmd:linguist$secondaryArchSuffix >= 5
|
||||
cmd:rsvg_convert
|
||||
sphinx_python310
|
||||
"
|
||||
|
||||
TEST_REQUIRES="
|
||||
qthaikuplugins$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD()
|
||||
@@ -128,7 +142,8 @@ BUILD()
|
||||
-DCMAKE_INSTALL_BINDIR=$commandBinDir \
|
||||
-DINCLUDE_INSTALL_DIR=$includeDir \
|
||||
-DSYSCONF_INSTALL_DIR=$settingsDir \
|
||||
-DCMAKE_BUILD_TYPE=Release -Wno-dev
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DWITH_DOC=ON -Wno-dev
|
||||
make -C build $jobArgs
|
||||
}
|
||||
|
||||
@@ -167,9 +182,14 @@ INSTALL()
|
||||
|
||||
packageEntries devel \
|
||||
$developDir
|
||||
|
||||
packageEntries doc \
|
||||
$documentationDir
|
||||
}
|
||||
|
||||
TEST()
|
||||
{
|
||||
make -C build test
|
||||
# 75% tests passed, 14 tests failed out of 57
|
||||
# 1 test nuked, 3 test crashed
|
||||
ctest --test-dir build --output-on-failure
|
||||
}
|
||||
|
||||
@@ -1,103 +1,103 @@
|
||||
From f6737becbfd3904461ed60eb7fcb9a047b47e094 Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Weber <weberd@outlook.de>
|
||||
Date: Sat, 3 Feb 2024 23:59:04 +0100
|
||||
Subject: Adapt Patch to 3.11.1
|
||||
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 9d65f50..dc3b84a 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -206,7 +206,7 @@ if(BUILD_CLIENT)
|
||||
find_package(Sparkle)
|
||||
endif()
|
||||
|
||||
- if(UNIX AND NOT APPLE)
|
||||
From e4a85ae5822d5bbde0671edecd8d3ec1646994b8 Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Weber <weberd@outlook.de>
|
||||
Date: Sat, 3 Feb 2024 23:59:04 +0100
|
||||
Subject: Adapt Patch to 3.11.1
|
||||
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 9d65f50..c70470c 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -206,7 +206,7 @@ if(BUILD_CLIENT)
|
||||
find_package(Sparkle)
|
||||
endif()
|
||||
|
||||
- if(UNIX AND NOT APPLE)
|
||||
+ if(UNIX AND NOT APPLE AND NOT HAIKU)
|
||||
find_package(Inotify REQUIRED)
|
||||
endif()
|
||||
find_package(Sphinx)
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index bf3ff9a..c7cdeaa 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -68,7 +68,7 @@ if(NOT TOKEN_AUTH_ONLY)
|
||||
endif()
|
||||
|
||||
# TODO: Mingw64 7.3 might also need to be excluded here as it seems to not automatically link libssp
|
||||
-if(NOT MSVC)
|
||||
find_package(Inotify REQUIRED)
|
||||
endif()
|
||||
find_package(Sphinx)
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index bf3ff9a..27f170b 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -68,7 +68,7 @@ if(NOT TOKEN_AUTH_ONLY)
|
||||
endif()
|
||||
|
||||
# TODO: Mingw64 7.3 might also need to be excluded here as it seems to not automatically link libssp
|
||||
-if(NOT MSVC)
|
||||
+if(NOT MSVC AND NOT HAIKU)
|
||||
if(NOT (CMAKE_SYSTEM_PROCESSOR MATCHES "^(alpha|parisc|hppa)") AND NOT CMAKE_CROSSCOMPILING)
|
||||
if((CMAKE_CXX_COMPILER_ID MATCHES "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9))
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector --param=ssp-buffer-size=4")
|
||||
diff --git a/src/common/common.cmake b/src/common/common.cmake
|
||||
index 1265427..028aeac 100644
|
||||
--- a/src/common/common.cmake
|
||||
+++ b/src/common/common.cmake
|
||||
@@ -25,7 +25,11 @@ elseif(APPLE)
|
||||
list(APPEND common_SOURCES
|
||||
${CMAKE_CURRENT_LIST_DIR}/utility_mac.mm
|
||||
)
|
||||
-elseif(UNIX AND NOT APPLE)
|
||||
if(NOT (CMAKE_SYSTEM_PROCESSOR MATCHES "^(alpha|parisc|hppa)") AND NOT CMAKE_CROSSCOMPILING)
|
||||
if((CMAKE_CXX_COMPILER_ID MATCHES "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9))
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector --param=ssp-buffer-size=4")
|
||||
diff --git a/src/common/common.cmake b/src/common/common.cmake
|
||||
index 1265427..586ff66 100644
|
||||
--- a/src/common/common.cmake
|
||||
+++ b/src/common/common.cmake
|
||||
@@ -25,7 +25,11 @@ elseif(APPLE)
|
||||
list(APPEND common_SOURCES
|
||||
${CMAKE_CURRENT_LIST_DIR}/utility_mac.mm
|
||||
)
|
||||
-elseif(UNIX AND NOT APPLE)
|
||||
+elseif(HAIKU)
|
||||
+ list(APPEND common_SOURCES
|
||||
+ ${CMAKE_CURRENT_LIST_DIR}/utility_haiku.cpp
|
||||
+ )
|
||||
+elseif(UNIX AND NOT APPLE AND NOT HAIKU)
|
||||
list(APPEND common_SOURCES
|
||||
${CMAKE_CURRENT_LIST_DIR}/utility_unix.cpp
|
||||
)
|
||||
diff --git a/src/common/utility.cpp b/src/common/utility.cpp
|
||||
index e4eff93..2c06960 100644
|
||||
--- a/src/common/utility.cpp
|
||||
+++ b/src/common/utility.cpp
|
||||
@@ -45,6 +45,12 @@
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
list(APPEND common_SOURCES
|
||||
${CMAKE_CURRENT_LIST_DIR}/utility_unix.cpp
|
||||
)
|
||||
diff --git a/src/common/utility.cpp b/src/common/utility.cpp
|
||||
index e4eff93..6e1656a 100644
|
||||
--- a/src/common/utility.cpp
|
||||
+++ b/src/common/utility.cpp
|
||||
@@ -45,6 +45,12 @@
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
+#ifdef Q_OS_HAIKU
|
||||
+#include <sys/statvfs.h>
|
||||
+#include <sys/types.h>
|
||||
+#include <unistd.h>
|
||||
+#endif
|
||||
+
|
||||
#include <cmath>
|
||||
#include <cstdarg>
|
||||
#include <cstring>
|
||||
@@ -153,6 +159,8 @@ static QLatin1String platform()
|
||||
return QLatin1String("DragonFlyBSD");
|
||||
#elif defined(Q_OS_FREEBSD) || defined(Q_OS_FREEBSD_KERNEL)
|
||||
return QLatin1String("FreeBSD");
|
||||
#include <cmath>
|
||||
#include <cstdarg>
|
||||
#include <cstring>
|
||||
@@ -153,6 +159,8 @@ static QLatin1String platform()
|
||||
return QLatin1String("DragonFlyBSD");
|
||||
#elif defined(Q_OS_FREEBSD) || defined(Q_OS_FREEBSD_KERNEL)
|
||||
return QLatin1String("FreeBSD");
|
||||
+#elif defined(Q_OS_HAIKU)
|
||||
+ return QLatin1String("Haiku");
|
||||
#elif defined(Q_OS_NETBSD)
|
||||
return QLatin1String("NetBSD");
|
||||
#elif defined(Q_OS_OPENBSD)
|
||||
@@ -186,7 +194,7 @@ QByteArray Utility::friendlyUserAgentString()
|
||||
|
||||
qint64 Utility::freeDiskSpace(const QString &path)
|
||||
{
|
||||
-#if defined(Q_OS_MAC) || defined(Q_OS_FREEBSD) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_NETBSD) || defined(Q_OS_OPENBSD)
|
||||
#elif defined(Q_OS_NETBSD)
|
||||
return QLatin1String("NetBSD");
|
||||
#elif defined(Q_OS_OPENBSD)
|
||||
@@ -186,7 +194,7 @@ QByteArray Utility::friendlyUserAgentString()
|
||||
|
||||
qint64 Utility::freeDiskSpace(const QString &path)
|
||||
{
|
||||
-#if defined(Q_OS_MAC) || defined(Q_OS_FREEBSD) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_NETBSD) || defined(Q_OS_OPENBSD)
|
||||
+#if defined(Q_OS_MAC) || defined(Q_OS_FREEBSD) || defined(Q_OS_FREEBSD_KERNEL) || defined(Q_OS_HAIKU) || defined(Q_OS_NETBSD) || defined(Q_OS_OPENBSD)
|
||||
struct statvfs stat;
|
||||
if (statvfs(path.toLocal8Bit().data(), &stat) == 0) {
|
||||
return (qint64)stat.f_bavail * stat.f_frsize;
|
||||
diff --git a/src/common/utility.h b/src/common/utility.h
|
||||
index bd62a5d..f021849 100644
|
||||
--- a/src/common/utility.h
|
||||
+++ b/src/common/utility.h
|
||||
@@ -134,6 +134,7 @@ namespace Utility {
|
||||
inline bool isUnix();
|
||||
inline bool isLinux(); // use with care
|
||||
inline bool isBSD(); // use with care, does not match OS X
|
||||
struct statvfs stat;
|
||||
if (statvfs(path.toLocal8Bit().data(), &stat) == 0) {
|
||||
return (qint64)stat.f_bavail * stat.f_frsize;
|
||||
diff --git a/src/common/utility.h b/src/common/utility.h
|
||||
index bd62a5d..889d850 100644
|
||||
--- a/src/common/utility.h
|
||||
+++ b/src/common/utility.h
|
||||
@@ -134,6 +134,7 @@ namespace Utility {
|
||||
inline bool isUnix();
|
||||
inline bool isLinux(); // use with care
|
||||
inline bool isBSD(); // use with care, does not match OS X
|
||||
+ inline bool isHaiku();
|
||||
|
||||
OCSYNC_EXPORT QString platformName();
|
||||
// crash helper for --debug
|
||||
@@ -341,5 +342,14 @@ inline bool Utility::isBSD()
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
OCSYNC_EXPORT QString platformName();
|
||||
// crash helper for --debug
|
||||
@@ -341,5 +342,14 @@ inline bool Utility::isBSD()
|
||||
#endif
|
||||
}
|
||||
|
||||
+inline bool Utility::isHaiku()
|
||||
+{
|
||||
+#if defined(Q_OS_HAIKU)
|
||||
@@ -107,14 +107,14 @@ index bd62a5d..f021849 100644
|
||||
+#endif
|
||||
+}
|
||||
+
|
||||
}
|
||||
#endif // UTILITY_H
|
||||
diff --git a/src/common/utility_haiku.cpp b/src/common/utility_haiku.cpp
|
||||
new file mode 100644
|
||||
index 0000000..fa876e4
|
||||
--- /dev/null
|
||||
+++ b/src/common/utility_haiku.cpp
|
||||
@@ -0,0 +1,125 @@
|
||||
}
|
||||
#endif // UTILITY_H
|
||||
diff --git a/src/common/utility_haiku.cpp b/src/common/utility_haiku.cpp
|
||||
new file mode 100644
|
||||
index 0000000..7017f15
|
||||
--- /dev/null
|
||||
+++ b/src/common/utility_haiku.cpp
|
||||
@@ -0,0 +1,125 @@
|
||||
+/*
|
||||
+ * Copyright (C) by Klaas Freitag <freitag@owncloud.com>
|
||||
+ * Copyright (C) by Daniel Molkentin <danimo@owncloud.com>
|
||||
@@ -240,93 +240,93 @@ index 0000000..fa876e4
|
||||
+}
|
||||
+
|
||||
+} // namespace OCC
|
||||
diff --git a/src/csync/CMakeLists.txt b/src/csync/CMakeLists.txt
|
||||
index 382eab2..455e820 100644
|
||||
--- a/src/csync/CMakeLists.txt
|
||||
+++ b/src/csync/CMakeLists.txt
|
||||
@@ -72,7 +72,7 @@ generate_export_header(nextcloud_csync
|
||||
target_link_libraries(nextcloud_csync
|
||||
PUBLIC
|
||||
${CSYNC_REQUIRED_LIBRARIES}
|
||||
- Qt5::Core Qt5::Concurrent
|
||||
diff --git a/src/csync/CMakeLists.txt b/src/csync/CMakeLists.txt
|
||||
index 382eab2..12ac638 100644
|
||||
--- a/src/csync/CMakeLists.txt
|
||||
+++ b/src/csync/CMakeLists.txt
|
||||
@@ -72,7 +72,7 @@ generate_export_header(nextcloud_csync
|
||||
target_link_libraries(nextcloud_csync
|
||||
PUBLIC
|
||||
${CSYNC_REQUIRED_LIBRARIES}
|
||||
- Qt5::Core Qt5::Concurrent
|
||||
+ Qt5::Core Qt5::Concurrent be
|
||||
)
|
||||
|
||||
if(ZLIB_FOUND)
|
||||
diff --git a/src/csync/std/c_private.h b/src/csync/std/c_private.h
|
||||
index 8307859..0ddcaa8 100644
|
||||
--- a/src/csync/std/c_private.h
|
||||
+++ b/src/csync/std/c_private.h
|
||||
@@ -85,7 +85,7 @@ using csync_stat_t = struct stat;
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_LSTAT
|
||||
-#define lstat _stat
|
||||
)
|
||||
|
||||
if(ZLIB_FOUND)
|
||||
diff --git a/src/csync/std/c_private.h b/src/csync/std/c_private.h
|
||||
index 8307859..b21d12c 100644
|
||||
--- a/src/csync/std/c_private.h
|
||||
+++ b/src/csync/std/c_private.h
|
||||
@@ -85,7 +85,7 @@ using csync_stat_t = struct stat;
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_LSTAT
|
||||
-#define lstat _stat
|
||||
+#define lstat stat
|
||||
#endif
|
||||
|
||||
/* tchar definitions for clean win32 filenames */
|
||||
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
|
||||
index 1968683..e81b1fe 100644
|
||||
--- a/src/gui/CMakeLists.txt
|
||||
+++ b/src/gui/CMakeLists.txt
|
||||
@@ -311,7 +311,7 @@ IF( APPLE )
|
||||
endif()
|
||||
ENDIF()
|
||||
|
||||
-IF( NOT WIN32 AND NOT APPLE )
|
||||
#endif
|
||||
|
||||
/* tchar definitions for clean win32 filenames */
|
||||
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
|
||||
index 1968683..8c5af95 100644
|
||||
--- a/src/gui/CMakeLists.txt
|
||||
+++ b/src/gui/CMakeLists.txt
|
||||
@@ -311,7 +311,7 @@ IF( APPLE )
|
||||
endif()
|
||||
ENDIF()
|
||||
|
||||
-IF( NOT WIN32 AND NOT APPLE )
|
||||
+IF( NOT WIN32 AND NOT APPLE AND NOT HAIKU )
|
||||
set(client_SRCS ${client_SRCS} folderwatcher_linux.cpp)
|
||||
ENDIF()
|
||||
IF( WIN32 )
|
||||
@@ -320,6 +320,9 @@ ENDIF()
|
||||
IF( APPLE )
|
||||
list(APPEND client_SRCS folderwatcher_mac.cpp)
|
||||
ENDIF()
|
||||
set(client_SRCS ${client_SRCS} folderwatcher_linux.cpp)
|
||||
ENDIF()
|
||||
IF( WIN32 )
|
||||
@@ -320,6 +320,9 @@ ENDIF()
|
||||
IF( APPLE )
|
||||
list(APPEND client_SRCS folderwatcher_mac.cpp)
|
||||
ENDIF()
|
||||
+IF( APPLE )
|
||||
+list(APPEND client_SRCS folderwatcher_haiku.cpp)
|
||||
+ENDIF()
|
||||
|
||||
set(3rdparty_SRC
|
||||
../3rdparty/QProgressIndicator/QProgressIndicator.h
|
||||
@@ -537,6 +540,7 @@ target_link_libraries(nextcloudCore
|
||||
Qt5::Quick
|
||||
Qt5::QuickControls2
|
||||
KF5::Archive
|
||||
|
||||
set(3rdparty_SRC
|
||||
../3rdparty/QProgressIndicator/QProgressIndicator.h
|
||||
@@ -537,6 +540,7 @@ target_link_libraries(nextcloudCore
|
||||
Qt5::Quick
|
||||
Qt5::QuickControls2
|
||||
KF5::Archive
|
||||
+ be
|
||||
)
|
||||
|
||||
add_subdirectory(socketapi)
|
||||
diff --git a/src/gui/folderwatcher.cpp b/src/gui/folderwatcher.cpp
|
||||
index 0743646..5d01a95 100644
|
||||
--- a/src/gui/folderwatcher.cpp
|
||||
+++ b/src/gui/folderwatcher.cpp
|
||||
@@ -23,6 +23,8 @@
|
||||
#include "folderwatcher_win.h"
|
||||
#elif defined(Q_OS_MAC)
|
||||
#include "folderwatcher_mac.h"
|
||||
)
|
||||
|
||||
add_subdirectory(socketapi)
|
||||
diff --git a/src/gui/folderwatcher.cpp b/src/gui/folderwatcher.cpp
|
||||
index 0743646..0ed8ae5 100644
|
||||
--- a/src/gui/folderwatcher.cpp
|
||||
+++ b/src/gui/folderwatcher.cpp
|
||||
@@ -23,6 +23,8 @@
|
||||
#include "folderwatcher_win.h"
|
||||
#elif defined(Q_OS_MAC)
|
||||
#include "folderwatcher_mac.h"
|
||||
+#elif defined(Q_OS_HAIKU)
|
||||
+#include "folderwatcher_haiku.h"
|
||||
#elif defined(Q_OS_UNIX)
|
||||
#include "folderwatcher_linux.h"
|
||||
#endif
|
||||
@@ -128,6 +130,10 @@ void FolderWatcher::startNotificatonTest(const QString &path)
|
||||
return;
|
||||
#endif
|
||||
|
||||
#elif defined(Q_OS_UNIX)
|
||||
#include "folderwatcher_linux.h"
|
||||
#endif
|
||||
@@ -128,6 +130,10 @@ void FolderWatcher::startNotificatonTest(const QString &path)
|
||||
return;
|
||||
#endif
|
||||
|
||||
+#ifdef Q_OS_HAIKU
|
||||
+ return;
|
||||
+#endif
|
||||
+
|
||||
Q_ASSERT(_testNotificationPath.isEmpty());
|
||||
_testNotificationPath = path;
|
||||
|
||||
diff --git a/src/gui/folderwatcher_haiku.cpp b/src/gui/folderwatcher_haiku.cpp
|
||||
new file mode 100644
|
||||
index 0000000..21e6fe4
|
||||
--- /dev/null
|
||||
+++ b/src/gui/folderwatcher_haiku.cpp
|
||||
@@ -0,0 +1,144 @@
|
||||
Q_ASSERT(_testNotificationPath.isEmpty());
|
||||
_testNotificationPath = path;
|
||||
|
||||
diff --git a/src/gui/folderwatcher_haiku.cpp b/src/gui/folderwatcher_haiku.cpp
|
||||
new file mode 100644
|
||||
index 0000000..2990d66
|
||||
--- /dev/null
|
||||
+++ b/src/gui/folderwatcher_haiku.cpp
|
||||
@@ -0,0 +1,144 @@
|
||||
+/*
|
||||
+ * Copyright (C) by François Revol <revol@free.fr>
|
||||
+ *
|
||||
@@ -471,12 +471,12 @@ index 0000000..21e6fe4
|
||||
+
|
||||
+
|
||||
+} // ns mirall
|
||||
diff --git a/src/gui/folderwatcher_haiku.h b/src/gui/folderwatcher_haiku.h
|
||||
new file mode 100644
|
||||
index 0000000..6bf7091
|
||||
--- /dev/null
|
||||
+++ b/src/gui/folderwatcher_haiku.h
|
||||
@@ -0,0 +1,69 @@
|
||||
diff --git a/src/gui/folderwatcher_haiku.h b/src/gui/folderwatcher_haiku.h
|
||||
new file mode 100644
|
||||
index 0000000..56535ed
|
||||
--- /dev/null
|
||||
+++ b/src/gui/folderwatcher_haiku.h
|
||||
@@ -0,0 +1,69 @@
|
||||
+/*
|
||||
+ * Copyright (C) by François Revol <revol@free.fr>
|
||||
+ *
|
||||
@@ -546,24 +546,24 @@ index 0000000..6bf7091
|
||||
+ WatcherHandler *_handler;
|
||||
+};
|
||||
+}
|
||||
diff --git a/src/gui/socketapi/socketapi.cpp b/src/gui/socketapi/socketapi.cpp
|
||||
index 1df11cf..a5cf142 100644
|
||||
--- a/src/gui/socketapi/socketapi.cpp
|
||||
+++ b/src/gui/socketapi/socketapi.cpp
|
||||
@@ -265,7 +265,7 @@ SocketApi::SocketApi(QObject *parent)
|
||||
_system(QStringLiteral("pluginkit"), { QStringLiteral("-e"), QStringLiteral("use"), QStringLiteral("-i"), QStringLiteral(APPLICATION_REV_DOMAIN ".FinderSyncExt") });
|
||||
|
||||
#endif
|
||||
- } else if (Utility::isLinux() || Utility::isBSD()) {
|
||||
diff --git a/src/gui/socketapi/socketapi.cpp b/src/gui/socketapi/socketapi.cpp
|
||||
index 1df11cf..0eb993d 100644
|
||||
--- a/src/gui/socketapi/socketapi.cpp
|
||||
+++ b/src/gui/socketapi/socketapi.cpp
|
||||
@@ -265,7 +265,7 @@ SocketApi::SocketApi(QObject *parent)
|
||||
_system(QStringLiteral("pluginkit"), { QStringLiteral("-e"), QStringLiteral("use"), QStringLiteral("-i"), QStringLiteral(APPLICATION_REV_DOMAIN ".FinderSyncExt") });
|
||||
|
||||
#endif
|
||||
- } else if (Utility::isLinux() || Utility::isBSD()) {
|
||||
+ } else if (Utility::isLinux() || Utility::isBSD() || Utility::isHaiku()) {
|
||||
QString runtimeDir;
|
||||
runtimeDir = QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation);
|
||||
socketPath = runtimeDir + "/" + Theme::instance()->appName() + "/socket";
|
||||
diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml
|
||||
index 75380d5..3d8fdc7 100644
|
||||
--- a/src/gui/tray/Window.qml
|
||||
+++ b/src/gui/tray/Window.qml
|
||||
@@ -80,7 +80,7 @@ ApplicationWindow {
|
||||
QString runtimeDir;
|
||||
runtimeDir = QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation);
|
||||
socketPath = runtimeDir + "/" + Theme::instance()->appName() + "/socket";
|
||||
diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml
|
||||
index 75380d5..3d8fdc7 100644
|
||||
--- a/src/gui/tray/Window.qml
|
||||
+++ b/src/gui/tray/Window.qml
|
||||
@@ -80,7 +80,7 @@ ApplicationWindow {
|
||||
}
|
||||
|
||||
background: Rectangle {
|
||||
@@ -572,7 +572,7 @@ index 75380d5..3d8fdc7 100644
|
||||
border.width: Style.trayWindowBorderWidth
|
||||
border.color: palette.dark
|
||||
color: palette.window
|
||||
@@ -132,7 +132,7 @@ ApplicationWindow {
|
||||
@@ -132,7 +132,7 @@ ApplicationWindow {
|
||||
}
|
||||
}
|
||||
|
||||
@@ -581,7 +581,7 @@ index 75380d5..3d8fdc7 100644
|
||||
anchors.fill: parent
|
||||
anchors.margins: Style.trayWindowBorderWidth
|
||||
source: ShaderEffectSource {
|
||||
@@ -145,7 +145,7 @@ ApplicationWindow {
|
||||
@@ -145,7 +145,7 @@ ApplicationWindow {
|
||||
radius: Systray.useNormalWindow ? 0.0 : Style.trayWindowRadius
|
||||
}
|
||||
}
|
||||
@@ -590,76 +590,109 @@ index 75380d5..3d8fdc7 100644
|
||||
Drawer {
|
||||
id: userStatusDrawer
|
||||
width: parent.width
|
||||
diff --git a/src/libsync/filesystem.cpp b/src/libsync/filesystem.cpp
|
||||
index 7c58c7b..ff638e5 100644
|
||||
--- a/src/libsync/filesystem.cpp
|
||||
+++ b/src/libsync/filesystem.cpp
|
||||
@@ -20,6 +20,7 @@
|
||||
#include <QDir>
|
||||
#include <QDirIterator>
|
||||
#include <QCoreApplication>
|
||||
diff --git a/src/libsync/filesystem.cpp b/src/libsync/filesystem.cpp
|
||||
index 7c58c7b..a52a9af 100644
|
||||
--- a/src/libsync/filesystem.cpp
|
||||
+++ b/src/libsync/filesystem.cpp
|
||||
@@ -20,6 +20,7 @@
|
||||
#include <QDir>
|
||||
#include <QDirIterator>
|
||||
#include <QCoreApplication>
|
||||
+#include <sys/time.h>
|
||||
|
||||
#include "csync.h"
|
||||
#include "vio/csync_vio_local.h"
|
||||
@@ -74,7 +75,7 @@ bool FileSystem::setModTime(const QString &filename, time_t modTime)
|
||||
struct timeval times[2];
|
||||
times[0].tv_sec = times[1].tv_sec = modTime;
|
||||
times[0].tv_usec = times[1].tv_usec = 0;
|
||||
- int rc = c_utimes(filename, times);
|
||||
|
||||
#include "csync.h"
|
||||
#include "vio/csync_vio_local.h"
|
||||
@@ -74,7 +75,7 @@ bool FileSystem::setModTime(const QString &filename, time_t modTime)
|
||||
struct timeval times[2];
|
||||
times[0].tv_sec = times[1].tv_sec = modTime;
|
||||
times[0].tv_usec = times[1].tv_usec = 0;
|
||||
- int rc = c_utimes(filename, times);
|
||||
+ int rc = -1; // c_utimes(filename, times);
|
||||
if (rc != 0) {
|
||||
qCWarning(lcFileSystem) << "Error setting mtime for" << filename
|
||||
<< "failed: rc" << rc << ", errno:" << errno;
|
||||
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
|
||||
index 44396f2..63681d2 100644
|
||||
--- a/test/CMakeLists.txt
|
||||
+++ b/test/CMakeLists.txt
|
||||
@@ -93,7 +93,7 @@ else()
|
||||
nextcloud_build_test(E2eFileTransfer)
|
||||
endif()
|
||||
|
||||
-if( UNIX AND NOT APPLE )
|
||||
if (rc != 0) {
|
||||
qCWarning(lcFileSystem) << "Error setting mtime for" << filename
|
||||
<< "failed: rc" << rc << ", errno:" << errno;
|
||||
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
|
||||
index 44396f2..1293fb7 100644
|
||||
--- a/test/CMakeLists.txt
|
||||
+++ b/test/CMakeLists.txt
|
||||
@@ -93,7 +93,7 @@ else()
|
||||
nextcloud_build_test(E2eFileTransfer)
|
||||
endif()
|
||||
|
||||
-if( UNIX AND NOT APPLE )
|
||||
+if( UNIX AND NOT APPLE AND NOT HAIKU )
|
||||
nextcloud_add_test(InotifyWatcher)
|
||||
endif(UNIX AND NOT APPLE)
|
||||
|
||||
diff --git a/test/testfolderwatcher.cpp b/test/testfolderwatcher.cpp
|
||||
index d57358d..ccf19b6 100644
|
||||
--- a/test/testfolderwatcher.cpp
|
||||
+++ b/test/testfolderwatcher.cpp
|
||||
@@ -264,7 +264,7 @@ private slots:
|
||||
}
|
||||
};
|
||||
|
||||
-#ifdef Q_OS_MAC
|
||||
nextcloud_add_test(InotifyWatcher)
|
||||
endif(UNIX AND NOT APPLE)
|
||||
|
||||
diff --git a/test/testfolderwatcher.cpp b/test/testfolderwatcher.cpp
|
||||
index d57358d..7770d2f 100644
|
||||
--- a/test/testfolderwatcher.cpp
|
||||
+++ b/test/testfolderwatcher.cpp
|
||||
@@ -264,7 +264,7 @@ private slots:
|
||||
}
|
||||
};
|
||||
|
||||
-#ifdef Q_OS_MAC
|
||||
+#ifdef Q_OS_HAIKU
|
||||
QTEST_MAIN(TestFolderWatcher)
|
||||
#else
|
||||
QTEST_GUILESS_MAIN(TestFolderWatcher)
|
||||
--
|
||||
2.42.1
|
||||
|
||||
|
||||
From b27e014efb1059381077ba6960dc3bc2ed38cd44 Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Weber <daniel.weber@vivaldi.net>
|
||||
Date: Sun, 4 Feb 2024 00:09:35 +0100
|
||||
Subject: Haiku not Apple
|
||||
|
||||
|
||||
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
|
||||
index e81b1fe..5a01b92 100644
|
||||
--- a/src/gui/CMakeLists.txt
|
||||
+++ b/src/gui/CMakeLists.txt
|
||||
@@ -320,7 +320,7 @@ ENDIF()
|
||||
IF( APPLE )
|
||||
list(APPEND client_SRCS folderwatcher_mac.cpp)
|
||||
ENDIF()
|
||||
QTEST_MAIN(TestFolderWatcher)
|
||||
#else
|
||||
QTEST_GUILESS_MAIN(TestFolderWatcher)
|
||||
--
|
||||
2.45.2
|
||||
|
||||
|
||||
From 9a4e91bed5ea9973de0c80fd104480b8839d56d0 Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Weber <daniel.weber@vivaldi.net>
|
||||
Date: Sun, 4 Feb 2024 00:09:35 +0100
|
||||
Subject: Haiku not Apple
|
||||
|
||||
|
||||
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
|
||||
index 8c5af95..e24b838 100644
|
||||
--- a/src/gui/CMakeLists.txt
|
||||
+++ b/src/gui/CMakeLists.txt
|
||||
@@ -320,7 +320,7 @@ ENDIF()
|
||||
IF( APPLE )
|
||||
list(APPEND client_SRCS folderwatcher_mac.cpp)
|
||||
ENDIF()
|
||||
-IF( APPLE )
|
||||
+IF( HAIKU )
|
||||
list(APPEND client_SRCS folderwatcher_haiku.cpp)
|
||||
ENDIF()
|
||||
|
||||
--
|
||||
2.42.1
|
||||
|
||||
|
||||
--
|
||||
2.45.2
|
||||
|
||||
|
||||
From 99f0f0e4da567f235d6616ce159fba1d77ee538d Mon Sep 17 00:00:00 2001
|
||||
From: Schrijvers Luc <begasus@gmail.com>
|
||||
Date: Tue, 27 Aug 2024 09:30:26 +0200
|
||||
Subject: Fix documantation path
|
||||
|
||||
|
||||
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
|
||||
index 4e9b638..0a09650 100644
|
||||
--- a/doc/CMakeLists.txt
|
||||
+++ b/doc/CMakeLists.txt
|
||||
@@ -11,7 +11,11 @@ if(SPHINX_FOUND)
|
||||
# assets
|
||||
set(LATEX_LOGO "${CMAKE_CURRENT_SOURCE_DIR}/logo-blue.pdf")
|
||||
|
||||
+if(HAIKU)
|
||||
+ set(APPLICATION_DOC_DIR "${CMAKE_INSTALL_DOCDIR}")
|
||||
+else()
|
||||
set(APPLICATION_DOC_DIR "${CMAKE_INSTALL_DOCDIR}/${PACKAGE}")
|
||||
+endif(HAIKU)
|
||||
install(DIRECTORY ${SPHINX_HTML_DIR} DESTINATION ${APPLICATION_DOC_DIR} OPTIONAL)
|
||||
install(DIRECTORY ${SPHINX_PDF_DIR} DESTINATION ${APPLICATION_DOC_DIR} OPTIONAL)
|
||||
install(DIRECTORY ${SPHINX_QCH_DIR} DESTINATION ${APPLICATION_DOC_DIR} OPTIONAL)
|
||||
@@ -90,4 +94,4 @@ if(SPHINX_FOUND)
|
||||
${SPHINX_HTMLHELP_DIR} )
|
||||
add_custom_target( doc-chm pushd ${SPHINX_HTMLHELP_DIR}; ${MSHTML_COMPILER} *.hhp; popd
|
||||
DEPENDS doc-chm-sphinx )
|
||||
-endif(SPHINX_FOUND)
|
||||
\ No newline at end of file
|
||||
+endif(SPHINX_FOUND)
|
||||
--
|
||||
2.45.2
|
||||
|
||||
|
||||
Reference in New Issue
Block a user