Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 22 Apr 2021 18:50:55 GMT
From:      Michael Reifenberger <mr@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: d5f4a8724b34 - main - deskutils/nextcloudclient: Update to 3.2.0
Message-ID:  <202104221850.13MIot3Y007771@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by mr:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d5f4a8724b34ed7cb23f6a1bf01a4e9b7674e106

commit d5f4a8724b34ed7cb23f6a1bf01a4e9b7674e106
Author:     Michael Reifenberger <mr@FreeBSD.org>
AuthorDate: 2021-04-22 18:47:57 +0000
Commit:     Michael Reifenberger <mr@FreeBSD.org>
CommitDate: 2021-04-22 18:47:57 +0000

    deskutils/nextcloudclient: Update to 3.2.0
---
 deskutils/nextcloudclient/Makefile                     |  4 ++--
 deskutils/nextcloudclient/distinfo                     |  6 +++---
 .../files/patch-src_libsync_CMakeLists.txt             | 18 ++++++++++++++++++
 deskutils/nextcloudclient/pkg-plist                    | 10 ++++++----
 4 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/deskutils/nextcloudclient/Makefile b/deskutils/nextcloudclient/Makefile
index ba55c78132fc..ace380ce9b9f 100644
--- a/deskutils/nextcloudclient/Makefile
+++ b/deskutils/nextcloudclient/Makefile
@@ -1,7 +1,7 @@
 # Created by: Mathieu Arnold
 
 PORTNAME=	nextcloudclient
-PORTVERSION=	3.1.3
+PORTVERSION=	3.2.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	deskutils
 
@@ -16,7 +16,7 @@ EXPIRATION_DATE=2021-06-23
 LIB_DEPENDS=	libinotify.so:devel/libinotify \
 		libqt5keychain.so:security/qtkeychain
 
-USES=		cmake:noninja compiler:c++11-lib gmake gnome iconv \
+USES=		cmake:noninja compiler:c++14-lang gmake gnome iconv \
 		localbase:ldflags pkgconfig qt:5 sqlite ssl
 USE_QT=		buildtools_build concurrent core dbus declarative graphicaleffects \
 		gui linguist_build location network printsupport qmake_build \
diff --git a/deskutils/nextcloudclient/distinfo b/deskutils/nextcloudclient/distinfo
index adb9cd2d44e4..5e5235e63ef6 100644
--- a/deskutils/nextcloudclient/distinfo
+++ b/deskutils/nextcloudclient/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1615636359
-SHA256 (nextcloud-desktop-v3.1.3_GH0.tar.gz) = 2e300db5942f6ba06d72f96baf70b12d210e66e2b89da1f7138e8ae5a2891adb
-SIZE (nextcloud-desktop-v3.1.3_GH0.tar.gz) = 19552683
+TIMESTAMP = 1618769802
+SHA256 (nextcloud-desktop-v3.2.0_GH0.tar.gz) = da1195b31fec0970121c1567f3cdaf3b9083d46727277116a98e5cd27f57aa60
+SIZE (nextcloud-desktop-v3.2.0_GH0.tar.gz) = 15214108
diff --git a/deskutils/nextcloudclient/files/patch-src_libsync_CMakeLists.txt b/deskutils/nextcloudclient/files/patch-src_libsync_CMakeLists.txt
new file mode 100644
index 000000000000..f2036bb94db0
--- /dev/null
+++ b/deskutils/nextcloudclient/files/patch-src_libsync_CMakeLists.txt
@@ -0,0 +1,18 @@
+--- src/libsync/CMakeLists.txt.orig	2021-04-18 20:44:16.273394000 +0200
++++ src/libsync/CMakeLists.txt	2021-04-18 20:44:45.589737000 +0200
+@@ -136,8 +130,7 @@
+ endif()
+ 
+-if(INOTIFY_FOUND)
+-    target_include_directories(${synclib_NAME} PRIVATE ${INOTIFY_INCLUDE_DIR})
+-    link_directories(${INOTIFY_LIBRARY_DIR})
+-    target_link_libraries(${synclib_NAME} ${INOTIFY_LIBRARY} )
++if(Inotify_FOUND)
++    target_include_directories(${synclib_NAME} PRIVATE ${Inotify_INCLUDE_DIRS})
++    target_link_libraries(${synclib_NAME} PUBLIC ${Inotify_LIBRARIES})
+ endif()
+ 
+@@ -167,2 +160,3 @@
+     install(TARGETS ${synclib_NAME} DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/MacOS)
+ endif()
++
diff --git a/deskutils/nextcloudclient/pkg-plist b/deskutils/nextcloudclient/pkg-plist
index 4f4963aab93b..ac8be2925144 100644
--- a/deskutils/nextcloudclient/pkg-plist
+++ b/deskutils/nextcloudclient/pkg-plist
@@ -1,6 +1,6 @@
 bin/nextcloud
 bin/nextcloudcmd
-@sample etc/Nextcloud/sync-exclude.lst.sample
+etc/Nextcloud/sync-exclude.lst.sample
 include/nextcloudsync/creds/abstractcredentials.h
 include/nextcloudsync/creds/httpcredentials.h
 include/nextcloudsync/mirall/account.h
@@ -10,12 +10,12 @@ include/nextcloudsync/mirall/progressdispatcher.h
 include/nextcloudsync/mirall/syncengine.h
 include/nextcloudsync/mirall/syncfileitem.h
 include/nextcloudsync/mirall/syncresult.h
+lib/libnextcloud_csync.so
+lib/libnextcloud_csync.so.0
+lib/libnextcloud_csync.so.%%VERSION%%
 lib/libnextcloudsync.so
 lib/libnextcloudsync.so.0
 lib/libnextcloudsync.so.%%VERSION%%
-lib/nextcloud/libocsync.so
-lib/nextcloud/libocsync.so.0
-lib/nextcloud/libocsync.so.%%VERSION%%
 share/applications/com.nextcloud.desktopclient.nextcloud.desktop
 share/caja-python/extensions/syncstate-Nextcloud.py
 share/icons/hicolor/1024x1024/apps/Nextcloud.png
@@ -83,6 +83,7 @@ share/icons/hicolor/72x72/apps/Nextcloud_sync.png
 share/icons/hicolor/72x72/apps/Nextcloud_sync_shared.png
 share/icons/hicolor/72x72/apps/Nextcloud_warn.png
 share/icons/hicolor/72x72/apps/Nextcloud_warn_shared.png
+share/mime/packages/nextcloud.xml
 share/nautilus-python/extensions/syncstate-Nextcloud.py
 share/nemo-python/extensions/syncstate-Nextcloud.py
 share/nextcloud/i18n/client_TW.qm
@@ -133,6 +134,7 @@ share/nextcloud/i18n/client_pt.qm
 share/nextcloud/i18n/client_pt_BR.qm
 share/nextcloud/i18n/client_ro.qm
 share/nextcloud/i18n/client_ru.qm
+share/nextcloud/i18n/client_sc.qm
 share/nextcloud/i18n/client_sk.qm
 share/nextcloud/i18n/client_sl.qm
 share/nextcloud/i18n/client_sr.qm



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104221850.13MIot3Y007771>