summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2016-11-27 13:33:15 -0500
committerMike Frysinger <vapier@gentoo.org>2016-11-27 13:33:40 -0500
commitf41c64c921a8c8baa2633ed6c00630e661e6fbfa (patch)
tree8db717acc85d029a8386f21bfd1fcd82bd18b77b /media-libs/netpbm
parentnet-libs/liboauth: amd64/x86 stable, bug #600858 (diff)
downloadgentoo-f41c64c921a8c8baa2633ed6c00630e661e6fbfa.tar.gz
gentoo-f41c64c921a8c8baa2633ed6c00630e661e6fbfa.tar.bz2
gentoo-f41c64c921a8c8baa2633ed6c00630e661e6fbfa.zip
media-libs/netpbm: fix pbmtext test failure in some locales #601012
Diffstat (limited to 'media-libs/netpbm')
-rw-r--r--media-libs/netpbm/files/netpbm-10.76.00-pbmtext-test.patch22
-rw-r--r--media-libs/netpbm/netpbm-10.76.00.ebuild1
2 files changed, 23 insertions, 0 deletions
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
new file mode 100644
index 00000000000..cdc075e5293
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-10.76.00-pbmtext-test.patch
@@ -0,0 +1,22 @@
+the tool tries to generate binary output, but the current locale might change
+what awk generates. force it to C/ASCII to avoid that.
+
+https://bugs.gentoo.org/601012
+
+--- test/pbmtext.test
++++ test/pbmtext.test
+@@ -81,12 +81,14 @@ rm ${fontRectangle_txt} ${font_pbm}
+
+ # One long row
+ # Should print 3233136020 4535
++LC_CTYPE=C \
+ awk 'BEGIN { for (i=32; i<=125;++i) printf("%c",i);
+ for (i=160;i<=255;++i) printf("%c",i); }' | \
+ pbmtext -builtin bdf | cksum
+
+ # One tall column
+ # Should print 1216262214 5711
++LC_CTYPE=C \
+ awk 'BEGIN { for (i=32; i<=125;++i) printf("%c\n",i);
+ for (i=160;i<=255;++i) printf("%c\n",i); }' | \
+ pbmtext -nomargins -builtin bdf | cksum
diff --git a/media-libs/netpbm/netpbm-10.76.00.ebuild b/media-libs/netpbm/netpbm-10.76.00.ebuild
index 5be50fe5e35..29f12e7f28b 100644
--- a/media-libs/netpbm/netpbm-10.76.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.76.00.ebuild
@@ -57,6 +57,7 @@ src_prepare() {
epatch "${FILESDIR}"/netpbm-10.76.00-build.patch
epatch "${FILESDIR}"/netpbm-10.76.00-test.patch #450530
epatch "${FILESDIR}"/netpbm-10.76.00-misc-deps.patch
+ epatch "${FILESDIR}"/netpbm-10.76.00-pbmtext-test.patch #601012
# make sure we use system libs
sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die