From nobody Sat Sep 28 11:31:16 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XG4sc32LZz5XCqx; Sat, 28 Sep 2024 11:31:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XG4sc2Fknz4Jm7; Sat, 28 Sep 2024 11:31:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727523076; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kfaCKUWW4gnSRMUEvKiBr0WgzZl50jb8h7s5C/DISPQ=; b=P8pdGtH3GZ7Y8M34VmpFDPE3VxGoIqxNxzPWuWEEhnlnE6ZucVas3s3UZd6NPwbYUWXahM GIdMPeR/UU5yFk8V0dS9q2hnbflpo3H8XOr3h8pSldhNlX6bwTF8IpeC0osrqI5eqRA1HN S9t58xFCDC+J8F7zqs5WDW1Kf12/dRJ+PC0MdA/JVExBLLR+7+CIUWoJHjay84xAuru8dU V+O74HpymNU1dDsCynSYsl3kB7rYsZEEcWfEuqT0VrQI7XFVaVC4wFM3yHbDTDGH0AfOqk ir28wGXkMAgzzJHpJz9C+iGfnGda9P6nhCqQZlFrPfYrcwkQZU/a2+3m6vovvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727523076; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kfaCKUWW4gnSRMUEvKiBr0WgzZl50jb8h7s5C/DISPQ=; b=l2rI7zj/yB+e++OyrjgnQ7vYiuJRfdcAOv/117oTlORPgq06keB3fjsVmZ4AW4QFoUkWEP ywpRWbdfjUJ6qb1YrcSTQleq7VsQUhRyoHXbtjTX7BLCrnwuY5GkSVeRbP5pcYbxxuNHSW Q3pbgvwz3QU8zJeIjpWIUSM3yDD+JjXn6/aGpg75aB7GRhS13H+UJHI6J8fCZi2KfvMEAC peucIYKVnqywUFh97Lkvja0zh7oyCifQaOwmC8o9q027uJLvyxQsG3X7/GXJx47GmRAeCH mC/WP5TlI/KaiXiqxuGxCCVjdv2nE3J8W44IbQFyj+hS4utkBUJZXGtT7CV/9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727523076; a=rsa-sha256; cv=none; b=o1f+bEUv0KPddNBczzeM0A+WtyESQV42owqwcOZtIHIaqoWlyxOvsyb7hMZwcDzbeOAU6s QhKXqOSUV7AHqQtfYedZLdYSpo6IEFp11Bq4kfPZanGiOFxx9gBDeykRwXOGhcDnwdS/z6 X9A0GDsko6pgVq+sUDWI+qMuU526gCmXKxbJydmddLQTNV+CDh1L3Wv5QPfT1kbO/+LnZw YZUVydSVbAlQjr46aiXFnzR/zh26ujzByFnV7pPSTVRWbodltdC1ryxLv0ZMCkNYCimnVp TvpIIi42txdAL3MP+7+mtCLNnhhDHZ9CCBlZ1NB36ZUi7/TB77my25qa83bGZw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XG4sc1rwjzNDT; Sat, 28 Sep 2024 11:31:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48SBVGEA096756; Sat, 28 Sep 2024 11:31:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48SBVGYm096753; Sat, 28 Sep 2024 11:31:16 GMT (envelope-from git) Date: Sat, 28 Sep 2024 11:31:16 GMT Message-Id: <202409281131.48SBVGYm096753@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Michael Reifenberger Subject: git: 0ae245619be4 - main - deskutils/nextcloudclient: update to 3.14.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mr X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0ae245619be4fb1d0e4ab58a8cd46b3183020f73 Auto-Submitted: auto-generated The branch main has been updated by mr: URL: https://cgit.FreeBSD.org/ports/commit/?id=0ae245619be4fb1d0e4ab58a8cd46b3183020f73 commit 0ae245619be4fb1d0e4ab58a8cd46b3183020f73 Author: Michael Reifenberger AuthorDate: 2024-09-28 11:27:51 +0000 Commit: Michael Reifenberger CommitDate: 2024-09-28 11:30:57 +0000 deskutils/nextcloudclient: update to 3.14.1 Update and switch to QT6 PR: 281544 Reported by: Guido Falsi madpilot@ --- deskutils/nextcloudclient/Makefile | 19 ++++++++-------- deskutils/nextcloudclient/distinfo | 6 +++--- .../nextcloudclient/files/patch-doc_building.rst | 25 ++++++++++++++++++++++ deskutils/nextcloudclient/pkg-plist | 8 +++++-- 4 files changed, 43 insertions(+), 15 deletions(-) diff --git a/deskutils/nextcloudclient/Makefile b/deskutils/nextcloudclient/Makefile index fd74b5a45c8a..dcd74cb4a227 100644 --- a/deskutils/nextcloudclient/Makefile +++ b/deskutils/nextcloudclient/Makefile @@ -1,5 +1,5 @@ PORTNAME= nextcloudclient -PORTVERSION= 3.13.3 +PORTVERSION= 3.14.1 DISTVERSIONPREFIX= v CATEGORIES= deskutils @@ -11,17 +11,16 @@ LICENSE= GPLv2 BUILD_DEPENDS= inkscape:graphics/inkscape LIB_DEPENDS= libinotify.so:devel/libinotify \ - libqt5keychain.so:security/qtkeychain@qt5 + libqt6keychain.so:security/qtkeychain@qt6 \ + libxkbcommon.so:x11/libxkbcommon -USES= cmake:noninja compiler:c++14-lang desktop-file-utils gmake \ - gnome iconv kde:5 localbase:ldflags pkgconfig qt:5 shared-mime-info \ +USES= cmake:noninja compiler:c++17-lang desktop-file-utils gl gmake \ + gnome iconv kde:6 localbase:ldflags pkgconfig qt:6 shared-mime-info \ sqlite ssl +USE_GL= opengl USE_KDE= archive USE_LDCONFIG= yes -USE_QT= buildtools:build concurrent core dbus declarative graphicaleffects \ - gui linguist:build network qmake:build quickcontrols \ - quickcontrols2 sql svg websockets widgets xml - +USE_QT= 5compat base declarative svg websockets CMAKE_ARGS= -DBUILD_UPDATER:BOOL=OFF \ -DWITH_STACK_PROTECTOR:BOOL=OFF @@ -52,11 +51,11 @@ DOCS_VARS= PORTDOCS=* GNOME_CMAKE_BOOL= BUILD_SHELL_INTEGRATION_NAUTILUS KDE_USES= xorg -KDE_USE= KDE=completion,config,coreaddons,ecm,jobwidgets,kio,service,solid,widgetsaddons,windowsystem \ +KDE_USE= KDE=completion,config,coreaddons,ecm:build,guiaddons,jobwidgets,kio,service,solid,widgetsaddons,windowsystem \ XORG=x11 KDE_CMAKE_BOOL= BUILD_SHELL_INTEGRATION_DOLPHIN -WEBENGINE_USE= QT=webchannel,webengine,printsupport,location +WEBENGINE_USE= QT=location,webchannel,webengine WEBENGINE_CMAKE_BOOL= BUILD_WITH_WEBENGINE .include diff --git a/deskutils/nextcloudclient/distinfo b/deskutils/nextcloudclient/distinfo index 3fd3ef1ac2d7..061b94cfcabe 100644 --- a/deskutils/nextcloudclient/distinfo +++ b/deskutils/nextcloudclient/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1724429487 -SHA256 (nextcloud-desktop-v3.13.3_GH0.tar.gz) = 4f1b0ffae207a8ab29d10f9cb6d51e107263cf45d138234bd8be1554eb12661f -SIZE (nextcloud-desktop-v3.13.3_GH0.tar.gz) = 13784545 +TIMESTAMP = 1727453525 +SHA256 (nextcloud-desktop-v3.14.1_GH0.tar.gz) = 83ddff511684c7b56a0a428c1a50630042a4c64d7b382d13b083509051cac8b9 +SIZE (nextcloud-desktop-v3.14.1_GH0.tar.gz) = 13956052 diff --git a/deskutils/nextcloudclient/files/patch-doc_building.rst b/deskutils/nextcloudclient/files/patch-doc_building.rst new file mode 100644 index 000000000000..1765379abd1d --- /dev/null +++ b/deskutils/nextcloudclient/files/patch-doc_building.rst @@ -0,0 +1,25 @@ +--- doc/building.rst.orig 2024-09-14 08:21:08 UTC ++++ doc/building.rst +@@ -220,13 +220,9 @@ ---------------------------------- + + 1. Click on 'Modify' in the Visual Studio Installer: + +- .. image:: ./images/building/visual-studio-installer.png +- :alt: Visual Studio Installer + + 2. Select 'Desktop development with C++' + +- .. image:: ./images/building/desktop-development-with-cpp.png +- :alt: Desktop development with C++ + + Handling the dependencies + ------------------------- +@@ -265,8 +261,6 @@ --------- + + 4. To use the tools installed with Visual Studio, you need the following in your %PATH%: + +- .. image:: ./images/building/path.png +- :alt: Windows environment variables + + 5. Alternatively you can use the tools installed with KDE Craft by adding them to %PATH%: + diff --git a/deskutils/nextcloudclient/pkg-plist b/deskutils/nextcloudclient/pkg-plist index e34797ec3adc..3ab387379022 100644 --- a/deskutils/nextcloudclient/pkg-plist +++ b/deskutils/nextcloudclient/pkg-plist @@ -11,12 +11,15 @@ 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/libnextcloud_csync.so.0 +%%KDE%%lib/libnextclouddolphinpluginhelper.so lib/libnextcloudsync.so -lib/libnextcloudsync.so.0 lib/libnextcloudsync.so.%%VERSION%% +lib/libnextcloudsync.so.0 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 share/icons/hicolor/1024x1024/apps/Nextcloud.png @@ -118,6 +121,7 @@ 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