From a720b1cd0cc22a63b915d0402fd9ba3345fe9fc1 Mon Sep 17 00:00:00 2001 From: alexlan Date: Tue, 24 Mar 2009 00:45:47 +0000 Subject: [PATCH] - Add patch to fix building with GCC 4.4 --- pfstools-1.7.0-gcc44.patch | 11 +++++++++++ pfstools.spec | 6 +++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 pfstools-1.7.0-gcc44.patch diff --git a/pfstools-1.7.0-gcc44.patch b/pfstools-1.7.0-gcc44.patch new file mode 100644 index 0000000..787a02a --- /dev/null +++ b/pfstools-1.7.0-gcc44.patch @@ -0,0 +1,11 @@ +--- pfstools-1.7.0/src/filter/pfspanoramic.cpp.orig 2009-03-23 17:23:39.000000000 -0700 ++++ pfstools-1.7.0/src/filter/pfspanoramic.cpp 2009-03-23 17:27:34.000000000 -0700 +@@ -195,7 +195,7 @@ + { + char *opts; + +- if(opts = strchr(name, '/')) ++ if(opts = strchr((char *)name, '/')) + { + *opts++ = '\0'; + } diff --git a/pfstools.spec b/pfstools.spec index 9208cd3..c8a426d 100644 --- a/pfstools.spec +++ b/pfstools.spec @@ -1,6 +1,6 @@ Name: pfstools Version: 1.7.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Programs for handling high-dynamic range images Group: Applications/Multimedia @@ -9,6 +9,7 @@ URL: http://pfstools.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Patch1: pfstools-mDATA.patch Patch2: pfstools-1.7.0-bf1.patch +Patch3: pfstools-1.7.0-gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: automake @@ -117,6 +118,7 @@ etc., for developing programs which can handle HDR graphics files. %setup -q %patch1 -p1 -b .mDATA %patch2 -p1 -b .bf1 +%patch3 -p1 -b .gcc44 # Remove the following once the patch for the Makefile.am file # is not necessary anymore. aclocal @@ -269,6 +271,8 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/pfs-1.2/pfs.h %changelog +* Mon Mar 23 2009 Alex Lancaster - 1.7.0-5 +- Add patch to fix building with GCC 4.4 * Wed Feb 25 2009 Ulrich Drepper - 1.7.0-4 - recompile for hdf5 ABI change