commit: 6db838d02c636a09a735bd787e4616fa9f496620 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Sep 17 02:52:46 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Sep 17 02:52:46 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6db838d0
media-gfx/graphicsmagick: fix build with bzip2 enabled, zlib disabled Submitted upstream. Bug: https://bugs.gentoo.org/641164 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/graphicsmagick-1.3.36-bzip-no-zlib.patch | 22 ++++++++++++++++++++++ .../graphicsmagick/graphicsmagick-1.3.36.ebuild | 1 + 2 files changed, 23 insertions(+) diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-bzip-no-zlib.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-bzip-no-zlib.patch new file mode 100644 index 00000000000..142b4c0b013 --- /dev/null +++ b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-bzip-no-zlib.patch @@ -0,0 +1,22 @@ +Sent upstream. + +# User Sam James <[email protected]> +# Date 1631846586 -3600 +# Fri Sep 17 03:43:06 2021 +0100 +magick/blob.c: Fix build with bzip2 enabled and zlib disabled + +Seems to be a typo. + +Bug: https://bugs.gentoo.org/641164 + +--- a/magick/blob.c ++++ b/magick/blob.c +@@ -5040,7 +5040,7 @@ MagickExport size_t WriteBlob(Image *ima + else + amount=(int) remaining; + +- bz_count=BZ2_bzwrite(blob->handle.gz, ++ bz_count=BZ2_bzwrite(blob->handle.bz, + (void *) ((unsigned char *) data+i),amount); + if (bz_count <= 0) + break; diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild index 877d4026435..45f73976f1a 100644 --- a/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild +++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild @@ -54,6 +54,7 @@ DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}"/${PN}-1.3.36-flags.patch "${FILESDIR}"/${PN}-1.3.19-perl.patch + "${FILESDIR}"/${PN}-1.3.36-bzip-no-zlib.patch ) src_prepare() {
