Accepting request 705853 from home:jirislaby:branches:graphics
- add 0001-fix-build-with-gcc-9.patch OBS-URL: https://build.opensuse.org/request/show/705853 OBS-URL: https://build.opensuse.org/package/show/graphics/librecad?expand=0&rev=52
This commit is contained in:
Git OBS Bridge
113
0001-fix-build-with-gcc-9.patch
Normal file
113
0001-fix-build-with-gcc-9.patch
Normal file
@@ -0,0 +1,113 @@
|
||||
From: Jiri Slaby <jslaby@suse.cz>
|
||||
Date: Tue, 28 May 2019 10:57:15 +0200
|
||||
Subject: fix build with gcc 9
|
||||
Patch-mainline: submitted
|
||||
References: build fix
|
||||
|
||||
These symbols were reported as multiply defined with gcc9 and LTO.
|
||||
|
||||
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
|
||||
---
|
||||
librecad/src/actions/rs_actiondrawcircletan1_2p.cpp | 2 +-
|
||||
librecad/src/actions/rs_actiondrawcircletan2.cpp | 2 +-
|
||||
librecad/src/actions/rs_actiondrawcircletan2_1p.cpp | 2 +-
|
||||
librecad/src/actions/rs_actiondrawcircletan3.cpp | 2 +-
|
||||
librecad/src/actions/rs_actiondrawlinerelangle.cpp | 2 +-
|
||||
librecad/src/actions/rs_actiondrawlinetangent1.cpp | 2 +-
|
||||
librecad/src/actions/rs_actiondrawlinetangent2.cpp | 2 +-
|
||||
7 files changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/librecad/src/actions/rs_actiondrawcircletan1_2p.cpp b/librecad/src/actions/rs_actiondrawcircletan1_2p.cpp
|
||||
index c14da00e4897..c1a0e23d0fac 100644
|
||||
--- a/librecad/src/actions/rs_actiondrawcircletan1_2p.cpp
|
||||
+++ b/librecad/src/actions/rs_actiondrawcircletan1_2p.cpp
|
||||
@@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
namespace{
|
||||
//list of entity types supported by current action
|
||||
-auto enTypeList={RS2::EntityLine, RS2::EntityArc, RS2::EntityCircle};
|
||||
+static auto enTypeList={RS2::EntityLine, RS2::EntityArc, RS2::EntityCircle};
|
||||
}
|
||||
|
||||
struct RS_ActionDrawCircleTan1_2P::Points {
|
||||
diff --git a/librecad/src/actions/rs_actiondrawcircletan2.cpp b/librecad/src/actions/rs_actiondrawcircletan2.cpp
|
||||
index d0558f05b746..0446003ea443 100644
|
||||
--- a/librecad/src/actions/rs_actiondrawcircletan2.cpp
|
||||
+++ b/librecad/src/actions/rs_actiondrawcircletan2.cpp
|
||||
@@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
#include "rs_debug.h"
|
||||
|
||||
namespace {
|
||||
-auto enTypeList={RS2::EntityLine, RS2::EntityArc, RS2::EntityCircle};
|
||||
+static auto enTypeList={RS2::EntityLine, RS2::EntityArc, RS2::EntityCircle};
|
||||
}
|
||||
|
||||
struct RS_ActionDrawCircleTan2::Points {
|
||||
diff --git a/librecad/src/actions/rs_actiondrawcircletan2_1p.cpp b/librecad/src/actions/rs_actiondrawcircletan2_1p.cpp
|
||||
index 324c166862d4..2ece493490d7 100644
|
||||
--- a/librecad/src/actions/rs_actiondrawcircletan2_1p.cpp
|
||||
+++ b/librecad/src/actions/rs_actiondrawcircletan2_1p.cpp
|
||||
@@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
#include "rs_debug.h"
|
||||
|
||||
namespace {
|
||||
-auto enTypeList={RS2::EntityLine, RS2::EntityArc, RS2::EntityCircle};
|
||||
+static auto enTypeList={RS2::EntityLine, RS2::EntityArc, RS2::EntityCircle};
|
||||
}
|
||||
|
||||
struct RS_ActionDrawCircleTan2_1P::Points {
|
||||
diff --git a/librecad/src/actions/rs_actiondrawcircletan3.cpp b/librecad/src/actions/rs_actiondrawcircletan3.cpp
|
||||
index 026ed30e5c20..92679c75f5bf 100644
|
||||
--- a/librecad/src/actions/rs_actiondrawcircletan3.cpp
|
||||
+++ b/librecad/src/actions/rs_actiondrawcircletan3.cpp
|
||||
@@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
#include "rs_debug.h"
|
||||
|
||||
namespace {
|
||||
-auto enTypeList={RS2::EntityArc, RS2::EntityCircle, RS2::EntityLine, RS2::EntityPoint};
|
||||
+static auto enTypeList={RS2::EntityArc, RS2::EntityCircle, RS2::EntityLine, RS2::EntityPoint};
|
||||
}
|
||||
|
||||
struct RS_ActionDrawCircleTan3::Points {
|
||||
diff --git a/librecad/src/actions/rs_actiondrawlinerelangle.cpp b/librecad/src/actions/rs_actiondrawlinerelangle.cpp
|
||||
index 8415dd604d5a..dfc6660aa6c2 100644
|
||||
--- a/librecad/src/actions/rs_actiondrawlinerelangle.cpp
|
||||
+++ b/librecad/src/actions/rs_actiondrawlinerelangle.cpp
|
||||
@@ -39,7 +39,7 @@
|
||||
#include "rs_debug.h"
|
||||
|
||||
namespace {
|
||||
-auto enTypeList={RS2::EntityLine, RS2::EntityArc, RS2::EntityCircle,
|
||||
+static auto enTypeList={RS2::EntityLine, RS2::EntityArc, RS2::EntityCircle,
|
||||
RS2::EntityEllipse};
|
||||
}
|
||||
|
||||
diff --git a/librecad/src/actions/rs_actiondrawlinetangent1.cpp b/librecad/src/actions/rs_actiondrawlinetangent1.cpp
|
||||
index 197b0cb6c849..335e0d03ba55 100644
|
||||
--- a/librecad/src/actions/rs_actiondrawlinetangent1.cpp
|
||||
+++ b/librecad/src/actions/rs_actiondrawlinetangent1.cpp
|
||||
@@ -37,7 +37,7 @@
|
||||
#include "rs_debug.h"
|
||||
|
||||
namespace{
|
||||
-auto circleType={RS2::EntityArc, RS2::EntityCircle,
|
||||
+static auto circleType={RS2::EntityArc, RS2::EntityCircle,
|
||||
RS2::EntityEllipse, RS2::EntitySplinePoints
|
||||
};
|
||||
}
|
||||
diff --git a/librecad/src/actions/rs_actiondrawlinetangent2.cpp b/librecad/src/actions/rs_actiondrawlinetangent2.cpp
|
||||
index fed3545e0d14..3c4f6019c00e 100644
|
||||
--- a/librecad/src/actions/rs_actiondrawlinetangent2.cpp
|
||||
+++ b/librecad/src/actions/rs_actiondrawlinetangent2.cpp
|
||||
@@ -36,7 +36,7 @@
|
||||
#include "rs_debug.h"
|
||||
|
||||
namespace{
|
||||
-auto circleType={RS2::EntityArc, RS2::EntityCircle, RS2::EntityEllipse};
|
||||
+static auto circleType={RS2::EntityArc, RS2::EntityCircle, RS2::EntityEllipse};
|
||||
}
|
||||
|
||||
RS_ActionDrawLineTangent2::RS_ActionDrawLineTangent2(
|
||||
--
|
||||
2.21.0
|
||||
|
||||
@@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue May 28 09:05:54 UTC 2019 - Jiri Slaby <jslaby@suse.com>
|
||||
|
||||
- add 0001-fix-build-with-gcc-9.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 11 09:02:23 UTC 2018 - jslaby@suse.com
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package librecad
|
||||
#
|
||||
# Copyright (c) 2017 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,7 +12,7 @@
|
||||
# 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/
|
||||
#
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ Name: librecad
|
||||
Version: 2.1.3
|
||||
Release: 0
|
||||
Summary: Computer-aided design (CAD) software package for 2D design and drafting
|
||||
License: GPL-2.0 and (Apache-2.0 or SUSE-GPL-3.0+-with-font-exception)
|
||||
License: GPL-2.0-only AND (Apache-2.0 OR SUSE-GPL-3.0+-with-font-exception)
|
||||
Group: Productivity/Graphics/CAD
|
||||
Url: http://librecad.org/
|
||||
|
||||
@@ -41,6 +41,7 @@ Patch3: librecad-use-system-libdxfrw.patch
|
||||
Patch4: librecad-install.diff
|
||||
Patch5: librecad-plugindir.diff
|
||||
Patch6: librecad-use-system-shapelib.patch
|
||||
Patch7: 0001-fix-build-with-gcc-9.patch
|
||||
%if 0%{?suse_version} > 1325
|
||||
BuildRequires: libboost_headers-devel
|
||||
%else
|
||||
@@ -93,7 +94,7 @@ CAD drawings.
|
||||
|
||||
%prep
|
||||
%setup -qn LibreCAD-%version -a 2 -a 3 -a 4
|
||||
%patch -P 0 -P 1 -P 2 -P 3 -P 4 -P 5 -p1
|
||||
%patch -P 0 -P 1 -P 2 -P 3 -P 4 -P 5 -P 7 -p1
|
||||
%if 0%{?suse_version} >= 1321
|
||||
%patch -P 6 -p1
|
||||
%endif
|
||||
@@ -175,7 +176,8 @@ perl -pi -e "s|image/vnd.dxf|image/vnd.dxf;|" %buildroot%_datadir/applications/l
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc LICENSE* README.md gpl-2.0* license-lc_opengost-fonts.txt
|
||||
%doc README.md
|
||||
%license LICENSE* gpl-2.0* license-lc_opengost-fonts.txt
|
||||
%_bindir/librecad
|
||||
%_bindir/ttf2lff
|
||||
%_libdir/%name
|
||||
|
||||
Reference in New Issue
Block a user