On Tue, October 25, 2022 08:33, Rafael Sadowski wrote:
> Change lib/inotify handling in owncloudclient. Runtime tests and
> feedback welcome.
>
Hi,
I've updated my homebox and rebuild owncloudclient with your patch.
Seems to work fine.
OK kirby@
> Rafael
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/net/owncloudclient/Makefile,v
> retrieving revision 1.63
> diff -u -p -u -p -r1.63 Makefile
> --- Makefile 5 Sep 2022 17:16:52 -0000 1.63
> +++ Makefile 25 Oct 2022 05:31:26 -0000
> @@ -3,6 +3,7 @@ COMMENT = owncloud sync client
> V = 2.11.1.8438
> DISTNAME = ownCloud-${V}
> PKGNAME = owncloudclient-${V}
> +REVISION = 0
>
> SHARED_LIBS += owncloudsync 7.2
> SHARED_LIBS += owncloud_csync 1.1
> @@ -39,13 +40,11 @@ CONFIGURE_ARGS += -Wno-dev \
> -DKDE_INSTALL_PLUGINDIR=${PREFIX}/lib/ownCloud/plugins/
> \
> -DCMAKE_DISABLE_FIND_PACKAGE_KF5=TRUE \
> -DCMAKE_DISABLE_FIND_PACKAGE_CMocka=TRUE \
> - -DInotify_INCLUDE_DIRS=${LOCALBASE}/include/inotify \
> - -DInotify_LIBRARIES=${LOCALBASE}/lib/inotify \
> -DCSYNC_REQUIRED_LIBRARIES=c
>
> -CFLAGS += -I${LOCALBASE}/include -I${LOCALBASE}/include/inotify
> -I${LOCALBASE}/include/qtkeychain
> -CXXFLAGS += -I${LOCALBASE}/include -I${LOCALBASE}/include/inotify
> -I${LOCALBASE}/include/qtkeychain
> -MODCMAKE_LDFLAGS = -L${LOCALBASE}/lib -L${LOCALBASE}/lib/inotify -linotify
> -Wl,-rpath=${LOCALBASE}/lib/inotify
> +CFLAGS += -I${LOCALBASE}/include -I${LOCALBASE}/include/qtkeychain
> +CXXFLAGS += -I${LOCALBASE}/include -I${LOCALBASE}/include/qtkeychain
> +MODCMAKE_LDFLAGS = -L${LOCALBASE}/lib
>
> NO_TEST = Yes
>
> Index: patches/patch-src_gui_CMakeLists_txt
> ===================================================================
> RCS file: patches/patch-src_gui_CMakeLists_txt
> diff -N patches/patch-src_gui_CMakeLists_txt
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_gui_CMakeLists_txt 25 Oct 2022 05:31:26 -0000
> @@ -0,0 +1,16 @@
> +Index: src/gui/CMakeLists.txt
> +--- src/gui/CMakeLists.txt.orig
> ++++ src/gui/CMakeLists.txt
> +@@ -182,7 +182,11 @@ elseif(UNIX AND NOT APPLE )
> + target_link_libraries(owncloudCore PUBLIC Qt5::DBus)
> + target_compile_definitions(owncloudCore PUBLIC
> "USE_FDO_NOTIFICATIONS")
> + endif()
> +- target_sources(owncloudCore PRIVATE folderwatcher_linux.cpp)
> ++ if(Inotify_FOUND)
> ++ target_sources(owncloudCore PRIVATE folderwatcher_linux.cpp)
> ++ target_include_directories(owncloudCore PRIVATE
> ${Inotify_INCLUDE_DIRS})
> ++ target_link_libraries(owncloudCore PUBLIC ${Inotify_LIBRARIES} )
> ++ endif()
> + endif()
> +
> +
>
>
