tags 671991 + patch
thanks
this backport fixes the GCC 4.7 related build failure, however the package fails
to build later for an unrelated reason. filing a separate bug report for this
diff -Nru grass-6.4.1/debian/changelog grass-6.4.1/debian/changelog
--- grass-6.4.1/debian/changelog 2012-01-20 14:49:23.000000000 +0100
+++ grass-6.4.1/debian/changelog 2012-05-10 01:43:33.000000000 +0200
@@ -1,3 +1,10 @@
+grass (6.4.1-2.1) unstable; urgency=low
+
+ * Non maintainer upload.
+ * Fix build failure with GCC 4.7. Closes: #671991.
+
+ -- Matthias Klose <d...@debian.org> Wed, 09 May 2012 23:40:21 +0000
+
grass (6.4.1-2) unstable; urgency=low
[ Hamish Bowman ]
diff -Nru grass-6.4.1/debian/patches/changeset_r50130.diff
grass-6.4.1/debian/patches/changeset_r50130.diff
--- grass-6.4.1/debian/patches/changeset_r50130.diff 1970-01-01
01:00:00.000000000 +0100
+++ grass-6.4.1/debian/patches/changeset_r50130.diff 2012-05-10
02:13:30.000000000 +0200
@@ -0,0 +1,49 @@
+Index: /grass/trunk/lib/iostream/mm.cpp
+===================================================================
+--- ./lib/iostream/mm.cc (revision 48562)
++++ ./lib/iostream/mm.cc (revision 50130)
+@@ -275,5 +275,5 @@
+
+ /* ************************************************************ */
+-void* operator new[] (size_t sz) {
++void* operator new[] (size_t sz) throw(std::bad_alloc) {
+ void *p;
+
+@@ -326,5 +326,5 @@
+
+ /* ************************************************************ */
+-void* operator new (size_t sz) {
++void* operator new (size_t sz) throw(std::bad_alloc) {
+ void *p;
+
+@@ -378,5 +378,5 @@
+
+ /* ---------------------------------------------------------------------- */
+-void operator delete (void *ptr) {
++void operator delete (void *ptr) throw() {
+ size_t sz;
+ void *p;
+@@ -418,5 +418,5 @@
+
+ /* ---------------------------------------------------------------------- */
+-void operator delete[] (void *ptr) {
++void operator delete[] (void *ptr) throw() {
+ size_t sz;
+ void *p;
+Index: /grass/trunk/include/iostream/mm.h
+===================================================================
+--- ./include/iostream/mm.h (revision 32746)
++++ ./include/iostream/mm.h (revision 50130)
+@@ -129,8 +129,8 @@
+
+ friend class mm_register_init;
+- friend void * operator new(size_t);
+- friend void * operator new[](size_t);
+- friend void operator delete(void *);
+- friend void operator delete[](void *);
++ friend void * operator new(size_t) throw(std::bad_alloc);
++ friend void * operator new[](size_t) throw(std::bad_alloc);
++ friend void operator delete(void *) throw();
++ friend void operator delete[](void *) throw();
+ };
+
diff -Nru grass-6.4.1/debian/patches/series grass-6.4.1/debian/patches/series
--- grass-6.4.1/debian/patches/series 2012-01-20 14:49:23.000000000 +0100
+++ grass-6.4.1/debian/patches/series 2012-05-10 02:14:52.000000000 +0200
@@ -3,3 +3,4 @@
pager
xterm
instdir
+changeset_r50130.diff
