CVS commit: pkgsrc/net/nextcloud-client

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Mon Nov 17 10:23:50 UTC 2025

Modified Files:
        pkgsrc/net/nextcloud-client: Makefile PLIST distinfo
Added Files:
        pkgsrc/net/nextcloud-client/patches: patch-src_gui_CMakeLists.txt

Log Message:
QT 6.10+ expects GuiPrivate in package list if used.

Depend on x11/kf6-kguiaddons, getting rid of warnings.
Leave out devel/kf6-kio dependency, it appears to rope in most of KDE.

While here, update to 3.17.3 - 4.x is a bit of a mess, still.

For the numerous changes between 3.16.4 and 3.17.3, see upstream's
changelog at <https://github.com/nextcloud/desktop/releases>.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/net/nextcloud-client/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/nextcloud-client/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/nextcloud-client/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/nextcloud-client/patches/patch-src_gui_CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/nextcloud-client/Makefile
diff -u pkgsrc/net/nextcloud-client/Makefile:1.27 pkgsrc/net/nextcloud-client/Makefile:1.28
--- pkgsrc/net/nextcloud-client/Makefile:1.27   Thu Oct 23 20:38:52 2025
+++ pkgsrc/net/nextcloud-client/Makefile        Mon Nov 17 10:23:50 2025
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2025/10/23 20:38:52 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2025/11/17 10:23:50 hauke Exp $
 #
 
-DISTNAME=      nextcloud-client-3.16.4
-PKGREVISION=   1
+DISTNAME=      nextcloud-client-3.17.3
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=nextcloud/}
 GITHUB_PROJECT=        desktop
@@ -47,9 +46,9 @@ AUTO_MKDIRS=  yes
 .include "../../archivers/kf6-karchive/buildlink3.mk"
 .include "../../databases/shared-mime-info/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
-#.include "../../devel/kf6-kio/buildlink3.mk"                  # optional
 .include "../../devel/extra-cmake-modules/buildlink3.mk"
 .include "../../devel/libinotify/buildlink3.mk"
+#.include "../../devel/kf6-kio/buildlink3.mk"  # optional, adds most of KDE
 .include "../../devel/qt6-qt5compat/buildlink3.mk"
 # In theory, qt6-qttools should be TOOL_DEPENDS only.
 .include "../../devel/qt6-qttools/buildlink3.mk"
@@ -60,6 +59,6 @@ AUTO_MKDIRS=  yes
 .include "../../security/libp11/buildlink3.mk"
 .include "../../security/qt6-qtkeychain/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
-#.include "../../x11/kf6-kguiaddons/buildlink3.mk"             # optional
+.include "../../x11/kf6-kguiaddons/buildlink3.mk"
 .include "../../x11/qt6-qtbase/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/nextcloud-client/PLIST
diff -u pkgsrc/net/nextcloud-client/PLIST:1.3 pkgsrc/net/nextcloud-client/PLIST:1.4
--- pkgsrc/net/nextcloud-client/PLIST:1.3       Mon Mar 31 06:20:58 2025
+++ pkgsrc/net/nextcloud-client/PLIST   Mon Nov 17 10:23:50 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2025/03/31 06:20:58 plunky Exp $
+@comment $NetBSD: PLIST,v 1.4 2025/11/17 10:23:50 hauke Exp $
 bin/nextcloud
 bin/nextcloudcmd
 include/nextcloudsync/creds/abstractcredentials.h
@@ -88,7 +88,6 @@ share/icons/hicolor/72x72/apps/Nextcloud
 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_ar.qm
 share/nextcloud/i18n/client_bg.qm
@@ -143,6 +142,7 @@ 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

Index: pkgsrc/net/nextcloud-client/distinfo
diff -u pkgsrc/net/nextcloud-client/distinfo:1.5 pkgsrc/net/nextcloud-client/distinfo:1.6
--- pkgsrc/net/nextcloud-client/distinfo:1.5    Tue May  6 10:31:11 2025
+++ pkgsrc/net/nextcloud-client/distinfo        Mon Nov 17 10:23:50 2025
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2025/05/06 10:31:11 hauke Exp $
+$NetBSD: distinfo,v 1.6 2025/11/17 10:23:50 hauke Exp $
 
-BLAKE2s (nextcloud-client-3.16.4.tar.gz) = ffb9b7445191eaf6937f23dba7823712b24b9a9fea3985ffa62a7d2b46ea2f6a
-SHA512 (nextcloud-client-3.16.4.tar.gz) = 86ed8c390cc2e616b6d3dfdcb6756f0fd72228b259c69d498ca12c29107bb71c817832eb72d3c48823a7ea5167a0f40d5e5aaa27f14d63ea9808ca476cf2fdb5
-Size (nextcloud-client-3.16.4.tar.gz) = 15612642 bytes
+BLAKE2s (nextcloud-client-3.17.3.tar.gz) = 18dfd968de367726470eedec012a258a207c56c1bbd9da80c6078fd35f940996
+SHA512 (nextcloud-client-3.17.3.tar.gz) = 827de1fec1ca9874eb89bb8614a82f2ae6ba6f40f32dce59218204b449b3490469d30d2d3b5fc369720fa5acf38b8a254d1f33be50f97b801ae6911b29756aff
+Size (nextcloud-client-3.17.3.tar.gz) = 9553123 bytes
 SHA1 (patch-CMakeLists.txt) = 65c8cb765a3b0a05c95687426838a2f48ba65dfa
+SHA1 (patch-src_gui_CMakeLists.txt) = 0bda369d63d9b4a99388be4483ec1660e28a99e5

Added files:

Index: pkgsrc/net/nextcloud-client/patches/patch-src_gui_CMakeLists.txt
diff -u /dev/null pkgsrc/net/nextcloud-client/patches/patch-src_gui_CMakeLists.txt:1.1
--- /dev/null   Mon Nov 17 10:23:50 2025
+++ pkgsrc/net/nextcloud-client/patches/patch-src_gui_CMakeLists.txt    Mon Nov 17 10:23:50 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_gui_CMakeLists.txt,v 1.1 2025/11/17 10:23:50 hauke Exp $
+
+As of QT 6.10, GuiPrivate needs to be in the find_package() list, see
+<https://doc-snapshots.qt.io/qt6-6.10/qtguiprivate-module.html#details>
+
+--- src/gui/CMakeLists.txt.orig        2025-11-17 09:59:37.481497190 +0000
++++ src/gui/CMakeLists.txt
+@@ -2,7 +2,7 @@
+ # SPDX-FileCopyrightText: 2014 ownCloud GmbH
+ # SPDX-License-Identifier: GPL-2.0-or-later
+ project(gui)
+-find_package(Qt${QT_MAJOR_VERSION} REQUIRED COMPONENTS Widgets Svg Qml Quick QuickControls2 QuickWidgets Xml Network)
++find_package(Qt${QT_MAJOR_VERSION} REQUIRED COMPONENTS Widgets Svg Qml Quick QuickControls2 QuickWidgets Xml Network GuiPrivate)
+ find_package(KF6Archive REQUIRED)
+ find_package(KF6GuiAddons)
+