public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/lib3mf/
Date: Mon, 25 Nov 2024 15:44:31 +0000 (UTC)	[thread overview]
Message-ID: <1732549411.c93f43e52ce643fb120a663cd51545e48cf6aaf6.sam@gentoo> (raw)

commit:     c93f43e52ce643fb120a663cd51545e48cf6aaf6
Author:     Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Mon Nov 25 15:37:49 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov 25 15:43:31 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c93f43e5

media-libs/lib3mf: don't use bundled headers

The includes are hardcoded. This is fixed in newer releases, so instead of
patching we just link the system includes to the place where they are expected.

Closes: https://bugs.gentoo.org/944790
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/lib3mf/{lib3mf-2.2.0.ebuild => lib3mf-2.2.0-r1.ebuild} | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/media-libs/lib3mf/lib3mf-2.2.0.ebuild b/media-libs/lib3mf/lib3mf-2.2.0-r1.ebuild
similarity index 88%
rename from media-libs/lib3mf/lib3mf-2.2.0.ebuild
rename to media-libs/lib3mf/lib3mf-2.2.0-r1.ebuild
index d5d470010791..c980abe83fef 100644
--- a/media-libs/lib3mf/lib3mf-2.2.0.ebuild
+++ b/media-libs/lib3mf/lib3mf-2.2.0-r1.ebuild
@@ -39,6 +39,14 @@ PATCHES=(
 	"${FILESDIR}"/${P}-include-cstdint.patch
 )
 
+src_prepare() {
+	cmake_src_prepare
+
+	rm -r Include/Libraries/{libzip,zlib} || die
+	ln -s "${EPREFIX}/usr/include" Include/Libraries/zlib || die
+	ln -s "${EPREFIX}/usr/include" Include/Libraries/libzip || die
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_INCLUDEDIR="include/${PN}"


             reply	other threads:[~2024-11-25 15:44 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-25 15:44 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-02-12 19:25 [gentoo-commits] repo/gentoo:master commit in: media-libs/lib3mf/ Arthur Zamarin
2025-02-12 19:25 Arthur Zamarin
2025-01-05 20:35 Sam James
2023-12-03  5:45 Arthur Zamarin
2021-12-06 11:31 Agostino Sarubbo
2021-12-05 22:04 Sam James
2021-04-27 23:53 Sam James
2021-04-27 18:02 Sam James
2021-04-27 18:01 Sam James
2021-04-10  4:24 Sam James
2021-03-14  8:41 Joonas Niilola
2021-03-14  8:41 Joonas Niilola
2021-03-14  8:41 Joonas Niilola
2021-02-07 17:07 Conrad Kostecki
2020-12-28  2:21 Jonas Stein
2020-11-20 14:59 Joonas Niilola
2020-11-20 14:59 Joonas Niilola
2020-08-25 10:25 Sam James

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1732549411.c93f43e52ce643fb120a663cd51545e48cf6aaf6.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox