Attachment 221752 Details for Bug 252813 – patch to update port

[patch] patch to update port

owncloudclient-2.7.4.diff (text/plain), 6.29 KB, created by Daniel Morante on 2021-01-20 03:00:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Morante

Created: 2021-01-20 03:00:14 UTC

Size: 6.29 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 562106)
>+++ Makefile	(working copy)
>@@ -2,11 +2,12 @@
> # $FreeBSD$
> 
> PORTNAME=	owncloudclient
>-DISTVERSION=	2.6.0
>-DISTVERSIONSUFFIX=	.13018
>+DISTVERSION=	2.7.4
>+DISTVERSIONSUFFIX=	.2934
> 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}
>+# owncloudclient-2.7.4.2934.tar.xz
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	OwnCloud Desktop Syncing Client
>@@ -18,22 +19,24 @@
> 		libqt5keychain.so:security/qtkeychain
> 
> USES=		cmake:noninja compiler:c++11-lib gmake iconv kde:5 \
>-		localbase:ldflags pkgconfig qt:5 sqlite tar:xz
>+		localbase:ldflags pkgconfig qt:5 sqlite tar:xz desktop-file-utils \
>+		shared-mime-info
> 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_KDE=	completion config coreaddons jobwidgets kio service widgetsaddons \
>+		windowsystem
>+
>+CMAKE_OFF=	BUILD_WITH_QT4 WITH_DOC WITH_STACK_PROTECTOR
>+CMAKE_ARGS=	-DCMAKE_INSTALL_MANDIR:STRING=man \
>+		-DSYSCONF_INSTALL_DIR="${PREFIX}/etc"
> USE_LDCONFIG=	yes
> 
> OPTIONS_DEFINE=		DEBUG
> 
>+PLIST_SUB=	VERSION=${PORTVERSION}
>+
> DEBUG_CMAKE_ON=		-DCMAKE_BUILD_TYPE:STRING=Debug
> 
>-PLIST_SUB=	VERSION=${PORTVERSION}
>-
> post-patch:
> 	@${REINPLACE_CMD} -e \
> 		's|.lst |.lst.sample |' ${WRKSRC}/CMakeLists.txt
>Index: distinfo
>===================================================================
>--- distinfo	(revision 562106)
>+++ distinfo	(working copy)
>@@ -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 = 1610990528
>+SHA256 (ownCloud-2.7.4.2934.tar.xz) = 4b5710a6f53d15584f5541b0b29e02d2eab603aaba50c8250ba695d8abed0217
>+SIZE (ownCloud-2.7.4.2934.tar.xz) = 14151708
>Index: files/patch-src_gui_owncloudgui.cpp
>===================================================================
>--- files/patch-src_gui_owncloudgui.cpp	(revision 562106)
>+++ files/patch-src_gui_owncloudgui.cpp	(working copy)
>@@ -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>
> +
>Index: files/patch-src_libsync_configfile.cpp
>===================================================================
>--- files/patch-src_libsync_configfile.cpp	(revision 562106)
>+++ files/patch-src_libsync_configfile.cpp	(working copy)
>@@ -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
>Index: files/patch-src_libsync_networkjobs.cpp
>===================================================================
>--- files/patch-src_libsync_networkjobs.cpp	(revision 562106)
>+++ files/patch-src_libsync_networkjobs.cpp	(nonexistent)
>@@ -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"
>
>Property changes on: files/patch-src_libsync_networkjobs.cpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 562106)
>+++ pkg-plist	(working copy)
>@@ -1,4 +1,3 @@
>-
> bin/owncloud
> bin/owncloudcmd
> @sample etc/ownCloud/sync-exclude.lst.sample
>@@ -18,7 +17,7 @@
> 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_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_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

Actions: View | Diff

Attachments on bug 252813: 221717 | 221752 | 221819 | 226822