Patch for CGAL-5.0
I have not bumped `Release:` on purpose, because the previous build attempt failed.
This commit is contained in:
parent
2c0aa470b3
commit
3a75a979ea
|
@ -0,0 +1,20 @@
|
|||
diff -up openscad-2019.05/features/cgal.prf.bak openscad-2019.05/features/cgal.prf
|
||||
--- openscad-2019.05/features/cgal.prf.bak 2019-10-02 15:35:12.951314278 +0200
|
||||
+++ openscad-2019.05/features/cgal.prf 2019-10-02 15:44:04.034063578 +0200
|
||||
@@ -1,4 +1,6 @@
|
||||
-DEFINES += ENABLE_CGAL
|
||||
+DEFINES += ENABLE_CGAL CGAL_HEADER_ONLY
|
||||
+
|
||||
+QMAKE_CXXFLAGS += -std=c++14
|
||||
|
||||
# Optionally specify location of CGAL using the
|
||||
# CGALDIR env. variable
|
||||
@@ -9,7 +11,7 @@ CGAL_DIR = $$(CGALDIR)
|
||||
message("CGAL location: $$CGAL_DIR")
|
||||
}
|
||||
|
||||
-LIBS += -lCGAL -lmpfr -lgmp
|
||||
+LIBS += -lmpfr -lgmp
|
||||
|
||||
*g++* {
|
||||
QMAKE_CXXFLAGS += -frounding-math
|
|
@ -19,6 +19,10 @@ Patch0: %{name}-polyclipping.patch
|
|||
# https://github.com/openscad/openscad/issues/2965
|
||||
Patch1: %{github}/pull/2973.patch
|
||||
|
||||
# Compatibility with CGAL-5.0
|
||||
# https://github.com/openscad/openscad/pull/3083
|
||||
Patch2: openscad-2019.05-CGAL-5.0.patch
|
||||
|
||||
BuildRequires: CGAL-devel >= 3.6
|
||||
BuildRequires: ImageMagick
|
||||
BuildRequires: Xvfb
|
||||
|
@ -213,6 +217,7 @@ cd -
|
|||
%changelog
|
||||
* Wed Oct 02 2019 Miro Hrončok <mhroncok@redhat.com> - 2019.05-6
|
||||
- Rebuilt for CGAL becoming header only
|
||||
- Add a patch to the QMake configuration, for CGAL 5.0
|
||||
|
||||
* Sun Sep 22 2019 Orion Poplawski <orion@nwra.com>
|
||||
- Rebuild for double-conversion 3.1.5
|
||||
|
|
Loading…
Reference in New Issue