Hello community, here is the log from the commit of package plasma5-workspace for openSUSE:Factory checked in at 2017-09-04 12:22:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma5-workspace (Old) and /work/SRC/openSUSE:Factory/.plasma5-workspace.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma5-workspace" Mon Sep 4 12:22:15 2017 rev:74 rq:519661 version:5.10.5 Changes: -------- --- /work/SRC/openSUSE:Factory/plasma5-workspace/plasma5-workspace.changes 2017-08-24 18:10:21.916620022 +0200 +++ /work/SRC/openSUSE:Factory/.plasma5-workspace.new/plasma5-workspace.changes 2017-09-04 12:22:21.949249290 +0200 @@ -1,0 +2,6 @@ +Wed Aug 30 11:52:53 UTC 2017 - [email protected] + +- Add patch to fix build with qalculate 2.0: + * 0001-Don-t-search-for-and-link-to-libcln-when-using-libqa.patch + +------------------------------------------------------------------- New: ---- 0001-Don-t-search-for-and-link-to-libcln-when-using-libqa.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma5-workspace.spec ++++++ --- /var/tmp/diff_new_pack.ZBNc6F/_old 2017-09-04 12:22:23.169077798 +0200 +++ /var/tmp/diff_new_pack.ZBNc6F/_new 2017-09-04 12:22:23.177076673 +0200 @@ -40,6 +40,7 @@ # PATCHES 201-300 and above are from upstream master/5.11 branch Patch201: applauncher-allow-to-show-apps-by-name.patch Patch202: logoutdialog-honor-Offer-shutdown-options.patch +Patch203: 0001-Don-t-search-for-and-link-to-libcln-when-using-libqa.patch BuildRequires: breeze5-icons BuildRequires: fdupes BuildRequires: kf5-filesystem @@ -219,6 +220,7 @@ %patch1 -p1 %patch201 -p1 %patch202 -p1 +%patch203 -p1 %build %cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} ++++++ 0001-Don-t-search-for-and-link-to-libcln-when-using-libqa.patch ++++++ >From a8b6358a74daeaf306d08e000f97500fd43507e1 Mon Sep 17 00:00:00 2001 From: Antonio Rojas <[email protected]> Date: Tue, 29 Aug 2017 08:24:30 +0200 Subject: [PATCH] Don't search for and link to libcln when using libqalculate>=2.0 Plasma doesn't use any cln code directly, only via libqalculate. In version 2.0, libqalculate dropped cln in favor of gmp, so the cln dependency becomes unnecessary. Differential Revision: https://phabricator.kde.org/D7590 --- cmake/FindQalculate.cmake | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/cmake/FindQalculate.cmake b/cmake/FindQalculate.cmake index 53bd302e..b8e74f45 100644 --- a/cmake/FindQalculate.cmake +++ b/cmake/FindQalculate.cmake @@ -51,7 +51,9 @@ else(QALCULATE_CFLAGS AND QALCULATE_LIBRARIES) pkg_check_modules(_pc_QALCULATE libqalculate) endif(QALCULATE_MIN_VERSION) - pkg_check_modules(_pc_CLN cln) + if(${_pc_QALCULATE_VERSION} VERSION_LESS 2.0.0) + pkg_check_modules(_pc_CLN cln) + endif() if(_pc_QALCULATE_FOUND) set(QALCULATE_CFLAGS ${_pc_QALCULATE_CFLAGS}) @@ -73,13 +75,15 @@ else(QALCULATE_CFLAGS AND QALCULATE_LIBRARIES) ${INCLUDE_INSTALL_DIR} ) - find_library(CLN_LIBRARIES - NAMES - cln - PATHS - ${_pc_CLN_LIBRARY_DIRS} - ${LIB_INSTALL_DIR} - ) + if(${_pc_QALCULATE_VERSION} VERSION_LESS 2.0.0) + find_library(CLN_LIBRARIES + NAMES + cln + PATHS + ${_pc_CLN_LIBRARY_DIRS} + ${LIB_INSTALL_DIR} + ) + endif() else(NOT WIN32) # XXX: currently no libqalculate on windows -- 2.14.1
