On Sun, Jul 31, 2022 at 04:56:33PM +0200, Rafael Sadowski wrote:
> On Fri Jul 29, 2022 at 07:17:16PM -0400, Adriano Barbosa wrote:
> > Hi.
> > Update for net/nextcloudclient v3.5.3.
> >
> > Added nextcloudsync_vfs_suffix shared lib missed some time in the
> > past.
> >
> > Changelog: https://github.com/nextcloud/desktop/releases/tag/v3.5.3
> > * [stable-3.5] Fix the system tray menu not being correctly replaced in
> > setupContextMenu on GNOME
> > * [stable-3.5] Ensure call notification stays on top of other windows
> > * [stable-3.5] Work around issues with window positioning on Linux DEs,
> > hardcode tray window to screen center when new account added
> > * [stable-3.5] Clean up systray methods, make more QML-friendly
> > * [stable-3.5] Refactor tray window opening code for clarity and efficiency
> > * [stable-3.5] Only set _FORTIFY_SOURCE when a higher level of this flag
> > has not been set
> > * [stable-3.5] Limit concurrent notifications
> > * [stable-3.5] Take ints by value rather than reference in UserModel
> > methods
> > * [stable-3.5] Respect skipAutoUpdateCheck in nextcloud.cfg with Sparkle
> > on macOS
> > * [stable-3.5] Use preprocessor directive rather than normal 'if' for
> > UNNotification types
> > * [stable-3.5] QML-ify the UserModel, use properties rather than setter
> > methods
> > * [stable-3.5] Fix ActivityItemContent QML paintedWidth errors
> > * [stable-3.5] Stop clearing notifications when new notifications are
> > received
> > * [stable-3.5] Ensure debug archive contents are readable by any user
> > * [stable-3.5] Stop styling QML unified search items hierarchically, use
> > global Style constants
> > * [stable-3.5] Update macOS Info.plist
> > * [stable-3.5] print sync direction in
> > SyncFileStatusTracker::slotAboutToPropagate
> > * [stable-3.5] Remove Ubuntu Impish, add Kinetic
> > * [stable-3.5] Ensure that throttled notifications still appear in tray
> > activity model
> > * [stable-3.5] Make apps menu scrollable when content taller than
> > available vertical space, preventing borking of layout
> >
> > Obrigado!
> > --
> > Adriano
> >
> >
>
> I think we ought to keep the "lib" prefix. It feels like an mistake by
> upstream. Anyway shared libs in /usr/local/lib should follow the same
> name pattern (libNAME.so.VERSION).
>
> Based on you diff:
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/net/nextcloudclient/Makefile,v
> retrieving revision 1.35
> diff -u -p -u -p -r1.35 Makefile
> --- Makefile 6 Jul 2022 19:52:38 -0000 1.35
> +++ Makefile 31 Jul 2022 14:51:25 -0000
> @@ -2,7 +2,7 @@ USE_WXNEEDED = Yes
>
> COMMENT = desktop sync client for Nextcloud
>
> -V = 3.5.2
> +V = 3.5.3
> DISTNAME = nextcloudclient-${V}
>
> GH_ACCOUNT = nextcloud
> @@ -13,15 +13,16 @@ CATEGORIES = net
>
> HOMEPAGE = https://nextcloud.com
>
> -SHARED_LIBS += nextcloudsync 4.0 # 3.5.2
> -SHARED_LIBS += nextcloud_csync 2.1 # 3.5.1
> +SHARED_LIBS += nextcloudsync 4.0 # 3.5.2
> +SHARED_LIBS += nextcloud_csync 2.1 # 3.5.1
> +SHARED_LIBS += nextcloudsync_vfs_suffix 0.0 # 3.5.3
>
> MAINTAINER = Adriano Barbosa <barbosa....@gmail.com>
>
> # GPLv2+
> PERMIT_PACKAGE = Yes
>
> -WANTLIB += ${COMPILER_LIBCXX} lib/inotify/inotify
> +WANTLIB += ${COMPILER_LIBCXX} lib/inotify
> WANTLIB += Qt5Concurrent Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Positioning
> WANTLIB += Qt5PrintSupport Qt5Qml Qt5QmlModels Qt5Quick Qt5QuickControls2
> WANTLIB += Qt5Svg Qt5WebChannel Qt5WebEngineCore Qt5WebEngineWidgets
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/net/nextcloudclient/distinfo,v
> retrieving revision 1.29
> diff -u -p -u -p -r1.29 distinfo
> --- distinfo 6 Jul 2022 19:52:38 -0000 1.29
> +++ distinfo 31 Jul 2022 14:51:25 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (nextcloudclient-3.5.2.tar.gz) =
> DEZzEOGhsyWTRGWExqXXqTG34to9FyHayLCsU8xJMIg=
> -SIZE (nextcloudclient-3.5.2.tar.gz) = 15433543
> +SHA256 (nextcloudclient-3.5.3.tar.gz) =
> xYExDYFMxaB1t3iQESuml3TJ7W2MQrTRKWNUgtLO5X4=
> +SIZE (nextcloudclient-3.5.3.tar.gz) = 15436522
> Index: patches/patch-src_libsync_vfs_suffix_CMakeLists_txt
> ===================================================================
> RCS file: patches/patch-src_libsync_vfs_suffix_CMakeLists_txt
> diff -N patches/patch-src_libsync_vfs_suffix_CMakeLists_txt
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_libsync_vfs_suffix_CMakeLists_txt 31 Jul 2022
> 14:51:25 -0000
> @@ -0,0 +1,12 @@
> +Index: src/libsync/vfs/suffix/CMakeLists.txt
> +--- src/libsync/vfs/suffix/CMakeLists.txt.orig
> ++++ src/libsync/vfs/suffix/CMakeLists.txt
> +@@ -11,8 +11,6 @@ set_target_properties(nextcloudsync_vfs_suffix
> + ${BIN_OUTPUT_DIRECTORY}
> + RUNTIME_OUTPUT_DIRECTORY
> + ${BIN_OUTPUT_DIRECTORY}
> +- PREFIX
> +- ""
> + AUTOMOC
> + TRUE
> + LIBRARY_OUTPUT_NAME
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/net/nextcloudclient/pkg/PLIST,v
> retrieving revision 1.10
> diff -u -p -u -p -r1.10 PLIST
> --- pkg/PLIST 11 Mar 2022 19:46:30 -0000 1.10
> +++ pkg/PLIST 31 Jul 2022 14:51:25 -0000
> @@ -14,7 +14,7 @@ include/nextcloudsync/mirall/syncfileite
> include/nextcloudsync/mirall/syncresult.h
> @lib lib/libnextcloud_csync.so.${LIBnextcloud_csync_VERSION}
> @lib lib/libnextcloudsync.so.${LIBnextcloudsync_VERSION}
> -@so lib/nextcloudsync_vfs_suffix.so
> +@lib
> lib/libnextcloudsync_vfs_suffix.so.${LIBnextcloudsync_vfs_suffix_VERSION}
> share/applications/com.nextcloud.desktopclient.nextcloud.desktop
> share/examples/Nextcloud/
> @sample ${SYSCONFDIR}/Nextcloud/
I have no objection but the change on libinotify which leads to a
missing lib/inotify. Bellow a diff wich works for me based on yours:
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/nextcloudclient/Makefile,v
retrieving revision 1.35
diff -u -p -r1.35 Makefile
--- Makefile 6 Jul 2022 19:52:38 -0000 1.35
+++ Makefile 31 Jul 2022 22:42:56 -0000
@@ -2,7 +2,7 @@ USE_WXNEEDED = Yes
COMMENT = desktop sync client for Nextcloud
-V = 3.5.2
+V = 3.5.3
DISTNAME = nextcloudclient-${V}
GH_ACCOUNT = nextcloud
@@ -13,8 +13,9 @@ CATEGORIES = net
HOMEPAGE = https://nextcloud.com
-SHARED_LIBS += nextcloudsync 4.0 # 3.5.2
-SHARED_LIBS += nextcloud_csync 2.1 # 3.5.1
+SHARED_LIBS += nextcloudsync 4.0 # 3.5.2
+SHARED_LIBS += nextcloud_csync 2.1 # 3.5.1
+SHARED_LIBS += nextcloudsync_vfs_suffix 0.0 # 3.5.3
MAINTAINER = Adriano Barbosa <barbosa....@gmail.com>
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/nextcloudclient/distinfo,v
retrieving revision 1.29
diff -u -p -r1.29 distinfo
--- distinfo 6 Jul 2022 19:52:38 -0000 1.29
+++ distinfo 31 Jul 2022 22:42:56 -0000
@@ -1,2 +1,2 @@
-SHA256 (nextcloudclient-3.5.2.tar.gz) =
DEZzEOGhsyWTRGWExqXXqTG34to9FyHayLCsU8xJMIg=
-SIZE (nextcloudclient-3.5.2.tar.gz) = 15433543
+SHA256 (nextcloudclient-3.5.3.tar.gz) =
xYExDYFMxaB1t3iQESuml3TJ7W2MQrTRKWNUgtLO5X4=
+SIZE (nextcloudclient-3.5.3.tar.gz) = 15436522
Index: patches/patch-src_libsync_vfs_suffix_CMakeLists_txt
===================================================================
RCS file: patches/patch-src_libsync_vfs_suffix_CMakeLists_txt
diff -N patches/patch-src_libsync_vfs_suffix_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_libsync_vfs_suffix_CMakeLists_txt 31 Jul 2022 22:42:56
-0000
@@ -0,0 +1,12 @@
+Index: src/libsync/vfs/suffix/CMakeLists.txt
+--- src/libsync/vfs/suffix/CMakeLists.txt.orig
++++ src/libsync/vfs/suffix/CMakeLists.txt
+@@ -11,8 +11,6 @@ set_target_properties(nextcloudsync_vfs_suffix
+ ${BIN_OUTPUT_DIRECTORY}
+ RUNTIME_OUTPUT_DIRECTORY
+ ${BIN_OUTPUT_DIRECTORY}
+- PREFIX
+- ""
+ AUTOMOC
+ TRUE
+ LIBRARY_OUTPUT_NAME
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/nextcloudclient/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST
--- pkg/PLIST 11 Mar 2022 19:46:30 -0000 1.10
+++ pkg/PLIST 31 Jul 2022 22:42:56 -0000
@@ -14,7 +14,7 @@ include/nextcloudsync/mirall/syncfileite
include/nextcloudsync/mirall/syncresult.h
@lib lib/libnextcloud_csync.so.${LIBnextcloud_csync_VERSION}
@lib lib/libnextcloudsync.so.${LIBnextcloudsync_VERSION}
-@so lib/nextcloudsync_vfs_suffix.so
+@lib lib/libnextcloudsync_vfs_suffix.so.${LIBnextcloudsync_vfs_suffix_VERSION}
share/applications/com.nextcloud.desktopclient.nextcloud.desktop
share/examples/Nextcloud/
@sample ${SYSCONFDIR}/Nextcloud/
