rev 19188 - in kde-extras/strigi/trunk/debian: . patches

[Pino Toscano]

Author: pino
Date: 2012-05-08 11:27:27 +0000 (Tue, 08 May 2012)
New Revision: 19188

Added:
   kde-extras/strigi/trunk/debian/patches/
   kde-extras/strigi/trunk/debian/patches/series
   kde-extras/strigi/trunk/debian/patches/upstream_gcc47-fix-unistd.h-header-required-unconditionally-f.patch
Modified:
   kde-extras/strigi/trunk/debian/changelog
Log:
fix build with GCC 4.7 (#667384)

backport upstream commit a8e97f672325557b3fbc84b987299350ec5ac10b (from the strigidaemon repository)


Modified: kde-extras/strigi/trunk/debian/changelog
===================================================================
--- kde-extras/strigi/trunk/debian/changelog	2012-05-08 11:22:40 UTC (rev 19187)
+++ kde-extras/strigi/trunk/debian/changelog	2012-05-08 11:27:27 UTC (rev 19188)
@@ -11,6 +11,10 @@
   * rules: explicitly disable the XSD regeneration (which uses java).
   * copyright: explicitly refer to /usr/share/common-licenses/GPL-2 instead of
     /usr/share/common-licenses/GPL.
+  * Backport upstream commit a8e97f672325557b3fbc84b987299350ec5ac10b (from the
+    strigidaemon repository) to fix build with GCC 4.7; patch
+    upstream_gcc47-fix-unistd.h-header-required-unconditionally-f.patch.
+    (Closes: #667384)
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Tue, 08 May 2012 12:24:14 +0200
 

Added: kde-extras/strigi/trunk/debian/patches/series
===================================================================
--- kde-extras/strigi/trunk/debian/patches/series	                        (rev 0)
+++ kde-extras/strigi/trunk/debian/patches/series	2012-05-08 11:27:27 UTC (rev 19188)
@@ -0,0 +1 @@
+upstream_gcc47-fix-unistd.h-header-required-unconditionally-f.patch

Added: kde-extras/strigi/trunk/debian/patches/upstream_gcc47-fix-unistd.h-header-required-unconditionally-f.patch
===================================================================
--- kde-extras/strigi/trunk/debian/patches/upstream_gcc47-fix-unistd.h-header-required-unconditionally-f.patch	                        (rev 0)
+++ kde-extras/strigi/trunk/debian/patches/upstream_gcc47-fix-unistd.h-header-required-unconditionally-f.patch	2012-05-08 11:27:27 UTC (rev 19188)
@@ -0,0 +1,27 @@
+From a8e97f672325557b3fbc84b987299350ec5ac10b Mon Sep 17 00:00:00 2001
+From: Rex Dieter <rdieter at fedoraproject.org>
+Date: Mon, 9 Jan 2012 11:13:25 -0600
+Subject: [PATCH] gcc47 fix, unistd.h header required unconditionally for
+ 'sleep'
+
+---
+ bin/daemon/eventlistener/eventlistenerqueue.cpp |    2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp b/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp
+index 9fcdcb1..1e97599 100644
+--- a/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp
++++ b/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp
+@@ -27,9 +27,7 @@
+ #include <iostream>
+ #include <stdio.h>
+ 
+-#if defined(__SUNPRO_CC)
+ #include <unistd.h>
+-#endif
+ 
+ using namespace std;
+ 
+-- 
+1.7.10
+