[rawstudio] Fix FTBS

[Gianluca Sforna]

commit 08dd2e8d5454d63705924d58f2f1f619277c7e5b
Author: Gianluca Sforna <giallu at gmail.com>
Date:   Thu Mar 1 23:16:45 2012 +0100

    Fix FTBS

 rawstudio-2.0-libpng.patch |   55 ++++++++++++++++++++++++++++++++++++++++++++
 rawstudio.spec             |   11 +++++++-
 2 files changed, 64 insertions(+), 2 deletions(-)
---
diff --git a/rawstudio-2.0-libpng.patch b/rawstudio-2.0-libpng.patch
new file mode 100644
index 0000000..54634ce
--- /dev/null
+++ b/rawstudio-2.0-libpng.patch
@@ -0,0 +1,55 @@
+diff -u -aur rawstudio-2.0/configure.in rawstudio-2.0.new/configure.in
+--- rawstudio-2.0/configure.in	2011-04-07 21:19:01.000000000 +0200
++++ rawstudio-2.0.new/configure.in	2012-02-28 11:53:25.825452614 +0100
+@@ -83,7 +83,7 @@
+ fi
+ AC_SUBST(LIBTIFF)
+ 
+-pkg_modules="gtk+-2.0 >= 2.8.0 libxml-2.0 >= 2.4 gconf-2.0 >= 2.0 lcms dbus-1 exiv2 fftw3f lensfun libcurl flickcurl sqlite3 libssl libgphoto2 x11"
++pkg_modules="gtk+-2.0 >= 2.8.0 libxml-2.0 >= 2.4 x11 gthread-2.0 gconf-2.0 >= 2.0 lcms dbus-1 exiv2 fftw3f lensfun libcurl flickcurl sqlite3 libssl libgphoto2 x11"
+ PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
+ AC_SUBST(PACKAGE_CFLAGS)
+ AC_SUBST(PACKAGE_LIBS)
+diff -u -aur rawstudio-2.0/plugins/load-gdk/exiv2-colorspace.cpp rawstudio-2.0.new/plugins/load-gdk/exiv2-colorspace.cpp
+--- rawstudio-2.0/plugins/load-gdk/exiv2-colorspace.cpp	2011-02-23 23:35:18.000000000 +0100
++++ rawstudio-2.0.new/plugins/load-gdk/exiv2-colorspace.cpp	2012-02-28 11:19:29.600026282 +0100
+@@ -125,11 +125,17 @@
+ 
+ 					int compression_type;
+ 					/* Extract embedded ICC profile */
+-					if (info_ptr->valid & PNG_INFO_iCCP)
++					if (png_get_valid(png_ptr, info_ptr, TRUE) & PNG_INFO_iCCP)
+ 					{
++#if PNG_LIBPNG_VER_SONUM >=15
++						png_uint_32 retval = png_get_iCCP (png_ptr, info_ptr,
++													(png_charpp) &icc_profile_title, &compression_type, 
++													(png_byte**) &icc_profile, (png_uint_32*) &icc_profile_size);
++#else
+ 						png_uint_32 retval = png_get_iCCP (png_ptr, info_ptr,
+ 													(png_charpp) &icc_profile_title, &compression_type,
+ 													(png_charpp) &icc_profile, (png_uint_32*) &icc_profile_size);
++#endif
+ 						if (retval != 0)
+ 						{
+ 							RSIccProfile *icc = rs_icc_profile_new_from_memory((gchar*)icc_profile, icc_profile_size, TRUE);
+diff -u -aur rawstudio-2.0/plugins/output-pngfile/output-pngfile.c rawstudio-2.0.new/plugins/output-pngfile/output-pngfile.c
+--- rawstudio-2.0/plugins/output-pngfile/output-pngfile.c	2011-03-26 02:52:29.000000000 +0100
++++ rawstudio-2.0.new/plugins/output-pngfile/output-pngfile.c	2012-02-28 11:31:50.392934364 +0100
+@@ -23,6 +23,7 @@
+ #include <gettext.h>
+ #include "config.h"
+ #include <png.h>
++#include <zlib.h>
+ 
+ #define RS_TYPE_PNGFILE (rs_pngfile_type)
+ #define RS_PNGFILE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RS_TYPE_PNGFILE, RSPngfile))
+@@ -197,8 +198,7 @@
+ 		const RSIccProfile *profile = rs_color_space_get_icc_profile(pngfile->color_space, pngfile->save16bit);
+ 		rs_icc_profile_get_data(profile, &data, &data_length);
+ 
+-		// FIXME: Insert correct profile name
+-		png_set_iCCP(png_ptr, info_ptr, "Profile name", PNG_COMPRESSION_TYPE_BASE, data, data_length);
++		png_set_iCCP(png_ptr, info_ptr, (png_charp)rs_color_space_get_name(pngfile->color_space), PNG_COMPRESSION_TYPE_BASE, (png_charp)data, data_length);
+ 		if (pngfile->save16bit)
+ 			png_set_gAMA(png_ptr, info_ptr, 1.0);
+ 	}
diff --git a/rawstudio.spec b/rawstudio.spec
index 000fbc1..c5b1054 100644
--- a/rawstudio.spec
+++ b/rawstudio.spec
@@ -1,6 +1,6 @@
 Name:           rawstudio 
 Version:        2.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Read, manipulate and convert digital camera raw images
 
 Group:          Applications/Multimedia 
@@ -22,6 +22,9 @@ BuildRequires:  desktop-file-utils
 BuildRequires:  intltool
 BuildRequires:  libtool
 
+# FIX FTBS, patch extracted from current code upstream
+Patch0:         rawstudio-2.0-libpng.patch
+
 
 %description
 Rawstudio is a highly specialized application for processing RAW images
@@ -53,10 +56,11 @@ Rawstudio backend library
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
-#./autogen.sh
+./autogen.sh
 %configure --disable-static
 make %{?_smp_mflags}
 
@@ -110,6 +114,9 @@ update-desktop-database &> /dev/null ||:
 %{_libdir}/pkgconfig/rawstudio-2.0.pc
 
 %changelog
+* Tue Feb 28 2012 Gianluca Sforna <giallu at gmail.com> - 2.0-4
+- Fix FTBS with in F17+ (patch from upstream) 
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild