forked from pool/exempi
This commit is contained in:
parent
642da00949
commit
0900595464
46
exempi-gcc44.patch
Normal file
46
exempi-gcc44.patch
Normal file
@ -0,0 +1,46 @@
|
||||
From 9c751b6f0f09cf6605af49bb2a6c90e7b7468d65 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Biebl <biebl@debian.org>
|
||||
Date: Sun, 28 Dec 2008 23:35:38 +0000
|
||||
Subject: fix build failures with GCC 4.4
|
||||
|
||||
- Add missing includes to fix FTBFS with GCC 4.4. See Debian
|
||||
Bug#504944
|
||||
|
||||
Signed-off-by: Hubert Figuiere <hub@figuiere.net>
|
||||
---
|
||||
diff --git a/exempi/tests/utils.cpp b/exempi/tests/utils.cpp
|
||||
index 64be1ee..ee1c3a9 100644
|
||||
--- a/exempi/tests/utils.cpp
|
||||
+++ b/exempi/tests/utils.cpp
|
||||
@@ -34,6 +34,7 @@
|
||||
* OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
+#include <cstdio>
|
||||
|
||||
#include <boost/test/unit_test.hpp>
|
||||
|
||||
diff --git a/samples/source/XMPFilesCoverage.cpp b/samples/source/XMPFilesCoverage.cpp
|
||||
index dc9ce41..007c12b 100644
|
||||
--- a/samples/source/XMPFilesCoverage.cpp
|
||||
+++ b/samples/source/XMPFilesCoverage.cpp
|
||||
@@ -17,6 +17,7 @@
|
||||
#include <errno.h>
|
||||
#include <time.h>
|
||||
#include <cstring>
|
||||
+#include <cstdio>
|
||||
|
||||
#define TXMP_STRING_TYPE std::string
|
||||
#define XMP_INCLUDE_XMPFILES 1
|
||||
diff --git a/source/common/XML_Node.cpp b/source/common/XML_Node.cpp
|
||||
index de3866f..75298a8 100644
|
||||
--- a/source/common/XML_Node.cpp
|
||||
+++ b/source/common/XML_Node.cpp
|
||||
@@ -11,6 +11,7 @@
|
||||
|
||||
#include <string.h>
|
||||
#include <cstring>
|
||||
+#include <cstdio>
|
||||
#include <map>
|
||||
|
||||
// ! Can't include XMP..._Impl.hpp - used by both Core and Files.
|
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 28 12:58:10 CEST 2009 - vuntz@novell.com
|
||||
|
||||
- Add exempi-gcc44.patch to fix build with gcc 4.4.
|
||||
- Remove AutoReqProv: it's default now.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 9 22:23:55 CET 2009 - crrodriguez@suse.de
|
||||
|
||||
|
@ -21,7 +21,7 @@
|
||||
Name: exempi
|
||||
Url: http://libopenraw.freedesktop.org/wiki/Exempi
|
||||
Version: 2.1.0
|
||||
Release: 1
|
||||
Release: 2
|
||||
BuildRequires: boost-devel >= 1.33.0
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: libexpat-devel
|
||||
@ -32,7 +32,8 @@ Group: Development/Libraries/C and C++
|
||||
Source0: http://libopenraw.freedesktop.org/download/%{name}-%{version}.tar.bz2
|
||||
# PATCH-FIX-UPSTREAM
|
||||
Patch0: exempi-rpmlint.diff
|
||||
AutoReqProv: on
|
||||
# PATCH-FIX-UPSTREAM exempi-gcc44.patch vuntz@novell.com -- Taken from git
|
||||
Patch1: exempi-gcc44.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%define debug_package_requires libexempi3 = %{version}
|
||||
|
||||
@ -86,6 +87,7 @@ Authors:
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
||||
@ -116,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_libdir}/pkgconfig/*.pc
|
||||
|
||||
%changelog
|
||||
* Tue Apr 28 2009 vuntz@novell.com
|
||||
- Add exempi-gcc44.patch to fix build with gcc 4.4.
|
||||
- Remove AutoReqProv: it's default now.
|
||||
* Fri Jan 09 2009 crrodriguez@suse.de
|
||||
- remove static libraries and "la" files
|
||||
- correct -devel package deps
|
||||
|
Loading…
x
Reference in New Issue
Block a user