Hello community, here is the log from the commit of package libgdiplus0 for openSUSE:Factory checked in at 2014-09-09 06:21:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libgdiplus0 (Old) and /work/SRC/openSUSE:Factory/.libgdiplus0.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libgdiplus0" Changes: -------- --- /work/SRC/openSUSE:Factory/libgdiplus0/libgdiplus0.changes 2013-12-13 14:54:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libgdiplus0.new/libgdiplus0.changes 2014-09-09 06:21:21.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Aug 31 20:53:29 UTC 2014 - [email protected] + +- Update giflib patch to work with giflib7-5.1.0 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgdiplus0.spec ++++++ --- /var/tmp/diff_new_pack.qqdUxw/_old 2014-09-09 06:21:22.000000000 +0200 +++ /var/tmp/diff_new_pack.qqdUxw/_new 2014-09-09 06:21:22.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libgdiplus0 # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 ++++++ libgdiplus0-giflib5.patch ++++++ --- /var/tmp/diff_new_pack.qqdUxw/_old 2014-09-09 06:21:22.000000000 +0200 +++ /var/tmp/diff_new_pack.qqdUxw/_new 2014-09-09 06:21:22.000000000 +0200 @@ -1,19 +1,28 @@ -diff --git a/src/gifcodec.c b/src/gifcodec.c -index 8dee0eb..564beed 100644 ---- a/src/gifcodec.c -+++ b/src/gifcodec.c -@@ -39,8 +39,10 @@ GUID gdip_gif_image_format_guid = {0xb96b3cb0U, 0x0728U, 0x11d3U, {0x9d, 0x7b, 0 +--- + src/gifcodec.c | 50 +++++++++++++++++++++++++++++++++++++++++--------- + 1 file changed, 41 insertions(+), 9 deletions(-) + +Index: libgdiplus-2.10.9/src/gifcodec.c +=================================================================== +--- libgdiplus-2.10.9.orig/src/gifcodec.c ++++ libgdiplus-2.10.9/src/gifcodec.c +@@ -39,8 +39,15 @@ GUID gdip_gif_image_format_guid = {0xb96 #include "gifcodec.h" -+#if GIFLIB_MAJOR < 5 ++#if !defined(GIFLIB_MAJOR) || GIFLIB_MAJOR < 5 /* giflib declares this incorrectly as EgifOpen */ extern GifFileType *EGifOpen(void *userData, OutputFunc writeFunc); +#endif ++#if !defined(GIFLIB_MAJOR) || !(GIFLIB_MAJOR > 5 || \ ++ (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1)) ++# define DGifCloseFile(a, b) DGifCloseFile(a) ++# define EGifCloseFile(a, b) EGifCloseFile(a) ++#endif /* Data structure used for callback */ typedef struct -@@ -105,7 +107,7 @@ gdip_gif_inputfunc (GifFileType *gif, GifByteType *data, int len) +@@ -105,7 +112,7 @@ gdip_gif_inputfunc (GifFileType *gif, Gi */ static int @@ -22,7 +31,7 @@ { ExtensionBlock *ep; -@@ -129,7 +131,7 @@ AddExtensionBlockMono(SavedImage *New, int Len, BYTE ExtData[]) +@@ -129,7 +136,7 @@ AddExtensionBlockMono(SavedImage *New, i if (ExtData) { memcpy(ep->Bytes, ExtData, Len); @@ -31,7 +40,7 @@ } return (GIF_OK); -@@ -232,20 +234,20 @@ DGifSlurpMono(GifFileType * GifFile, SavedImage *TrailingExtensions) +@@ -232,20 +239,20 @@ DGifSlurpMono(GifFileType * GifFile, Sav } case EXTENSION_RECORD_TYPE: { @@ -55,7 +64,7 @@ } break; } -@@ -303,12 +305,19 @@ gdip_load_gif_image (void *stream, GpImage **image, BOOL from_file) +@@ -303,12 +310,19 @@ gdip_load_gif_image (void *stream, GpIma result = NULL; loop_counter = FALSE; @@ -76,7 +85,25 @@ if (gif == NULL) { goto error; } -@@ -660,11 +669,22 @@ gdip_save_gif_image (void *stream, GpImage *image, BOOL from_file) +@@ -581,7 +595,7 @@ gdip_load_gif_image (void *stream, GpIma + } + + FreeExtensionMono(&global_extensions); +- DGifCloseFile (gif); ++ DGifCloseFile (gif, NULL); + + *image = result; + return Ok; +@@ -597,7 +611,7 @@ error: + + if (gif != NULL) { + FreeExtensionMono (&global_extensions); +- DGifCloseFile (gif); ++ DGifCloseFile (gif, NULL); + } + + *image = NULL; +@@ -660,11 +674,22 @@ gdip_save_gif_image (void *stream, GpIma return InvalidParameter; } @@ -99,7 +126,7 @@ if (!fp) { return FileNotFound; -@@ -848,8 +868,15 @@ gdip_save_gif_image (void *stream, GpImage *image, BOOL from_file) +@@ -848,8 +873,15 @@ gdip_save_gif_image (void *stream, GpIma Buffer[0] = 1; Buffer[1] = ptr[0]; Buffer[2] = ptr[1]; @@ -115,3 +142,12 @@ } } +@@ -923,7 +955,7 @@ gdip_save_gif_image (void *stream, GpIma + } + } + +- EGifCloseFile (fp); ++ EGifCloseFile (fp, NULL); + + return Ok; + -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
