summaryrefslogtreecommitdiff
path: root/graphics/hugin
diff options
context:
space:
mode:
authortitopoquito <titopoquito@googlemail.com>2012-09-10 22:00:21 +0200
committerRobby Workman <rworkman@slackbuilds.org>2012-09-10 16:35:40 -0500
commitb89fed3606791412dd145e67f1e1875ba26c7f7c (patch)
treea5fd1d82f30a84f44e75808d2ba26a04d78a8ecd /graphics/hugin
parent59220ca932c4cbebc200e3e6846257138f0abd78 (diff)
downloadslackbuilds-b89fed3606791412dd145e67f1e1875ba26c7f7c.tar.gz
graphics/hugin: Added a patch for gcc-4.7.x.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'graphics/hugin')
-rw-r--r--graphics/hugin/hugin-gcc47.patch33
-rw-r--r--graphics/hugin/hugin.SlackBuild6
2 files changed, 38 insertions, 1 deletions
diff --git a/graphics/hugin/hugin-gcc47.patch b/graphics/hugin/hugin-gcc47.patch
new file mode 100644
index 0000000000..09aaddd6eb
--- /dev/null
+++ b/graphics/hugin/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/graphics/hugin/hugin.SlackBuild b/graphics/hugin/hugin.SlackBuild
index 4af11a9374..a52b663f48 100644
--- a/graphics/hugin/hugin.SlackBuild
+++ b/graphics/hugin/hugin.SlackBuild
@@ -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" \