summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author titopoquito2024-04-21 16:11:29 +0200
committer Willy Sudiarto Raharjo2024-04-21 16:31:45 +0200
commit2e2db4fde56902b4c9f5afdf950b9dbd4d2780a9 (patch)
treec62c73ca665ef6e71999064818be2537f3701d4f
parentf4b4d16e1fd71093306040967fa7af04c3408c11 (diff)
downloadslackbuilds-2e2db4fde56902b4c9f5afdf950b9dbd4d2780a9.tar.gz
graphics/hugin: Patch to work with newer boost.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--graphics/hugin/boost-1.85.0-patch16
-rw-r--r--graphics/hugin/hugin.SlackBuild6
2 files changed, 20 insertions, 2 deletions
diff --git a/graphics/hugin/boost-1.85.0-patch b/graphics/hugin/boost-1.85.0-patch
new file mode 100644
index 0000000000..d2909ded9b
--- /dev/null
+++ b/graphics/hugin/boost-1.85.0-patch
@@ -0,0 +1,16 @@
+--- src/hugin_base/hugin_utils/filesystem.h.old 2023-05-08 20:19:14.000000000 +0200
++++ src/hugin_base/hugin_utils/filesystem.h 2024-04-21 10:00:22.770138350 +0200
+@@ -64,6 +64,12 @@
+ #endif
+ #include <boost/filesystem.hpp>
+ namespace fs = boost::filesystem;
+- #define OVERWRITE_EXISTING boost::filesystem::copy_option::overwrite_if_exists
++ #if BOOST_VERSION>=107400
++ // in Boost 1.74 and later filesystem::copy_option is deprecated
++ // use filesystem::copy_options instead
++ #define OVERWRITE_EXISTING boost::filesystem::copy_options::overwrite_existing
++ #else
++ #define OVERWRITE_EXISTING boost::filesystem::copy_option::overwrite_if_exists
++ #endif
+ #endif
+ #endif // _HUGIN_UTILS_FILESYSTEM_H
diff --git a/graphics/hugin/hugin.SlackBuild b/graphics/hugin/hugin.SlackBuild
index 0c5c216bc4..cd74672bfe 100644
--- a/graphics/hugin/hugin.SlackBuild
+++ b/graphics/hugin/hugin.SlackBuild
@@ -3,7 +3,7 @@
# Slackware build script for Hugin
#
# Copyright 2009-2010 Erik W. Hanson, Minneapolis, MN, USA
-# Copyright 2011-2023 by titopoquito (titopoquito@gmail.com)
+# Copyright 2011-2024 by titopoquito (titopoquito@gmail.com)
# Thanks to Romain Dartigues for the help with the update to 2016.2.0
# All rights reserved.
#
@@ -35,7 +35,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=hugin
VERSION=${VERSION:-2023.0.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -79,6 +79,8 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
cd $PRGNAM-$VERSION
+patch -p0 <$CWD/boost-1.85.0-patch
+
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \