diff options
| author |   Bernd Waibel <waebbl-gentoo@posteo.net> | 2022-03-24 18:02:30 +0100 |
|---|---|---|
| committer |   Joonas Niilola <juippis@gentoo.org> | 2022-04-15 09:18:47 +0300 |
| commit | 0d52105b62053748216dc2975f55d6764ae08013 (patch) | |
| tree | 64c8de5ce51a9d4006bb96546f2a864ebf287792 | |
| parent | dev-python/jupyter: Stabilize 1.0.0-r4 amd64, #835228 (diff) | |
| download | gentoo-0d52105b62053748216dc2975f55d6764ae08013.tar.gz gentoo-0d52105b62053748216dc2975f55d6764ae08013.tar.bz2 gentoo-0d52105b62053748216dc2975f55d6764ae08013.zip | |
media-gfx/openscad: drop outdated patch for 9999
Closes: https://bugs.gentoo.org/832944
Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/24929
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
| -rw-r--r-- | media-gfx/openscad/files/openscad-9999-fix-pkg-config-name-and-include-directory-search.patch | 31 | ||||
| -rw-r--r-- | media-gfx/openscad/openscad-9999.ebuild | 5 |
2 files changed, 2 insertions, 34 deletions
diff --git a/media-gfx/openscad/files/openscad-9999-fix-pkg-config-name-and-include-directory-search.patch b/media-gfx/openscad/files/openscad-9999-fix-pkg-config-name-and-include-directory-search.patch deleted file mode 100644 index a448deec37da..000000000000 --- a/media-gfx/openscad/files/openscad-9999-fix-pkg-config-name-and-include-directory-search.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 2483ee56960c99c35036273fc9fc2877eac772fc Mon Sep 17 00:00:00 2001 -From: Bernd Waibel <waebbl-gentoo@posteo.net> -Date: Wed, 20 Oct 2021 19:46:08 +0200 -Subject: [PATCH] fix pkg-config name and include directory search - -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 44858364..ad2f01ca 100644 ---- a/cmake/Modules/FindLib3MF.cmake -+++ b/cmake/Modules/FindLib3MF.cmake -@@ -14,11 +14,11 @@ - # Travis CI Ubuntu Trusty environment has some issue with pkg-config - # not finding the version. - find_package(PkgConfig REQUIRED QUIET) --pkg_check_modules(PC_LIB3MF lib3MF) -+pkg_check_modules(PC_LIB3MF lib3mf) - set(LIB3MF_VERSION ${PC_LIB3MF_VERSION}) - - find_path(LIB3MF_INCLUDE_DIRS -- NAMES Model/COM/NMR_DLLInterfaces.h -+ NAMES lib3mf_implicit.hpp - HINTS $ENV{LIB3MF_INCLUDEDIR} - ${PC_LIB3MF_INCLUDEDIR} - ${PC_LIB3MF_INCLUDE_DIRS} --- -2.33.1 - diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild index f7e74169b9ec..996bf04653fb 100644 --- a/media-gfx/openscad/openscad-9999.ebuild +++ b/media-gfx/openscad/openscad-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -47,6 +47,7 @@ RDEPEND=" dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 + dev-qt/qtsvg:5 dev-qt/qtwidgets:5 x11-libs/qscintilla:= dbus? ( dev-qt/qtdbus:5 ) @@ -71,8 +72,6 @@ DOCS=( doc/testing.txt ) -PATCHES=( "${FILESDIR}"/${P}-fix-pkg-config-name-and-include-directory-search.patch ) - src_configure() { local mycmakeargs=( -DCLANG_TIDY=OFF |