summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2021-09-17 03:52:46 +0100
committerSam James <sam@gentoo.org>2021-09-17 03:52:46 +0100
commit6db838d02c636a09a735bd787e4616fa9f496620 (patch)
treec473af4c04a3914d47e63b5f36e726fc50202603 /media-gfx
parentnet-misc/httpie: simplify by using d_e_t pytest by itself (diff)
downloadgentoo-6db838d02c636a09a735bd787e4616fa9f496620.tar.gz
gentoo-6db838d02c636a09a735bd787e4616fa9f496620.tar.bz2
gentoo-6db838d02c636a09a735bd787e4616fa9f496620.zip
media-gfx/graphicsmagick: fix build with bzip2 enabled, zlib disabled
Submitted upstream. Bug: https://bugs.gentoo.org/641164 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-bzip-no-zlib.patch22
-rw-r--r--media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild1
2 files changed, 23 insertions, 0 deletions
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 000000000000..142b4c0b0139
--- /dev/null
+++ b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-bzip-no-zlib.patch
@@ -0,0 +1,22 @@
+Sent upstream.
+
+# User Sam James <sam@gentoo.org>
+# 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 877d40264358..45f73976f1ad 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() {