Hello community, here is the log from the commit of package SimGear for openSUSE:Leap:15.2 checked in at 2020-02-21 16:53:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/SimGear (Old) and /work/SRC/openSUSE:Leap:15.2/.SimGear.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "SimGear" Fri Feb 21 16:53:32 2020 rev:10 rq:772217 version:2018.3.4 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/SimGear/SimGear.changes 2020-01-15 14:46:08.525239917 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.SimGear.new.26092/SimGear.changes 2020-02-21 16:53:33.479382203 +0100 @@ -1,0 +2,72 @@ +Thu Sep 26 11:41:34 UTC 2019 - Stefan Brüns <[email protected]> + +- Fix build with cmake 3.15 due to https://cmake.org/cmake/help/v3.15/policy/CMP0093.html + 0001-Always-add-PROJECT_BINARY_DIR-to-include_directories.patch +- Use system expat and udns libraries +- Enable OpenMP support + +------------------------------------------------------------------- +Fri Aug 16 22:11:30 UTC 2019 - Stefan Brüns <[email protected]> + +- Update to 2018.3.4 + * changelog: http://wiki.flightgear.org/Changelog_2018.3#2018.3.4_point_release +- Drop upstream patches: + * 0001-Improve-HTTP-redirect-handling-and-add-test.patch + +------------------------------------------------------------------- +Thu Mar 21 18:22:45 UTC 2019 - Stefan Brüns <[email protected]> + +- Fix building with booost 1.69: + * Add 0001-Remove-deprecated-boost-utility.patch + * Add 0001-boost-enable_if-Support-Boost-versions-1.56.patch + +------------------------------------------------------------------- +Mon Mar 4 20:09:34 UTC 2019 - Stefan Brüns <[email protected]> + +- Fix redirect handling, add + 0001-Improve-HTTP-redirect-handling-and-add-test.patch + +------------------------------------------------------------------- +Mon Feb 11 22:45:29 UTC 2019 - Stefan Brüns <[email protected]> + +- Update to 2018.3.2 + * changelog: http://wiki.flightgear.org/Changelog_2018.3#2018.3.2_point_release + +------------------------------------------------------------------- +Tue Dec 18 00:06:29 UTC 2018 - Stefan Brüns <[email protected]> + +- Update to 2018.3.1 + * changelog: see upstream, http://wiki.flightgear.org/Changelog_2018.3 +- Drop upstream 0001-Add-missing-return-value.patch + +------------------------------------------------------------------- +Thu Jul 19 00:44:12 UTC 2018 - [email protected] + +- Adjust BuildRequires and Requires + * Use BuildConflicts to force a OSG version >= 3.2 + * Drop BuildRequires for OSG plugins, not needed + * Add versioned Requires: openSceneGraph-plugins. We want plugins + with the same version as the linked library +- Use %license for COPYING + +------------------------------------------------------------------- +Sun Jul 1 03:21:06 UTC 2018 - [email protected] + +- Fix failing build, no-return-in-nonvoid-function + 0001-Add-missing-return-value.patch +- Change BuildRequires, OpenSceneGraph 3.6 has an incompatible API + +------------------------------------------------------------------- +Wed Jun 27 15:43:30 UTC 2018 - [email protected] + +- Update to 2018.2.2 + * changelog: see upstream, http://wiki.flightgear.org/Changelog_2018.2 + * Fixes boo#1099288 (update requested) + +------------------------------------------------------------------- +Fri May 4 21:52:40 UTC 2018 - [email protected] + +- Update to 2018.1.1 + * changelog: see upstream, http://wiki.flightgear.org/Changelog_2018.1 + +------------------------------------------------------------------- Old: ---- simgear-2017.3.1.tar.bz2 New: ---- 0001-Always-add-PROJECT_BINARY_DIR-to-include_directories.patch 0001-Remove-deprecated-boost-utility.patch 0001-boost-enable_if-Support-Boost-versions-1.56.patch simgear-2018.3.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ SimGear.spec ++++++ --- /var/tmp/diff_new_pack.XuPA2G/_old 2020-02-21 16:53:35.163385590 +0100 +++ /var/tmp/diff_new_pack.XuPA2G/_new 2020-02-21 16:53:35.191385646 +0100 @@ -1,7 +1,7 @@ # # spec file for package SimGear # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,36 +12,43 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define libname libSimGearCore-2017_3_1 -%define main_version 2017.3 +# We want specific versions of the devel and plugins OpenSceneGraph subpackages +# in our requirements, i.e. the same version we have built against +%define openscenegraph_version %(rpm -qa --nosignature --nodigest libOpenSceneGraph\*-devel | sed 's/.*-devel-\\(.*\\)-.*/\\1/') + +%define libname libSimGearCore-2018_3_4 +%define main_version 2018.3 Name: SimGear -Version: %{main_version}.1 +Version: %{main_version}.4 Release: 0 Summary: Simulator Construction Gear # https://sourceforge.net/p/flightgear/codetickets/1940/ -License: LGPL-2.0+ and GPL-2.0+ and MIT +License: LGPL-2.0-or-later AND GPL-2.0-or-later AND MIT Group: Amusements/Games/3D/Simulation Url: http://www.flightgear.org/ Source0: https://sourceforge.net/projects/flightgear/files/release-%{main_version}/simgear-%{version}.tar.bz2 -BuildRequires: OpenSceneGraph-plugins >= 3.2 +# PATCH-FIX-UPSTREAM 0001-Remove-deprecated-boost-utility.patch +Patch1: 0001-Remove-deprecated-boost-utility.patch +# PATCH-FIX-UPSTREAM 0001-boost-enable_if-Support-Boost-versions-1.56.patch +Patch2: 0001-boost-enable_if-Support-Boost-versions-1.56.patch +# PATCH-FIX-UPSTREAM +Patch3: 0001-Always-add-PROJECT_BINARY_DIR-to-include_directories.patch BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: libOpenSceneGraph-devel > 1.2 +BuildRequires: libOpenSceneGraph-devel < 3.6 +BuildConflicts: libOpenSceneGraph-devel < 3.2 +BuildRequires: libboost_headers-devel BuildRequires: pkgconfig +BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(openal) -BuildRequires: pkgconfig(openthreads) BuildRequires: pkgconfig(zlib) -%if 0%{?suse_version} > 1330 -BuildRequires: libboost_headers-devel -%else -BuildRequires: boost-devel -%endif +BuildRequires: udns-devel %description SimGear is a set of open-source libraries designed to be used as building @@ -54,7 +61,7 @@ %package -n %{libname} Summary: Simulator Construction Gear Group: Amusements/Games/3D/Simulation -Requires: OpenSceneGraph-plugins >= 3.0 +Requires: OpenSceneGraph-plugins = %{openscenegraph_version} %description -n %{libname} SimGear is a set of open-source libraries designed to be used as building @@ -68,11 +75,11 @@ Summary: Development libraries and headers for SimGear Group: Development/Libraries/C and C++ Requires: %{libname} = %{version} -Requires: boost-devel -Requires: libOpenSceneGraph-devel > 1.2 -Requires: libOpenThreads-devel +BuildRequires: libboost_headers-devel +Requires: libOpenSceneGraph-devel = %{openscenegraph_version} Requires: libjpeg-devel Requires: openal-soft-devel +Requires: udns-devel Requires: zlib-devel %description devel @@ -81,6 +88,9 @@ %prep %setup -q -n simgear-%{version} +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build export CFLAGS="%{optflags}" @@ -88,8 +98,12 @@ # configure to build shared simgear libraries %cmake \ -DSIMGEAR_SHARED:BOOL=ON \ + -DSYSTEM_EXPAT:BOOL=ON \ + -DSYSTEM_UDNS:BOOL=ON \ + -DENABLE_OPENMP:BOOL=ON \ -DENABLE_TESTS:BOOL=OFF -make %{?_smp_mflags} + +%cmake_build %install %cmake_install @@ -100,7 +114,7 @@ %postun -n %{libname} -p /sbin/ldconfig %files -n %{libname} -%doc COPYING +%license COPYING %{_libdir}/libSimGear*.so.* %files devel ++++++ 0001-Always-add-PROJECT_BINARY_DIR-to-include_directories.patch ++++++ >From efc88b61330961965decc7a8d33310327c3306f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <[email protected]> Date: Mon, 14 Oct 2019 20:30:35 +0200 Subject: [PATCH] Always add PROJECT_BINARY_DIR to include_directories The directory is added by BoostTestTargets.cmake when Boost is found, but due to a bug in the file it fails to detect boost even when it is available. --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8a2f59f..3cb28ae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -520,6 +520,7 @@ include(CheckCXXFeatures) # use BEFORE to ensure local directories are used first, # ahead of system-installed libs include_directories(BEFORE ${PROJECT_BINARY_DIR}/simgear) +include_directories(BEFORE ${PROJECT_BINARY_DIR}) add_definitions(-DHAVE_CONFIG_H) -- 2.23.0 ++++++ 0001-Remove-deprecated-boost-utility.patch ++++++ >From 4b793d5344af26a0fca4f6d7ccc7ce0b55d3c935 Mon Sep 17 00:00:00 2001 From: Scott Giese <[email protected]> Date: Sat, 2 Feb 2019 19:46:04 -0600 Subject: [PATCH] Remove deprecated boost/utility. This is enable compatibility with boost 1.69. --- simgear/nasal/cppbind/NasalHash.hxx | 1 + simgear/props/props.hxx | 3 ++- simgear/structure/SGWeakReferenced.hxx | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/simgear/nasal/cppbind/NasalHash.hxx b/simgear/nasal/cppbind/NasalHash.hxx index aac672fd..5019d08b 100644 --- a/simgear/nasal/cppbind/NasalHash.hxx +++ b/simgear/nasal/cppbind/NasalHash.hxx @@ -24,6 +24,7 @@ #include <simgear/structure/map.hxx> #include <boost/iterator/iterator_facade.hpp> +#include <boost/core/enable_if.hpp> namespace nasal { diff --git a/simgear/props/props.hxx b/simgear/props/props.hxx index c94186cb..68d3c03c 100644 --- a/simgear/props/props.hxx +++ b/simgear/props/props.hxx @@ -55,13 +55,14 @@ namespace boost { struct disable_if : public disable_if_c<Cond::value, T> {}; } #else -# include <boost/utility.hpp> # include <boost/type_traits/is_enum.hpp> +# include <boost/core/enable_if.hpp> # include <simgear/debug/logstream.hxx> # include <simgear/math/SGMathFwd.hxx> # include <simgear/math/sg_types.hxx> #endif + #include <simgear/structure/SGReferenced.hxx> #include <simgear/structure/SGSharedPtr.hxx> diff --git a/simgear/structure/SGWeakReferenced.hxx b/simgear/structure/SGWeakReferenced.hxx index 3bb70ffa..27f647b4 100644 --- a/simgear/structure/SGWeakReferenced.hxx +++ b/simgear/structure/SGWeakReferenced.hxx @@ -22,7 +22,7 @@ #include "SGSharedPtr.hxx" #include <boost/type_traits/is_base_of.hpp> -#include <boost/utility/enable_if.hpp> +#include <boost/core/enable_if.hpp> #ifdef _MSC_VER # pragma warning(push) -- 2.21.0 ++++++ 0001-boost-enable_if-Support-Boost-versions-1.56.patch ++++++ >From 7246edcb4b5180bf14c25a012562120ff0805fac Mon Sep 17 00:00:00 2001 From: Scott Giese <[email protected]> Date: Tue, 5 Feb 2019 12:20:06 -0600 Subject: [PATCH] [boost::enable_if] Support Boost versions < 1.56 --- simgear/nasal/cppbind/NasalHash.hxx | 4 ++++ simgear/props/props.hxx | 6 +++++- simgear/structure/SGWeakReferenced.hxx | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/simgear/nasal/cppbind/NasalHash.hxx b/simgear/nasal/cppbind/NasalHash.hxx index 5019d08b..59281643 100644 --- a/simgear/nasal/cppbind/NasalHash.hxx +++ b/simgear/nasal/cppbind/NasalHash.hxx @@ -24,7 +24,11 @@ #include <simgear/structure/map.hxx> #include <boost/iterator/iterator_facade.hpp> +#if BOOST_VERSION >= 105600 #include <boost/core/enable_if.hpp> +#else +#include <boost/utility/enable_if.hpp> +#endif namespace nasal { diff --git a/simgear/props/props.hxx b/simgear/props/props.hxx index 68d3c03c..3afc8796 100644 --- a/simgear/props/props.hxx +++ b/simgear/props/props.hxx @@ -56,7 +56,11 @@ namespace boost { } #else # include <boost/type_traits/is_enum.hpp> -# include <boost/core/enable_if.hpp> +#if BOOST_VERSION >= 105600 +#include <boost/core/enable_if.hpp> +#else +#include <boost/utility/enable_if.hpp> +#endif # include <simgear/debug/logstream.hxx> # include <simgear/math/SGMathFwd.hxx> diff --git a/simgear/structure/SGWeakReferenced.hxx b/simgear/structure/SGWeakReferenced.hxx index 27f647b4..24db41b8 100644 --- a/simgear/structure/SGWeakReferenced.hxx +++ b/simgear/structure/SGWeakReferenced.hxx @@ -22,7 +22,11 @@ #include "SGSharedPtr.hxx" #include <boost/type_traits/is_base_of.hpp> +#if BOOST_VERSION >= 105600 #include <boost/core/enable_if.hpp> +#else +#include <boost/utility/enable_if.hpp> +#endif #ifdef _MSC_VER # pragma warning(push) -- 2.21.0 ++++++ simgear-2017.3.1.tar.bz2 -> simgear-2018.3.4.tar.bz2 ++++++ ++++ 24270 lines of diff (skipped)
