[pkg-xmule] Bug#314665: xmule: FTBFS (amd64/gcc-4.0): ISO C++ forbids declaration of 'CKnownFile' with no type

[Andreas Jochens]

Package: xmule
Version: 1.10.0b-1
Severity: normal
Tags: patch

When building 'xmule' on amd64/unstable with gcc-4.0,
I get the following error:

==== Building xMule ====
AddFileThread.cpp
KnownFile.h:49: error: ISO C++ forbids declaration of 'CKnownFile' with no type
KnownFile.h:49: error: expected ';' before '*' token
make[2]: *** [obj/AddFileThread.o] Error 1

With the attached patch 'xmule' can be compiled
on amd64 using gcc-4.0.

Regards
Andreas Jochens

diff -urN ../tmp-orig/xmule-1.10.0b/debian/patches/01_fix_cryptopp_includes.dpatch ./debian/patches/01_fix_cryptopp_includes.dpatch
--- ../tmp-orig/xmule-1.10.0b/debian/patches/01_fix_cryptopp_includes.dpatch	2005-06-17 20:05:11.000000000 +0200
+++ ./debian/patches/01_fix_cryptopp_includes.dpatch	2005-06-17 20:04:54.000000000 +0200
@@ -20,7 +20,7 @@
 -    #include <cryptopp/base64.h>
 -    #include <cryptopp/files.h>
 -    #include <cryptopp/sha.h>
-+    #include <crypto++/config.h>
++
 +    #include <crypto++/osrng.h>
 +    #include <crypto++/base64.h>
 +    #include <crypto++/files.h>
diff -urN ../tmp-orig/xmule-1.10.0b/src/KnownFile.h ./src/KnownFile.h
--- ../tmp-orig/xmule-1.10.0b/src/KnownFile.h	2005-04-30 09:26:57.000000000 +0200
+++ ./src/KnownFile.h	2005-06-17 19:57:37.000000000 +0200
@@ -32,6 +32,7 @@
 class CTag;
 class Packet;
 class wxDC;
+class CKnownFile;
 
 class CFileStatistic{
 	friend class CKnownFile;
diff -urN ../tmp-orig/xmule-1.10.0b/src/ServerSocket.h ./src/ServerSocket.h
--- ../tmp-orig/xmule-1.10.0b/src/ServerSocket.h	2005-04-30 09:26:57.000000000 +0200
+++ ./src/ServerSocket.h	2005-06-17 20:01:49.000000000 +0200
@@ -32,6 +32,7 @@
 class CServer;
 class Packet;
 class wxEvtHandler;
+class CServerConnect;
 
 #ifndef ID_SOKETTI
 #define ID_SOKETTI 7772
diff -urN ../tmp-orig/xmule-1.10.0b/src/SharedFileList.h ./src/SharedFileList.h
--- ../tmp-orig/xmule-1.10.0b/src/SharedFileList.h	2005-04-30 09:26:57.000000000 +0200
+++ ./src/SharedFileList.h	2005-06-17 19:58:03.000000000 +0200
@@ -37,6 +37,7 @@
 class CPreferences;
 class CServerConnect;
 struct UnknownFile_Struct;
+class CSharedFilesCtrl;
 
 typedef std::map<CCKey, CKnownFile*> CKnownFileMap;