commit f874d1cbea3bf225c187e81fe18c6147d97724b5
Author: Jan Rękorajski <[email protected]>
Date: Tue Jun 7 00:59:38 2022 +0200
- up to 2021.01
boost-1.73.patch | 10 ----------
gcc10.patch | 10 ----------
localedir.patch | 2 +-
openscad.spec | 12 ++++--------
4 files changed, 5 insertions(+), 29 deletions(-)
---
diff --git a/openscad.spec b/openscad.spec
index c60a8d3..dab6cf7 100644
--- a/openscad.spec
+++ b/openscad.spec
@@ -7,26 +7,24 @@
%endif
Summary: The Programmers Solid 3D CAD Modeller
Name: openscad
-Version: 2019.05
-Release: 7
+Version: 2021.01
+Release: 1
# COPYING contains a linking exception for CGAL
# Appdata file is CC0
# Examples are CC0
License: GPLv2 with exceptions and CC0
Group: Applications/Engineering
Source0: http://files.openscad.org/%{name}-%{version}.src.tar.gz
-# Source0-md5: 2b63e249d56e2eba62ed5b042e1d82bc
+# Source0-md5: 79f8e3a42bcfeeb3ddde9e5bc2311f76
Patch0: %{name}-polyclipping.patch
Patch1: localedir.patch
-Patch2: boost-1.73.patch
-Patch3: gcc10.patch
URL: http://www.openscad.org/
BuildRequires: Qt5Network-devel
BuildRequires: Qt5Concurrent-devel
BuildRequires: Qt5Multimedia-devel
BuildRequires: Qt5DBus-devel
BuildRequires: Qt5PrintSupport-devel
-BuildRequires: CGAL-devel >= 3.6
+BuildRequires: CGAL-devel >= 4.9
BuildRequires: ImageMagick
BuildRequires: Mesa-dri-driver-swrast
BuildRequires: bison >= 2.4
@@ -148,8 +146,6 @@ expect some API changes, however many things are already
working.
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
# use system package
%{__rm} -r src/ext/polyclipping
diff --git a/boost-1.73.patch b/boost-1.73.patch
deleted file mode 100644
index 64b3d05..0000000
--- a/boost-1.73.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- openscad-2019.05/src/import.cc~ 2019-03-31 06:14:41.000000000 +0200
-+++ openscad-2019.05/src/import.cc 2020-08-08 01:19:22.113104409 +0200
-@@ -50,7 +50,6 @@
- #include <boost/assign/std/vector.hpp>
- using namespace boost::assign; // bring 'operator+=()' into scope
-
--#include <boost/detail/endian.hpp>
- #include <cstdint>
-
- extern PolySet * import_amf(std::string, const Location &loc);
diff --git a/gcc10.patch b/gcc10.patch
deleted file mode 100644
index 7b396a5..0000000
--- a/gcc10.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- openscad-2019.05/src/parser.y~ 2019-04-07 17:45:27.000000000 +0200
-+++ openscad-2019.05/src/parser.y 2020-08-08 01:27:32.558842432 +0200
-@@ -46,6 +46,7 @@
- #include "printutils.h"
- #include "memory.h"
- #include <sstream>
-+#include <stack>
- #include <boost/filesystem.hpp>
- #include "boost-utils.h"
-
diff --git a/localedir.patch b/localedir.patch
index 3d42b74..e052447 100644
--- a/localedir.patch
+++ b/localedir.patch
@@ -14,7 +14,7 @@
bind_textdomain_codeset("openscad", "UTF-8");
textdomain("openscad");
- } else {
-- PRINT("Could not initialize localization.");
+- LOG(message_group::None,Location::NONE,"","Could not initialize
localization.");
- }
}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openscad.git/commitdiff/f874d1cbea3bf225c187e81fe18c6147d97724b5
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
