On Tue, June 7, 2016 13:41, David Coppa wrote:
> On Mon, 06 Jun 2016, Stuart Henderson wrote:
>
>> On 2016/06/06 12:40, Stuart Henderson wrote:
>> > FAILED: shell_integration/dolphin/libownclouddolphinpluginhelper.so
>>
>> oh...it didn't attempt to build this file in the previous build.
>> It picks it up because the (fairly recently added) kf5 was present
>> during configure:
>>
>> -- Found KF5KIO: /usr/local/lib/cmake/KF5KIO/KF5KIOConfig.cmake (found
>> version "5.21.0")
>> -- Found KF5: success (found suitable version "5.21.0", minimum required is
>> "5.16") found components: KIO
>> -- Found KF5CoreAddons:
>> /usr/local/lib/cmake/KF5CoreAddons/KF5CoreAddonsConfig.cmake (found version
>> "5.21.0")
>> -- Found KF5: success (found suitable version "5.21.0", minimum required is
>> "5.16.0") found components: CoreAddons KIO
>> CMake Warning at /usr/local/share/ECM/kde-modules/KDEInstallDirs.cmake:595
>> (message):
>> KDE_INSTALL_BINDIR, KDE_INSTALL_LIBDIR and KDE_INSTALL_INCLUDEDIR should
>> either all be absolute paths or all be relative paths.
>> Call Stack (most recent call first):
>> shell_integration/dolphin/CMakeLists.txt:22 (include)
>>
>> I've disabled this in owncloudclient for now. Not sure why linking
>> is failing. FWIW /usr/obj/ports/owncloudclient-2.1.1-qt5/bin/c++ is a
>> symlink pointing to eg++. Anyway the port is "fixed" now at least.
>
> Hi!
>
> To keep CMake from searching for a package named "Foo", you can
> just set the variable CMAKE_DISABLE_FIND_PACKAGE_Foo to TRUE.
> This works for any package.
>
> Here's a diff for owncloudclient:
I like this. ok kirby@
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/net/owncloudclient/Makefile,v
> retrieving revision 1.10
> diff -u -p -u -p -r1.10 Makefile
> --- Makefile 27 Apr 2016 11:58:16 -0000 1.10
> +++ Makefile 7 Jun 2016 10:39:25 -0000
> @@ -37,7 +37,8 @@ CONFIGURE_ARGS += -Wno-dev \
> -DCMAKE_CXX_FLAGS="${CXXFLAGS}
> -I${LOCALBASE}/include/inotify" \
> -DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS} \
> -L${LOCALBASE}/lib/inotify -linotify -liconv \
> - -Wl,-rpath=${LOCALBASE}/lib/inotify"
> + -Wl,-rpath=${LOCALBASE}/lib/inotify" \
> + -DCMAKE_DISABLE_FIND_PACKAGE_KF5=TRUE
>
> FLAVORS = qt5
> FLAVOR ?=
> Index: patches/patch-shell_integration_CMakeLists_txt
> ===================================================================
> RCS file: patches/patch-shell_integration_CMakeLists_txt
> diff -N patches/patch-shell_integration_CMakeLists_txt
> --- patches/patch-shell_integration_CMakeLists_txt 6 Jun 2016 21:24:57
> -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,25 +0,0 @@
> -$OpenBSD: patch-shell_integration_CMakeLists_txt,v 1.1 2016/06/06 21:24:57
> sthen Exp $
> -
> -hidden dep, and linking fails if it's picked up (using eg++ to link):
> -
> -/usr/lib/crtbeginS.o: In function `atexit':
> -(.text+0x1db): undefined reference to `__cxa_atexit'
> -shell_integration/dolphin/CMakeFiles/ownclouddolphinpluginhelper.dir/ownclouddolphinpluginhelper.cpp.o:
> In function `OwncloudDolphinPluginHelper::tryConnect()':
> -ownclouddolphinpluginhelper.cpp:(.text+0x1ad): undefined reference to
> `strlen'
> -ownclouddolphinpluginhelper.cpp:(.text+0x21d): undefined reference to
> `memcpy'
> -ownclouddolphinpluginhelper.cpp:(.text+0x2fb): undefined reference to
> `__stack_smash_handler'
> -[..]
> -
> ---- shell_integration/CMakeLists.txt.orig Tue Feb 9 08:07:08 2016
> -+++ shell_integration/CMakeLists.txt Mon Jun 6 15:21:08 2016
> -@@ -8,10 +8,4 @@ if( UNIX AND NOT APPLE )
> -
> - find_package(ECM 1.2.0 NO_MODULE QUIET)
> - set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}
> "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
> -- find_package(KF5 "5.16" COMPONENTS KIO)
> -- if(KF5_FOUND)
> -- add_subdirectory(dolphin)
> -- else()
> -- message("Dolphin plugin disabled: KDE Frameworks 5.16 not found")
> -- endif()
> - endif()
>
>
