Attachment #221819 for bug #252813




# $FreeBSD$

PORTNAME=	owncloudclient
DISTVERSION=	2.7.4
DISTVERSIONSUFFIX=	.2934
CATEGORIES=	deskutils
MASTER_SITES=	https://download.owncloud.com/desktop/ownCloud/stable/${DISTVERSION}${DISTVERSIONSUFFIX}/source/
DISTNAME=	ownCloud-${DISTVERSION}${DISTVERSIONSUFFIX}
# owncloudclient-2.7.4.2934.tar.xz

MAINTAINER=	ports@FreeBSD.org
COMMENT=	OwnCloud Desktop Syncing Client

		libqt5keychain.so:security/qtkeychain

USES=		cmake:noninja compiler:c++11-lib gmake iconv kde:5 \
		localbase:ldflags pkgconfig qt:5 sqlite tar:xz desktop-file-utils \
		shared-mime-info
USE_KDE=	completion config coreaddons jobwidgets kio service widgetsaddons \
		windowsystem
USE_LDCONFIG=	yes
USE_QT=		buildtools_build concurrent core dbus gui linguist_build network \
		qmake_build sql webkit widgets xml
USE_KDE=	completion config coreaddons jobwidgets kio service widgetsaddons
CMAKE_ARGS=	-DBUILD_WITH_QT4:BOOL=OFF \
		-DCMAKE_INSTALL_MANDIR:STRING=man \
		-DWITH_DOC:BOOL=OFF \
		-DWITH_STACK_PROTECTOR:BOOL=OFF
USE_LDCONFIG=	yes

CMAKE_ARGS=	-DCMAKE_INSTALL_MANDIR:STRING=man \
		-DSYSCONF_INSTALL_DIR="${PREFIX}/etc"
CMAKE_OFF=	BUILD_WITH_QT4 WITH_DOC WITH_STACK_PROTECTOR

PLIST_SUB=	VERSION=${PORTVERSION}

OPTIONS_DEFINE=		DEBUG

DEBUG_CMAKE_ON=		-DCMAKE_BUILD_TYPE:STRING=Debug

PLIST_SUB=	VERSION=${PORTVERSION}

post-patch:
	@${REINPLACE_CMD} -e \
		's|.lst |.lst.sample |' ${WRKSRC}/CMakeLists.txt

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1575646063	1	TIMESTAMP = 1610990528
2	SHA256 (owncloudclient-2.6.0.13018.tar.xz) = e78e3286bccfac12fdc24d78fb60f760529d21b71846099fc762a8762b271f36	2	SHA256 (ownCloud-2.7.4.2934.tar.xz) = 4b5710a6f53d15584f5541b0b29e02d2eab603aaba50c8250ba695d8abed0217
3	SIZE (owncloudclient-2.6.0.13018.tar.xz) = 17311396	3	SIZE (ownCloud-2.7.4.2934.tar.xz) = 14151708

Lines 1-8 Link Here

(-)files/patch-src_gui_owncloudgui.cpp (-3 / +3 lines)
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	+




--- src/libsync/configfile.cpp.orig	2020-12-21 16:16:36 UTC
+++ src/libsync/configfile.cpp
@@ -526,11 +526,22 @@ bool ConfigFile::skipUpdateCheck(const QString &connec
     if (connection.isEmpty())
         con = defaultConnection();
 
+#if 0
     QVariant fallback = getValue(skipUpdateCheckC(), con, false);
+#else
+    QVariant fallback = getValue(skipUpdateCheckC(), con, true);
+#endif
     fallback = getValue(skipUpdateCheckC(), QString(), fallback);
 
     QVariant value = getPolicySetting(skipUpdateCheckC(), fallback);
+#if 0
     return value.toBool();
+#else

Lines 1-10 Link Here

(-)files/patch-src_libsync_networkjobs.cpp (-10 lines)
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"





bin/owncloud
bin/owncloudcmd
@sample etc/ownCloud/sync-exclude.lst.sample

lib/libowncloud_csync.so
lib/libowncloud_csync.so.0
lib/libowncloud_csync.so.%%VERSION%%
%%QT_PLUGINDIR%%/owncloudsync_vfs_suffix.so
%%QT_PLUGINDIR%%/kf5/overlayicon/ownclouddolphinoverlayplugin.so
%%QT_PLUGINDIR%%/ownclouddolphinactionplugin.so
share/applications/owncloud.desktop

share/icons/hicolor/16x16/apps/ownCloud_warn.png
share/icons/hicolor/16x16/apps/ownCloud_warn_shared.png
share/icons/hicolor/16x16/apps/owncloud.png
share/icons/hicolor/24x24/apps/owncloud.png
share/icons/hicolor/256x256/apps/ownCloud_error.png
share/icons/hicolor/256x256/apps/ownCloud_error_shared.png
share/icons/hicolor/256x256/apps/ownCloud_ok.png

share/icons/hicolor/48x48/apps/ownCloud_warn.png
share/icons/hicolor/48x48/apps/ownCloud_warn_shared.png
share/icons/hicolor/48x48/apps/owncloud.png
share/icons/hicolor/512x512/apps/owncloud.png
share/icons/hicolor/64x64/apps/ownCloud_error.png
share/icons/hicolor/64x64/apps/ownCloud_error_shared.png
share/icons/hicolor/64x64/apps/ownCloud_ok.png

Return to bug 252813

Lines 2-12 Link Here

(-)Makefile (-13 / +16 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= owncloudclient	4	PORTNAME= owncloudclient
5	DISTVERSION= 2.6.0	5	DISTVERSION= 2.7.4
6	DISTVERSIONSUFFIX= .13018	6	DISTVERSIONSUFFIX= .2934
7	CATEGORIES= deskutils	7	CATEGORIES= deskutils
8	MASTER_SITES= https://download.owncloud.com/desktop/stable/	8	MASTER_SITES= https://download.owncloud.com/desktop/ownCloud/stable/${DISTVERSION}${DISTVERSIONSUFFIX}/source/
9	# owncloudclient-2.6.0.13018.tar.xz	9	DISTNAME= ownCloud-${DISTVERSION}${DISTVERSIONSUFFIX}
		10	# owncloudclient-2.7.4.2934.tar.xz
10		11
11	MAINTAINER= ports@FreeBSD.org	12	MAINTAINER= ports@FreeBSD.org
12	COMMENT= OwnCloud Desktop Syncing Client	13	COMMENT= OwnCloud Desktop Syncing Client
Lines 18-39 Link Here
18	libqt5keychain.so:security/qtkeychain	19	libqt5keychain.so:security/qtkeychain
19		20
20	USES= cmake:noninja compiler:c++11-lib gmake iconv kde:5 \	21	USES= cmake:noninja compiler:c++11-lib gmake iconv kde:5 \
21	localbase:ldflags pkgconfig qt:5 sqlite tar:xz	22	localbase:ldflags pkgconfig qt:5 sqlite tar:xz desktop-file-utils \
		23	shared-mime-info
		24	USE_KDE= completion config coreaddons jobwidgets kio service widgetsaddons \
		25	windowsystem
		26	USE_LDCONFIG= yes
22	USE_QT= buildtools_build concurrent core dbus gui linguist_build network \	27	USE_QT= buildtools_build concurrent core dbus gui linguist_build network \
23	qmake_build sql webkit widgets xml	28	qmake_build sql webkit widgets xml
24	USE_KDE= completion config coreaddons jobwidgets kio service widgetsaddons
25	CMAKE_ARGS= -DBUILD_WITH_QT4:BOOL=OFF \
26	-DCMAKE_INSTALL_MANDIR:STRING=man \
27	-DWITH_DOC:BOOL=OFF \
28	-DWITH_STACK_PROTECTOR:BOOL=OFF
29	USE_LDCONFIG= yes
30		29
		30	CMAKE_ARGS= -DCMAKE_INSTALL_MANDIR:STRING=man \
		31	-DSYSCONF_INSTALL_DIR="${PREFIX}/etc"
		32	CMAKE_OFF= BUILD_WITH_QT4 WITH_DOC WITH_STACK_PROTECTOR
		33
		34	PLIST_SUB= VERSION=${PORTVERSION}
		35
31	OPTIONS_DEFINE= DEBUG	36	OPTIONS_DEFINE= DEBUG
32		37
33	DEBUG_CMAKE_ON= -DCMAKE_BUILD_TYPE:STRING=Debug	38	DEBUG_CMAKE_ON= -DCMAKE_BUILD_TYPE:STRING=Debug
34		39
35	PLIST_SUB= VERSION=${PORTVERSION}
36
37	post-patch:	40	post-patch:
38	@${REINPLACE_CMD} -e \	41	@${REINPLACE_CMD} -e \
39	's\|.lst \|.lst.sample \|' ${WRKSRC}/CMakeLists.txt	42	's\|.lst \|.lst.sample \|' ${WRKSRC}/CMakeLists.txt

Lines 1-17 Link Here

(-)files/patch-src_libsync_configfile.cpp (-6 / +6 lines)
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

Lines 1-4 Link Here

(-)pkg-plist (-4 / +2 lines)
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 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 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 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