[adonthell] 20/65: adonthell: fix ftbfs (#624998)

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository adonthell.

commit 06eeebdc53768f7f4dbfd7ea01f2a6eed9724355
Author: Peter de Wachter <pdewacht at gmail.com>
Date:   Sun May 8 19:49:20 2011 +0000

    adonthell: fix ftbfs (#624998)
---
 debian/changelog                          |  7 +++++-
 debian/patches/11_ftbfs_with_gcc-4.6.diff | 40 +++++++++++++++++++++++++++++++
 debian/patches/series                     |  1 +
 3 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 7a4f28e..0c5ae3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 adonthell (0.3.5-6) UNRELEASED; urgency=low
 
+  [ Iain Lane ]
   * debian/control: Remove myself from Uploaders 
 
- -- Iain Lane <laney at ubuntu.com>  Wed, 30 Jun 2010 10:53:46 +0100
+  [ Peter De Wachter ]
+  * Fixed FTBFS with newer gcc. (Closes: #624998)
+    - Added patch: 11_ftbfs_with_gcc-4.6.diff
+
+ -- Peter De Wachter <pdewacht at gmail.com>  Sun, 08 May 2011 21:47:10 +0200
 
 adonthell (0.3.5-5) unstable; urgency=low
 
diff --git a/debian/patches/11_ftbfs_with_gcc-4.6.diff b/debian/patches/11_ftbfs_with_gcc-4.6.diff
new file mode 100644
index 0000000..abc6eb6
--- /dev/null
+++ b/debian/patches/11_ftbfs_with_gcc-4.6.diff
@@ -0,0 +1,40 @@
+Description: fix "taking address of temporary" errors
+Author: Peter De Wachter <pdewacht at gmail.com>
+Bug-Debian: http://bugs.debian.org/624998
+Forwarded: not-needed?
+
+It looks like the relevant code has been entirely rewritten for adonthell 0.4
+
+--- a/src/label.cc
++++ b/src/label.cc
+@@ -645,7 +645,7 @@
+ }
+ 
+ 
+-const string label::text_string () const
++const string & label::text_string () const
+ {
+     return my_text_;  
+ }
+--- a/src/label.h
++++ b/src/label.h
+@@ -90,7 +90,7 @@
+     /**
+        Get the text in string
+     */
+-    const string text_string () const;
++    const string & text_string () const;
+ 
+ 
+     /**
+--- a/src/win_event.cc
++++ b/src/win_event.cc
+@@ -35,7 +35,7 @@
+ 	    case DESTROY:
+ 	    {
+ 	        set_callback_destroy (
+-	        makeFunctor (&Functor0wRet<bool>(), *callback, &py_callback::callback_func0ret));
++	        makeFunctor (new Functor0wRet<bool>(), *callback, &py_callback::callback_func0ret));
+ 	        break;
+ 	    }
+ 	
diff --git a/debian/patches/series b/debian/patches/series
index 012cf82..56f9b5d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 04_do_not_ship_pyc.diff
 10_ftbfs_with_gcc-4.4.diff
+11_ftbfs_with_gcc-4.6.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/adonthell.git