public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Louis Sautier" <sbraz@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/
Date: Wed,  5 Dec 2018 09:53:44 +0000 (UTC)	[thread overview]
Message-ID: <1544003567.91433e5fca89bb5281548d29e3c13278ad295425.sbraz@gentoo> (raw)

commit:     91433e5fca89bb5281548d29e3c13278ad295425
Author:     Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  5 09:49:01 2018 +0000
Commit:     Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Wed Dec  5 09:52:47 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91433e5f

media-gfx/zbar: fix build failures on multilib systems

* Explicitly disable QT on non-native ABIs, otherwise it is implicitly
  enabled by upstream's build system.
* Wrap QT-related headers that are only included for native ABI builds.

Closes: https://bugs.gentoo.org/672500
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>

 media-gfx/zbar/zbar-0.20.1.ebuild | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/media-gfx/zbar/zbar-0.20.1.ebuild b/media-gfx/zbar/zbar-0.20.1.ebuild
index 8d21ca2a30a..643a3a60ea9 100644
--- a/media-gfx/zbar/zbar-0.20.1.ebuild
+++ b/media-gfx/zbar/zbar-0.20.1.ebuild
@@ -125,6 +125,8 @@ multilib_src_configure() {
 		else
 			myeconfargs+=( --without-qt )
 		fi
+	else
+			myeconfargs+=( --without-qt )
 	fi
 
 	ECONF_SOURCE=${S} \
@@ -138,6 +140,16 @@ src_test() {
 	virtx multilib-minimal_src_test
 }
 
+src_install() {
+	if use qt5; then
+		local MULTILIB_WRAPPED_HEADERS=(
+			/usr/include/zbar/QZBar.h
+			/usr/include/zbar/QZBarImage.h
+		)
+	fi
+	multilib-minimal_src_install
+}
+
 multilib_src_install_all() {
 	einstalldocs
 	find "${D}" -name '*.la' -delete || die


             reply	other threads:[~2018-12-05  9:53 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-05  9:53 Louis Sautier [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-10-07 19:12 [gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/ Andreas Sturmlechner
2024-09-22  4:50 Sam James
2024-09-22  4:50 Sam James
2023-09-29 13:04 Arthur Zamarin
2023-04-12  1:50 Sam James
2023-04-11 19:05 Arthur Zamarin
2022-08-02 10:13 Joonas Niilola
2022-04-11  6:35 Jakov Smolić
2022-04-11  6:35 Jakov Smolić
2021-04-06 21:17 Sam James
2021-02-21 20:23 Sam James
2021-02-21 20:23 Sam James
2021-02-21 12:14 David Seifert
2020-12-13 10:34 Sam James
2020-05-17 16:42 Joonas Niilola
2020-02-24 18:07 Andreas Sturmlechner
2020-02-24 16:25 Agostino Sarubbo
2020-02-21  9:37 Agostino Sarubbo
2020-02-09 16:29 Michał Górny
2020-02-03 17:37 Andreas Sturmlechner
2019-02-12  9:39 Mikle Kolyada
2019-02-12  9:39 Mikle Kolyada
2019-02-12  9:39 Mikle Kolyada
2019-01-12 10:59 Pacho Ramos
2018-12-29 13:37 Andreas Sturmlechner
2018-12-29  9:16 Mikle Kolyada
2018-12-22 22:25 Thomas Deutschmann
2018-12-05 12:49 Louis Sautier
2018-12-05  8:19 Louis Sautier
2018-11-25 17:36 Andreas Sturmlechner
2018-05-10 10:08 Andreas Sturmlechner
2018-05-10 10:08 Andreas Sturmlechner
2018-02-06 16:24 Thomas Deutschmann
2017-12-19 10:38 Jason Zaman
2017-12-18 10:37 Michael Weber
2017-12-18  9:52 Michael Weber
2017-12-18  9:19 Michael Weber
2017-09-07 20:31 Michał Górny
2017-09-07 20:31 Michał Górny
2017-09-07 20:31 Michał Górny
2017-09-07 20:31 Michał Górny
2017-09-07 20:31 Michał Górny
2017-09-07 20:31 Michał Górny
2016-09-07  6:36 Andrew Savchenko
2015-08-10 23:16 Michael Weber

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=1544003567.91433e5fca89bb5281548d29e3c13278ad295425.sbraz@gentoo \
    --to=sbraz@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