[Pkg-amule-commits] [SCM] Git repository for pkg-amule branch, master, updated. debian/2.2.6+debian0-8-5-g0d4b071

[Giuseppe Iuculano]

The following commit has been merged in the master branch:
commit 0d4b07174e4f0e9c430ba47dde9cabb0e5850016
Author: Giuseppe Iuculano <iuculano at debian.org>
Date:   Sun Mar 20 11:11:40 2011 +0100

    Fix FTBFS with gcc 4.5 , patch from Ubuntu
    
    Closes: #564853
    Thanks: shankao

diff --git a/debian/patches/fix_ftbfs_on_gcc45.diff b/debian/patches/fix_ftbfs_on_gcc45.diff
new file mode 100644
index 0000000..e120ef2
--- /dev/null
+++ b/debian/patches/fix_ftbfs_on_gcc45.diff
@@ -0,0 +1,22 @@
+# Subject: Fix FTBFS on gcc 4.5 (new in ubuntu natty)
+# Origin: other, http://bugs.amule.org/view.php?id=1624
+# Bug-ubuntu: https://bugs.launchpad.net/ubuntu/+source/amule/+bug/685584
+# Forwarded: upstream claims it's in their current svn code
+Index: amule-2.2.6+debian0/src/utils/wxCas/src/wxcasframe.cpp
+===================================================================
+--- amule-2.2.6+debian0.orig/src/utils/wxCas/src/wxcasframe.cpp	2010-12-15 16:46:18.435693002 +0000
++++ amule-2.2.6+debian0/src/utils/wxCas/src/wxcasframe.cpp	2010-12-15 16:47:07.151693001 +0000
+@@ -285,11 +285,11 @@
+ #ifdef __WXMSW__
+ 
+ 	memdc.
+-	SetFont ( wxFont::wxFont ( 6, wxSWISS, wxNORMAL, wxBOLD ) );
++	SetFont ( wxFont ( 6, wxSWISS, wxNORMAL, wxBOLD ) );
+ #else
+ 
+ 	memdc.
+-	SetFont ( wxFont::wxFont ( 8, wxSWISS, wxNORMAL, wxBOLD ) );
++	SetFont ( wxFont ( 8, wxSWISS, wxNORMAL, wxBOLD ) );
+ #endif
+ 
+ 	memdc.
diff --git a/debian/patches/series b/debian/patches/series
index 4bd8f97..bea6300 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ use_xdg-open_as_preview_default.diff
 alc_man_typo.diff
 ed2k_man_typo.diff
 fallocate.diff
+fix_ftbfs_on_gcc45.diff

-- 
Git repository for pkg-amule