rev 20410 - in kde-extras/kwave/trunk/debian: . patches

[Pino Toscano]

Author: pino
Date: 2016-03-25 13:33:50 +0000 (Fri, 25 Mar 2016)
New Revision: 20410

Added:
   kde-extras/kwave/trunk/debian/patches/upstream_move-unportable-includes-within-their-ifdef-blocks.patch
Modified:
   kde-extras/kwave/trunk/debian/changelog
   kde-extras/kwave/trunk/debian/patches/series
Log:
fix build on !linux archs

backport upstream commit 7b773ae4a6f0e8debeecb440e5d5e7528de804bd


Modified: kde-extras/kwave/trunk/debian/changelog
===================================================================
--- kde-extras/kwave/trunk/debian/changelog	2016-03-25 13:17:15 UTC (rev 20409)
+++ kde-extras/kwave/trunk/debian/changelog	2016-03-25 13:33:50 UTC (rev 20410)
@@ -1,5 +1,9 @@
 kwave (0.9.1-1-2) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * Backport upstream commit 7b773ae4a6f0e8debeecb440e5d5e7528de804bd to fix
+    the build on non-Linux architectures; patch
+    upstream_move-unportable-includes-within-their-ifdef-blocks.patch.
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Fri, 25 Mar 2016 14:16:49 +0100
 

Modified: kde-extras/kwave/trunk/debian/patches/series
===================================================================
--- kde-extras/kwave/trunk/debian/patches/series	2016-03-25 13:17:15 UTC (rev 20409)
+++ kde-extras/kwave/trunk/debian/patches/series	2016-03-25 13:33:50 UTC (rev 20410)
@@ -1,3 +1,4 @@
 07-no-rpath
 cmake-verbose.diff
 plugins-not-executable.diff
+upstream_move-unportable-includes-within-their-ifdef-blocks.patch

Added: kde-extras/kwave/trunk/debian/patches/upstream_move-unportable-includes-within-their-ifdef-blocks.patch
===================================================================
--- kde-extras/kwave/trunk/debian/patches/upstream_move-unportable-includes-within-their-ifdef-blocks.patch	                        (rev 0)
+++ kde-extras/kwave/trunk/debian/patches/upstream_move-unportable-includes-within-their-ifdef-blocks.patch	2016-03-25 13:33:50 UTC (rev 20410)
@@ -0,0 +1,33 @@
+From 7b773ae4a6f0e8debeecb440e5d5e7528de804bd Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Fri, 25 Mar 2016 13:50:37 +0100
+Subject: [PATCH] move unportable includes within their #ifdef blocks
+
+This fixes (or helps fixing) the build on any OS different than Linux.
+---
+ libkwave/MemoryManager.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libkwave/MemoryManager.cpp b/libkwave/MemoryManager.cpp
+index 67a1591..b1f167f 100644
+--- a/libkwave/MemoryManager.cpp
++++ b/libkwave/MemoryManager.cpp
+@@ -29,13 +29,13 @@
+ #include <QString>
+ 
+ #ifdef HAVE_SYSINFO
+-#endif
+ #include <linux/kernel.h> // for struct sysinfo
+ #include <sys/sysinfo.h>  // for sysinfo()
++#endif
+ 
+ #ifdef HAVE_GETRLIMIT
+-#endif
+ #include <sys/resource.h> // for getrlimit()
++#endif
+ 
+ #include "libkwave/MemoryManager.h"
+ #include "libkwave/String.h"
+-- 
+2.8.0.rc3
+