| 1 |
commit: 91ca0c194e16f0a710264f0c6e09b9210160e845 |
| 2 |
Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz> |
| 3 |
AuthorDate: Sat Feb 27 16:05:01 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 27 16:28:16 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91ca0c19 |
| 7 |
|
| 8 |
media-gfx/zbar: fix musl build |
| 9 |
|
| 10 |
The patch is taken from upstream |
| 11 |
https://github.com/mchehab/zbar/pull/115 |
| 12 |
|
| 13 |
Package-Manager: Portage-3.0.13, Repoman-3.0.2 |
| 14 |
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz> |
| 15 |
Closes: https://github.com/gentoo/gentoo/pull/19688 |
| 16 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 17 |
|
| 18 |
.../files/zbar-0.23.1_musl_include_locale_h.patch | 26 ++++++++++++++++++++++ |
| 19 |
media-gfx/zbar/zbar-0.23.1.ebuild | 1 + |
| 20 |
2 files changed, 27 insertions(+) |
| 21 |
|
| 22 |
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 |
| 23 |
new file mode 100644 |
| 24 |
index 00000000000..3262dd1abcb |
| 25 |
--- /dev/null |
| 26 |
+++ b/media-gfx/zbar/files/zbar-0.23.1_musl_include_locale_h.patch |
| 27 |
@@ -0,0 +1,26 @@ |
| 28 |
+diff --git a/zbarcam/zbarcam.c b/zbarcam/zbarcam.c |
| 29 |
+index f7ea281..2452613 100644 |
| 30 |
+--- a/zbarcam/zbarcam.c |
| 31 |
++++ b/zbarcam/zbarcam.c |
| 32 |
+@@ -37,6 +37,7 @@ |
| 33 |
+ #ifdef ENABLE_NLS |
| 34 |
+ #include "../zbar/gettext.h" |
| 35 |
+ # include <libintl.h> |
| 36 |
++# include <locale.h> |
| 37 |
+ # define _(string) gettext(string) |
| 38 |
+ #else |
| 39 |
+ # define _(string) string |
| 40 |
+diff --git a/zbarimg/zbarimg.c b/zbarimg/zbarimg.c |
| 41 |
+index 0796fd8..3192ec1 100644 |
| 42 |
+--- a/zbarimg/zbarimg.c |
| 43 |
++++ b/zbarimg/zbarimg.c |
| 44 |
+@@ -42,6 +42,7 @@ |
| 45 |
+ #ifdef ENABLE_NLS |
| 46 |
+ #include "../zbar/gettext.h" |
| 47 |
+ # include <libintl.h> |
| 48 |
++# include <locale.h> |
| 49 |
+ # define _(string) gettext(string) |
| 50 |
+ #else |
| 51 |
+ # define _(string) string |
| 52 |
+-- |
| 53 |
+2.26.2 |
| 54 |
|
| 55 |
diff --git a/media-gfx/zbar/zbar-0.23.1.ebuild b/media-gfx/zbar/zbar-0.23.1.ebuild |
| 56 |
index d5805ede1de..2f529efbe04 100644 |
| 57 |
--- a/media-gfx/zbar/zbar-0.23.1.ebuild |
| 58 |
+++ b/media-gfx/zbar/zbar-0.23.1.ebuild |
| 59 |
@@ -83,6 +83,7 @@ BDEPEND=" |
| 60 |
PATCHES=( |
| 61 |
"${FILESDIR}/${P}_fix_leftover_on_shell_compatibility.patch" |
| 62 |
"${FILESDIR}/${P}_fix_unittest.patch" |
| 63 |
+ "${FILESDIR}/${P}_musl_include_locale_h.patch" |
| 64 |
"${FILESDIR}/zbar-0.23_fix_Qt5X11Extras_detect.patch" |
| 65 |
"${FILESDIR}/zbar-0.23_fix_python_detect.patch" |
| 66 |
) |
Archives