Attachment 199486 Details for Bug 233260 – Further upstream fix included

[patch] Further upstream fix included

nextcloud.diff (text/plain), 12.09 KB, created by Guido Falsi on 2018-11-23 16:48:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guido Falsi

Created: 2018-11-23 16:48:25 UTC

Size: 12.09 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 485687)
>+++ Makefile	(working copy)
>@@ -2,9 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	nextcloudclient
>-PORTVERSION=	0.0.0.20180323
>-#DISTVERSIONPREFIX=	v
>-PORTREVISION=	2
>+PORTVERSION=	2.5.0
>+DISTVERSIONPREFIX=	v
> CATEGORIES=	deskutils
> 
> MAINTAINER=	mr@FreeBSD.org
>@@ -17,31 +16,38 @@
> 
> USES=		cmake:outsource,noninja compiler:c++11-lib gmake iconv \
> 		localbase:ldflags pkgconfig qt:5 sqlite ssl
>-USE_QT=		buildtools_build concurrent core dbus gui linguist_build network \
>-		qmake_build sql webkit widgets xml
>+USE_QT=		buildtools_build concurrent core dbus declarative gui \
>+		linguist_build location network printsupport qmake_build \
>+		sql webchannel webengine webkit widgets xml
>+
> CMAKE_ARGS=	-DBUILD_WITH_QT4:BOOL=OFF \
> 		-DCMAKE_INSTALL_MANDIR:STRING=man \
> 		-DWITH_STACK_PROTECTOR:BOOL=OFF
> USE_LDCONFIG=	yes
>-INSTALLS_ICONS=	yes
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	nextcloud
>-GH_PROJECT=	client
>-GH_TAGNAME=	4c40789dcafe5b193e125620b63dcc95e08ffba5
>+GH_PROJECT=	desktop
> 
>-#OPTIONS_DEFINE=		DEBUG DOCS
>-OPTIONS_DEFINE=		DEBUG # DOCS doesn't build currently
>+#OPTIONS_DEFINE=	DOCS
> 
> #DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx \
> #			doxygen:devel/doxygen
> #DOCS_USE=		tex=dvipsk:build,latex:build
>-#DOCS_CMAKE_ON=		-DWITH_DOC:BOOL=ON
>+#DOCS_CMAKE_ON=	-DWITH_DOC:BOOL=ON
> 
>-DEBUG_CMAKE_ON=		-DCMAKE_BUILD_TYPE:STRING=Debug
>-
> PLIST_SUB=	VERSION=${PORTVERSION}
> 
>+.include <bsd.port.pre.mk>
>+
>+.ifdef WITH_DEBUG
>+CMAKE_ARGS+=		-DCMAKE_BUILD_TYPE:STRING=Debug
>+.endif
>+
>+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200085 && !${SSL_DEFAULT:Mopenssl111}
>+BROKEN=	nextcloudclient requires OpenSSL 1.1.0, add DEFAULT_VERSIONS+=ssl=openssl111 to /etc/make.conf
>+.endif
>+
> post-patch:
> 	@${REINPLACE_CMD} -e \
> 		's|.lst |.lst.sample |' ${WRKSRC}/CMakeLists.txt
>@@ -49,4 +55,4 @@
> pre-configure:
> 	@(cd ${WRKSRC} && ${CP} -f sync-exclude.lst sync-exclude.lst.sample)
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 485687)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1521915864
>-SHA256 (nextcloud-client-0.0.0.20180323-4c40789dcafe5b193e125620b63dcc95e08ffba5_GH0.tar.gz) = 311028a8dadc9137699255f9b1d619c45f5ce820f2942697285339bfc6c0e836
>-SIZE (nextcloud-client-0.0.0.20180323-4c40789dcafe5b193e125620b63dcc95e08ffba5_GH0.tar.gz) = 18378272
>+TIMESTAMP = 1542203394
>+SHA256 (nextcloud-desktop-v2.5.0_GH0.tar.gz) = 4d639f43e49fd4367cd1b99bf21aecb2eac3bd89a7b0d96c7d2a0975baad6528
>+SIZE (nextcloud-desktop-v2.5.0_GH0.tar.gz) = 18914632
>Index: files/patch-Fix_activity_flood
>===================================================================
>--- files/patch-Fix_activity_flood	(nonexistent)
>+++ files/patch-Fix_activity_flood	(working copy)
>@@ -0,0 +1,96 @@
>+From 1d0bf08a1cc1c1091f195500546a1feec9c84997 Mon Sep 17 00:00:00 2001
>+From: Roeland Jago Douma <roeland@famdouma.nl>
>+Date: Mon, 19 Nov 2018 14:13:51 +0100
>+Subject: [PATCH] Do not fetch activities if they are not enabled
>+
>+Fixes #788
>+Fixes #834
>+
>+If the activity app is not enabled we should not try to fetch the
>+activities at all.
>+
>+Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
>+---
>+ src/gui/activitylistmodel.cpp | 16 +++++++++++++---
>+ src/gui/activitylistmodel.h   |  1 +
>+ src/libsync/capabilities.cpp  |  4 ++++
>+ src/libsync/capabilities.h    |  3 +++
>+ 4 files changed, 21 insertions(+), 3 deletions(-)
>+
>+diff --git a/src/gui/activitylistmodel.cpp b/src/gui/activitylistmodel.cpp
>+index d8bbbeea8..d4f993b55 100644
>+--- src/gui/activitylistmodel.cpp
>++++ src/gui/activitylistmodel.cpp
>+@@ -291,18 +291,28 @@ void ActivityListModel::combineActivityLists()
>+     endInsertRows();
>+ }
>+ 
>++bool ActivityListModel::canFetchActivities() const {
>++    return _accountState->isConnected() && _accountState->account()->capabilities().hasActivities();
>++}
>++
>+ void ActivityListModel::fetchMore(const QModelIndex &)
>+ {
>+-    if (_accountState->isConnected()) {
>+-        _activityLists = ActivityList();
>++    _activityLists = ActivityList();
>++    if (canFetchActivities()) {
>+         startFetchJob();
>++    } else {
>++        combineActivityLists();
>+     }
>+ }
>+ 
>+ void ActivityListModel::slotRefreshActivity()
>+ {
>+     _activityLists.clear();
>+-    startFetchJob();
>++    if (canFetchActivities()) {
>++        startFetchJob();
>++    } else {
>++        combineActivityLists();
>++    }
>+ }
>+ 
>+ void ActivityListModel::slotRemoveAccount()
>+diff --git a/src/gui/activitylistmodel.h b/src/gui/activitylistmodel.h
>+index 952dc82d5..9b66da135 100644
>+--- src/gui/activitylistmodel.h
>++++ src/gui/activitylistmodel.h
>+@@ -67,6 +67,7 @@ private slots:
>+ private:
>+     void startFetchJob();
>+     void combineActivityLists();
>++    bool canFetchActivities() const;
>+ 
>+     ActivityList _activityLists;
>+     ActivityList _syncFileItemLists;
>+diff --git a/src/libsync/capabilities.cpp b/src/libsync/capabilities.cpp
>+index 89942885c..39df7d167 100644
>+--- src/libsync/capabilities.cpp
>++++ src/libsync/capabilities.cpp
>+@@ -103,6 +103,10 @@ bool Capabilities::isValid() const
>+     return !_capabilities.isEmpty();
>+ }
>+ 
>++bool Capabilities::hasActivities() const {
>++    return _capabilities.contains("activity");
>++}
>++
>+ QList<QByteArray> Capabilities::supportedChecksumTypes() const
>+ {
>+     QList<QByteArray> list;
>+diff --git a/src/libsync/capabilities.h b/src/libsync/capabilities.h
>+index 88ad84c11..8f8fd826a 100644
>+--- src/libsync/capabilities.h
>++++ src/libsync/capabilities.h
>+@@ -59,6 +59,9 @@ class OWNCLOUDSYNC_EXPORT Capabilities
>+     /// returns true if the capabilities are loaded already.
>+     bool isValid() const;
>+ 
>++    /// return true if the activity app is enabled
>++    bool hasActivities() const;
>++
>+     /**
>+      * Returns the checksum types the server understands.
>+      *
>
>Property changes on: files/patch-Fix_activity_flood
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-Fix_activity_loop
>===================================================================
>--- files/patch-Fix_activity_loop	(nonexistent)
>+++ files/patch-Fix_activity_loop	(working copy)
>@@ -0,0 +1,120 @@
>+diff --git a/src/gui/activitylistmodel.cpp b/src/gui/activitylistmodel.cpp
>+index d4f993b55..d74e8597b 100644
>+--- src/gui/activitylistmodel.cpp
>++++ src/gui/activitylistmodel.cpp
>+@@ -150,16 +150,12 @@ int ActivityListModel::rowCount(const QModelIndex &) const
>+     return _finalList.count();
>+ }
>+ 
>+-// current strategy: Fetch 100 items per Account
>+-// ATTENTION: This method is const and thus it is not possible to modify
>+-// the _activityLists hash or so. Doesn't make it easier...
>+ bool ActivityListModel::canFetchMore(const QModelIndex &) const
>+ {
>+-    if (_activityLists.count() == 0)
>+-        return true;
>+-
>++    // We need to be connected to be able to fetch more
>+     if (_accountState && _accountState->isConnected()) {
>+-        if (_activityLists.count() == 0 && !_currentlyFetching) {
>++        // If the fetching is reported to be done or we are currently fetching we can't fetch more
>++        if (!_doneFetching && !_currentlyFetching) {
>+             return true;
>+         }
>+     }
>+@@ -177,8 +173,8 @@ void ActivityListModel::startFetchJob()
>+         this, &ActivityListModel::slotActivitiesReceived);
>+ 
>+     QUrlQuery params;
>+-    params.addQueryItem(QLatin1String("page"), QLatin1String("0"));
>+-    params.addQueryItem(QLatin1String("pagesize"), QLatin1String("100"));
>++    params.addQueryItem(QLatin1String("start"), QString::number(_currentItem));
>++    params.addQueryItem(QLatin1String("count"), QString::number(100));
>+     job->addQueryParams(params);
>+ 
>+     _currentlyFetching = true;
>+@@ -192,10 +188,16 @@ void ActivityListModel::slotActivitiesReceived(const QJsonDocument &json, int st
>+ 
>+     ActivityList list;
>+     auto ast = _accountState;
>+-    if (!ast)
>++    if (!ast) {
>+         return;
>++    }
>+ 
>+-    _currentlyFetching = 0;
>++    if (activities.size() == 0) {
>++        _doneFetching = true;
>++    }
>++
>++    _currentlyFetching = false;
>++    _currentItem += activities.size();
>+ 
>+     foreach (auto activ, activities) {
>+         auto json = activ.toObject();
>+@@ -212,7 +214,7 @@ void ActivityListModel::slotActivitiesReceived(const QJsonDocument &json, int st
>+         list.append(a);
>+     }
>+ 
>+-    _activityLists = list;
>++    _activityLists.append(list);
>+ 
>+     emit activityJobStatusCode(statusCode);
>+ 
>+@@ -234,6 +236,7 @@ void ActivityListModel::addNotificationToActivityList(Activity activity) {
>+ void ActivityListModel::removeActivityFromActivityList(int row) {
>+     Activity activity =  _finalList.at(row);
>+     removeActivityFromActivityList(activity);
>++    combineActivityLists();
>+ }
>+ 
>+ void ActivityListModel::addSyncFileItemToActivityList(Activity activity) {
>+@@ -297,10 +300,10 @@ bool ActivityListModel::canFetchActivities() const {
>+ 
>+ void ActivityListModel::fetchMore(const QModelIndex &)
>+ {
>+-    _activityLists = ActivityList();
>+     if (canFetchActivities()) {
>+         startFetchJob();
>+     } else {
>++        _doneFetching = true;
>+         combineActivityLists();
>+     }
>+ }
>+@@ -308,9 +311,13 @@ void ActivityListModel::fetchMore(const QModelIndex &)
>+ void ActivityListModel::slotRefreshActivity()
>+ {
>+     _activityLists.clear();
>++    _doneFetching = false;
>++    _currentItem = 0;
>++
>+     if (canFetchActivities()) {
>+         startFetchJob();
>+     } else {
>++        _doneFetching = true;
>+         combineActivityLists();
>+     }
>+ }
>+@@ -320,5 +327,7 @@ void ActivityListModel::slotRemoveAccount()
>+     _finalList.clear();
>+     _activityLists.clear();
>+     _currentlyFetching = false;
>++    _doneFetching = false;
>++    _currentItem = 0;
>+ }
>+ }
>+diff --git a/src/gui/activitylistmodel.h b/src/gui/activitylistmodel.h
>+index 9b66da135..0c7606a0c 100644
>+--- src/gui/activitylistmodel.h
>++++ src/gui/activitylistmodel.h
>+@@ -75,7 +75,9 @@ private slots:
>+     ActivityList _notificationErrorsLists;
>+     ActivityList _finalList;
>+     AccountState *_accountState;
>+-    bool _currentlyFetching = true;
>++    bool _currentlyFetching = false;
>++    bool _doneFetching = false;
>++    int _currentItem = 0;
>+ };
>+ }
>+ #endif // ACTIVITYLISTMODEL_H
>
>Property changes on: files/patch-Fix_activity_loop
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 485687)
>+++ pkg-plist	(working copy)
>@@ -86,13 +86,24 @@
> share/nautilus-python/extensions/syncstate-Nextcloud.py
> share/nemo-python/extensions/syncstate-Nextcloud.py
> share/nextcloud/i18n/client_TW.qm
>+share/nextcloud/i18n/client_bg.qm
> share/nextcloud/i18n/client_ca.qm
> share/nextcloud/i18n/client_cs.qm
> share/nextcloud/i18n/client_de.qm
> share/nextcloud/i18n/client_el.qm
> share/nextcloud/i18n/client_en.qm
>+share/nextcloud/i18n/client_en_GB.qm
> share/nextcloud/i18n/client_es.qm
> share/nextcloud/i18n/client_es_AR.qm
>+share/nextcloud/i18n/client_es_CL.qm
>+share/nextcloud/i18n/client_es_CO.qm
>+share/nextcloud/i18n/client_es_CR.qm
>+share/nextcloud/i18n/client_es_DO.qm
>+share/nextcloud/i18n/client_es_EC.qm
>+share/nextcloud/i18n/client_es_GT.qm
>+share/nextcloud/i18n/client_es_HN.qm
>+share/nextcloud/i18n/client_es_MX.qm
>+share/nextcloud/i18n/client_es_SV.qm
> share/nextcloud/i18n/client_et.qm
> share/nextcloud/i18n/client_eu.qm
> share/nextcloud/i18n/client_fa.qm
>@@ -100,8 +111,10 @@
> share/nextcloud/i18n/client_fr.qm
> share/nextcloud/i18n/client_gl.qm
> share/nextcloud/i18n/client_hu.qm
>+share/nextcloud/i18n/client_is.qm
> share/nextcloud/i18n/client_it.qm
> share/nextcloud/i18n/client_ja.qm
>+share/nextcloud/i18n/client_lt_LT.qm
> share/nextcloud/i18n/client_nb_NO.qm
> share/nextcloud/i18n/client_nl.qm
> share/nextcloud/i18n/client_pl.qm

Actions: View | Diff

Attachments on bug 233260: 199282 | 199387 | 199486 | 199969