diff --git a/hugin-deprecated-copy_option.patch b/hugin-deprecated-copy_option.patch new file mode 100644 index 0000000..0fd9435 --- /dev/null +++ b/hugin-deprecated-copy_option.patch @@ -0,0 +1,17 @@ +diff -r 4b55f17c4e72 -r 4d081490b48a src/hugin_base/hugin_utils/filesystem.h +--- a/src/hugin_base/hugin_utils/filesystem.h Tue Mar 12 17:27:29 2024 +0100 ++++ b/src/hugin_base/hugin_utils/filesystem.h Tue Mar 12 17:27:57 2024 +0100 +@@ -64,6 +64,12 @@ + #endif + #include + 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/hugin.changes b/hugin.changes index 2fcb529..1855fba 100644 --- a/hugin.changes +++ b/hugin.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Apr 25 09:53:30 UTC 2024 - pgajdos@suse.com + +- fixed build with new boost [bsc#1223377] +- added patches + fix deprecated boost::filesystem::copy_option enum + + hugin-deprecated-copy_option.patch + ------------------------------------------------------------------- Tue Jan 2 08:32:37 UTC 2024 - Atri Bhattacharya diff --git a/hugin.spec b/hugin.spec index bdd2ae0..9bb745e 100644 --- a/hugin.spec +++ b/hugin.spec @@ -31,6 +31,8 @@ Group: Productivity/Graphics/Other URL: http://hugin.sourceforge.net/ Source: https://downloads.sourceforge.net/project/%{name}/%{name}/%{name}-%{mversion}/%{name}-%{version}.tar.bz2 Patch0: hugin.appdata.patch +# 8684:4d081490b48a +Patch1: hugin-deprecated-copy_option.patch BuildRequires: Mesa-devel BuildRequires: OpenEXR-devel BuildRequires: cmake >= 3.1.0