[hugin] Fix to build with gcc-4.7.0
bpostle
bpostle at fedoraproject.org
Mon Jan 16 23:08:12 UTC 2012
commit 5703378f51666bc152f00e41e74cd21376d1d6e7
Author: Bruno Postle <bruno at postle.net>
Date: Mon Jan 16 23:08:18 2012 +0000
Fix to build with gcc-4.7.0
hugin-gcc47.patch | 33 +++++++++++++++++++++++++++++++++
hugin.spec | 7 ++++++-
2 files changed, 39 insertions(+), 1 deletions(-)
---
diff --git a/hugin-gcc47.patch b/hugin-gcc47.patch
new file mode 100644
index 0000000..09aaddd
--- /dev/null
+++ b/hugin-gcc47.patch
@@ -0,0 +1,33 @@
+diff -r 658ded2153f2 src/celeste/Utilities.h
+--- a/src/celeste/Utilities.h Sun Jan 01 13:23:39 2012 +0100
++++ b/src/celeste/Utilities.h Sat Jan 07 19:38:25 2012 +0000
+@@ -33,6 +33,8 @@
+ #include <stdio.h>
+ #ifdef _WINDOWS
+ #include "direct.h"
++#else
++#include <unistd.h>
+ #endif
+
+ using namespace std;
+diff -r 658ded2153f2 src/foreign/zthread/include/zthread/Guard.h
+--- a/src/foreign/zthread/include/zthread/Guard.h Sun Jan 01 13:23:39 2012 +0100
++++ b/src/foreign/zthread/include/zthread/Guard.h Sat Jan 07 19:38:25 2012 +0000
+@@ -428,7 +428,7 @@
+ template <class U, class V>
+ Guard(Guard<U, V>& g) : LockHolder<LockType>(g) {
+
+- LockingPolicy::shareScope(*this, extract(g));
++ LockingPolicy::shareScope(*this, this->extract(g));
+
+ }
+
+@@ -458,7 +458,7 @@
+ template <class U, class V>
+ Guard(Guard<U, V>& g, LockType& lock) : LockHolder<LockType>(lock) {
+
+- LockingPolicy::transferScope(*this, extract(g));
++ LockingPolicy::transferScope(*this, this->extract(g));
+
+ }
+
diff --git a/hugin.spec b/hugin.spec
index a8c6868..55769fd 100644
--- a/hugin.spec
+++ b/hugin.spec
@@ -2,10 +2,11 @@
Summary: A panoramic photo stitcher and more
Name: hugin
Version: 2011.4.0
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
Group: Applications/Multimedia
Source: http://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.bz2
+Patch0: hugin-gcc47.patch
URL: http://hugin.sourceforge.net/
Requires: shared-mime-info
Requires: webclient
@@ -39,6 +40,7 @@ without a GUI environment.
%prep
%setup -q
+%patch0 -p1
%build
%cmake . -DBUILD_HSI=1
@@ -161,6 +163,9 @@ touch --no-create %{_datadir}/icons/gnome || :
%{_mandir}/man1/linefind.*
%changelog
+* Mon Jan 16 2012 Bruno Postle 2011.4.0-3
+- Patch to build with gcc-4.7.0
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2011.4.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list