diff options
| author | Clive Johnston <clivejo@aol.com> | 2016-05-27 08:39:25 (GMT) |
|---|---|---|
| committer | Clive Johnston <clivejo@aol.com> | 2016-05-27 08:39:25 (GMT) |
| commit | 46651e7289f4f20c964d2fd4d81a8ef85c6bba45 (patch) | |
| tree | 22a63b780ffc8c9e3c3eb05155b420fc08ed2e70 | |
| parent | 59ebd3a35fc8d2f56dea7758325bfcc79d6989de (diff) | |
Applying patch from Rik Mills
- Removed patch upstream_include_cmath_c++_fix.diff as it is
applied upstream
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | debian/patches/upstream_include_cmath_c++_fix.diff | 24 |
3 files changed, 2 insertions, 25 deletions
diff --git a/debian/changelog b/debian/changelog index 91a6820..339676b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ plasma-desktop (4:5.6.4-0ubuntu2) UNRELEASED; urgency=medium * Adding patch upstream_fix_kicker_recent_documents.diff which fixes opening recent docs on newer KF5. Fixes KDE-Bug:363337 + * Removed patch upstream_include_cmath_c++_fix.diff as it is + applied upstream -- Rik Mills <rik.mills88@gmail.com> Tue, 24 May 2016 12:29:09 +0100 diff --git a/debian/patches/series b/debian/patches/series index e4fd2b5..336ae82 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ allow_uxterm_overrides.diff -upstream_include_cmath_c++_fix.diff upstream_fix_kicker_recent_documents.diff diff --git a/debian/patches/upstream_include_cmath_c++_fix.diff b/debian/patches/upstream_include_cmath_c++_fix.diff deleted file mode 100644 index 1f1e47e..0000000 --- a/debian/patches/upstream_include_cmath_c++_fix.diff +++ /dev/null @@ -1,24 +0,0 @@ -Description: Fix building on Linux with clang/libc++ - 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 -Author: Armin K <krejzi@email.com> -Last-Update: 2016-05-06 ---- -Index: plasma-desktop/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp -=================================================================== ---- plasma-desktop.orig/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp -+++ plasma-desktop/kcms/touchpad/src/backends/x11/synapticstouchpad.cpp -@@ -46,6 +46,7 @@ - * Peter Osterlund (petero2@telia.com) - */ - -+#include <cmath> - #include <QDebug> - - #include "synapticstouchpad.h" |