Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/netpbm/files/, media-libs/netpbm/
Date: Mon, 29 Nov 2021 23:46:55
Message-Id: 1638229436.6f29361e96643e51495cdf55ab0f42d2c34c97a0.sam@gentoo
1 commit: 6f29361e96643e51495cdf55ab0f42d2c34c97a0
2 Author: Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com>
3 AuthorDate: Sun Nov 28 14:59:01 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 29 23:43:56 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f29361e
7
8 media-libs/netpbm: fix test failing on ppc64
9
10 Closes: https://bugs.gentoo.org/827338
11 Package-Manager: Portage-3.0.28, Repoman-3.0.3
12 Signed-off-by: Viorel Munteanu <ceamac.paragon <AT> gmail.com>
13 Closes: https://github.com/gentoo/gentoo/pull/23100
14 Signed-off-by: Sam James <sam <AT> gentoo.org>
15
16 .../files/netpbm-10.86.24-fix-test-ppc64.patch | 22 ++++++++++++++++++++++
17 ...m-10.86.26.ebuild => netpbm-10.86.24-r1.ebuild} | 5 +++--
18 ...m-10.86.26.ebuild => netpbm-10.86.26-r1.ebuild} | 1 +
19 3 files changed, 26 insertions(+), 2 deletions(-)
20
21 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
22 new file mode 100644
23 index 000000000000..e1b558d59117
24 --- /dev/null
25 +++ b/media-libs/netpbm/files/netpbm-10.86.24-fix-test-ppc64.patch
26 @@ -0,0 +1,22 @@
27 +char is unsigned by default on ppc64
28 +
29 +--- a/converter/other/pnmtopalm/palmtopnm.c
30 ++++ b/converter/other/pnmtopalm/palmtopnm.c
31 +@@ -823,7 +823,7 @@
32 + unsigned int j;
33 +
34 + for (j = 0; j < bytesPerRow; ) {
35 +- char incount;
36 ++ signed char incount;
37 + pm_readchar(ifP, &incount);
38 + if (incount < 0) {
39 + /* How do we handle incount == -128 ? */
40 +@@ -865,7 +865,7 @@
41 + unsigned int j;
42 +
43 + for (j = 0; j < bytesPerRow; ) {
44 +- char incount;
45 ++ signed char incount;
46 + pm_readchar(ifP, &incount);
47 + if (incount < 0) {
48 + /* How do we handle incount == -128 ? */
49
50 diff --git a/media-libs/netpbm/netpbm-10.86.26.ebuild b/media-libs/netpbm/netpbm-10.86.24-r1.ebuild
51 similarity index 96%
52 copy from media-libs/netpbm/netpbm-10.86.26.ebuild
53 copy to media-libs/netpbm/netpbm-10.86.24-r1.ebuild
54 index a4bc1a21670d..9a257b98e32a 100644
55 --- a/media-libs/netpbm/netpbm-10.86.26.ebuild
56 +++ b/media-libs/netpbm/netpbm-10.86.24-r1.ebuild
57 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/ceamac/netpbm-make-dist/releases/download/v${PV}/${P
58
59 LICENSE="GPL-2"
60 SLOT="0"
61 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
62 +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
63 IUSE="doc jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
64 # zlib USE flag is no longer used, enabled by default.
65 # cannot remove it yet because of #801445
66 @@ -45,6 +45,7 @@ PATCHES=(
67 "${FILESDIR}"/netpbm-10.86.21-test.patch #450530
68 "${FILESDIR}"/netpbm-10.86.21-misc-deps.patch
69 "${FILESDIR}"/netpbm-10.86.22-fix-ps-test.patch #670362
70 + "${FILESDIR}"/netpbm-10.86.24-fix-test-ppc64.patch #827338
71 )
72
73 netpbm_libtype() {
74 @@ -166,7 +167,7 @@ src_configure() {
75 TIFFLIB_NEEDS_Z = N
76 JPEGLIB = $(netpbm_config jpeg)
77 PNGLIB = $(netpbm_config png)
78 - ZLIB = $($(tc-getPKG_CONFIG) --libs zlib)
79 + ZLIB = -lz
80 LINUXSVGALIB = $(netpbm_config svga vga)
81 XML2_LIBS = $(netpbm_config xml xml2)
82 JBIGLIB = $(netpbm_config jbig)
83
84 diff --git a/media-libs/netpbm/netpbm-10.86.26.ebuild b/media-libs/netpbm/netpbm-10.86.26-r1.ebuild
85 similarity index 98%
86 rename from media-libs/netpbm/netpbm-10.86.26.ebuild
87 rename to media-libs/netpbm/netpbm-10.86.26-r1.ebuild
88 index a4bc1a21670d..39873d62dbfd 100644
89 --- a/media-libs/netpbm/netpbm-10.86.26.ebuild
90 +++ b/media-libs/netpbm/netpbm-10.86.26-r1.ebuild
91 @@ -45,6 +45,7 @@ PATCHES=(
92 "${FILESDIR}"/netpbm-10.86.21-test.patch #450530
93 "${FILESDIR}"/netpbm-10.86.21-misc-deps.patch
94 "${FILESDIR}"/netpbm-10.86.22-fix-ps-test.patch #670362
95 + "${FILESDIR}"/netpbm-10.86.24-fix-test-ppc64.patch #827338
96 )
97
98 netpbm_libtype() {