View | Details | Raw Unified | Return to bug 252813 | Differences between
and this patch

Collapse All | Expand All

(-)b/deskutils/owncloudclient/Makefile (-14 / +17 lines)
Lines 1-13 Link Here
1
# Created by: Mathieu Arnold
1
# Created by: Mathieu Arnold
2
2
3
PORTNAME=	owncloudclient
3
PORTNAME=	owncloudclient
4
DISTVERSION=	2.6.0
4
DISTVERSION=	2.8.2
5
DISTVERSIONSUFFIX=	.13018
5
DISTVERSIONSUFFIX=	.4246
6
CATEGORIES=	deskutils
6
CATEGORIES=	deskutils
7
MASTER_SITES=	https://download.owncloud.com/desktop/stable/
7
MASTER_SITES=	https://download.owncloud.com/desktop/ownCloud/stable/${DISTVERSION}${DISTVERSIONSUFFIX}/source/
8
# owncloudclient-2.6.0.13018.tar.xz
8
DISTNAME=	ownCloud-${DISTVERSION}${DISTVERSIONSUFFIX}
9
# owncloudclient-2.8.2.4246.tar.xz
9
10
10
MAINTAINER=	ports@FreeBSD.org
11
MAINTAINER=	daniel@morante.net
11
COMMENT=	OwnCloud Desktop Syncing Client
12
COMMENT=	OwnCloud Desktop Syncing Client
12
13
13
LICENSE=	GPLv2
14
LICENSE=	GPLv2
Lines 17-38 LIB_DEPENDS= libinotify.so:devel/libinotify \ Link Here
17
		libqt5keychain.so:security/qtkeychain
18
		libqt5keychain.so:security/qtkeychain
18
19
19
USES=		cmake:noninja compiler:c++11-lib gmake iconv kde:5 \
20
USES=		cmake:noninja compiler:c++11-lib gmake iconv kde:5 \
20
		localbase:ldflags pkgconfig qt:5 sqlite tar:xz
21
		localbase:ldflags pkgconfig qt:5 sqlite tar:xz desktop-file-utils \
22
		shared-mime-info
23
USE_KDE=	completion config coreaddons jobwidgets kio service widgetsaddons \
24
		windowsystem
25
USE_LDCONFIG=	yes
21
USE_QT=		buildtools_build concurrent core dbus gui linguist_build network \
26
USE_QT=		buildtools_build concurrent core dbus gui linguist_build network \
22
		qmake_build sql webkit widgets xml
27
		qmake_build sql webkit widgets xml
23
USE_KDE=	completion config coreaddons jobwidgets kio service widgetsaddons
28
24
CMAKE_ARGS=	-DBUILD_WITH_QT4:BOOL=OFF \
29
CMAKE_ARGS=	-DCMAKE_INSTALL_MANDIR:STRING=man \
25
		-DCMAKE_INSTALL_MANDIR:STRING=man \
30
		-DSYSCONF_INSTALL_DIR="${PREFIX}/etc"
26
		-DWITH_DOC:BOOL=OFF \
31
CMAKE_OFF=	BUILD_WITH_QT4 WITH_DOC WITH_STACK_PROTECTOR
27
		-DWITH_STACK_PROTECTOR:BOOL=OFF
32
28
USE_LDCONFIG=	yes
33
PLIST_SUB=	VERSION=${PORTVERSION}
29
34
30
OPTIONS_DEFINE=		DEBUG
35
OPTIONS_DEFINE=		DEBUG
31
36
32
DEBUG_CMAKE_ON=		-DCMAKE_BUILD_TYPE:STRING=Debug
37
DEBUG_CMAKE_ON=		-DCMAKE_BUILD_TYPE:STRING=Debug
33
38
34
PLIST_SUB=	VERSION=${PORTVERSION}
35
36
post-patch:
39
post-patch:
37
	@${REINPLACE_CMD} -e \
40
	@${REINPLACE_CMD} -e \
38
		's|.lst |.lst.sample |' ${WRKSRC}/CMakeLists.txt
41
		's|.lst |.lst.sample |' ${WRKSRC}/CMakeLists.txt
(-)b/deskutils/owncloudclient/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1575646063
1
TIMESTAMP = 1626836974
2
SHA256 (owncloudclient-2.6.0.13018.tar.xz) = e78e3286bccfac12fdc24d78fb60f760529d21b71846099fc762a8762b271f36
2
SHA256 (ownCloud-2.8.2.4246.tar.xz) = 0cc2e5154a1349bd21941ac3c32e8621778a9ff150730a19de2710e22d32fc43
3
SIZE (owncloudclient-2.6.0.13018.tar.xz) = 17311396
3
SIZE (ownCloud-2.8.2.4246.tar.xz) = 15044652
(-)b/deskutils/owncloudclient/files/patch-src_gui_owncloudgui.cpp (-3 / +3 lines)
Lines 1-8 Link Here
1
--- src/gui/owncloudgui.cpp.orig	2017-12-20 15:03:02 UTC
1
--- src/gui/owncloudgui.cpp.orig	2020-12-21 16:16:36 UTC
2
+++ src/gui/owncloudgui.cpp
2
+++ src/gui/owncloudgui.cpp
3
@@ -35,6 +35,8 @@
3
@@ -32,6 +32,8 @@
4
 #include "common/syncjournalfilerecord.h"
5
 #include "creds/abstractcredentials.h"
4
 #include "creds/abstractcredentials.h"
5
 #include "guiutility.h"
6
 
6
 
7
+#include <climits>
7
+#include <climits>
8
+
8
+
(-)b/deskutils/owncloudclient/files/patch-src_libsync_configfile.cpp (-6 / +6 lines)
Lines 1-17 Link Here
1
--- src/libsync/configfile.cpp.orig	2017-12-20 15:03:02 UTC
1
--- src/libsync/configfile.cpp.orig	2020-12-21 16:16:36 UTC
2
+++ src/libsync/configfile.cpp
2
+++ src/libsync/configfile.cpp
3
@@ -448,11 +448,22 @@ bool ConfigFile::skipUpdateCheck(const QString &connec
3
@@ -526,11 +526,22 @@ bool ConfigFile::skipUpdateCheck(const QString &connec
4
     if (connection.isEmpty())
4
     if (connection.isEmpty())
5
         con = defaultConnection();
5
         con = defaultConnection();
6
 
6
 
7
+#if 0
7
+#if 0
8
     QVariant fallback = getValue(QLatin1String(skipUpdateCheckC), con, false);
8
     QVariant fallback = getValue(skipUpdateCheckC(), con, false);
9
+#else
9
+#else
10
+    QVariant fallback = getValue(QLatin1String(skipUpdateCheckC), con, true);
10
+    QVariant fallback = getValue(skipUpdateCheckC(), con, true);
11
+#endif
11
+#endif
12
     fallback = getValue(QLatin1String(skipUpdateCheckC), QString(), fallback);
12
     fallback = getValue(skipUpdateCheckC(), QString(), fallback);
13
 
13
 
14
     QVariant value = getPolicySetting(QLatin1String(skipUpdateCheckC), fallback);
14
     QVariant value = getPolicySetting(skipUpdateCheckC(), fallback);
15
+#if 0
15
+#if 0
16
     return value.toBool();
16
     return value.toBool();
17
+#else
17
+#else
(-)a/deskutils/owncloudclient/files/patch-src_libsync_networkjobs.cpp (-10 lines)
Removed Link Here
1
--- src/libsync/networkjobs.cpp.orig	2020-05-30 08:02:56 UTC
2
+++ src/libsync/networkjobs.cpp
3
@@ -31,6 +31,7 @@
4
 #include <QJsonObject>
5
 #ifndef TOKEN_AUTH_ONLY
6
 #include <QPainter>
7
+#include <QPainterPath>
8
 #endif
9
 
10
 #include "networkjobs.h"
(-)b/deskutils/owncloudclient/pkg-plist (-4 / +2 lines)
Lines 1-4 Link Here
1
2
bin/owncloud
1
bin/owncloud
3
bin/owncloudcmd
2
bin/owncloudcmd
4
@sample etc/ownCloud/sync-exclude.lst.sample
3
@sample etc/ownCloud/sync-exclude.lst.sample
Lines 18-24 lib/libowncloudsync.so.%%VERSION%% Link Here
18
lib/libowncloud_csync.so
17
lib/libowncloud_csync.so
19
lib/libowncloud_csync.so.0
18
lib/libowncloud_csync.so.0
20
lib/libowncloud_csync.so.%%VERSION%%
19
lib/libowncloud_csync.so.%%VERSION%%
21
lib/ownCloud/plugins/owncloudsync_vfs_suffix.so
20
%%QT_PLUGINDIR%%/owncloudsync_vfs_suffix.so
22
%%QT_PLUGINDIR%%/kf5/overlayicon/ownclouddolphinoverlayplugin.so
21
%%QT_PLUGINDIR%%/kf5/overlayicon/ownclouddolphinoverlayplugin.so
23
%%QT_PLUGINDIR%%/ownclouddolphinactionplugin.so
22
%%QT_PLUGINDIR%%/ownclouddolphinactionplugin.so
24
share/applications/owncloud.desktop
23
share/applications/owncloud.desktop
Lines 42-48 share/icons/hicolor/16x16/apps/ownCloud_sync_shared.png Link Here
42
share/icons/hicolor/16x16/apps/ownCloud_warn.png
41
share/icons/hicolor/16x16/apps/ownCloud_warn.png
43
share/icons/hicolor/16x16/apps/ownCloud_warn_shared.png
42
share/icons/hicolor/16x16/apps/ownCloud_warn_shared.png
44
share/icons/hicolor/16x16/apps/owncloud.png
43
share/icons/hicolor/16x16/apps/owncloud.png
45
share/icons/hicolor/22x22/apps/owncloud.png
44
share/icons/hicolor/24x24/apps/owncloud.png
46
share/icons/hicolor/256x256/apps/ownCloud_error.png
45
share/icons/hicolor/256x256/apps/ownCloud_error.png
47
share/icons/hicolor/256x256/apps/ownCloud_error_shared.png
46
share/icons/hicolor/256x256/apps/ownCloud_error_shared.png
48
share/icons/hicolor/256x256/apps/ownCloud_ok.png
47
share/icons/hicolor/256x256/apps/ownCloud_ok.png
Lines 70-76 share/icons/hicolor/48x48/apps/ownCloud_sync_shared.png Link Here
70
share/icons/hicolor/48x48/apps/ownCloud_warn.png
69
share/icons/hicolor/48x48/apps/ownCloud_warn.png
71
share/icons/hicolor/48x48/apps/ownCloud_warn_shared.png
70
share/icons/hicolor/48x48/apps/ownCloud_warn_shared.png
72
share/icons/hicolor/48x48/apps/owncloud.png
71
share/icons/hicolor/48x48/apps/owncloud.png
73
share/icons/hicolor/512x512/apps/owncloud.png
74
share/icons/hicolor/64x64/apps/ownCloud_error.png
72
share/icons/hicolor/64x64/apps/ownCloud_error.png
75
share/icons/hicolor/64x64/apps/ownCloud_error_shared.png
73
share/icons/hicolor/64x64/apps/ownCloud_error_shared.png
76
share/icons/hicolor/64x64/apps/ownCloud_ok.png
74
share/icons/hicolor/64x64/apps/ownCloud_ok.png

Return to bug 252813