pool/WindowMaker
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 283600 from X11:windowmanagers

Browse Source 
- Update wm-giflib.patch to support giflib-5.1
(and don't break giflib-5.0 ;) (forwarded request 283512 from jengelh)

OBS-URL: https://build.opensuse.org/request/show/283600
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/WindowMaker?expand=0&rev=38
This commit is contained in:
Dominique Leuenberger 2015-02-01 11:30:12 +00:00 committed by Git OBS Bridge
commit e6adf12c9a
3 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
WindowMaker.changes
View File

@ -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

2
WindowMaker.spec
View File

@ -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

39
wm-giflib.patch
View File

@ -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 <string.h>
#include <gif_lib.h>
+#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