diff --git a/deskutils/nextcloudclient/Makefile b/deskutils/nextcloudclient/Makefile index 36aef68d4517..efcad09b3329 100644 --- a/deskutils/nextcloudclient/Makefile +++ b/deskutils/nextcloudclient/Makefile @@ -1,81 +1,81 @@ PORTNAME= nextcloudclient -PORTVERSION= 4.0.1 +PORTVERSION= 4.0.2 DISTVERSIONPREFIX= v CATEGORIES= deskutils MAINTAINER= mr@FreeBSD.org COMMENT= NextCloud Desktop Syncing Client WWW= https://github.com/nextcloud/desktop LICENSE= GPLv2 BUILD_DEPENDS= inkscape:graphics/inkscape LIB_DEPENDS= libinotify.so:devel/libinotify \ libqt6keychain.so:security/qtkeychain@qt6 \ libxkbcommon.so:x11/libxkbcommon \ libp11.so:security/libp11 USES= cmake:noninja compiler:c++20-lang desktop-file-utils gl gmake \ gnome iconv kde:6 localbase:ldflags pkgconfig qt:6 shared-mime-info \ sqlite ssl USE_CXXSTD= c++20 USE_GL= opengl USE_KDE= archive ecm:build USE_LDCONFIG= yes USE_QT= 5compat base declarative positioning svg websockets CMAKE_ARGS= -DBUILD_UPDATER:BOOL=OFF \ -DWITH_STACK_PROTECTOR:BOOL=OFF PLIST_SUB= VERSION=${PORTVERSION} USE_GITHUB= yes GH_ACCOUNT= nextcloud GH_PROJECT= desktop OPTIONS_DEFINE= DEBUG GNOME GUIADDONS KDE WEBENGINE OPTIONS_DEFAULT= GNOME GUIADDONS OPTIONS_DEFAULT_aarch64= WEBENGINE OPTIONS_DEFAULT_amd64= WEBENGINE OPTIONS_DEFAULT_i386= WEBENGINE OPTIONS_SUB= yes GUIADDONS_DESC= Use KDE guiaddons (implies KDE) KDE_DESC= KDE desktop environment support WEBENGINE_DESC= Use Webengine to provide web login flow GNOME_CMAKE_BOOL= BUILD_SHELL_INTEGRATION_NAUTILUS KDE_USES= xorg KDE_USE= KDE=completion,config,coreaddons,ecm:build,jobwidgets,kio,service,solid,widgetsaddons,windowsystem \ XORG=x11 KDE_CMAKE_BOOL= BUILD_SHELL_INTEGRATION_DOLPHIN GUIADDONS_IMPLIES= KDE GUIADDONS_USE= KDE=guiaddons WEBENGINE_USE= QT=location,webchannel,webengine WEBENGINE_CMAKE_BOOL= BUILD_WITH_WEBENGINE .include .ifdef WITH_DEBUG CMAKE_ARGS+= -DCMAKE_BUILD_TYPE:STRING=Debug .endif post-patch: @${REINPLACE_CMD} -e \ 's|.lst |.lst.sample |' ${WRKSRC}/CMakeLists.txt post-patch-GUIADDONS-off: @${REINPLACE_CMD} -e '/^find_package.*KF6GuiAddons/d' \ ${WRKSRC}/src/gui/CMakeLists.txt pre-configure: @(cd ${WRKSRC} && ${CP} -f sync-exclude.lst sync-exclude.lst.sample) post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/sync-exclude.lst ${STAGEDIR}${EXAMPLESDIR} .include diff --git a/deskutils/nextcloudclient/distinfo b/deskutils/nextcloudclient/distinfo index d05d7e8df6a4..616ab429dbd3 100644 --- a/deskutils/nextcloudclient/distinfo +++ b/deskutils/nextcloudclient/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1761637713 -SHA256 (nextcloud-desktop-v4.0.1_GH0.tar.gz) = 4be3efd3aab3ab7ff410f67b69ca7173aba2dd4797ee77cefe0d427bb0011b59 -SIZE (nextcloud-desktop-v4.0.1_GH0.tar.gz) = 8693203 +TIMESTAMP = 1764772402 +SHA256 (nextcloud-desktop-v4.0.2_GH0.tar.gz) = 5d8c3eefe31e1cad5e65d88bcc4e256806d3db33122e755d329c83461c013b5b +SIZE (nextcloud-desktop-v4.0.2_GH0.tar.gz) = 8735478 diff --git a/deskutils/nextcloudclient/files/patch-src_csync_ConfigureChecks.cmake b/deskutils/nextcloudclient/files/patch-src_csync_ConfigureChecks.cmake deleted file mode 100644 index 0d45a7facbde..000000000000 --- a/deskutils/nextcloudclient/files/patch-src_csync_ConfigureChecks.cmake +++ /dev/null @@ -1,12 +0,0 @@ ---- src/csync/ConfigureChecks.cmake.orig 2025-03-06 09:00:02 UTC -+++ src/csync/ConfigureChecks.cmake -@@ -13,9 +13,6 @@ set(SOURCEDIR ${CMAKE_CURRENT_SOURCE_DIR}) - set(BINARYDIR ${CMAKE_CURRENT_BINARY_DIR}) - set(SOURCEDIR ${CMAKE_CURRENT_SOURCE_DIR}) - --# HEADER FILES --check_include_file(argp.h HAVE_ARGP_H) -- - # FUNCTIONS - if (NOT LINUX) - # librt diff --git a/deskutils/nextcloudclient/files/patch-src_libsync_configfile.cpp b/deskutils/nextcloudclient/files/patch-src_libsync_configfile.cpp index 95097102e956..b009f473d376 100644 --- a/deskutils/nextcloudclient/files/patch-src_libsync_configfile.cpp +++ b/deskutils/nextcloudclient/files/patch-src_libsync_configfile.cpp @@ -1,25 +1,18 @@ ---- src/libsync/configfile.cpp.orig 2025-03-06 09:00:02 UTC +--- src/libsync/configfile.cpp.orig 2025-12-03 14:37:03 UTC +++ src/libsync/configfile.cpp -@@ -653,11 +653,22 @@ bool ConfigFile::skipUpdateCheck(const QString &connec - if (connection.isEmpty()) - con = defaultConnection(); - -+#if 0 - QVariant fallback = getValue(QLatin1String(skipUpdateCheckC), con, false); -+#else -+ QVariant fallback = getValue(QLatin1String(skipUpdateCheckC), con, true); -+#endif +@@ -626,11 +626,13 @@ bool ConfigFile::skipUpdateCheck(const QString &connec + bool ConfigFile::skipUpdateCheck(const QString &connectionGroupName) const + { + const auto groupName = connectionGroupName.isEmpty() ? defaultConnectionGroupName() : connectionGroupName; +- QVariant fallback = getValue(QLatin1String(skipUpdateCheckC), groupName, false); ++ QVariant fallback = getValue(QLatin1String(skipUpdateCheckC), groupName, true); fallback = getValue(QLatin1String(skipUpdateCheckC), QString(), fallback); QVariant value = getPolicySetting(QLatin1String(skipUpdateCheckC), fallback); -+#if 0 - return value.toBool(); -+#else +- return value.toBool(); + if ( !value.toBool() ) -+ qDebug() << "FreeBSD package disabled the UpdateCheck mechanism."; -+ ++ qDebug() << "FreeBSD package disabled the UpdateCheck mechanism."; + return true; -+#endif } - void ConfigFile::setSkipUpdateCheck(bool skip, const QString &connection) + void ConfigFile::setSkipUpdateCheck(bool skip, const QString &connectionGroupName) diff --git a/deskutils/nextcloudclient/pkg-plist b/deskutils/nextcloudclient/pkg-plist index 40845a88c333..ed4f2d2454e0 100644 --- a/deskutils/nextcloudclient/pkg-plist +++ b/deskutils/nextcloudclient/pkg-plist @@ -1,134 +1,134 @@ bin/nextcloud bin/nextcloudcmd @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%% %%KDE%%lib/libnextclouddolphinpluginhelper.so lib/libnextcloudsync.so lib/libnextcloudsync.so.0 lib/libnextcloudsync.so.%%VERSION%% lib/nextcloudsync_vfs_suffix.so %%KDE%%%%QT_PLUGINDIR%%/kf6/kfileitemaction/nextclouddolphinactionplugin.so %%KDE%%%%QT_PLUGINDIR%%/kf6/overlayicon/nextclouddolphinoverlayplugin.so share/applications/com.nextcloud.desktopclient.nextcloud.desktop %%GNOME%%share/caja-python/extensions/syncstate-Nextcloud.py -%%EXAMPLESDIR%%/sync-exclude.lst share/icons/hicolor/1024x1024/apps/Nextcloud.png share/icons/hicolor/128x128/apps/Nextcloud.png share/icons/hicolor/128x128/apps/Nextcloud_a_shared.png share/icons/hicolor/128x128/apps/Nextcloud_error.png share/icons/hicolor/128x128/apps/Nextcloud_ok.png share/icons/hicolor/128x128/apps/Nextcloud_sync.png share/icons/hicolor/128x128/apps/Nextcloud_warn.png share/icons/hicolor/16x16/apps/Nextcloud.png share/icons/hicolor/16x16/apps/Nextcloud_a_shared.png share/icons/hicolor/16x16/apps/Nextcloud_error.png share/icons/hicolor/16x16/apps/Nextcloud_ok.png share/icons/hicolor/16x16/apps/Nextcloud_sync.png share/icons/hicolor/16x16/apps/Nextcloud_warn.png share/icons/hicolor/24x24/apps/Nextcloud.png share/icons/hicolor/256x256/apps/Nextcloud.png share/icons/hicolor/256x256/apps/Nextcloud_a_shared.png share/icons/hicolor/256x256/apps/Nextcloud_error.png share/icons/hicolor/256x256/apps/Nextcloud_ok.png share/icons/hicolor/256x256/apps/Nextcloud_sync.png share/icons/hicolor/256x256/apps/Nextcloud_warn.png share/icons/hicolor/32x32/apps/Nextcloud.png share/icons/hicolor/32x32/apps/Nextcloud_a_shared.png share/icons/hicolor/32x32/apps/Nextcloud_error.png share/icons/hicolor/32x32/apps/Nextcloud_ok.png share/icons/hicolor/32x32/apps/Nextcloud_sync.png share/icons/hicolor/32x32/apps/Nextcloud_warn.png share/icons/hicolor/48x48/apps/Nextcloud.png share/icons/hicolor/48x48/apps/Nextcloud_a_shared.png share/icons/hicolor/48x48/apps/Nextcloud_error.png share/icons/hicolor/48x48/apps/Nextcloud_ok.png share/icons/hicolor/48x48/apps/Nextcloud_sync.png share/icons/hicolor/48x48/apps/Nextcloud_warn.png share/icons/hicolor/512x512/apps/Nextcloud.png share/icons/hicolor/64x64/apps/Nextcloud.png share/icons/hicolor/64x64/apps/Nextcloud_a_shared.png share/icons/hicolor/64x64/apps/Nextcloud_error.png share/icons/hicolor/64x64/apps/Nextcloud_ok.png share/icons/hicolor/64x64/apps/Nextcloud_sync.png share/icons/hicolor/64x64/apps/Nextcloud_warn.png share/icons/hicolor/72x72/apps/Nextcloud_a_shared.png share/icons/hicolor/72x72/apps/Nextcloud_error.png share/icons/hicolor/72x72/apps/Nextcloud_ok.png share/icons/hicolor/72x72/apps/Nextcloud_sync.png share/icons/hicolor/72x72/apps/Nextcloud_warn.png share/mime/packages/nextcloud.xml %%GNOME%%share/nautilus-python/extensions/syncstate-Nextcloud.py %%GNOME%%share/nemo-python/extensions/syncstate-Nextcloud.py share/nextcloud/i18n/client_af.qm share/nextcloud/i18n/client_ar.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_ga.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_lo.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_sw.qm share/nextcloud/i18n/client_th.qm share/nextcloud/i18n/client_tr.qm share/nextcloud/i18n/client_ug.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