diff options
| author |   Ionen Wolkens <ionen@gentoo.org> | 2022-09-30 02:27:25 -0400 |
|---|---|---|
| committer | Ionen Wolkens <ionen@gentoo.org> | 2022-09-30 06:48:09 -0400 |
| commit | dd5beb0c6f4559cea1b7c023454458a0465ef97b (patch) | |
| tree | f769b6bf3f59f360f7ee84c9138d01462552bded | |
| parent | media-gfx/xli: force gcc -E for imake's generation (diff) | |
| download | gentoo-dd5beb0c6f4559cea1b7c023454458a0465ef97b.tar.gz gentoo-dd5beb0c6f4559cea1b7c023454458a0465ef97b.tar.bz2 gentoo-dd5beb0c6f4559cea1b7c023454458a0465ef97b.zip | |
media-gfx/xli: fix build with clang16
Also fixup deps a bit while revbumping for implicits.
Closes: https://bugs.gentoo.org/870790
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
| -rw-r--r-- | media-gfx/xli/files/xli-1.17.0-clang16.patch | 20 | ||||
| -rw-r--r-- | media-gfx/xli/xli-1.17.0-r6.ebuild (renamed from media-gfx/xli/xli-1.17.0-r5.ebuild) | 14 |
2 files changed, 29 insertions, 5 deletions
diff --git a/media-gfx/xli/files/xli-1.17.0-clang16.patch b/media-gfx/xli/files/xli-1.17.0-clang16.patch new file mode 100644 index 000000000000..99a5ee44c4eb --- /dev/null +++ b/media-gfx/xli/files/xli-1.17.0-clang16.patch @@ -0,0 +1,20 @@ +https://bugs.gentoo.org/870790 +--- a/window.c ++++ b/window.c +@@ -211,3 +211,3 @@ + XSetWindowAttributes swa; +- static cmap_atom = None; ++ static int cmap_atom = None; + Window cmap_windows[2]; +--- a/xli.h ++++ b/xli.h +@@ -14,2 +14,3 @@ + #include <stdlib.h> ++#include <string.h> + #include <math.h> +--- a/xlito.c ++++ b/xlito.c +@@ -3,2 +3,3 @@ + #include <stdlib.h> ++#include <string.h> + #include <ctype.h> diff --git a/media-gfx/xli/xli-1.17.0-r5.ebuild b/media-gfx/xli/xli-1.17.0-r6.ebuild index 35ea8f0999eb..a33109d2bef3 100644 --- a/media-gfx/xli/xli-1.17.0-r5.ebuild +++ b/media-gfx/xli/xli-1.17.0-r6.ebuild @@ -17,23 +17,27 @@ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~ RDEPEND=" app-arch/bzip2:= - >=media-libs/libpng-1.0.5:= - >=sys-libs/zlib-1.1.4:= - virtual/jpeg:0 + media-libs/libjpeg-turbo:= + media-libs/libpng:= + sys-libs/zlib:= + x11-libs/libX11 x11-libs/libXext !media-gfx/xloadimage" -DEPEND="${RDEPEND}" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto" BDEPEND=" app-text/rman sys-devel/gcc - x11-base/xorg-proto >=x11-misc/imake-1.0.8-r1" PATCHES=( "${FILESDIR}"/xli-security-gentoo.diff "${FILESDIR}"/${P}-fix-scale-zoom.patch #282979 "${FILESDIR}"/${P}-libpng14.patch + "${FILESDIR}"/${P}-clang16.patch ) + DOCS=( README README.xloadimage ABOUTGAMMA TODO chkgamma.jpg ) src_prepare() { |