diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-04-16 13:07:24 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-04-16 13:07:24 +0100 |
| commit | 0c100b7dd2b30e75b799d806df4ef899fd98e1ea (patch) | |
| tree | 464c922e949c7e4d5d891fb2cdda5daee5612537 /media-gfx/openscad | |
| parent | e68d405c5d712af4387159df07e226217bdda049 (diff) | |
gentoo resync : 16.04.2022
Diffstat (limited to 'media-gfx/openscad')
| -rw-r--r-- | media-gfx/openscad/Manifest | 3 | ||||
| -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 |
3 files changed, 3 insertions, 36 deletions
diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest index 1dcfe044167d..79cd1e18c589 100644 --- a/media-gfx/openscad/Manifest +++ b/media-gfx/openscad/Manifest @@ -1,8 +1,7 @@ AUX 50openscad-gentoo.el 167 BLAKE2B 36292439057e2b9a5993c73cf5d46e5b6b0b56695f46307114fcfffa79990be0b0622ec3a6918726d4a5f7e4343525b9e67f785996ec4eb7abb938b6df1cb2f7 SHA512 ce669eba45ab90e9dbcd770a7470ca9ed7088b1acabbc876fe4d31dc7a6edd36076063e4bd417d348c3e073113e3ad2bc2dd0ac89e02d3d8aeca7627ad7d2a1e AUX openscad-2021.01-0001-Gentoo-specific-Disable-ccache-building.patch 790 BLAKE2B b08a024f81a29d7fb4e0860977b814d2ec6ce6dcbf8ab87655f5d36f51ea3bbce6559369363c33ca7593cbc3284de920f71be3c38e3ab7b5efa83d3466132b79 SHA512 2af887d7b085c49203e72ad41cb5c0e32b772a8abd35843485434cb11b263ba8a727a0ebc34c7138bff1e6852245f2bdaf7d91711184a5f16ed22603578a0892 AUX openscad-2021.01-0002-fix-to-find-lib3mf-2.patch 1396 BLAKE2B a43872dd83427f28a48528fbac534924796db769bd0213ba1b6fca41a65c766aa3355aa9ee3f7d68dcbbf3d578cee984f2ad61f599fdf9551ef55724f460f4db SHA512 ffbf402976054c1e7294a0d661e0648bdb359cf57e676d818cf1140644b7a0d0943f5adf1d2f511ad17ca45a35e31785aae584dc7607f13bfc9d94795fc3812b -AUX openscad-9999-fix-pkg-config-name-and-include-directory-search.patch 1053 BLAKE2B ebe8641b3506e01b62d7e311a1c1b139ae499a7ecb9f61dd0ed3d7a6d7eeccd15ed75b7591f4eda032c053bef46023b83146128f81d5d300f5b147a9396fa574 SHA512 a3107b69dbd2a74751c44368e60aff8ce25933a5dd8ff3ecd7fa4b8afaa0a9de2e5acf06ecce223cd42b334ef7b74b5879ae6b68135366b227fe0aded9e955c6 DIST openscad-2021.01.tar.gz 15817555 BLAKE2B 417857d704fa3c14312641ebda983eb85a1e3bc0d517a235fa3bd2523fce6f93c1ea526c330179bc35f03e6c73d3cd7c4c57cd71480088c21bfc99bb020ab7cd SHA512 8deaa26bf4c295c12da38f323d2b2e6f827851337f5bc1cc9c79afc083c9f913c19a263086e6e853bf2c8434c1ccc705ea22ddb02dc99d39bb1e5e03fc58d128 EBUILD openscad-2021.01.ebuild 2318 BLAKE2B 7d474960f76029b745bbcb26e6e4a6f2511f364bf10c85bcab9cf9ef4fc7bdc4b97402a602b59682e612af3cdb080e79abe24d06431c0a30c55c62daca9bbfaa SHA512 31a5481da0a65d589b0d4bbd41d76b77affcc2d1cf83fb1de91ea4766ac9ce74ba8a40e12ec7abadc823a7f30e51a93ac8b0871358adace7e9020003424a4a98 -EBUILD openscad-9999.ebuild 2576 BLAKE2B c2c4e2c37ef8ed682863ade96a355cc7d7b17ceaa9904274f296be0576dddbf7815f51630bae8be2fe9906869bc95b85b68316a71e0df429d3aaf153e9b2693e SHA512 9685776a32dd69fcfa0563b0439be0a2610556278fa65d3f781683aa1b421d03e01270f6c7f98c6a8d0e66eb5b793c04bf795ca4052761bcabe213cc85a02bb5 +EBUILD openscad-9999.ebuild 2506 BLAKE2B c9d1862b31eb6c82feaa038e0d3e13f1eb04f8b8567c2a7d8f4ccfded8aad77efdc4cac38d7e429e9c06acf1f0f17e8ffe9b45d65f37b354f715cfda3bc2807f SHA512 a8c53089c3c0ecbe0b53452dfe854477bd7bcb66d841f051b35d0d07401cd9dbad66ce3c6b1ace55e12f17bc2b613ba614c266ef0ea737ceba03003bc36b39ed MISC metadata.xml 1348 BLAKE2B b15a74a20ef94a6a47de57826c5279a4e8c388a52bf9d1058a1ba0b347fcd77e0c8b79a42515f5411d0991fb8fb71c604f792dd2a2addaaca78bc85dbfc7a611 SHA512 fea109a00324f0bdcaae855e18fba456a449bb8192e633cfd5806fa1040fe3bba24f75493e0012d54afe8828073fc4d02ae01533b45648e05c575777b23572d1 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 |