summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuido Falsi <madpilot@FreeBSD.org>2021-01-13 15:01:23 +0000
committerGuido Falsi <madpilot@FreeBSD.org>2021-01-13 15:01:23 +0000
commit35010362d6f31750473c859cec430ae7cee9f57e (patch)
tree390360012ba3a8a3ba2fabe40bb2b97645194137
parentUpdate thunar to 4.16.2 (diff)
- Update nextcloudclient to 3.1.0
- Remove patches already included upstream Approved by: mr (maintainer timeout) Differential Revision: https://reviews.freebsd.org/D27697
-rw-r--r--deskutils/nextcloudclient/Makefile4
-rw-r--r--deskutils/nextcloudclient/distinfo6
-rw-r--r--deskutils/nextcloudclient/files/patch-src_gui_accountsettings.cpp12
-rw-r--r--deskutils/nextcloudclient/files/patch-src_gui_generalsettings.cpp18
4 files changed, 5 insertions, 35 deletions
diff --git a/deskutils/nextcloudclient/Makefile b/deskutils/nextcloudclient/Makefile
index 30fcf72668a3..fa383d6fc20f 100644
--- a/deskutils/nextcloudclient/Makefile
+++ b/deskutils/nextcloudclient/Makefile
@@ -2,9 +2,8 @@
# $FreeBSD$
PORTNAME= nextcloudclient
-PORTVERSION= 3.0.3
+PORTVERSION= 3.1.1
DISTVERSIONPREFIX= v
-PORTREVISION= 1
CATEGORIES= deskutils
MAINTAINER= mr@FreeBSD.org
@@ -22,6 +21,7 @@ USE_QT= buildtools_build concurrent core dbus declarative graphicaleffects \
quickcontrols2 sql svg webchannel webengine webkit \
widgets xml
CMAKE_ARGS= -DBUILD_WITH_QT4:BOOL=OFF \
+ -DBUILD_UPDATER:BOOL=OFF \
-DCMAKE_INSTALL_MANDIR:STRING=man \
-DWITH_STACK_PROTECTOR:BOOL=OFF
USE_LDCONFIG= yes
diff --git a/deskutils/nextcloudclient/distinfo b/deskutils/nextcloudclient/distinfo
index 2366c43f013b..d4cfae4ad047 100644
--- a/deskutils/nextcloudclient/distinfo
+++ b/deskutils/nextcloudclient/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1604321716
-SHA256 (nextcloud-desktop-v3.0.3_GH0.tar.gz) = abd021ff06ecb267221a221dbf8b4efd3bd8e418053cc49b6b6faa290717c6d8
-SIZE (nextcloud-desktop-v3.0.3_GH0.tar.gz) = 19202718
+TIMESTAMP = 1608722777
+SHA256 (nextcloud-desktop-v3.1.1_GH0.tar.gz) = e296156a4de033a59f9b3210fe17fdfb8bb7aebefb715ae4e3b85e627e40a87f
+SIZE (nextcloud-desktop-v3.1.1_GH0.tar.gz) = 19440799
diff --git a/deskutils/nextcloudclient/files/patch-src_gui_accountsettings.cpp b/deskutils/nextcloudclient/files/patch-src_gui_accountsettings.cpp
deleted file mode 100644
index 2f41eefd7126..000000000000
--- a/deskutils/nextcloudclient/files/patch-src_gui_accountsettings.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/gui/accountsettings.cpp.orig 2017-12-20 15:03:02 UTC
-+++ src/gui/accountsettings.cpp
-@@ -34,7 +34,8 @@
- #include "tooltipupdater.h"
- #include "filesystem.h"
-
--#include <math.h>
-+#include <climits>
-+#include <cmath>
-
- #include <QDesktopServices>
- #include <QDir>
diff --git a/deskutils/nextcloudclient/files/patch-src_gui_generalsettings.cpp b/deskutils/nextcloudclient/files/patch-src_gui_generalsettings.cpp
deleted file mode 100644
index 0b1683a51b39..000000000000
--- a/deskutils/nextcloudclient/files/patch-src_gui_generalsettings.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/gui/generalsettings.cpp.orig 2017-12-20 15:03:02 UTC
-+++ src/gui/generalsettings.cpp
-@@ -117,6 +117,7 @@ void GeneralSettings::loadMiscSettings()
-
- void GeneralSettings::slotUpdateInfo()
- {
-+#if 0
- // Note: the sparkle-updater is not an OCUpdater
- OCUpdater *updater = qobject_cast<OCUpdater *>(Updater::instance());
- if (ConfigFile().skipUpdateCheck()) {
-@@ -133,6 +134,7 @@ void GeneralSettings::slotUpdateInfo()
- // can't have those infos from sparkle currently
- _ui->updatesGroupBox->setVisible(false);
- }
-+#endif
- }
-
- void GeneralSettings::saveMiscSettings()