Package: armagetronad Version: 0.2.8.3.1-1 Followup-For: Bug #625079 User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu oneiric ubuntu-patch
In Ubuntu, the attached patch was applied to achieve the following: * Add 01_g++-4.6: Apply upstream r1275 to resolve FTBFS. (Closes: #625079) (LP: #765939) Thanks for considering the patch. -- System Information: Debian Release: wheezy/sid APT prefers oneiric-updates APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500, 'oneiric-proposed'), (500, 'oneiric') Architecture: amd64 (x86_64) Kernel: Linux 3.0.0-9-generic (SMP w/4 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
diff -Nru armagetronad-0.2.8.3.1/debian/patches/01_g++-4.6 armagetronad-0.2.8.3.1/debian/patches/01_g++-4.6 --- armagetronad-0.2.8.3.1/debian/patches/01_g++-4.6 1969-12-31 19:00:00.000000000 -0500 +++ armagetronad-0.2.8.3.1/debian/patches/01_g++-4.6 2011-08-29 20:51:29.000000000 -0400 @@ -0,0 +1,70 @@ +Description: Add ctors to resolve FTBFS with g++-4.6 +Forwarded: not-needed +Author: Daniel Lee Harple +Applied-upstream: http://bazaar.launchpad.net/~armagetronad-dev/armagetronad/0.2.8-armagetronad-work/revision/1275 +Reviewed-by: Daniel T Chen <crim...@ubuntu.com> +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/armagetronad/+bug/765939 +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=625079 +Last-update: 2011-08-29 + +Index: armagetronad-0.2.8.3.1/src/tools/tDirectories.cpp +=================================================================== +--- armagetronad-0.2.8.3.1.orig/src/tools/tDirectories.cpp 2011-08-29 20:36:00.000000000 -0400 ++++ armagetronad-0.2.8.3.1/src/tools/tDirectories.cpp 2011-08-29 20:36:21.000000000 -0400 +@@ -474,6 +474,7 @@ + class tPathConfig: public tPath + { + public: ++ tPathConfig() {} + private: + void Paths ( tArray< tString >& paths ) const + { +@@ -505,6 +506,7 @@ + class tPathData: public tPath + { + public: ++ tPathData() {} + private: + void Paths ( tArray< tString >& paths ) const + { +@@ -526,6 +528,7 @@ + class tPathVar: public tPath + { + public: ++ tPathVar() {} + private: + void Paths ( tArray< tString >& paths ) const + { +@@ -552,6 +555,7 @@ + class tPathScreenshot: public tPath + { + public: ++ tPathScreenshot() {} + private: + void Paths ( tArray< tString >& paths ) const + { +Index: armagetronad-0.2.8.3.1/src/tools/tDirectories.h +=================================================================== +--- armagetronad-0.2.8.3.1.orig/src/tools/tDirectories.h 2011-08-29 20:36:00.000000000 -0400 ++++ armagetronad-0.2.8.3.1/src/tools/tDirectories.h 2011-08-29 20:36:21.000000000 -0400 +@@ -58,6 +58,7 @@ + + class tPathResource: public tPath { + public: ++ tPathResource() {} + tString GetWritePath(const char *filename) const; + tString GetIncluded() const; //!< returns the path to the included resources + private: +Index: armagetronad-0.2.8.3.1/src/tools/tList.h +=================================================================== +--- armagetronad-0.2.8.3.1.orig/src/tools/tList.h 2011-08-29 20:36:00.000000000 -0400 ++++ armagetronad-0.2.8.3.1/src/tools/tList.h 2011-08-29 20:36:21.000000000 -0400 +@@ -149,7 +149,7 @@ + } + (*this)[this->Len()-1] = NULL; + +- SetLen(this->Len()-1); ++ this->SetLen(this->Len()-1); + + if ( REFERENCE ) + { diff -Nru armagetronad-0.2.8.3.1/debian/patches/series armagetronad-0.2.8.3.1/debian/patches/series --- armagetronad-0.2.8.3.1/debian/patches/series 2010-03-12 00:19:03.000000000 -0500 +++ armagetronad-0.2.8.3.1/debian/patches/series 2011-08-29 20:53:18.000000000 -0400 @@ -1 +1,2 @@ # +01_g++-4.6