diff --git a/deskutils/nextcloudclient/Makefile b/deskutils/nextcloudclient/Makefile index ba55c78132fc..ace380ce9b9f 100644 --- a/deskutils/nextcloudclient/Makefile +++ b/deskutils/nextcloudclient/Makefile @@ -1,65 +1,65 @@ # Created by: Mathieu Arnold PORTNAME= nextcloudclient -PORTVERSION= 3.1.3 +PORTVERSION= 3.2.0 DISTVERSIONPREFIX= v CATEGORIES= deskutils MAINTAINER= mr@FreeBSD.org COMMENT= NextCloud Desktop Syncing Client LICENSE= GPLv2 DEPRECATED= Uses EOL Python 2.7 via www/qt5-webengine 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 \ quickcontrols2 sql svg webchannel webengine websockets \ widgets xml CMAKE_ARGS= -DBUILD_WITH_QT4:BOOL=OFF \ -DBUILD_UPDATER:BOOL=OFF \ -DCMAKE_INSTALL_MANDIR:STRING=man \ -DWITH_STACK_PROTECTOR:BOOL=OFF \ -DNO_SHIBBOLETH=1 USE_LDCONFIG= yes INSTALLS_ICONS= yes DEBUG= yes USE_GITHUB= yes GH_ACCOUNT= nextcloud GH_PROJECT= desktop #OPTIONS_DEFINE= DEBUG DOCS OPTIONS_DEFINE= DEBUG # DOCS doesn't build currently #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 PLIST_SUB= VERSION=${PORTVERSION} .include .ifdef WITH_DEBUG CMAKE_ARGS+= -DCMAKE_BUILD_TYPE:STRING=Debug .endif .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200085 && !${SSL_DEFAULT:Mopenssl} BROKEN= nextcloudclient requires OpenSSL 1.1.0, add DEFAULT_VERSIONS+=ssl=openssl to /etc/make.conf .endif post-patch: @${REINPLACE_CMD} -e \ 's|.lst |.lst.sample |' ${WRKSRC}/CMakeLists.txt pre-configure: @(cd ${WRKSRC} && ${CP} -f sync-exclude.lst sync-exclude.lst.sample) .include 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,145 +1,147 @@ 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 include/nextcloudsync/mirall/configfile.h include/nextcloudsync/mirall/networkjobs.h 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 share/icons/hicolor/128x128/apps/Nextcloud.png share/icons/hicolor/128x128/apps/Nextcloud_error.png share/icons/hicolor/128x128/apps/Nextcloud_error_shared.png share/icons/hicolor/128x128/apps/Nextcloud_ok.png share/icons/hicolor/128x128/apps/Nextcloud_ok_shared.png share/icons/hicolor/128x128/apps/Nextcloud_sync.png share/icons/hicolor/128x128/apps/Nextcloud_sync_shared.png share/icons/hicolor/128x128/apps/Nextcloud_warn.png share/icons/hicolor/128x128/apps/Nextcloud_warn_shared.png share/icons/hicolor/16x16/apps/Nextcloud.png share/icons/hicolor/16x16/apps/Nextcloud_error.png share/icons/hicolor/16x16/apps/Nextcloud_error_shared.png share/icons/hicolor/16x16/apps/Nextcloud_ok.png share/icons/hicolor/16x16/apps/Nextcloud_ok_shared.png share/icons/hicolor/16x16/apps/Nextcloud_sync.png share/icons/hicolor/16x16/apps/Nextcloud_sync_shared.png share/icons/hicolor/16x16/apps/Nextcloud_warn.png share/icons/hicolor/16x16/apps/Nextcloud_warn_shared.png share/icons/hicolor/24x24/apps/Nextcloud.png share/icons/hicolor/256x256/apps/Nextcloud.png share/icons/hicolor/256x256/apps/Nextcloud_error.png share/icons/hicolor/256x256/apps/Nextcloud_error_shared.png share/icons/hicolor/256x256/apps/Nextcloud_ok.png share/icons/hicolor/256x256/apps/Nextcloud_ok_shared.png share/icons/hicolor/256x256/apps/Nextcloud_sync.png share/icons/hicolor/256x256/apps/Nextcloud_sync_shared.png share/icons/hicolor/256x256/apps/Nextcloud_warn.png share/icons/hicolor/256x256/apps/Nextcloud_warn_shared.png share/icons/hicolor/32x32/apps/Nextcloud.png share/icons/hicolor/32x32/apps/Nextcloud_error.png share/icons/hicolor/32x32/apps/Nextcloud_error_shared.png share/icons/hicolor/32x32/apps/Nextcloud_ok.png share/icons/hicolor/32x32/apps/Nextcloud_ok_shared.png share/icons/hicolor/32x32/apps/Nextcloud_sync.png share/icons/hicolor/32x32/apps/Nextcloud_sync_shared.png share/icons/hicolor/32x32/apps/Nextcloud_warn.png share/icons/hicolor/32x32/apps/Nextcloud_warn_shared.png share/icons/hicolor/48x48/apps/Nextcloud.png share/icons/hicolor/48x48/apps/Nextcloud_error.png share/icons/hicolor/48x48/apps/Nextcloud_error_shared.png share/icons/hicolor/48x48/apps/Nextcloud_ok.png share/icons/hicolor/48x48/apps/Nextcloud_ok_shared.png share/icons/hicolor/48x48/apps/Nextcloud_sync.png share/icons/hicolor/48x48/apps/Nextcloud_sync_shared.png share/icons/hicolor/48x48/apps/Nextcloud_warn.png share/icons/hicolor/48x48/apps/Nextcloud_warn_shared.png share/icons/hicolor/512x512/apps/Nextcloud.png share/icons/hicolor/64x64/apps/Nextcloud.png share/icons/hicolor/64x64/apps/Nextcloud_error.png share/icons/hicolor/64x64/apps/Nextcloud_error_shared.png share/icons/hicolor/64x64/apps/Nextcloud_ok.png share/icons/hicolor/64x64/apps/Nextcloud_ok_shared.png share/icons/hicolor/64x64/apps/Nextcloud_sync.png share/icons/hicolor/64x64/apps/Nextcloud_sync_shared.png share/icons/hicolor/64x64/apps/Nextcloud_warn.png share/icons/hicolor/64x64/apps/Nextcloud_warn_shared.png share/icons/hicolor/72x72/apps/Nextcloud_error.png share/icons/hicolor/72x72/apps/Nextcloud_error_shared.png share/icons/hicolor/72x72/apps/Nextcloud_ok.png share/icons/hicolor/72x72/apps/Nextcloud_ok_shared.png 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 share/nextcloud/i18n/client_af.qm share/nextcloud/i18n/client_bg.qm share/nextcloud/i18n/client_br.qm share/nextcloud/i18n/client_ca.qm share/nextcloud/i18n/client_cs.qm share/nextcloud/i18n/client_da.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_eo.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 share/nextcloud/i18n/client_fi.qm share/nextcloud/i18n/client_fr.qm share/nextcloud/i18n/client_gl.qm share/nextcloud/i18n/client_he.qm share/nextcloud/i18n/client_hr.qm share/nextcloud/i18n/client_hu.qm share/nextcloud/i18n/client_id.qm share/nextcloud/i18n/client_is.qm share/nextcloud/i18n/client_it.qm share/nextcloud/i18n/client_ja.qm share/nextcloud/i18n/client_ko.qm share/nextcloud/i18n/client_lt_LT.qm share/nextcloud/i18n/client_lv.qm share/nextcloud/i18n/client_mk.qm share/nextcloud/i18n/client_nb_NO.qm share/nextcloud/i18n/client_nl.qm share/nextcloud/i18n/client_oc.qm share/nextcloud/i18n/client_pl.qm 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 share/nextcloud/i18n/client_sv.qm share/nextcloud/i18n/client_th.qm share/nextcloud/i18n/client_tr.qm share/nextcloud/i18n/client_uk.qm share/nextcloud/i18n/client_zh_CN.qm share/nextcloud/i18n/client_zh_HK.qm share/nextcloud/i18n/client_zh_TW.qm