graphics/hugin: Added a patch for gcc-4.7.x.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
This commit is contained in:
titopoquito 2012-09-10 22:00:21 +02:00 committed by Robby Workman
parent 59220ca932
commit b89fed3606
2 changed files with 38 additions and 1 deletions

View file

@ -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));
}

View file

@ -27,7 +27,7 @@
PRGNAM=hugin
VERSION=2011.4.0
BUILD=${BUILD:-1}
BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@ -68,6 +68,10 @@ cd $PRGNAM-$VERSION
chown -R root:root .
chmod -R u+w,go+r-w,a-s .
# apply patch to make compilation work with gcc 4.7
# patch taken from https://bugs.launchpad.net/hugin/+bug/913250
patch -p1 < $CWD/hugin-gcc47.patch
cmake \
-DCMAKE_C_FLAGS="$SLKCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKCFLAGS" \