tags 474804 + patch
thanks

Hi,

Attached patch fixes FTBFS with gcc-4.3

Changelog:

zsnes (1.510-2.1) unstable; urgency=high

  * Non-maintainer upload.
  * Fix gcc-4.3 FTBFS (Closes: #474804).

 -- Ian Beckwith <[EMAIL PROTECTED]>  Thu, 10 Apr 2008 22:20:59 +0100


Two files attached:

zsnes-1.510-2--1.510-2.1.patch - full diff against last version
gcc-4.3-ftbfs.dpatch - just the dpatch

I'm doing this as part of NM T&S, hopefully my AM will upload this
soon.

New package is available at: 

http://erislabs.net/ianb/debian/zsnes_1.510-2.1.dsc

cheers,

Ian.

-- 
Ian Beckwith - [EMAIL PROTECTED] - http://erislabs.net/ianb/
GPG fingerprint: AF6C C0F1 1E74 424B BCD5  4814 40EC C154 A8BA C1EA
Listening to: Skinny Puppy - Process - Amnesia
#! /bin/sh /usr/share/dpatch/dpatch-run
## gcc-4.3-ftbfs.dpatch by  <Ian Beckwith <[EMAIL PROTECTED]>>
##
## DP: Fix build failures with gcc-4.3

@DPATCH@
diff -urNad zsnes-1.510~/src/parsegen.cpp zsnes-1.510/src/parsegen.cpp
--- zsnes-1.510~/src/parsegen.cpp       2007-01-15 23:58:43.000000000 +0000
+++ zsnes-1.510/src/parsegen.cpp        2008-04-10 22:16:37.000000000 +0100
@@ -26,6 +26,7 @@
 #include <iostream>
 #include <fstream>
 #include <string>
+#include <cstring>
 #include <vector>
 #include <algorithm>
 #include <sstream>
@@ -1828,7 +1829,7 @@
   }
 }
 
-int main(size_t argc, const char **argv)
+int main(int argc, const char **argv)
 {
   const char *cheader_file = 0;
   bool compile = false;
diff -urNad zsnes-1.510~/src/tools/depbuild.cpp 
zsnes-1.510/src/tools/depbuild.cpp
--- zsnes-1.510~/src/tools/depbuild.cpp 2006-12-27 11:04:05.000000000 +0000
+++ zsnes-1.510/src/tools/depbuild.cpp  2008-04-10 22:17:07.000000000 +0100
@@ -24,6 +24,7 @@
 #include <iostream>
 #include <string>
 #include <cstdio>
+#include <cstdlib>
 using namespace std;
 
 #include "fileutil.h"
@@ -183,7 +184,7 @@
   }
 }
 
-int main(size_t argc, const char *const *const argv)
+int main(int argc, const char *const *const argv)
 {
   if (argc < 5)
   {
diff -urNad zsnes-1.510~/src/tools/strutil.h zsnes-1.510/src/tools/strutil.h
--- zsnes-1.510~/src/tools/strutil.h    2006-12-27 11:04:05.000000000 +0000
+++ zsnes-1.510/src/tools/strutil.h     2008-04-10 22:16:56.000000000 +0100
@@ -23,6 +23,7 @@
 #define STRUTIL_H
 
 #include <string>
+#include <cstring>
 #include <vector>
 #include <cctype>
 
diff -Naur zsnes-1.510.old/debian/changelog zsnes-1.510/debian/changelog
--- zsnes-1.510.old/debian/changelog	2008-04-11 00:38:02.000000000 +0100
+++ zsnes-1.510/debian/changelog	2008-04-11 00:38:20.000000000 +0100
@@ -1,3 +1,10 @@
+zsnes (1.510-2.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Fix gcc-4.3 FTBFS (Closes: #474804).
+
+ -- Ian Beckwith <[EMAIL PROTECTED]>  Thu, 10 Apr 2008 22:20:59 +0100
+
 zsnes (1.510-2) unstable; urgency=low
 
   * Acknowledge NMU, closes: #447366
diff -Naur zsnes-1.510.old/debian/patches/00list zsnes-1.510/debian/patches/00list
--- zsnes-1.510.old/debian/patches/00list	2008-04-11 00:38:02.000000000 +0100
+++ zsnes-1.510/debian/patches/00list	2008-04-11 00:38:20.000000000 +0100
@@ -1,2 +1,3 @@
 gcc-fno-rtti
 replace_crc32
+gcc-4.3-ftbfs.dpatch
diff -Naur zsnes-1.510.old/debian/patches/gcc-4.3-ftbfs.dpatch zsnes-1.510/debian/patches/gcc-4.3-ftbfs.dpatch
--- zsnes-1.510.old/debian/patches/gcc-4.3-ftbfs.dpatch	1970-01-01 01:00:00.000000000 +0100
+++ zsnes-1.510/debian/patches/gcc-4.3-ftbfs.dpatch	2008-04-11 00:38:20.000000000 +0100
@@ -0,0 +1,57 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## gcc-4.3-ftbfs.dpatch by  <Ian Beckwith <[EMAIL PROTECTED]>>
+##
+## DP: Fix build failures with gcc-4.3
+
[EMAIL PROTECTED]@
+diff -urNad zsnes-1.510~/src/parsegen.cpp zsnes-1.510/src/parsegen.cpp
+--- zsnes-1.510~/src/parsegen.cpp	2007-01-15 23:58:43.000000000 +0000
++++ zsnes-1.510/src/parsegen.cpp	2008-04-10 22:16:37.000000000 +0100
+@@ -26,6 +26,7 @@
+ #include <iostream>
+ #include <fstream>
+ #include <string>
++#include <cstring>
+ #include <vector>
+ #include <algorithm>
+ #include <sstream>
+@@ -1828,7 +1829,7 @@
+   }
+ }
+ 
+-int main(size_t argc, const char **argv)
++int main(int argc, const char **argv)
+ {
+   const char *cheader_file = 0;
+   bool compile = false;
+diff -urNad zsnes-1.510~/src/tools/depbuild.cpp zsnes-1.510/src/tools/depbuild.cpp
+--- zsnes-1.510~/src/tools/depbuild.cpp	2006-12-27 11:04:05.000000000 +0000
++++ zsnes-1.510/src/tools/depbuild.cpp	2008-04-10 22:17:07.000000000 +0100
+@@ -24,6 +24,7 @@
+ #include <iostream>
+ #include <string>
+ #include <cstdio>
++#include <cstdlib>
+ using namespace std;
+ 
+ #include "fileutil.h"
+@@ -183,7 +184,7 @@
+   }
+ }
+ 
+-int main(size_t argc, const char *const *const argv)
++int main(int argc, const char *const *const argv)
+ {
+   if (argc < 5)
+   {
+diff -urNad zsnes-1.510~/src/tools/strutil.h zsnes-1.510/src/tools/strutil.h
+--- zsnes-1.510~/src/tools/strutil.h	2006-12-27 11:04:05.000000000 +0000
++++ zsnes-1.510/src/tools/strutil.h	2008-04-10 22:16:56.000000000 +0100
+@@ -23,6 +23,7 @@
+ #define STRUTIL_H
+ 
+ #include <string>
++#include <cstring>
+ #include <vector>
+ #include <cctype>
+ 

Attachment: signature.asc
Description: Digital signature

Reply via email to