gentoo resync : 07.05.2021

4 files changed, 0 insertions, 166 deletions

diff --git a/media-gfx/openscad/files/openscad-2019.05-0001-Fix-build-with-boost-1.73.patch b/media-gfx/openscad/files/openscad-2019.05-0001-Fix-build-with-boost-1.73.patch
deleted file mode 100644
index 74f48b4c1aed..000000000000
--- a/media-gfx/openscad/files/openscad-2019.05-0001-Fix-build-with-boost-1.73.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 47275a3d92969709e7605f23a408c5ed5aa483c9 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Fri, 15 May 2020 19:09:10 +0200
-Subject: [PATCH] Fix build with boost-1.73
-
-Thanks to William T Wilson for reporting and providing the patch.
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- src/import.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/import.cc b/src/import.cc
-index eef1323..08e46ff 100644
---- a/src/import.cc
-+++ b/src/import.cc
-@@ -50,7 +50,7 @@ namespace fs = boost::filesystem;
- #include <boost/assign/std/vector.hpp>
- using namespace boost::assign; // bring 'operator+=()' into scope
- 
--#include <boost/detail/endian.hpp>
-+#include <boost/endian/arithmetic.hpp>
- #include <cstdint>
- 
- extern PolySet * import_amf(std::string, const Location &loc);
--- 
-2.26.2
-
diff --git a/media-gfx/openscad/files/openscad-2019.05-0002-Gentoo-specific-Disable-ccache-building.patch b/media-gfx/openscad/files/openscad-2019.05-0002-Gentoo-specific-Disable-ccache-building.patch
deleted file mode 100644
index 1a4903828e80..000000000000
--- a/media-gfx/openscad/files/openscad-2019.05-0002-Gentoo-specific-Disable-ccache-building.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 2940d8e5c74faa5dcd5279c8166064ade3da5695 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Sun, 17 May 2020 21:13:44 +0200
-Subject: [PATCH] [Gentoo-specific] Disable ccache building
-
-On Gentoo we use a USE flag to determine whether to use
-ccache for building or not.
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- openscad.pro | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/openscad.pro b/openscad.pro
-index 2d190dd..9c4e67b 100755
---- a/openscad.pro
-+++ b/openscad.pro
-@@ -214,10 +214,10 @@ mdi {
-   DEFINES += ENABLE_MDI
- }
- 
--system("ccache -V >/dev/null 2>/dev/null") {
--  CONFIG += ccache
--  message("Using ccache")
--}
-+#system("ccache -V >/dev/null 2>/dev/null") {
-+#  CONFIG += ccache
-+#  message("Using ccache")
-+#}
- 
- include(common.pri)
- 
--- 
-2.26.2
-
diff --git a/media-gfx/openscad/files/openscad-2019.05-0003-change-C-standard-to-c-14.patch b/media-gfx/openscad/files/openscad-2019.05-0003-change-C-standard-to-c-14.patch
deleted file mode 100644
index 3863d5631b9a..000000000000
--- a/media-gfx/openscad/files/openscad-2019.05-0003-change-C-standard-to-c-14.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 02f9a4eca87d7713a8345b8513423d9d4a5127e0 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Fri, 27 Nov 2020 18:49:09 +0100
-Subject: [PATCH] change C++ standard to c++14
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- c++11.pri => c++std.pri | 21 ++++++++-------------
- common.pri              |  2 +-
- 2 files changed, 9 insertions(+), 14 deletions(-)
- rename c++11.pri => c++std.pri (74%)
-
-diff --git a/c++11.pri b/c++std.pri
-similarity index 74%
-rename from c++11.pri
-rename to c++std.pri
-index 0a2c3b6..aac656d 100644
---- a/c++11.pri
-+++ b/c++std.pri
-@@ -4,16 +4,16 @@ macx {
-   dirs = $${BOOSTDIR} $${QMAKE_LIBDIR}
-   for(dir, dirs) {
-     system(otool -L $${dir}/libboost_thread*  | grep libc++ >& /dev/null ) {
--      message("Using libc++11")
-+      message("Using libc++")
-       CONFIG += libc++
-     }
-     else {
-       message("Using libstdc++")
-       CONFIG += libstdc++
--      c++11 {
--        # libc++ is a requirement for using C++11 
--        warning("Disabling C++11 since libstdc++ dependencies were found")
--        CONFIG -= c++11
-+      c++std {
-+        # libc++ is a requirement for using C++14 
-+        warning("Disabling C++14 since libstdc++ dependencies were found")
-+        CONFIG -= c++std
-       }
-     }
-   }
-@@ -25,9 +25,9 @@ macx {
-   }
- }
- 
--c++11 {
--  QMAKE_CXXFLAGS += -std=c++11
--  message("Using C++11")
-+c++std {
-+  QMAKE_CXXFLAGS += -std=c++14
-+  message("Using C++14")
- 
-   *clang*: {
-       # 3rd party libraries will probably violate this for a long time
-@@ -41,8 +41,3 @@ c++11 {
-     QMAKE_OBJECTIVE_CFLAGS_WARN_ON += $$CXX11_SUPPRESS_WARNINGS
-   }
- }
--else {
--  *clang* {
--    QMAKE_CXXFLAGS_WARN_ON += -Wno-c++11-extensions
--  }
--}
-diff --git a/common.pri b/common.pri
-index 1110757..d1d5edc 100644
---- a/common.pri
-+++ b/common.pri
-@@ -30,4 +30,4 @@ include(win.pri)
- include(flex.pri)
- include(bison.pri)
- include(opengl.pri)
--include(c++11.pri)
-+include(c++std.pri)
--- 
-2.29.2
-
diff --git a/media-gfx/openscad/files/openscad-2019.05_fix-boost-1.72.0-build.patch b/media-gfx/openscad/files/openscad-2019.05_fix-boost-1.72.0-build.patch
deleted file mode 100644
index 28d3285a7375..000000000000
--- a/media-gfx/openscad/files/openscad-2019.05_fix-boost-1.72.0-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From b6c170cc5dd1bc677176ee732cdb0ddae57e5cf0 Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Fri, 25 Oct 2019 15:10:26 +0000
-Subject: [PATCH] Add missing header bootlegged by Boost < 1.72
-
-src/parser.y:76:6: error: no template named 'stack' in namespace 'std'
-std::stack<LocalScope *> scope_stack;
-~~~~~^
----
- src/parser.y | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/parser.y b/src/parser.y
-index 7f4fd56c..4c77c989 100644
---- a/src/parser.y
-+++ b/src/parser.y
-@@ -46,6 +46,7 @@
- #include "printutils.h"
- #include "memory.h"
- #include <sstream>
-+#include <stack>
- #include <boost/filesystem.hpp>
- #include "boost-utils.h"
- #include "feature.h"
--- 
-2.24.1
-