Package: njam
Version: 1.25-5
Followup-For: Bug #565087
User: [email protected]
Usertags: origin-ubuntu oneiric ubuntu-patch
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
*** /tmp/tmpwdaaBU
In Ubuntu, the attached patch was applied to achieve the following:
* debian/patches/gcc_46.dpatch: (LP: #756133) (Closes: #565087)
- Fix compile with newer gcc versions.
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')
Architecture: amd64 (x86_64)
Kernel: Linux 3.0.0-999-generic (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAEBAgAGBQJOIKAsAAoJEGHzRCZ03mYk2QQQANsnFrUemzb2tl4uCjSe5g2C
bmq+uur2ubSKYSp5IHgfDPR2WB5QXei3B46j8WckXxQU7/Q2Mll8PEOAK6nRcZWN
OCAtKi2cXIyNxgoZ6fk6hfFiff5Q/QzuCywhg/YMh2aamplWctF8nQjhTWHO40iN
sC2Jnr1ICK4t2MFJZB01ddTPDHuwWuiZkToqUnvU7lUliJyh7UZLrz0jFo6atAFN
Yv6M5QJJjwshzk4WQUG/cBJrrBjN3FAizGeV1B7kgNoNS9zHXrah5DecuBvQTNBJ
liOh6rTiqjKs4Dh7X4T2DeDp94udGTXw6zHdddq+niU5sJA7vGiE0IgDUIaOwDsh
99sIhA9TWVYXAXFmxIeWVj2SnzUXdXXc58A3qtisn1Y1zR83NzlijY5wc5STdCyg
BZw7+fxdvcXvgfHJnCiBnyVyCC4snqdUZtGMbIrmuSXfcS2C30au0jw77YDazo6d
CnJqmZVYNF7UXos74n78gTUe+bDpnShlB8p5WtN5MRdozmEZjI+AoTO8ToB9eB5P
+aci49Pwq3E0DXpP/tpmR1jnAt0J3QGyhqTnlUVxAqtQSkbSOhqD0IY0IOPS0qOF
crbCtJu65fy5X/fswlDtKYE+pDsYMTtzXdO9uxnn+h2EMY6QpOCggyj0M/ajKKwX
tzaPo50/7piwrHvpCyef
=ESRH
-----END PGP SIGNATURE-----
=== modified file 'debian/patches/00list'
--- debian/patches/00list 2008-06-03 21:57:27 +0000
+++ debian/patches/00list 2011-07-15 20:03:27 +0000
@@ -1 +1,2 @@
changed_hiscore_name
+gcc_46.dpatch
=== added file 'debian/patches/gcc_46.dpatch'
--- debian/patches/gcc_46.dpatch 1970-01-01 00:00:00 +0000
+++ debian/patches/gcc_46.dpatch 2011-07-15 20:13:08 +0000
@@ -0,0 +1,28 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+Description: gcc4.5 and later are more restrictive with c++ function calls,
+ this trivial patch fixes build failures with -fpermissive
+Author: Andreas Moog <[email protected]>
+Last-Update: 2011-07-15
+
+=== modified file 'src/njamedit.cpp'
+--- a/src/njamedit.cpp 2006-07-27 23:15:50 +0000
++++ b/src/njamedit.cpp 2011-07-15 20:01:54 +0000
+@@ -114,7 +114,7 @@
+ key = SDLK_a;
+ else if (CheckForSave())
+ {
+- LogFile::LogFile("Saving maps");
++ LogFile("Saving maps");
+ m_Maps.Save(filename);
+ level_type_was = level_type;
+ changed = false;
+@@ -131,7 +131,7 @@
+ char types[2][5] = { "COOP", "DUEL" };
+ sprintf(buf, "levels/%s.%s\0", filename, types[level_type]);
+ sprintf(filename, "%s\0", buf);
+- LogFile::LogFile("Saving maps");
++ LogFile("Saving maps");
+ m_Maps.Save(filename);
+ level_type_was = level_type;
+ changed = false;
+
