cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to owncloudclient-3.0.0.9215

Browse Source
This commit is contained in:
kirby 2023-01-15 10:39:35 +00:00
parent ba03b57a13
commit 9defe5c902
10 changed files with 90 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
net/owncloudclient/Makefile
View File

@ -1,11 +1,12 @@
COMMENT = owncloud sync client
V = 2.11.1.8946
V = 3.0.0.9215
DISTNAME = ownCloud-${V}
PKGNAME = owncloudclient-${V}
SHARED_LIBS += owncloudsync 7.2
SHARED_LIBS += owncloud_csync 1.1
SHARED_LIBS += owncloudsync 8.0
SHARED_LIBS += owncloud_csync 2.0
SHARED_LIBS += owncloudResources 0.0
CATEGORIES = net
@ -39,7 +40,9 @@ CONFIGURE_ARGS += -Wno-dev \
-DKDE_INSTALL_PLUGINDIR=${PREFIX}/lib/ownCloud/plugins/ \
-DCMAKE_DISABLE_FIND_PACKAGE_KF5=TRUE \
-DCMAKE_DISABLE_FIND_PACKAGE_CMocka=TRUE \
-DCSYNC_REQUIRED_LIBRARIES=c
-DCSYNC_REQUIRED_LIBRARIES=c \
-DWITH_AUTO_UPDATER=FALSE \
-DWITH_LIBCLOUDPROVIDERS=FALSE
CFLAGS += -I${LOCALBASE}/include -I${LOCALBASE}/include/qtkeychain
CXXFLAGS += -I${LOCALBASE}/include -I${LOCALBASE}/include/qtkeychain

4
net/owncloudclient/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (ownCloud-2.11.1.8946.tar.xz) = tkNGcoKXQrxBBksX/IqsYAVjm9VQNmrU8lAKRH2B7zg=
SIZE (ownCloud-2.11.1.8946.tar.xz) = 5654496
SHA256 (ownCloud-3.0.0.9215.tar.xz) = cORFiyMEEX1jKQJIW4eqFAkwIFoXcP18PZTn6Zi1y+U=
SIZE (ownCloud-3.0.0.9215.tar.xz) = 5676836

2
net/owncloudclient/patches/patch-src_common_utility_cpp
View File

@ -1,7 +1,7 @@
Index: src/common/utility.cpp
--- src/common/utility.cpp.orig
+++ src/common/utility.cpp
@@ -220,8 +220,8 @@ qint64 Utility::freeDiskSpace(const QString &path)
@@ -163,8 +163,8 @@ qint64 Utility::freeDiskSpace(const QString &path)
return (qint64)stat.f_bavail * stat.f_frsize;
}
#elif defined(Q_OS_UNIX)

16
net/owncloudclient/patches/patch-src_common_utility_h Normal file
View File

@ -0,0 +1,16 @@
Upstream commit 2d6b2d3c036f44a5c2a9e58321364c210401ff12
Index: src/common/utility.h
--- src/common/utility.h.orig
+++ src/common/utility.h
@@ -381,10 +381,8 @@ OCSYNC_EXPORT Q_DECLARE_LOGGING_CATEGORY(lcUtility)
}
-#ifdef Q_OS_LINUX
OCSYNC_EXPORT QString appImageLocation();
OCSYNC_EXPORT bool runningInAppImage();
-#endif
} // Utility namespace
/** @} */ // \addtogroup

28
net/owncloudclient/patches/patch-src_common_utility_unix_cpp Normal file
View File

@ -0,0 +1,28 @@
Upstream commit 2d6b2d3c036f44a5c2a9e58321364c210401ff12
Index: src/common/utility_unix.cpp
--- src/common/utility_unix.cpp.orig
+++ src/common/utility_unix.cpp
@@ -111,18 +111,20 @@ void Utility::setLaunchOnStartup(const QString &appNam
}
}
-#ifdef Q_OS_LINUX
QString Utility::appImageLocation()
{
+#ifdef Q_OS_LINUX
static const auto value = qEnvironmentVariable("APPIMAGE");
return value;
+#else
+ return QString();
+#endif
}
bool Utility::runningInAppImage()
{
return !Utility::appImageLocation().isEmpty();
}
-#endif
bool Utility::hasDarkSystray()
{

12
net/owncloudclient/patches/patch-src_csync_ConfigureChecks_cmake
View File

@ -1,12 +0,0 @@
Index: src/csync/ConfigureChecks.cmake
--- src/csync/ConfigureChecks.cmake.orig
+++ src/csync/ConfigureChecks.cmake
@@ -12,7 +12,7 @@ set(LIBDIR ${LIB_INSTALL_DIR})
set(SYSCONFDIR ${SYSCONF_INSTALL_DIR})
# HEADER FILES
-check_include_file(argp.h HAVE_ARGP_H)
+#check_include_file(argp.h HAVE_ARGP_H)
# FUNCTIONS
if (NOT LINUX)

14
net/owncloudclient/patches/patch-src_csync_std_c_private_h
View File

@ -1,14 +0,0 @@
Disable Thread-Local-Storage
Index: src/csync/std/c_private.h
--- src/csync/std/c_private.h.orig
+++ src/csync/std/c_private.h
@@ -138,7 +138,7 @@ typedef char mbchar_t;
#endif
/* FIXME: Implement TLS for OS X */
-#if defined(__GNUC__) && !defined(__APPLE__)
+#if defined(__GNUC__) && !defined(__APPLE__) && !defined(__OpenBSD__)
# define CSYNC_THREAD __thread
#elif defined(_MSC_VER)
# define CSYNC_THREAD __declspec(thread)

13
net/owncloudclient/patches/patch-src_gui_CMakeLists_txt
View File

@ -1,16 +1,21 @@
Index: src/gui/CMakeLists.txt
--- src/gui/CMakeLists.txt.orig
+++ src/gui/CMakeLists.txt
@@ -182,7 +182,11 @@ elseif(UNIX AND NOT APPLE )
@@ -156,9 +156,14 @@ elseif(UNIX AND NOT APPLE)
target_link_libraries(owncloudCore PUBLIC Qt5::DBus)
target_compile_definitions(owncloudCore PUBLIC "USE_FDO_NOTIFICATIONS")
endif()
- target_sources(owncloudCore PRIVATE folderwatcher_linux.cpp)
- target_sources(owncloudCore PRIVATE
- folderwatcher_linux.cpp
- guiutility_unix.cpp)
+
+ if(Inotify_FOUND)
+ target_sources(owncloudCore PRIVATE folderwatcher_linux.cpp)
+ target_sources(owncloudCore PRIVATE
+ folderwatcher_linux.cpp
+ guiutility_unix.cpp)
+ target_include_directories(owncloudCore PRIVATE ${Inotify_INCLUDE_DIRS})
+ target_link_libraries(owncloudCore PUBLIC ${Inotify_LIBRARIES} )
+ endif()
endif()
if(WITH_AUTO_UPDATER)

12
net/owncloudclient/patches/patch-src_libsync_platform_cpp Normal file
View File

@ -0,0 +1,12 @@
Index: src/libsync/platform.cpp
--- src/libsync/platform.cpp.orig
+++ src/libsync/platform.cpp
@@ -44,7 +44,7 @@ std::unique_ptr<Platform> Platform::create()
#if defined(Q_OS_WIN)
return std::make_unique<WinPlatform>();
-#elif defined(Q_OS_LINUX)
+#elif defined(Q_OS_UNIX)
return std::make_unique<UnixPlatform>();
#elif defined(Q_OS_MAC)
return std::make_unique<MacPlatform>();

27
net/owncloudclient/pkg/PLIST
View File

@ -5,22 +5,25 @@
@pkgpath net/owncloudclient,-qt5
@bin bin/owncloud
@bin bin/owncloudcmd
include/owncloudsync/
include/owncloudsync/creds/
include/owncloudsync/creds/abstractcredentials.h
include/owncloudsync/creds/httpcredentials.h
include/owncloudsync/mirall/
include/owncloudsync/mirall/account.h
include/owncloudsync/mirall/configfile.h
include/owncloudsync/mirall/networkjobs.h
include/owncloudsync/mirall/progressdispatcher.h
include/owncloudsync/mirall/syncengine.h
include/owncloudsync/mirall/syncfileitem.h
include/owncloudsync/mirall/syncresult.h
include/ownCloud/
include/ownCloud/common/
include/ownCloud/common/filesystembase.h
include/ownCloud/common/ocsynclib.h
include/ownCloud/common/utility.h
include/ownCloud/libsync/
include/ownCloud/libsync/accessmanager.h
include/ownCloud/libsync/logger.h
include/ownCloud/libsync/owncloudlib.h
lib/cmake/ownCloud/
lib/cmake/ownCloud/ownCloudConfig${MODCMAKE_BUILD_SUFFIX}
lib/cmake/ownCloud/ownCloudConfig.cmake
lib/cmake/ownCloud/ownCloudConfigVersion.cmake
@lib lib/libowncloudResources.so.${LIBowncloudResources_VERSION}
@lib lib/libowncloud_csync.so.${LIBowncloud_csync_VERSION}
@lib lib/libowncloudsync.so.${LIBowncloudsync_VERSION}
lib/ownCloud/
lib/ownCloud/plugins/
@so lib/ownCloud/plugins/owncloudsync_vfs_off.so
@so lib/ownCloud/plugins/owncloudsync_vfs_suffix.so
share/applications/owncloud.desktop
share/caja-python/