From f85e0ff120b1635e4c6a15f2b3dcdec461a739476655535dde545e794cc0d315 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Tue, 22 Mar 2011 09:15:10 +0000
Subject: [PATCH] Accepting request 64798 from home:namtrac:branches:graphics

OBS-URL: https://build.opensuse.org/request/show/64798
OBS-URL: https://build.opensuse.org/package/show/graphics/hugin?expand=0&rev=15
---
 hugin-fix-gcc46.patch | 20 ++++++++++++++++++++
 hugin.changes         |  5 +++++
 hugin.spec            |  3 +++
 3 files changed, 28 insertions(+)
 create mode 100644 hugin-fix-gcc46.patch

diff --git a/hugin-fix-gcc46.patch b/hugin-fix-gcc46.patch
new file mode 100644
index 0000000..97f3752
--- /dev/null
+++ b/hugin-fix-gcc46.patch
@@ -0,0 +1,20 @@
+
+# HG changeset patch
+# User Bruno Postle <bruno@postle.net>
+# Date 1295990053 0
+# Node ID 1fc6ad6e7c7ae679e3b8f96b6f4c36920f228138
+# Parent  9e1d0816a1edd95a985ad6fd62da9c8b7342efb5
+Fix for compilation with gcc-4.6.0
+
+diff -r 9e1d0816a1ed -r 1fc6ad6e7c7a src/foreign/vigra/vigra/multi_iterator.hxx
+--- a/src/foreign/vigra/vigra/multi_iterator.hxx	Mon Jan 24 21:37:53 2011 +0100
++++ b/src/foreign/vigra/vigra/multi_iterator.hxx	Tue Jan 25 21:14:13 2011 +0000
+@@ -41,6 +41,7 @@
+ #define VIGRA_MULTI_ITERATOR_HXX
+ 
+ #include <sys/types.h>
++#include <stddef.h>
+ #include "tinyvector.hxx"
+ #include "iteratortags.hxx"
+ 
+
diff --git a/hugin.changes b/hugin.changes
index aac5aab..a383fe3 100644
--- a/hugin.changes
+++ b/hugin.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Mar 22 08:12:00 UTC 2011 - idoenmez@novell.com
+
+- Add hugin-fix-gcc46.patch: fix gcc 4.6 compilation 
+
 -------------------------------------------------------------------
 Mon Mar 21 16:51:59 UTC 2011 - coolo@novell.com
 
diff --git a/hugin.spec b/hugin.spec
index 573d0e5..2296014 100644
--- a/hugin.spec
+++ b/hugin.spec
@@ -39,6 +39,8 @@ Source:         %{name}-%{version}.tar.bz2
 #Source:         %{name}-svn2008xxxx.tar.bz2
 Source1:        %{name}-svn-dummy
 Patch0:         hugin-libpng14.patch
+# PATCH-FIX-UPSTREAM hugin-fix-gcc46.patch idoenmez@suse.de -- Fix compilation with gcc 4.6
+Patch1:         hugin-fix-gcc46.patch
 Url:            http://hugin.sourceforge.net/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       make
@@ -79,6 +81,7 @@ Authors:
 %prep
 %setup -q
 %patch0
+%patch1 -p1
 # For SVN snapshot:
 #setup -q -n %{name}
 # Rename Catalan in Spain to Catalan.