Accepting request 109341 from home:dimstar:gcc47

Fix build with gcc 4.7 - Please work with upstream to resolve it in upstream code base. There is also a chance that a newer version of the package might have this fixed already.

OBS-URL: https://build.opensuse.org/request/show/109341
OBS-URL: https://build.opensuse.org/package/show/graphics/libraw?expand=0&rev=53
This commit is contained in:
Adrian Schröter 2012-03-15 16:38:33 +00:00 committed by Git OBS Bridge
parent 1f8d1a1835
commit 0bbb62e01c
3 changed files with 24 additions and 8 deletions

12
libraw-gcc47.patch Normal file
View File

@ -0,0 +1,12 @@
Index: LibRaw-0.13.5/samples/dcraw_emu.cpp
===================================================================
--- LibRaw-0.13.5.orig/samples/dcraw_emu.cpp
+++ LibRaw-0.13.5/samples/dcraw_emu.cpp
@@ -27,6 +27,7 @@ it under the terms of the one of three l
#endif
#include <stdio.h>
+#include <unistd.h> // For getpagesize, read and close
#include <string.h>
#include <stdlib.h>
#include <math.h>

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Mar 14 19:29:33 UTC 2012 - dimstar@opensuse.org
- Add libraw-gcc47.patch: Fix build with gcc 4.7.
-------------------------------------------------------------------
Wed Aug 24 11:53:14 UTC 2011 - idonmez@novell.com

View File

@ -1,7 +1,7 @@
#
# spec file for package libraw
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -20,12 +20,14 @@
Name: libraw
Version: 0.13.5
Release: 1
License: CDDLv1.0 | LGPLv2.1
Release: 0
Summary: Library for reading RAW files obtained from digital photo cameras
Url: http://www.libraw.org/
License: CDDL-1.0 or LGPL-2.1
Group: System/Libraries
Url: http://www.libraw.org/
Source: http://www.libraw.org/data/%{tar_name}-%{version}.tar.gz
# PATCH-FIX-UPSTREAM libraw-gcc47.patch dimstar@opensuse.org -- Fix build with gcc 4.7.
Patch0: libraw-gcc47.patch
BuildRequires: gcc-c++
BuildRequires: libjpeg-devel
BuildRequires: liblcms2-devel
@ -40,7 +42,6 @@ LibRaw is based on the source codes of the dcraw utility, where part of
drawbacks have already been eliminated and part will be fixed in future.
%package tools
License: CDDLv1.0 | LGPLv2.1
Summary: Library for reading RAW files obtained from digital photo cameras -- Tools
Group: System/Libraries
@ -52,7 +53,6 @@ LibRaw is based on the source codes of the dcraw utility, where part of
drawbacks have already been eliminated and part will be fixed in future.
%package -n libraw2
License: CDDLv1.0 | LGPLv2.1
Summary: Library for reading RAW files obtained from digital photo cameras
Group: System/Libraries
@ -64,7 +64,6 @@ LibRaw is based on the source codes of the dcraw utility, where part of
drawbacks have already been eliminated and part will be fixed in future.
%package devel
License: CDDLv1.0 | LGPLv2.1
Summary: Development files for %{name}
Group: Development/Libraries/Other
Requires: libraw2 = %{version}
@ -77,7 +76,6 @@ LibRaw is based on the source codes of the dcraw utility, where part of
drawbacks have already been eliminated and part will be fixed in future.
%package devel-static
License: CDDLv1.0 | LGPLv2.1
Summary: Library for reading RAW files obtained from digital photo cameras
Group: Development/Libraries/Other
Requires: %{name}-devel = %{version}
@ -94,6 +92,7 @@ against LibRaw. LibRaw does not provide dynamic libraries.
%prep
%setup -q -n %{tar_name}-%{version}
%patch0 -p1
%build
CXXFLAGS="%{optflags} -fPIC" \