rev 6017 - in kde-extras/strigi/trunk/debian: . patches
Mark Purcell
msp at alioth.debian.org
Wed May 2 05:30:46 UTC 2007
Author: msp
Date: 2007-05-02 05:30:44 +0000 (Wed, 02 May 2007)
New Revision: 6017
Added:
kde-extras/strigi/trunk/debian/patches/Bug#417714: FTBFS with GCC 4.3.diff
Modified:
kde-extras/strigi/trunk/debian/changelog
Log:
* Include gcc4.3 patch from Martin (Closes: #417714)
Modified: kde-extras/strigi/trunk/debian/changelog
===================================================================
--- kde-extras/strigi/trunk/debian/changelog 2007-05-01 19:40:45 UTC (rev 6016)
+++ kde-extras/strigi/trunk/debian/changelog 2007-05-02 05:30:44 UTC (rev 6017)
@@ -1,9 +1,9 @@
-strigi (0.3.11-2) UNRELEASED; urgency=low
+strigi (0.3.11-2) unstable; urgency=low
- * NOT RELEASED YET
* Robust get-orig-source target
+ * Include gcc4.3 patch from Martin (Closes: #417714)
- -- Mark Purcell <msp at debian.org> Sun, 4 Mar 2007 12:44:55 +0000
+ -- Mark Purcell <msp at debian.org> Wed, 02 May 2007 06:27:39 +0100
strigi (0.3.11-1) experimental; urgency=low
Added: kde-extras/strigi/trunk/debian/patches/Bug#417714: FTBFS with GCC 4.3.diff
===================================================================
--- kde-extras/strigi/trunk/debian/patches/Bug#417714: FTBFS with GCC 4.3.diff 2007-05-01 19:40:45 UTC (rev 6016)
+++ kde-extras/strigi/trunk/debian/patches/Bug#417714: FTBFS with GCC 4.3.diff 2007-05-02 05:30:44 UTC (rev 6017)
@@ -0,0 +1,349 @@
+From tbm at cyrius.com Wed Apr 4 21:53:09 2007
+Return-path: <pkg-kde-extras-bounces+msp=debian.org at lists.alioth.debian.org>
+Envelope-to: debian at purcell.id.au
+Delivery-date: Wed, 04 Apr 2007 13:05:42 +0100
+Received: from master.debian.org ([70.103.162.29])
+ by bristol.purcell.id.au with esmtp (Exim 4.63)
+ (envelope-from <pkg-kde-extras-bounces+msp=debian.org at lists.alioth.debian.org>)
+ id 1HZ4F4-0005DM-5h
+ for debian at purcell.id.au; Wed, 04 Apr 2007 13:05:42 +0100
+Received: from alioth.debian.org ([217.196.43.134])
+ by master.debian.org with esmtp (Exim 4.50)
+ id 1HZ4F2-0000kF-HP
+ for debian at purcell.id.au; Wed, 04 Apr 2007 12:05:33 +0000
+Received: from localhost ([127.0.0.1] helo=alioth.debian.org)
+ by alioth.debian.org with esmtp (Exim 4.50)
+ id 1HZ4F1-0006ZR-9h
+ for msp at debian.org; Wed, 04 Apr 2007 12:05:31 +0000
+Received: from rietz.debian.org ([140.211.166.43])
+ by alioth.debian.org with esmtp (Exim 4.50) id 1HZ4EN-0004yN-AR
+ for pkg-kde-extras at lists.alioth.debian.org;
+ Wed, 04 Apr 2007 12:04:57 +0000
+Received: from debbugs by rietz.debian.org with local (Exim 4.50)
+ id 1HZ4A2-0003o6-Cz; Wed, 04 Apr 2007 12:00:22 +0000
+X-Loop: owner at bugs.debian.org
+Resent-From: Martin Michlmayr <tbm at cyrius.com>
+Resent-To: debian-bugs-dist at lists.debian.org
+Resent-CC: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
+Resent-Date: Wed, 04 Apr 2007 12:00:19 +0000
+Resent-Message-ID: <handler.417714.B.11756879416734 at bugs.debian.org>
+X-Debian-PR-Message: report 417714
+X-Debian-PR-Package: strigi
+X-Debian-PR-Keywords: patch
+Received: via spool by submit at bugs.debian.org id=B.11756879416734
+ (code B ref -1); Wed, 04 Apr 2007 12:00:19 +0000
+Received: (at submit) by bugs.debian.org; 4 Apr 2007 11:59:01 +0000
+Received: from sorrow.cyrius.com ([65.19.161.204])
+ by rietz.debian.org with esmtp (Exim 4.50) id 1HZ43M-0003wt-Sl
+ for submit at bugs.debian.org; Wed, 04 Apr 2007 11:53:29 +0000
+Received: by sorrow.cyrius.com (Postfix, from userid 10)
+ id 8029964D3E; Wed, 4 Apr 2007 11:53:28 +0000 (UTC)
+Received: by deprecation.cyrius.com (Postfix, from userid 1000)
+ id CBDE354373; Wed, 4 Apr 2007 12:53:09 +0100 (BST)
+Date: Wed, 4 Apr 2007 13:53:09 +0200
+From: Martin Michlmayr <tbm at cyrius.com>
+To: submit at bugs.debian.org
+Message-ID: <20070404115309.GC9832 at deprecation.cyrius.com>
+References: <20070329085040.DABE2460DE at em64t.snowman.net>
+MIME-Version: 1.0
+Content-Type: text/plain;
+ charset=us-ascii
+Content-Disposition: inline
+In-Reply-To: <20070329085040.DABE2460DE at em64t.snowman.net>
+User-Agent: Mutt/1.5.13 (2006-08-11)
+Delivered-To: submit at bugs.debian.org
+Resent-Sender: Debian BTS <debbugs at bugs.debian.org>
+Resent-Date: Wed, 04 Apr 2007 12:00:22 +0000
+X-BeenThere: pkg-kde-extras at lists.alioth.debian.org
+X-Mailman-Version: 2.1.5
+Precedence: list
+Reply-To: Martin Michlmayr <tbm at cyrius.com>,
+ 417714 at bugs.debian.org
+List-Id: "List for the maintainers of stuff under pkd-kde/kde-extras."
+ <pkg-kde-extras.lists.alioth.debian.org>
+List-Unsubscribe: <http://lists.alioth.debian.org/mailman/listinfo/pkg-kde-extras>,
+ <mailto:pkg-kde-extras-request at lists.alioth.debian.org?subject=unsubscribe>
+List-Archive: <http://lists.alioth.debian.org/pipermail/pkg-kde-extras>
+List-Post: <mailto:pkg-kde-extras at lists.alioth.debian.org>
+List-Help: <mailto:pkg-kde-extras-request at lists.alioth.debian.org?subject=help>
+List-Subscribe: <http://lists.alioth.debian.org/mailman/listinfo/pkg-kde-extras>,
+ <mailto:pkg-kde-extras-request at lists.alioth.debian.org?subject=subscribe>
+Sender: pkg-kde-extras-bounces+msp=debian.org at lists.alioth.debian.org
+Errors-To: pkg-kde-extras-bounces+msp=debian.org at lists.alioth.debian.org
+X-SA-Exim-Connect-IP: 70.103.162.29
+X-SA-Exim-Rcpt-To: debian at purcell.id.au
+X-SA-Exim-Mail-From: pkg-kde-extras-bounces+msp=debian.org at lists.alioth.debian.org
+X-Spam-Checker-Version: SpamAssassin 3.1.7-deb (2006-10-05) on debian
+X-Spam-Level:
+X-Spam-Status: No, score=-2.6 required=1.0 tests=AWL,BAYES_00,
+ UNPARSEABLE_RELAY autolearn=ham version=3.1.7-deb
+X-Spam-Report:
+ * 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay
+ * lines
+ * -2.6 BAYES_00 BODY: Bayesian spam probability is 0 to 1%
+ * [score: 0.0000]
+ * -0.0 AWL AWL: From: address is in the auto white-list
+Subject: [Pkg-kde-extras] Bug#417714: FTBFS with GCC 4.3: missing #includes
+X-SA-Exim-Version: 4.2.1 (built Tue, 09 Jan 2007 17:23:22 +0000)
+X-SA-Exim-Scanned: Yes (on bristol.purcell.id.au)
+X-Length: 13798
+X-KMail-EncryptionState:
+X-KMail-SignatureState:
+X-KMail-MDN-Sent:
+X-UID: 2354
+Status: RO
+X-Status: OC
+
+Package: strigi
+Version: 0.3.9-1
+Usertags: ftbfs-gcc-4.3
+Tags: patch
+
+Your package fails to build with GCC 4.3. Version 4.3 has not been
+released yet but I'm building with a snapshot in order to find errors
+and give people an advance warning. In GCC 4.3, the C++ header
+dependencies have been cleaned up. The advantage of this is that
+programs will compile faster. The downside is that you actually
+need to directly #include everything you use (but you really should
+do this anyway, otherwise your program won't work with any compiler
+other than GCC). Some background of this can be found at
+http://gcc.gnu.org/PR28080
+
+You can reproduce this problem with gcc-snapshot (20070326-1 or higher)
+from unstable. (Currently not available for i386, but for amd64, powerpc
+and ia64. I hope to have i386 binaries in the archive in ~3 weeks.)
+
+> Automatic build of strigi_0.3.9-1 on em64t by sbuild/amd64 0.53
+...
+> /usr/lib/gcc-snapshot/bin/c++ -Wall -g3 -O0 -ansi -O2 -g -I/usr/include/log4cxx -I/build/tbm/strigi-0.3.9/./src/filters/../streams -I/build/tbm/strigi-0.3.9/./src/filters/../streamindexer -fPIC -DHAVE_LOG4CXX -o src/filters/CMakeFiles/filters.dir/filters.o -c /build/tbm/strigi-0.3.9/./src/filters/filters.cpp
+> /usr/bin/cmake -E cmake_progress_report /build/tbm/strigi-0.3.9/./obj-x86_64-linux-gnu/CMakeFiles 1
+> [ 1%] Building CXX object src/filters/CMakeFiles/filters.dir/filtermanager.o
+> /usr/lib/gcc-snapshot/bin/c++ -Wall -g3 -O0 -ansi -O2 -g -I/usr/include/log4cxx -I/build/tbm/strigi-0.3.9/./src/filters/../streams -I/build/tbm/strigi-0.3.9/./src/filters/../streamindexer -fPIC -DHAVE_LOG4CXX -o src/filters/CMakeFiles/filters.dir/filtermanager.o -c /build/tbm/strigi-0.3.9/./src/filters/filtermanager.cpp
+> In file included from /build/tbm/strigi-0.3.9/./src/filters/filtermanager.cpp:22:
+> /build/tbm/strigi-0.3.9/./src/filters/filtermanager.h:55: error: 'uint' has not been declared
+> /build/tbm/strigi-0.3.9/./src/filters/filtermanager.cpp:59: error: prototype for 'bool FilterManager::findMatch(const char*, uint)' does not match any in class 'FilterManager'
+> /build/tbm/strigi-0.3.9/./src/filters/filtermanager.h:55: error: candidates are: bool FilterManager::findMatch(const char*, int)
+> /build/tbm/strigi-0.3.9/./src/filters/filtermanager.h:48: error: bool FilterManager::findMatch(std::string&)
+
+--- src/sqliteindexer/sqliteindexwriter.cpp~ 2007-04-04 11:37:21.000000000 +0000
++++ src/sqliteindexer/sqliteindexwriter.cpp 2007-04-04 11:37:29.000000000 +0000
+@@ -19,6 +19,7 @@
+ */
+ #include "sqliteindexwriter.h"
+ #include "sqliteindexmanager.h"
++#include <cstdlib>
+ #include <vector>
+ #include <sstream>
+ #include <cassert>
+--- src/sqliteindexer/sqliteindexmanager.cpp~ 2007-04-04 11:37:37.000000000 +0000
++++ src/sqliteindexer/sqliteindexmanager.cpp 2007-04-04 11:37:46.000000000 +0000
+@@ -21,6 +21,7 @@
+ #include "sqliteindexreader.h"
+ #include "sqliteindexwriter.h"
+ #include "strigi_thread.h"
++#include <cstdlib>
+ using namespace std;
+ using namespace jstreams;
+
+--- src/sqliteindexer/sqliteindexreader.cpp~ 2007-04-04 11:38:06.000000000 +0000
++++ src/sqliteindexer/sqliteindexreader.cpp 2007-04-04 11:38:12.000000000 +0000
+@@ -19,6 +19,7 @@
+ */
+ #include "sqliteindexreader.h"
+ #include "sqliteindexmanager.h"
++#include <cstdlib>
+ #include <set>
+ #include <sstream>
+ using namespace std;
+--- src/luceneindexer/tests/CLuceneTest.cpp~ 2007-04-04 11:46:57.000000000 +0000
++++ src/luceneindexer/tests/CLuceneTest.cpp 2007-04-04 11:47:02.000000000 +0000
+@@ -5,6 +5,7 @@
+ #include "indexreadertests.h"
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <cstdlib>
+
+ int
+ CLuceneTest(int argc, char**argv) {
+--- src/daemon/eventlistener/pollinglistener.h~ 2007-04-04 11:39:58.000000000 +0000
++++ src/daemon/eventlistener/pollinglistener.h 2007-04-04 11:40:06.000000000 +0000
+@@ -22,6 +22,7 @@
+
+ #include "eventlistener.h"
+
++#include <cstdlib>
+ #include <map>
+ #include <pthread.h>
+
+--- src/daemon/dbus/dbusserver.cpp~ 2007-04-04 11:40:26.000000000 +0000
++++ src/daemon/dbus/dbusserver.cpp 2007-04-04 11:40:34.000000000 +0000
+@@ -23,6 +23,7 @@
+ #include "dbusclientinterface.h"
+ #include "testinterface.h"
+ #include "dbustestinterface.h"
++#include <cstdlib>
+ using namespace std;
+
+ void*
+--- src/daemon/socketclient.cpp~ 2007-04-04 11:38:29.000000000 +0000
++++ src/daemon/socketclient.cpp 2007-04-04 11:38:43.000000000 +0000
+@@ -24,6 +24,7 @@
+ #include <sys/un.h>
+ #include <errno.h>
+ #include <assert.h>
++#include <cstdlib>
+ #include <sstream>
+ using namespace std;
+
+--- src/daemon/asyncsocket.h~ 2007-04-04 11:39:21.000000000 +0000
++++ src/daemon/asyncsocket.h 2007-04-04 11:39:30.000000000 +0000
+@@ -20,6 +20,7 @@
+ #ifndef ASYNCSOCKET_H
+ #define ASYNCSOCKET_H
+
++#include <cstdlib>
+ #include <string>
+
+ class AsyncSocket {
+--- src/daemon/indexscheduler.h~ 2007-04-04 11:41:09.000000000 +0000
++++ src/daemon/indexscheduler.h 2007-04-04 11:41:20.000000000 +0000
+@@ -20,6 +20,7 @@
+ #ifndef INDEXSCHEDULER_H
+ #define INDEXSCHEDULER_H
+
++#include <cstdlib>
+ #include <map>
+ #include <string>
+ #include <set>
+--- src/daemon/socketserver.cpp~ 2007-04-04 11:41:45.000000000 +0000
++++ src/daemon/socketserver.cpp 2007-04-04 11:41:51.000000000 +0000
+@@ -27,6 +27,7 @@
+ #include <sys/un.h>
+ #include <errno.h>
+ #include <assert.h>
++#include <cstdlib>
+ using namespace std;
+
+ #if defined(__APPLE__)
+--- src/filters/filtermanager.h~ 2007-04-04 11:27:40.000000000 +0000
++++ src/filters/filtermanager.h 2007-04-04 11:27:46.000000000 +0000
+@@ -20,6 +20,7 @@
+ #ifndef FILTERMANAGER_H
+ #define FILTERMANAGER_H
+
++#include <cstdlib>
+ #include <map>
+ #include <string>
+ #include "strigi_thread.h"
+--- src/htmlgui/strigihtmlgui.cpp~ 2007-04-04 11:42:30.000000000 +0000
++++ src/htmlgui/strigihtmlgui.cpp 2007-04-04 11:42:37.000000000 +0000
+@@ -27,6 +27,7 @@
+ #include <sstream>
+ #include <fstream>
+ #include <sys/stat.h>
++#include <cstdlib>
+ using namespace std;
+ using namespace jstreams;
+
+--- src/streamindexer/throughplugins/xattrthroughanalyzer.cpp~ 2007-04-04 11:45:42.000000000 +0000
++++ src/streamindexer/throughplugins/xattrthroughanalyzer.cpp 2007-04-04 11:45:49.000000000 +0000
+@@ -24,6 +24,7 @@
+ #include <sys/types.h>
+ #include <attr/xattr.h>
+ #include <errno.h>
++#include <cstdlib>
+
+ class XattrAnalyzer : public jstreams::StreamThroughAnalyzer {
+ private:
+--- src/streamindexer/streamindexer.h~ 2007-04-04 11:30:12.000000000 +0000
++++ src/streamindexer/streamindexer.h 2007-04-04 11:30:18.000000000 +0000
+@@ -20,6 +20,7 @@
+ #ifndef STREAMINDEXER_H
+ #define STREAMINDEXER_H
+
++#include <cstdlib>
+ #include <vector>
+ #include "moduleloader.h"
+
+--- src/streamindexer/query.cpp~ 2007-04-04 11:30:48.000000000 +0000
++++ src/streamindexer/query.cpp 2007-04-04 11:31:12.000000000 +0000
+@@ -20,6 +20,8 @@
+ #include "query.h"
+ #include "jstreamsconfig.h"
+ #include "indexreader.h"
++#include <cctype>
++#include <cstdlib>
+ using namespace std;
+ using namespace jstreams;
+
+--- src/streamindexer/indexwriter.cpp~ 2007-04-04 11:33:26.000000000 +0000
++++ src/streamindexer/indexwriter.cpp 2007-04-04 11:33:32.000000000 +0000
+@@ -20,6 +20,7 @@
+ #include "jstreamsconfig.h"
+ #include "indexwriter.h"
+ #include "textutils.h"
++#include <cstdlib>
+ using namespace jstreams;
+ using namespace std;
+ string
+--- src/streamindexer/expatsaxendanalyzer.cpp~ 2007-04-04 11:33:54.000000000 +0000
++++ src/streamindexer/expatsaxendanalyzer.cpp 2007-04-04 11:34:03.000000000 +0000
+@@ -23,6 +23,7 @@
+ #include "inputstreamreader.h"
+ #include "indexwriter.h"
+ #include <expat.h>
++#include <cctype>
+ using namespace jstreams;
+ using namespace std;
+
+--- src/streams/pdf/pdfparser.cpp~ 2007-04-04 11:44:46.000000000 +0000
++++ src/streams/pdf/pdfparser.cpp 2007-04-04 11:45:10.000000000 +0000
+@@ -3,6 +3,7 @@
+ #include "stringterminatedsubstream.h"
+ #include "gzipinputstream.h"
+ #include "subinputstream.h"
++#include <cctype>
+ using namespace jstreams;
+ using namespace std;
+
+--- src/streams/pdf/pdftest.cpp~ 2007-04-04 11:45:26.000000000 +0000
++++ src/streams/pdf/pdftest.cpp 2007-04-04 11:45:31.000000000 +0000
+@@ -3,6 +3,7 @@
+ #include "stringreader.h"
+ #include "gzipinputstream.h"
+ #include "kmpsearcher.h"
++#include <cctype>
+ using namespace jstreams;
+ extern "C" {
+ #include <magic.h>
+--- src/streams/kmpsearcher.h~ 2007-04-04 11:28:19.000000000 +0000
++++ src/streams/kmpsearcher.h 2007-04-04 11:28:27.000000000 +0000
+@@ -20,6 +20,7 @@
+ #ifndef KMPSEARCHER_H
+ #define KMPSEARCHER_H
+
++#include <cstdlib>
+ #include <string>
+
+ namespace jstreams {
+--- src/streams/substreamprovider.h~ 2007-04-04 11:28:55.000000000 +0000
++++ src/streams/substreamprovider.h 2007-04-04 11:29:03.000000000 +0000
+@@ -20,6 +20,7 @@
+ #ifndef SUBSTREAMPROVIDER
+ #define SUBSTREAMPROVIDER
+
++#include <cstdlib>
+ #include <string>
+ #include "streambase.h"
+
+
+--
+Martin Michlmayr
+http://www.cyrius.com/
+
+
+_______________________________________________
+pkg-kde-extras mailing list
+pkg-kde-extras at lists.alioth.debian.org
+http://lists.alioth.debian.org/mailman/listinfo/pkg-kde-extras
+
More information about the pkg-kde-commits
mailing list