[med-svn] r10501 - in trunk/packages/cd-hit/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2012-04-22 16:08:48 +0000 (Sun, 22 Apr 2012)
New Revision: 10501

Added:
   trunk/packages/cd-hit/trunk/debian/patches/gcc-4.7.patch
Modified:
   trunk/packages/cd-hit/trunk/debian/changelog
   trunk/packages/cd-hit/trunk/debian/patches/series
Log:
Fix gcc-4.7 build issue


Modified: trunk/packages/cd-hit/trunk/debian/changelog
===================================================================
--- trunk/packages/cd-hit/trunk/debian/changelog	2012-04-22 15:30:48 UTC (rev 10500)
+++ trunk/packages/cd-hit/trunk/debian/changelog	2012-04-22 16:08:48 UTC (rev 10501)
@@ -1,4 +1,4 @@
-cd-hit (4.5.8-2012-03-24-1) UNRELEASED; urgency=low
+cd-hit (4.5.8-2012-03-24-2) UNRELEASED; urgency=low
 
   [ Charles Plessy ]
   * renamed debian/upstream-metadata.yaml to debian/upstream
@@ -9,8 +9,10 @@
   * debian/control: Standards-Version: 3.9.3 (no changes needed)
   * debian/copyright: Fixed DEP5 and verified using
       cme fix dpkg-copyright
+  * debian/patches/gcc-4.7.patch: Enable building with g++-4.7
+    Closes: #667134
 
- -- Andreas Tille <tille at debian.org>  Sun, 22 Apr 2012 09:01:16 +0200
+ -- Andreas Tille <tille at debian.org>  Sun, 22 Apr 2012 18:06:41 +0200
 
 cd-hit (4.5.7-1) unstable; urgency=low
 

Added: trunk/packages/cd-hit/trunk/debian/patches/gcc-4.7.patch
===================================================================
--- trunk/packages/cd-hit/trunk/debian/patches/gcc-4.7.patch	                        (rev 0)
+++ trunk/packages/cd-hit/trunk/debian/patches/gcc-4.7.patch	2012-04-22 16:08:48 UTC (rev 10501)
@@ -0,0 +1,18 @@
+Author: Andreas Tille <tille at debian.org>
+Date: Sun, 22 Apr 2012 18:06:41 +0200
+Bug-Closed: http://bugs.debian.org/667134
+Description: Build with g++ version 4.7
+ Just followed the hint of g++ itself which said:
+    note: use 'this->push_back' instead
+
+--- cd-hit-v4.5.8-2012-03-24.orig/cdhit-common.h
++++ cd-hit-v4.5.8-2012-03-24/cdhit-common.h
+@@ -92,7 +92,7 @@
+ 		void Append( const TYPE & item ){
+ 			size_t n = this->size();
+ 			if( n + 1 >= this->capacity() ) this->reserve( n + n/5 + 1 );
+-			push_back( item );
++			this->push_back( item );
+ 		}
+ 		int size()const{ return (int)vector<TYPE>::size(); }
+ };

Modified: trunk/packages/cd-hit/trunk/debian/patches/series
===================================================================
--- trunk/packages/cd-hit/trunk/debian/patches/series	2012-04-22 15:30:48 UTC (rev 10500)
+++ trunk/packages/cd-hit/trunk/debian/patches/series	2012-04-22 16:08:48 UTC (rev 10501)
@@ -1 +1,2 @@
 fix_makefile_clean_target.patch
+gcc-4.7.patch