summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Vaněk <arkamar@atlas.cz>2021-02-27 17:05:01 +0100
committerSam James <sam@gentoo.org>2021-02-27 16:28:16 +0000
commit91ca0c194e16f0a710264f0c6e09b9210160e845 (patch)
tree6f55d493bfb016964eabcd5a910237ea68e6594e /media-gfx/zbar
parentapp-office/mdbtools: patch now upstreamed (diff)
downloadgentoo-91ca0c194e16f0a710264f0c6e09b9210160e845.tar.gz
gentoo-91ca0c194e16f0a710264f0c6e09b9210160e845.tar.bz2
gentoo-91ca0c194e16f0a710264f0c6e09b9210160e845.zip
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 <arkamar@atlas.cz> Closes: https://github.com/gentoo/gentoo/pull/19688 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-gfx/zbar')
-rw-r--r--media-gfx/zbar/files/zbar-0.23.1_musl_include_locale_h.patch26
-rw-r--r--media-gfx/zbar/zbar-0.23.1.ebuild1
2 files changed, 27 insertions, 0 deletions
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 000000000000..3262dd1abcb3
--- /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 <libintl.h>
++# include <locale.h>
+ # 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 <libintl.h>
++# include <locale.h>
+ # 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 d5805ede1de9..2f529efbe041 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"
)