Date: Mon, 27 Mar 2017 15:46:09 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r437053 - head/x11/kde4-workspace/files Message-ID: <201703271546.v2RFk9G1050874@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Mon Mar 27 15:46:08 2017 New Revision: 437053 URL: https://svnweb.freebsd.org/changeset/ports/437053 Log: Unbreak after r436971. Import some commits from kde-workspace's git repository, and add another one to make sure we are linking against the full path to libXss.so and not just passing "-lXss" to the linker. rezny@ has a patch to update kde-workspace to its latest (and last) release in Phabricator, but I'm landing this one to unbreak the build in the meantime. Added: head/x11/kde4-workspace/files/patch-git_0f43493 (contents, props changed) head/x11/kde4-workspace/files/patch-git_68a4d76 (contents, props changed) head/x11/kde4-workspace/files/patch-plasma_generic_applets_systemtray_CMakeLists.txt (contents, props changed) Added: head/x11/kde4-workspace/files/patch-git_0f43493 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/kde4-workspace/files/patch-git_0f43493 Mon Mar 27 15:46:08 2017 (r437053) @@ -0,0 +1,34 @@ +Fixes the build with kdelibs 4.14.30. + +commit 0f4349389875fa7452ec0a9d0a468be1e14cda33 +Author: Kevin Ottens <ervin@kde.org> +Date: Mon Jul 20 19:56:53 2015 +0200 + + Link to proper targets + +diff --git a/plasma/generic/dataengines/akonadi/CMakeLists.txt b/plasma/generic/dataengines/akonadi/CMakeLists.txt +index 7f0dd346a4..091e76bd00 100644 +--- a/plasma/generic/dataengines/akonadi/CMakeLists.txt ++++ b/plasma/generic/dataengines/akonadi/CMakeLists.txt +@@ -21,7 +21,7 @@ target_link_libraries( + ${KDE4_AKONADI_KMIME_LIBS} + ${KDE4_KABC_LIBS} + ${QT_QTXML_LIBRARY} +- microblog ++ ${KDE4_MICROBLOG_LIBS} + ) + + install(TARGETS plasma_engine_akonadi DESTINATION ${PLUGIN_INSTALL_DIR}) +diff --git a/plasma/generic/dataengines/calendar/CMakeLists.txt b/plasma/generic/dataengines/calendar/CMakeLists.txt +index 6ad3b61046..fb0893da0e 100644 +--- a/plasma/generic/dataengines/calendar/CMakeLists.txt ++++ b/plasma/generic/dataengines/calendar/CMakeLists.txt +@@ -33,7 +33,7 @@ target_link_libraries( + if(Akonadi_FOUND) + target_link_libraries( + plasma_engine_calendar +- akonadi-calendar ++ ${KDEPIMLIBS_AKONADI_CALENDAR_LIBS} + ${KDE4_AKONADI_LIBS} + ${KDEPIMLIBS_AKONADI_KCAL_LIBS} + ) Added: head/x11/kde4-workspace/files/patch-git_68a4d76 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/kde4-workspace/files/patch-git_68a4d76 Mon Mar 27 15:46:08 2017 (r437053) @@ -0,0 +1,28 @@ +Fixes the build with x11/kdelibs4 4.14.30. + +commit 68a4d76ceb7e9b8aa9f15f2231f806e74c91ec6d +Author: Kevin Ottens <ervin@kde.org> +Date: Mon Jul 20 19:11:37 2015 +0200 + + Avoid target name clash + +diff --git a/libs/ksysguard/tests/CMakeLists.txt b/libs/ksysguard/tests/CMakeLists.txt +index d472fd7e0a..2269b18ee1 100644 +--- libs/ksysguard/tests/CMakeLists.txt ++++ libs/ksysguard/tests/CMakeLists.txt +@@ -12,13 +12,13 @@ target_link_libraries(processtest processui ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIB + + # KSignalPlotter benchmark + set( signalplotterbenchmark_SRCS signalplotterbenchmark.cpp ../signalplotter/ksignalplotter.cpp) +-kde4_add_unit_test( signalplotterbenchmark TESTNAME ksysguard-signalplottertest ${signalplotterbenchmark_SRCS} ) ++kde4_add_unit_test( signalplotterbenchmark TESTNAME ksysguard-signalplotterbenchmark ${signalplotterbenchmark_SRCS} ) + target_link_libraries( signalplotterbenchmark ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTBENCHMARK_LIBRARY} ) + + + # KGraphicsSignalPlotter benchmark + set( graphicssignalplotterbenchmark_SRCS graphicssignalplotterbenchmark.cpp ../signalplotter/kgraphicssignalplotter.cpp) +-kde4_add_unit_test( graphicssignalplotterbenchmark TESTNAME ksysguard-signalplottertest ${graphicssignalplotterbenchmark_SRCS} ) ++kde4_add_unit_test( graphicssignalplotterbenchmark TESTNAME ksysguard-graphicssignalplotterbenchmark ${graphicssignalplotterbenchmark_SRCS} ) + target_link_libraries( graphicssignalplotterbenchmark ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTBENCHMARK_LIBRARY} ) + + Added: head/x11/kde4-workspace/files/patch-plasma_generic_applets_systemtray_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/kde4-workspace/files/patch-plasma_generic_applets_systemtray_CMakeLists.txt Mon Mar 27 15:46:08 2017 (r437053) @@ -0,0 +1,16 @@ +Link to the full library as detected by CMake, so that the linker is passed +"/full/path/to/libXss.so" instead of "-lXss", which can fail if -L/full/path/to +is not passed as well. + +Not upstreamed because upstream is no longer releasing kde-workspace. +--- plasma/generic/applets/systemtray/CMakeLists.txt ++++ plasma/generic/applets/systemtray/CMakeLists.txt +@@ -43,7 +43,7 @@ include (CheckLibraryExists) + check_library_exists (Xss XScreenSaverQueryInfo "" HAVE_LIBXSS) + configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h) + IF (HAVE_LIBXSS) +- SET (IDLE_DETECTION_LIB "Xss") ++ SET (IDLE_DETECTION_LIB ${X11_Xscreensaver_LIB}) + ENDIF (HAVE_LIBXSS) + + kde4_add_plugin(plasma_applet_systemtray ${systemtray_SRCS})
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703271546.v2RFk9G1050874>