aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Reifenberger <mr@FreeBSD.org>2024-09-28 11:27:51 +0000
committerMichael Reifenberger <mr@FreeBSD.org>2024-09-28 11:30:57 +0000
commit0ae245619be4fb1d0e4ab58a8cd46b3183020f73 (patch)
treeb697fb18615dd2f2e8c69004cbe1bbef646cf679
parent9e9ada883fb9f090342ed972e707aac31ee4b812 (diff)
deskutils/nextcloudclient: update to 3.14.1
Update and switch to QT6 PR: 281544 Reported by: Guido Falsi madpilot@
-rw-r--r--deskutils/nextcloudclient/Makefile19
-rw-r--r--deskutils/nextcloudclient/distinfo6
-rw-r--r--deskutils/nextcloudclient/files/patch-doc_building.rst25
-rw-r--r--deskutils/nextcloudclient/pkg-plist8
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 <bsd.port.pre.mk>
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