| 1 |
commit: 6db838d02c636a09a735bd787e4616fa9f496620 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 17 02:52:46 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 17 02:52:46 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6db838d0 |
| 7 |
|
| 8 |
media-gfx/graphicsmagick: fix build with bzip2 enabled, zlib disabled |
| 9 |
|
| 10 |
Submitted upstream. |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/641164 |
| 13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 14 |
|
| 15 |
.../files/graphicsmagick-1.3.36-bzip-no-zlib.patch | 22 ++++++++++++++++++++++ |
| 16 |
.../graphicsmagick/graphicsmagick-1.3.36.ebuild | 1 + |
| 17 |
2 files changed, 23 insertions(+) |
| 18 |
|
| 19 |
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 |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..142b4c0b013 |
| 22 |
--- /dev/null |
| 23 |
+++ b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-bzip-no-zlib.patch |
| 24 |
@@ -0,0 +1,22 @@ |
| 25 |
+Sent upstream. |
| 26 |
+ |
| 27 |
+# User Sam James <sam@g.o> |
| 28 |
+# Date 1631846586 -3600 |
| 29 |
+# Fri Sep 17 03:43:06 2021 +0100 |
| 30 |
+magick/blob.c: Fix build with bzip2 enabled and zlib disabled |
| 31 |
+ |
| 32 |
+Seems to be a typo. |
| 33 |
+ |
| 34 |
+Bug: https://bugs.gentoo.org/641164 |
| 35 |
+ |
| 36 |
+--- a/magick/blob.c |
| 37 |
++++ b/magick/blob.c |
| 38 |
+@@ -5040,7 +5040,7 @@ MagickExport size_t WriteBlob(Image *ima |
| 39 |
+ else |
| 40 |
+ amount=(int) remaining; |
| 41 |
+ |
| 42 |
+- bz_count=BZ2_bzwrite(blob->handle.gz, |
| 43 |
++ bz_count=BZ2_bzwrite(blob->handle.bz, |
| 44 |
+ (void *) ((unsigned char *) data+i),amount); |
| 45 |
+ if (bz_count <= 0) |
| 46 |
+ break; |
| 47 |
|
| 48 |
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild |
| 49 |
index 877d4026435..45f73976f1a 100644 |
| 50 |
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild |
| 51 |
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild |
| 52 |
@@ -54,6 +54,7 @@ DEPEND="${RDEPEND}" |
| 53 |
PATCHES=( |
| 54 |
"${FILESDIR}"/${PN}-1.3.36-flags.patch |
| 55 |
"${FILESDIR}"/${PN}-1.3.19-perl.patch |
| 56 |
+ "${FILESDIR}"/${PN}-1.3.36-bzip-no-zlib.patch |
| 57 |
) |
| 58 |
|
| 59 |
src_prepare() { |
Archives