media-gfx/openscad: adapt to work with lib3mf-2

Now uses cmake instead of qmake.

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
Signed-off-by: Joonas Niilola <juippis@gentoo.org>

2 files changed, 36 insertions, 35 deletions

diff --git a/media-gfx/openscad/files/openscad-9999-0001-fix-to-find-lib3mf-2.patch b/media-gfx/openscad/files/openscad-9999-0001-fix-to-find-lib3mf-2.patch
new file mode 100644
index 000000000000..0ca19d33646b
--- /dev/null
+++ b/media-gfx/openscad/files/openscad-9999-0001-fix-to-find-lib3mf-2.patch
@@ -0,0 +1,36 @@
+From 15bf93ab04e6fd61507f138bcfc6f9c770d9479b Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Thu, 11 Feb 2021 23:14:31 +0100
+Subject: [PATCH] fix to find lib3mf-2
+
+Lib3mf-2 uses lowercase name for it's pkg-config file.
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ cmake/Modules/FindLib3MF.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/Modules/FindLib3MF.cmake b/cmake/Modules/FindLib3MF.cmake
+index 7a1ee285..b062c09c 100644
+--- a/cmake/Modules/FindLib3MF.cmake
++++ b/cmake/Modules/FindLib3MF.cmake
+@@ -15,14 +15,14 @@ message(STATUS "Searching for lib3mf.")
+ # We still fall back to the rest of detection code here.
+ # Travis CI Ubuntu Trusty environment has some issue with pkg-config
+ # not finding the version.
+-pkg_check_modules(LIB3MF lib3MF)
++pkg_check_modules(LIB3MF lib3mf)
+ 
+ # default to uppercase for 1.0 library name
+ set(LIB3MF_LIB "3MF")
+ 
+ # some distribution packages are missing version information for 2.0
+ if (LIB3MF_VERSION STREQUAL "" AND LIB3MF_FOUND)
+-  if (EXISTS "/usr/include/lib3mf" AND EXISTS "/usr/include/lib3mf/lib3mf_implicit.hpp")
++  if (EXISTS "/usr/include/lib3mf" AND EXISTS "/usr/include/lib3mf/Bindings/Cpp/lib3mf_implicit.hpp")
+     set(LIB3MF_VERSION "2.0.0")
+   endif()
+ endif()
+-- 
+2.30.1
+
diff --git a/media-gfx/openscad/files/openscad-9999-0002-Gentoo-specific-Disable-ccache-building.patch b/media-gfx/openscad/files/openscad-9999-0002-Gentoo-specific-Disable-ccache-building.patch
deleted file mode 100644
index ca21b9322e8e..000000000000
--- a/media-gfx/openscad/files/openscad-9999-0002-Gentoo-specific-Disable-ccache-building.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 8d6fd9c0896e513eec2da3c97cfd33a5ec09c148 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Sun, 17 May 2020 21:38:45 +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 cc7f3569..8fbd3a5b 100755
---- a/openscad.pro
-+++ b/openscad.pro
-@@ -208,10 +208,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
-