pool/plasma5-workspace
SHA256
11
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 519661 from KDE:Frameworks5

Browse Source 
- Add patch to fix build with qalculate 2.0:
  * 0001-Don-t-search-for-and-link-to-libcln-when-using-libqa.patch

OBS-URL: https://build.opensuse.org/request/show/519661
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plasma5-workspace?expand=0&rev=74
This commit is contained in:
Dominique Leuenberger
2017-09-04 10:22:15 +00:00
committed by Git OBS Bridge
parent 7fc38a4fbd e89e3b6551
commit 4594b7e48a
3 changed files with 63 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
0001-Don-t-search-for-and-link-to-libcln-when-using-libqa.patch Normal file
View File

@@ -0,0 +1,55 @@
From a8b6358a74daeaf306d08e000f97500fd43507e1 Mon Sep 17 00:00:00 2001
From: Antonio Rojas <arojas@archlinux.org>
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

6
plasma5-workspace.changes
View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Aug 30 11:52:53 UTC 2017 - fabian@ritter-vogt.de
- Add patch to fix build with qalculate 2.0:
* 0001-Don-t-search-for-and-link-to-libcln-when-using-libqa.patch
-------------------------------------------------------------------
Tue Aug 22 19:11:31 CEST 2017 - fabian@ritter-vogt.de

2
plasma5-workspace.spec
View File

@@ -40,6 +40,7 @@ Patch1: 0001-Ignore-default-sddm-face-icons.patch
# 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 @@ workspace. Development files.
%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}