summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2016-11-09 11:17:39 +0100
committerPacho Ramos <pacho@gentoo.org>2016-11-09 11:19:56 +0100
commit783509647ee34bce32e2f249dfe44b2fcf1888ec (patch)
treeeaf67efcc5cb02dadf581c252ba7aee57f633783 /mail-filter/spamprobe/files
parentdev-util/debugedit: Added some checks to the update script. (diff)
downloadgentoo-783509647ee34bce32e2f249dfe44b2fcf1888ec.tar.gz
gentoo-783509647ee34bce32e2f249dfe44b2fcf1888ec.tar.bz2
gentoo-783509647ee34bce32e2f249dfe44b2fcf1888ec.zip
mail-filter/spamprobe: Fix building with giflib-5 (#574218 by André Malo)
Package-Manager: portage-2.3.2 RepoMan-Options: --force
Diffstat (limited to 'mail-filter/spamprobe/files')
-rw-r--r--mail-filter/spamprobe/files/spamprobe-1.4d-giflib5.patch27
-rw-r--r--mail-filter/spamprobe/files/spamprobe-1.4d-libpng14.patch4
2 files changed, 29 insertions, 2 deletions
diff --git a/mail-filter/spamprobe/files/spamprobe-1.4d-giflib5.patch b/mail-filter/spamprobe/files/spamprobe-1.4d-giflib5.patch
new file mode 100644
index 000000000000..761f58ddc5ee
--- /dev/null
+++ b/mail-filter/spamprobe/files/spamprobe-1.4d-giflib5.patch
@@ -0,0 +1,27 @@
+diff -Nur spamprobe~/src/parser/GifParser.cc spamprobe/src/parser/GifParser.cc
+--- spamprobe~/src/parser/GifParser.cc
++++ spamprobe/src/parser/GifParser.cc
+@@ -81,7 +81,11 @@
+ GifParser::~GifParser()
+ {
+ if (m_gif) {
++#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5
++ DGifCloseFile(m_gif, NULL);
++#else
+ DGifCloseFile(m_gif);
++#endif
+ }
+ }
+
+@@ -99,7 +103,11 @@
+ void GifParser::openImage()
+ {
+ m_nextByteIndex = 0;
++#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5
++ m_gif = DGifOpen(this, readFromBuffer, NULL);
++#else
+ m_gif = DGifOpen(this, readFromBuffer);
++#endif
+ if (!m_gif) {
+ throw runtime_error("open gif failed");
+ }
diff --git a/mail-filter/spamprobe/files/spamprobe-1.4d-libpng14.patch b/mail-filter/spamprobe/files/spamprobe-1.4d-libpng14.patch
index c019f39543eb..2be1b493f06b 100644
--- a/mail-filter/spamprobe/files/spamprobe-1.4d-libpng14.patch
+++ b/mail-filter/spamprobe/files/spamprobe-1.4d-libpng14.patch
@@ -1,5 +1,5 @@
---- src/parser/PngParser.cc
-+++ src/parser/PngParser.cc
+--- a/src/parser/PngParser.cc
++++ b/src/parser/PngParser.cc
@@ -53,9 +53,9 @@
{
if (m_initialized) {