commit: 6f29361e96643e51495cdf55ab0f42d2c34c97a0 Author: Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com> AuthorDate: Sun Nov 28 14:59:01 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Nov 29 23:43:56 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f29361e
media-libs/netpbm: fix test failing on ppc64 Closes: https://bugs.gentoo.org/827338 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Viorel Munteanu <ceamac.paragon <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/23100 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/netpbm-10.86.24-fix-test-ppc64.patch | 22 ++++++++++++++++++++++ ...m-10.86.26.ebuild => netpbm-10.86.24-r1.ebuild} | 5 +++-- ...m-10.86.26.ebuild => netpbm-10.86.26-r1.ebuild} | 1 + 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/media-libs/netpbm/files/netpbm-10.86.24-fix-test-ppc64.patch b/media-libs/netpbm/files/netpbm-10.86.24-fix-test-ppc64.patch new file mode 100644 index 000000000000..e1b558d59117 --- /dev/null +++ b/media-libs/netpbm/files/netpbm-10.86.24-fix-test-ppc64.patch @@ -0,0 +1,22 @@ +char is unsigned by default on ppc64 + +--- a/converter/other/pnmtopalm/palmtopnm.c ++++ b/converter/other/pnmtopalm/palmtopnm.c +@@ -823,7 +823,7 @@ + unsigned int j; + + for (j = 0; j < bytesPerRow; ) { +- char incount; ++ signed char incount; + pm_readchar(ifP, &incount); + if (incount < 0) { + /* How do we handle incount == -128 ? */ +@@ -865,7 +865,7 @@ + unsigned int j; + + for (j = 0; j < bytesPerRow; ) { +- char incount; ++ signed char incount; + pm_readchar(ifP, &incount); + if (incount < 0) { + /* How do we handle incount == -128 ? */ diff --git a/media-libs/netpbm/netpbm-10.86.26.ebuild b/media-libs/netpbm/netpbm-10.86.24-r1.ebuild similarity index 96% copy from media-libs/netpbm/netpbm-10.86.26.ebuild copy to media-libs/netpbm/netpbm-10.86.24-r1.ebuild index a4bc1a21670d..9a257b98e32a 100644 --- a/media-libs/netpbm/netpbm-10.86.26.ebuild +++ b/media-libs/netpbm/netpbm-10.86.24-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/ceamac/netpbm-make-dist/releases/download/v${PV}/${P LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="doc jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib" # zlib USE flag is no longer used, enabled by default. # cannot remove it yet because of #801445 @@ -45,6 +45,7 @@ PATCHES=( "${FILESDIR}"/netpbm-10.86.21-test.patch #450530 "${FILESDIR}"/netpbm-10.86.21-misc-deps.patch "${FILESDIR}"/netpbm-10.86.22-fix-ps-test.patch #670362 + "${FILESDIR}"/netpbm-10.86.24-fix-test-ppc64.patch #827338 ) netpbm_libtype() { @@ -166,7 +167,7 @@ src_configure() { TIFFLIB_NEEDS_Z = N JPEGLIB = $(netpbm_config jpeg) PNGLIB = $(netpbm_config png) - ZLIB = $($(tc-getPKG_CONFIG) --libs zlib) + ZLIB = -lz LINUXSVGALIB = $(netpbm_config svga vga) XML2_LIBS = $(netpbm_config xml xml2) JBIGLIB = $(netpbm_config jbig) diff --git a/media-libs/netpbm/netpbm-10.86.26.ebuild b/media-libs/netpbm/netpbm-10.86.26-r1.ebuild similarity index 98% rename from media-libs/netpbm/netpbm-10.86.26.ebuild rename to media-libs/netpbm/netpbm-10.86.26-r1.ebuild index a4bc1a21670d..39873d62dbfd 100644 --- a/media-libs/netpbm/netpbm-10.86.26.ebuild +++ b/media-libs/netpbm/netpbm-10.86.26-r1.ebuild @@ -45,6 +45,7 @@ PATCHES=( "${FILESDIR}"/netpbm-10.86.21-test.patch #450530 "${FILESDIR}"/netpbm-10.86.21-misc-deps.patch "${FILESDIR}"/netpbm-10.86.22-fix-ps-test.patch #670362 + "${FILESDIR}"/netpbm-10.86.24-fix-test-ppc64.patch #827338 ) netpbm_libtype() {
