| 1 |
commit: f41c64c921a8c8baa2633ed6c00630e661e6fbfa |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 27 18:33:15 2016 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 27 18:33:40 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f41c64c9 |
| 7 |
|
| 8 |
media-libs/netpbm: fix pbmtext test failure in some locales #601012 |
| 9 |
|
| 10 |
.../files/netpbm-10.76.00-pbmtext-test.patch | 22 ++++++++++++++++++++++ |
| 11 |
media-libs/netpbm/netpbm-10.76.00.ebuild | 1 + |
| 12 |
2 files changed, 23 insertions(+) |
| 13 |
|
| 14 |
diff --git a/media-libs/netpbm/files/netpbm-10.76.00-pbmtext-test.patch b/media-libs/netpbm/files/netpbm-10.76.00-pbmtext-test.patch |
| 15 |
new file mode 100644 |
| 16 |
index 00000000..cdc075e |
| 17 |
--- /dev/null |
| 18 |
+++ b/media-libs/netpbm/files/netpbm-10.76.00-pbmtext-test.patch |
| 19 |
@@ -0,0 +1,22 @@ |
| 20 |
+the tool tries to generate binary output, but the current locale might change |
| 21 |
+what awk generates. force it to C/ASCII to avoid that. |
| 22 |
+ |
| 23 |
+https://bugs.gentoo.org/601012 |
| 24 |
+ |
| 25 |
+--- test/pbmtext.test |
| 26 |
++++ test/pbmtext.test |
| 27 |
+@@ -81,12 +81,14 @@ rm ${fontRectangle_txt} ${font_pbm} |
| 28 |
+ |
| 29 |
+ # One long row |
| 30 |
+ # Should print 3233136020 4535 |
| 31 |
++LC_CTYPE=C \ |
| 32 |
+ awk 'BEGIN { for (i=32; i<=125;++i) printf("%c",i); |
| 33 |
+ for (i=160;i<=255;++i) printf("%c",i); }' | \ |
| 34 |
+ pbmtext -builtin bdf | cksum |
| 35 |
+ |
| 36 |
+ # One tall column |
| 37 |
+ # Should print 1216262214 5711 |
| 38 |
++LC_CTYPE=C \ |
| 39 |
+ awk 'BEGIN { for (i=32; i<=125;++i) printf("%c\n",i); |
| 40 |
+ for (i=160;i<=255;++i) printf("%c\n",i); }' | \ |
| 41 |
+ pbmtext -nomargins -builtin bdf | cksum |
| 42 |
|
| 43 |
diff --git a/media-libs/netpbm/netpbm-10.76.00.ebuild b/media-libs/netpbm/netpbm-10.76.00.ebuild |
| 44 |
index 5be50fe..29f12e7 100644 |
| 45 |
--- a/media-libs/netpbm/netpbm-10.76.00.ebuild |
| 46 |
+++ b/media-libs/netpbm/netpbm-10.76.00.ebuild |
| 47 |
@@ -57,6 +57,7 @@ src_prepare() { |
| 48 |
epatch "${FILESDIR}"/netpbm-10.76.00-build.patch |
| 49 |
epatch "${FILESDIR}"/netpbm-10.76.00-test.patch #450530 |
| 50 |
epatch "${FILESDIR}"/netpbm-10.76.00-misc-deps.patch |
| 51 |
+ epatch "${FILESDIR}"/netpbm-10.76.00-pbmtext-test.patch #601012 |
| 52 |
|
| 53 |
# make sure we use system libs |
| 54 |
sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die |
Archives