diff --git a/WindowMaker.changes b/WindowMaker.changes index 81a41a8..b27451d 100644 --- a/WindowMaker.changes +++ b/WindowMaker.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jan 27 18:11:07 UTC 2015 - jengelh@inai.de + +- Update wm-giflib.patch to support giflib-5.1 + ------------------------------------------------------------------- Thu Nov 6 00:12:35 UTC 2014 - kmroz@suse.com diff --git a/WindowMaker.spec b/WindowMaker.spec index 980168a..4bfca19 100644 --- a/WindowMaker.spec +++ b/WindowMaker.spec @@ -1,7 +1,7 @@ # # spec file for package WindowMaker # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/wm-giflib.patch b/wm-giflib.patch index e0d0a00..cf4698d 100644 --- a/wm-giflib.patch +++ b/wm-giflib.patch @@ -86,7 +86,7 @@ WPrefs.app/editmenu.c | 4 ++++ WPrefs.app/main.c | 4 ++++ WPrefs.app/xmodifier.c | 4 ++++ - configure.ac | 5 +++-- + configure.ac | 4 +++- src/actions.c | 4 ++++ src/appicon.c | 4 ++++ src/application.c | 4 ++++ @@ -161,12 +161,12 @@ wmlib/event.c | 4 ++++ wmlib/menu.c | 4 ++++ wrlib/alpha_combine.c | 4 ++++ - wrlib/gif.c | 26 +++++++++++++++++++++++--- + wrlib/load_gif.c | 7 +++++-- wrlib/tests/testdraw.c | 4 ++++ wrlib/tests/testgrad.c | 4 ++++ wrlib/tests/testrot.c | 4 ++++ wrlib/tests/view.c | 4 ++++ - 167 files changed, 686 insertions(+), 5 deletions(-) + 167 files changed, 668 insertions(+), 3 deletions(-) Index: WindowMaker-0.95.6/WINGs/Examples/colorpick.c =================================================================== @@ -2497,6 +2497,39 @@ Index: WindowMaker-0.95.6/wrlib/alpha_combine.c #include "wraster.h" void RCombineAlpha(unsigned char *d, unsigned char *s, int s_has_alpha, +Index: WindowMaker-0.95.6/wrlib/load_gif.c +=================================================================== +--- WindowMaker-0.95.6.orig/wrlib/load_gif.c ++++ WindowMaker-0.95.6/wrlib/load_gif.c +@@ -27,6 +27,10 @@ + #include + + #include ++#if defined(GIFLIB_MAJOR) && (GIFLIB_MAJOR > 5 || (GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1)) ++#else ++# define DGifCloseFile(a, b) DGifCloseFile(a) ++#endif + + #include "wraster.h" + #include "imgformat.h" +@@ -81,7 +84,7 @@ RImage *RLoadGIF(const char *file, int i + } + + if (gif->SWidth < 1 || gif->SHeight < 1) { +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + RErrorCode = RERR_BADIMAGEFILE; + return NULL; + } +@@ -216,7 +219,7 @@ RImage *RLoadGIF(const char *file, int i + free(buffer); + + if (gif) +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + + return image; + } Index: WindowMaker-0.95.6/wrlib/tests/testdraw.c =================================================================== --- WindowMaker-0.95.6.orig/wrlib/tests/testdraw.c