Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package librecad for openSUSE:Factory checked in at 2021-05-04 22:01:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/librecad (Old) and /work/SRC/openSUSE:Factory/.librecad.new.2988 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "librecad" Tue May 4 22:01:04 2021 rev:24 rq:890431 version:2.1.3 Changes: -------- --- /work/SRC/openSUSE:Factory/librecad/librecad.changes 2020-06-09 00:05:53.865553243 +0200 +++ /work/SRC/openSUSE:Factory/.librecad.new.2988/librecad.changes 2021-05-04 22:01:12.616550818 +0200 @@ -1,0 +2,5 @@ +Tue May 4 07:30:44 UTC 2021 - Jiri Slaby <jsl...@suse.cz> + +- add add-boost-tuple-include-to-fix-build.patch + +------------------------------------------------------------------- New: ---- add-boost-tuple-include-to-fix-build.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ librecad.spec ++++++ --- /var/tmp/diff_new_pack.g9KjUH/_old 2021-05-04 22:01:13.204548608 +0200 +++ /var/tmp/diff_new_pack.g9KjUH/_new 2021-05-04 22:01:13.208548593 +0200 @@ -1,7 +1,7 @@ # # spec file for package librecad # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ Version: 2.1.3 Release: 0 Summary: Computer-aided design (CAD) software package for 2D design and drafting -License: GPL-2.0-only AND (Apache-2.0 OR SUSE-GPL-3.0+-with-font-exception) +License: (Apache-2.0 OR SUSE-GPL-3.0+-with-font-exception) AND GPL-2.0-only Group: Productivity/Graphics/CAD URL: http://librecad.org/ @@ -42,16 +42,17 @@ Patch7: librecad-plugindir.diff Patch8: librecad-use-system-shapelib.patch Patch9: 0001-fix-build-with-gcc-9.patch +Patch10: add-boost-tuple-include-to-fix-build.patch BuildRequires: fdupes BuildRequires: freetype2-devel BuildRequires: gcc-c++ >= 4.7 BuildRequires: libboost_headers-devel -BuildRequires: libdxfrw-devel >= 0.6.1 BuildRequires: libshp-devel BuildRequires: muparser-devel BuildRequires: unzip BuildRequires: update-desktop-files BuildRequires: wqy-microhei-fonts +BuildRequires: (pkgconfig(libdxfrw) or pkgconfig(libdxfrw0)) BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Help) @@ -60,8 +61,8 @@ BuildRequires: pkgconfig(Qt5Widgets) Requires(post): desktop-file-utils Requires(post): shared-mime-info -Requires(postun): desktop-file-utils -Requires(postun): shared-mime-info +Requires(postun):desktop-file-utils +Requires(postun):shared-mime-info Recommends: %name-parts # old qcad had a newer version, so we provide all versions here. Provides: qcad @@ -85,7 +86,11 @@ %setup -qn LibreCAD-%version -a 2 -a 3 -a 4 %autopatch -p1 -dxfrw_includedir=$(pkg-config --cflags-only-I libdxfrw0 | sed 's|-I||g') +pc="libdxfrw" +if ! pkg-config --exists "$pc"; then + pc=libdxfrw0 +fi +dxfrw_includedir=$(pkg-config --cflags-only-I "$pc" | sed 's|-I||g') # Fix paths sed -i 's|##LIBDIR##|%_libdir|g' librecad/src/lib/engine/rs_system.cpp ++++++ add-boost-tuple-include-to-fix-build.patch ++++++ From: Jiri Slaby <jsl...@suse.cz> Date: Tue, 4 May 2021 09:25:03 +0200 Subject: add boost tuple include to fix build Patch-mainline: Submitted pr#1345 References: boost 1.76 build failure With boost 1.76, we see: lib/engine/rs_ellipse.cpp:70:15: error: 'tuple' in namespace 'boost::math' does not name a template type 70 | boost::math::tuple<double, double, double> operator()(double const& z) const { | ^~~~~ Fix this by including the proper boost header. Signed-off-by: Jiri Slaby <jsl...@suse.cz> --- librecad/src/lib/engine/rs_ellipse.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/librecad/src/lib/engine/rs_ellipse.cpp b/librecad/src/lib/engine/rs_ellipse.cpp index 291f734ea6b1..d47bf6ca4a12 100644 --- a/librecad/src/lib/engine/rs_ellipse.cpp +++ b/librecad/src/lib/engine/rs_ellipse.cpp @@ -48,6 +48,9 @@ #include <boost/version.hpp> #include <boost/math/tools/roots.hpp> #include <boost/math/special_functions/ellint_2.hpp> +#if BOOST_VERSION > 104500 +#include <boost/math/tools/tuple.hpp> +#endif #endif namespace{ -- 2.31.1
