diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-12 21:55:15 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-12 21:55:15 +0000 |
commit | 7218e1b46bceac05841e90472501742d905fb3fc (patch) | |
tree | 56fae051db521b8fce8014cbc8b11484885b14b3 /media-gfx/openscad/files | |
parent | 6d691ad5b6239929063441bbd14c489e92e7396e (diff) |
gentoo resync : 12.03.2021
Diffstat (limited to 'media-gfx/openscad/files')
4 files changed, 111 insertions, 35 deletions
diff --git a/media-gfx/openscad/files/openscad-2021.01-0001-Gentoo-specific-Disable-ccache-building.patch b/media-gfx/openscad/files/openscad-2021.01-0001-Gentoo-specific-Disable-ccache-building.patch new file mode 100644 index 000000000000..6de581078d27 --- /dev/null +++ b/media-gfx/openscad/files/openscad-2021.01-0001-Gentoo-specific-Disable-ccache-building.patch @@ -0,0 +1,32 @@ +From c138881767262b9f5c64a465a0e1e46ffcfc5899 Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <waebbl-gentoo@posteo.net> +Date: Sun, 28 Feb 2021 16:51:30 +0100 +Subject: [PATCH] [Gentoo specific] Disable ccache building + +On Gentoo, we use a USE flag to determine whether ccache +should be used for building. + +Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> +--- + openscad.pro | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/openscad.pro b/openscad.pro +index b76ca76..678e08d 100755 +--- a/openscad.pro ++++ b/openscad.pro +@@ -211,11 +211,6 @@ mdi { + DEFINES += ENABLE_MDI + } + +-system("ccache -V >/dev/null 2>/dev/null") { +- CONFIG += ccache +- message("Using ccache") +-} +- + include(common.pri) + + # mingw has to come after other items so OBJECT_DIRS will work properly +-- +2.30.1 + diff --git a/media-gfx/openscad/files/openscad-2021.01-0002-fix-to-find-lib3mf-2.patch b/media-gfx/openscad/files/openscad-2021.01-0002-fix-to-find-lib3mf-2.patch new file mode 100644 index 000000000000..1995bd6e0ac4 --- /dev/null +++ b/media-gfx/openscad/files/openscad-2021.01-0002-fix-to-find-lib3mf-2.patch @@ -0,0 +1,43 @@ +From 16847a70cf05484a668d8f79aba4ccec7e16c025 Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <waebbl-gentoo@posteo.net> +Date: Sat, 6 Mar 2021 22:59:17 +0100 +Subject: [PATCH] fix to find lib3mf-2 + +The pkgconfig file for lib3mf has been renamed in case +for lib3mf-2 versions. +This patch uses the news names. + +Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> +--- + features/lib3mf.prf | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/features/lib3mf.prf b/features/lib3mf.prf +index 2c512da..47be364 100644 +--- a/features/lib3mf.prf ++++ b/features/lib3mf.prf +@@ -15,8 +15,8 @@ isEmpty(LIB3MF_LIBPATH) { + } + + isEmpty(LIB3MF_INCLUDEPATH) { +- LIB3MF_CFLAGS = $$system("$$PKG_CONFIG --cflags lib3MF") +- LIB3MF_INCLUDEPATH = $$system("$$PKG_CONFIG --variable=includedir lib3MF") ++ LIB3MF_CFLAGS = $$system("$$PKG_CONFIG --cflags lib3mf") ++ LIB3MF_INCLUDEPATH = $$system("$$PKG_CONFIG --variable=includedir lib3mf") + !isEmpty(LIB3MF_CFLAGS) { + ENABLE_LIB3MF=yes + } +@@ -25,8 +25,8 @@ isEmpty(LIB3MF_INCLUDEPATH) { + } + + isEmpty(LIB3MF_LIBPATH) { +- LIB3MF_LIBS = $$system("$$PKG_CONFIG --libs lib3MF") +- LIB3MF_LIBPATH = $$system("$$PKG_CONFIG --variable=libdir lib3MF") ++ LIB3MF_LIBS = $$system("$$PKG_CONFIG --libs lib3mf") ++ LIB3MF_LIBPATH = $$system("$$PKG_CONFIG --variable=libdir lib3mf") + !isEmpty(LIB3MF_LIBS) { + ENABLE_LIB3MF=yes + } +-- +2.30.1 + 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 - |