From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4E6C11382C5 for ; Sat, 27 Feb 2021 16:35:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7CAF6E097C; Sat, 27 Feb 2021 16:35:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 643D0E097C for ; Sat, 27 Feb 2021 16:35:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1207633D3CF for ; Sat, 27 Feb 2021 16:35:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B4D0E53 for ; Sat, 27 Feb 2021 16:35:30 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1614443296.91ca0c194e16f0a710264f0c6e09b9210160e845.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/, media-gfx/zbar/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/zbar/files/zbar-0.23.1_musl_include_locale_h.patch media-gfx/zbar/zbar-0.23.1.ebuild X-VCS-Directories: media-gfx/zbar/files/ media-gfx/zbar/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 91ca0c194e16f0a710264f0c6e09b9210160e845 X-VCS-Branch: master Date: Sat, 27 Feb 2021 16:35:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b32e53b7-44f8-4a53-a823-c315f58b3f44 X-Archives-Hash: abace35d9d4587472dca4e22a9d1910e commit: 91ca0c194e16f0a710264f0c6e09b9210160e845 Author: Petr Vaněk atlas cz> AuthorDate: Sat Feb 27 16:05:01 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sat Feb 27 16:28:16 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91ca0c19 media-gfx/zbar: fix musl build The patch is taken from upstream https://github.com/mchehab/zbar/pull/115 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Petr Vaněk atlas.cz> Closes: https://github.com/gentoo/gentoo/pull/19688 Signed-off-by: Sam James gentoo.org> .../files/zbar-0.23.1_musl_include_locale_h.patch | 26 ++++++++++++++++++++++ media-gfx/zbar/zbar-0.23.1.ebuild | 1 + 2 files changed, 27 insertions(+) diff --git a/media-gfx/zbar/files/zbar-0.23.1_musl_include_locale_h.patch b/media-gfx/zbar/files/zbar-0.23.1_musl_include_locale_h.patch new file mode 100644 index 00000000000..3262dd1abcb --- /dev/null +++ b/media-gfx/zbar/files/zbar-0.23.1_musl_include_locale_h.patch @@ -0,0 +1,26 @@ +diff --git a/zbarcam/zbarcam.c b/zbarcam/zbarcam.c +index f7ea281..2452613 100644 +--- a/zbarcam/zbarcam.c ++++ b/zbarcam/zbarcam.c +@@ -37,6 +37,7 @@ + #ifdef ENABLE_NLS + #include "../zbar/gettext.h" + # include ++# include + # define _(string) gettext(string) + #else + # define _(string) string +diff --git a/zbarimg/zbarimg.c b/zbarimg/zbarimg.c +index 0796fd8..3192ec1 100644 +--- a/zbarimg/zbarimg.c ++++ b/zbarimg/zbarimg.c +@@ -42,6 +42,7 @@ + #ifdef ENABLE_NLS + #include "../zbar/gettext.h" + # include ++# include + # define _(string) gettext(string) + #else + # define _(string) string +-- +2.26.2 diff --git a/media-gfx/zbar/zbar-0.23.1.ebuild b/media-gfx/zbar/zbar-0.23.1.ebuild index d5805ede1de..2f529efbe04 100644 --- a/media-gfx/zbar/zbar-0.23.1.ebuild +++ b/media-gfx/zbar/zbar-0.23.1.ebuild @@ -83,6 +83,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${P}_fix_leftover_on_shell_compatibility.patch" "${FILESDIR}/${P}_fix_unittest.patch" + "${FILESDIR}/${P}_musl_include_locale_h.patch" "${FILESDIR}/zbar-0.23_fix_Qt5X11Extras_detect.patch" "${FILESDIR}/zbar-0.23_fix_python_detect.patch" )