deskutils/owncloudclient: Update to 2.8.2

PR:		252813

6 files changed, 32 insertions, 42 deletions

diff --git a/deskutils/owncloudclient/Makefile b/deskutils/owncloudclient/Makefile
index 07f64b0c6d2c..b9b423e9d79f 100644
--- a/deskutils/owncloudclient/Makefile
+++ b/deskutils/owncloudclient/Makefile
@@ -1,13 +1,13 @@
 # Created by: Mathieu Arnold
 
 PORTNAME=	owncloudclient
-DISTVERSION=	2.6.0
-DISTVERSIONSUFFIX=	.13018
+DISTVERSION=	2.8.2
+DISTVERSIONSUFFIX=	.4246
 CATEGORIES=	deskutils
-MASTER_SITES=	https://download.owncloud.com/desktop/stable/
-# owncloudclient-2.6.0.13018.tar.xz
+MASTER_SITES=	https://download.owncloud.com/desktop/ownCloud/stable/${DISTVERSION}${DISTVERSIONSUFFIX}/source/
+DISTNAME=	ownCloud-${DISTVERSION}${DISTVERSIONSUFFIX}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	daniel@morante.net
 COMMENT=	OwnCloud Desktop Syncing Client
 
 LICENSE=	GPLv2
@@ -16,23 +16,25 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libinotify.so:devel/libinotify \
 		libqt5keychain.so:security/qtkeychain
 
-USES=		cmake:noninja compiler:c++11-lib gmake iconv kde:5 \
-		localbase:ldflags pkgconfig qt:5 sqlite tar:xz
-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
+USES=		cmake:noninja compiler:c++11-lib desktop-file-utils gmake \
+		iconv kde:5 localbase:ldflags pkgconfig qt:5 shared-mime-info \
+		sqlite tar:xz
+USE_KDE=	completion config coreaddons jobwidgets kio service \
+		widgetsaddons windowsystem
 USE_LDCONFIG=	yes
+USE_QT=		concurrent core dbus gui network sql webkit widgets xml \
+		buildtools_build linguist_build qmake_build
+
+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
diff --git a/deskutils/owncloudclient/distinfo b/deskutils/owncloudclient/distinfo
index 477740a95f90..df0368fecd00 100644
--- a/deskutils/owncloudclient/distinfo
+++ b/deskutils/owncloudclient/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1575646063
-SHA256 (owncloudclient-2.6.0.13018.tar.xz) = e78e3286bccfac12fdc24d78fb60f760529d21b71846099fc762a8762b271f36
-SIZE (owncloudclient-2.6.0.13018.tar.xz) = 17311396
+TIMESTAMP = 1626836974
+SHA256 (ownCloud-2.8.2.4246.tar.xz) = 0cc2e5154a1349bd21941ac3c32e8621778a9ff150730a19de2710e22d32fc43
+SIZE (ownCloud-2.8.2.4246.tar.xz) = 15044652
diff --git a/deskutils/owncloudclient/files/patch-src_gui_owncloudgui.cpp b/deskutils/owncloudclient/files/patch-src_gui_owncloudgui.cpp
index f9e0d7f0fd37..cfc75c1b3b1a 100644
--- a/deskutils/owncloudclient/files/patch-src_gui_owncloudgui.cpp
+++ b/deskutils/owncloudclient/files/patch-src_gui_owncloudgui.cpp
@@ -1,8 +1,8 @@
---- src/gui/owncloudgui.cpp.orig	2017-12-20 15:03:02 UTC
+--- src/gui/owncloudgui.cpp.orig	2020-12-21 16:16:36 UTC
 +++ src/gui/owncloudgui.cpp
-@@ -35,6 +35,8 @@
- #include "common/syncjournalfilerecord.h"
+@@ -32,6 +32,8 @@
  #include "creds/abstractcredentials.h"
+ #include "guiutility.h"
  
 +#include <climits>
 +
diff --git a/deskutils/owncloudclient/files/patch-src_libsync_configfile.cpp b/deskutils/owncloudclient/files/patch-src_libsync_configfile.cpp
index 09f5dc7f7598..bf8733f5e592 100644
--- a/deskutils/owncloudclient/files/patch-src_libsync_configfile.cpp
+++ b/deskutils/owncloudclient/files/patch-src_libsync_configfile.cpp
@@ -1,17 +1,17 @@
---- src/libsync/configfile.cpp.orig	2017-12-20 15:03:02 UTC
+--- src/libsync/configfile.cpp.orig	2020-12-21 16:16:36 UTC
 +++ src/libsync/configfile.cpp
-@@ -448,11 +448,22 @@ bool ConfigFile::skipUpdateCheck(const QString &connec
+@@ -526,11 +526,22 @@ bool ConfigFile::skipUpdateCheck(const QString &connec
      if (connection.isEmpty())
          con = defaultConnection();
  
 +#if 0
-     QVariant fallback = getValue(QLatin1String(skipUpdateCheckC), con, false);
+     QVariant fallback = getValue(skipUpdateCheckC(), con, false);
 +#else
-+    QVariant fallback = getValue(QLatin1String(skipUpdateCheckC), con, true);
++    QVariant fallback = getValue(skipUpdateCheckC(), con, true);
 +#endif
-     fallback = getValue(QLatin1String(skipUpdateCheckC), QString(), fallback);
+     fallback = getValue(skipUpdateCheckC(), QString(), fallback);
  
-     QVariant value = getPolicySetting(QLatin1String(skipUpdateCheckC), fallback);
+     QVariant value = getPolicySetting(skipUpdateCheckC(), fallback);
 +#if 0
      return value.toBool();
 +#else
diff --git a/deskutils/owncloudclient/files/patch-src_libsync_networkjobs.cpp b/deskutils/owncloudclient/files/patch-src_libsync_networkjobs.cpp
deleted file mode 100644
index 7b3f3aa33221..000000000000
--- a/deskutils/owncloudclient/files/patch-src_libsync_networkjobs.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/libsync/networkjobs.cpp.orig	2020-05-30 08:02:56 UTC
-+++ src/libsync/networkjobs.cpp
-@@ -31,6 +31,7 @@
- #include <QJsonObject>
- #ifndef TOKEN_AUTH_ONLY
- #include <QPainter>
-+#include <QPainterPath>
- #endif
- 
- #include "networkjobs.h"
diff --git a/deskutils/owncloudclient/pkg-plist b/deskutils/owncloudclient/pkg-plist
index 41625bd9f8be..dd4d2c167ea4 100644
--- a/deskutils/owncloudclient/pkg-plist
+++ b/deskutils/owncloudclient/pkg-plist
@@ -1,4 +1,3 @@
-
 bin/owncloud
 bin/owncloudcmd
 @sample etc/ownCloud/sync-exclude.lst.sample
@@ -18,7 +17,7 @@ lib/libowncloudsync.so.%%VERSION%%
 lib/libowncloud_csync.so
 lib/libowncloud_csync.so.0
 lib/libowncloud_csync.so.%%VERSION%%
-lib/ownCloud/plugins/owncloudsync_vfs_suffix.so
+%%QT_PLUGINDIR%%/owncloudsync_vfs_suffix.so
 %%QT_PLUGINDIR%%/kf5/overlayicon/ownclouddolphinoverlayplugin.so
 %%QT_PLUGINDIR%%/ownclouddolphinactionplugin.so
 share/applications/owncloud.desktop
@@ -42,7 +41,7 @@ share/icons/hicolor/16x16/apps/ownCloud_sync_shared.png
 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/22x22/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
@@ -70,7 +69,6 @@ share/icons/hicolor/48x48/apps/ownCloud_sync_shared.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