From d9856d62288ee92515c5d4a7f488a14d313bbdc6 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 8 Apr 2016 20:14:47 -0500 Subject: [PATCH] one gcc6 FTBFS fix --- ...ix-building-on-Linux-with-clang-libc.patch | 30 +++++++++++++++++++ plasma-desktop.spec | 4 ++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 0001-Fix-building-on-Linux-with-clang-libc.patch diff --git a/0001-Fix-building-on-Linux-with-clang-libc.patch b/0001-Fix-building-on-Linux-with-clang-libc.patch new file mode 100644 index 0000000..cd061c5 --- /dev/null +++ b/0001-Fix-building-on-Linux-with-clang-libc.patch @@ -0,0 +1,30 @@ +From 3a3bbc39d5cba8d77c89f6652c5b9c24c9980497 Mon Sep 17 00:00:00 2001 +From: Armin K +Date: Sun, 13 Mar 2016 21:11:44 +0100 +Subject: [PATCH] Fix building on Linux with clang/libc++ + +When using libc++, cmath isn't being pulled in, +resulting in + +error: no member named 'sqrt' in namespace 'std' + +Adding explicit include fixes it +--- + kcms/touchpad/src/backends/x11/synapticstouchpad.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp b/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp +index d4742bf..eb222ae 100644 +--- a/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp ++++ b/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp +@@ -46,6 +46,7 @@ + * Peter Osterlund (petero2@telia.com) + */ + ++#include + #include + + #include "synapticstouchpad.h" +-- +2.7.3 + diff --git a/plasma-desktop.spec b/plasma-desktop.spec index bedc6a2..1dbdb2e 100644 --- a/plasma-desktop.spec +++ b/plasma-desktop.spec @@ -29,7 +29,8 @@ Patch102: plasma-desktop-fedora_layout.patch ## upstream patches -## upstream patches +## upstream patches (master branch) +Patch21: 0001-Fix-building-on-Linux-with-clang-libc.patch ## upstreamable patches # missing '#include ' means PK never used @@ -165,6 +166,7 @@ BuildArch: noarch %prep %setup -q +%patch21 -p1 -b .0001 %patch50 -p1 -b .PackageKit %if 0%{?fedora} > 22