tags 667349 + patch
thanks
Philip, the libtiff4 symbols transition is finished, now uploading the attached
debdiff. Please feel free to override the upload.
diff -Nru rawtherapee-3.0.0~dfsg1/debian/changelog
rawtherapee-3.0.0~dfsg1/debian/changelog
--- rawtherapee-3.0.0~dfsg1/debian/changelog 2011-07-21 15:06:34.000000000
+0200
+++ rawtherapee-3.0.0~dfsg1/debian/changelog 2012-05-30 08:08:53.000000000
+0200
@@ -1,3 +1,10 @@
+rawtherapee (3.0.0~dfsg1-1.1) unstable; urgency=low
+
+ * Non maintainer upload
+ * Fix build failure with GCC 4.7. Closes: #667349.
+
+ -- Matthias Klose <d...@debian.org> Wed, 30 May 2012 06:08:03 +0000
+
rawtherapee (3.0.0~dfsg1-1) unstable; urgency=low
* New upstream release (closes LP: #795161).
diff -Nru rawtherapee-3.0.0~dfsg1/debian/patches/ftbfs-gcc-4.7.diff
rawtherapee-3.0.0~dfsg1/debian/patches/ftbfs-gcc-4.7.diff
--- rawtherapee-3.0.0~dfsg1/debian/patches/ftbfs-gcc-4.7.diff 1970-01-01
01:00:00.000000000 +0100
+++ rawtherapee-3.0.0~dfsg1/debian/patches/ftbfs-gcc-4.7.diff 2012-05-30
08:19:09.000000000 +0200
@@ -0,0 +1,40 @@
+Index: rawtherapee-3.0.0~dfsg1/rtexif/rtexif.h
+===================================================================
+--- rawtherapee-3.0.0~dfsg1.orig/rtexif/rtexif.h 2011-07-21
13:35:22.000000000 +0200
++++ rawtherapee-3.0.0~dfsg1/rtexif/rtexif.h 2012-05-30 08:13:01.484158614
+0200
+@@ -55,6 +55,8 @@
+ Interpreter* interpreter;
+ };
+
++bool extractLensInfo(std::string &fullname,double &minFocal, double
&maxFocal, double &maxApertureAtMinFocal, double &maxApertureAtMaxFocal);
++
+ // a directory of tags
+ class TagDirectory {
+
+@@ -337,7 +339,6 @@
+ inline void sset4 (int v, unsigned char *s, ByteOrder order);
+ inline float int_to_float (int i);
+ inline short int int2_to_signed (short unsigned int i);
+-bool extractLensInfo(std::string &fullname,double &minFocal, double
&maxFocal, double &maxApertureAtMinFocal, double &maxApertureAtMaxFocal);
+
+ extern const TagAttrib exifAttribs[];
+ extern const TagAttrib gpsAttribs[];
+Index: rawtherapee-3.0.0~dfsg1/rtengine/iccstore.cc
+===================================================================
+--- rawtherapee-3.0.0~dfsg1.orig/rtengine/iccstore.cc 2011-07-21
13:35:22.000000000 +0200
++++ rawtherapee-3.0.0~dfsg1/rtengine/iccstore.cc 2012-05-30
08:19:07.388161391 +0200
+@@ -53,10 +53,10 @@
+ std::vector<std::string> res;
+ for (std::map<std::string, cmsHPROFILE>::iterator i=fileProfiles.begin();
i!=fileProfiles.end(); i++){
+ std::string name(i->first);
+- std::string::size_type i = name.find_last_of('/');
+- if( i == std::string::npos )
+- i = name.find_last_of('\\');
+- if( i == std::string::npos )
++ std::string::size_type i2 = name.find_last_of('/');
++ if( i2 == std::string::npos )
++ i2 = name.find_last_of('\\');
++ if( i2 == std::string::npos )
+ res.push_back ( name ); // list only profiles inside selected
profiles directory
+ }
+ return res;
diff -Nru rawtherapee-3.0.0~dfsg1/debian/patches/series
rawtherapee-3.0.0~dfsg1/debian/patches/series
--- rawtherapee-3.0.0~dfsg1/debian/patches/series 2011-07-21
12:00:31.000000000 +0200
+++ rawtherapee-3.0.0~dfsg1/debian/patches/series 2012-05-30
08:09:04.000000000 +0200
@@ -1 +1,2 @@
01-AboutThisBuild.patch
+ftbfs-gcc-4.7.diff
