From 30fd3200b07e14d31f70245d4120912ae610231c3491dc9176029e72706a5afb Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Thu, 25 Apr 2024 10:43:47 +0000 Subject: [PATCH 1/2] Accepting request 1170135 from home:pgajdos - fixed build with new boost - added patches fix deprecated boost::filesystem::copy_option enum + hugin-deprecated-copy_option.patch OBS-URL: https://build.opensuse.org/request/show/1170135 OBS-URL: https://build.opensuse.org/package/show/graphics/hugin?expand=0&rev=132 --- hugin-deprecated-copy_option.patch | 17 +++++++++++++++++ hugin.changes | 8 ++++++++ hugin.spec | 2 ++ 3 files changed, 27 insertions(+) create mode 100644 hugin-deprecated-copy_option.patch 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..c79cf5d 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 +- 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 From 14c68a0c2dddaca8635c6915b8d28a2357087dd8b845d38959d28443a417aad4 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Thu, 25 Apr 2024 11:05:13 +0000 Subject: [PATCH 2/2] Accepting request 1170138 from home:pgajdos - fixed build with new boost [bsc#1223377] OBS-URL: https://build.opensuse.org/request/show/1170138 OBS-URL: https://build.opensuse.org/package/show/graphics/hugin?expand=0&rev=133 --- hugin.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hugin.changes b/hugin.changes index c79cf5d..1855fba 100644 --- a/hugin.changes +++ b/hugin.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Thu Apr 25 09:53:30 UTC 2024 - pgajdos@suse.com -- fixed build with new boost +- fixed build with new boost [bsc#1223377] - added patches fix deprecated boost::filesystem::copy_option enum + hugin-deprecated-copy_option.patch