[packages/libgdiplus] - updated to 3.12 - updated giflib patch

[qboosh]

commit dd68097e66638e8ac65b534f64853b7dd4104310
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jan 25 18:58:43 2015 +0100

    - updated to 3.12
    - updated giflib patch

 libgdiplus-giflib.patch | 36 +++++++++++++++++++-----------------
 libgdiplus.spec         |  6 +++---
 2 files changed, 22 insertions(+), 20 deletions(-)
---
diff --git a/libgdiplus.spec b/libgdiplus.spec
index 399f902..fdecc0c 100644
--- a/libgdiplus.spec
+++ b/libgdiplus.spec
@@ -7,12 +7,12 @@
 Summary:	An Open Source implementation of the GDI+ API
 Summary(pl.UTF-8):	Otwarta implementacja API GDI+
 Name:		libgdiplus
-Version:	3.8
-Release:	2
+Version:	3.12
+Release:	1
 License:	MIT
 Group:		Libraries
 Source0:	http://download.mono-project.com/sources/libgdiplus/%{name}-%{version}.tar.gz
-# Source0-md5:	e75440257b006d7fc2c39e9c56022c4e
+# Source0-md5:	b8fd78c2adce16498354c2476a248d98
 Patch0:		%{name}-giflib.patch
 URL:		http://www.mono-project.com/docs/gui/libgdiplus/
 BuildRequires:	autoconf >= 2.54
diff --git a/libgdiplus-giflib.patch b/libgdiplus-giflib.patch
index 6c1d983..149820d 100644
--- a/libgdiplus-giflib.patch
+++ b/libgdiplus-giflib.patch
@@ -1,16 +1,18 @@
---- libgdiplus-3.6/src/gifcodec.c.orig	2014-08-27 18:45:05.000000000 +0200
-+++ libgdiplus-3.6/src/gifcodec.c	2014-08-31 18:12:20.853094147 +0200
-@@ -39,9 +39,6 @@
+--- libgdiplus-3.12/src/gifcodec.c.orig	2015-01-05 11:27:06.000000000 +0100
++++ libgdiplus-3.12/src/gifcodec.c	2015-01-25 17:25:58.991762538 +0100
+@@ -39,11 +39,6 @@ GUID gdip_gif_image_format_guid = {0xb96
  
  #include "gifcodec.h"
  
+-#ifdef EgifOpen
 -/* giflib declares this incorrectly as EgifOpen */
 -extern GifFileType *EGifOpen(void *userData, OutputFunc writeFunc);
+-#endif
 -
  /* Data structure used for callback */
  typedef struct
  {
-@@ -105,7 +102,7 @@
+@@ -107,7 +102,7 @@ gdip_gif_inputfunc (GifFileType *gif, Gi
  */
  
  static int
@@ -19,7 +21,7 @@
  {
  	ExtensionBlock	*ep;
  
-@@ -121,15 +118,15 @@
+@@ -123,15 +118,15 @@ AddExtensionBlockMono(SavedImage *New, i
  
  	ep = &New->ExtensionBlocks[New->ExtensionBlockCount++];
  
@@ -37,7 +39,7 @@
  	}
  
  	return (GIF_OK);
-@@ -166,6 +163,7 @@
+@@ -168,6 +163,7 @@ static int
  DGifSlurpMono(GifFileType * GifFile, SavedImage *TrailingExtensions)
  {
  	int		ImageSize;
@@ -45,7 +47,7 @@
  	GifRecordType	RecordType;
  	SavedImage	*sp;
  	GifByteType	*ExtData;
-@@ -232,20 +230,19 @@
+@@ -234,20 +230,19 @@ DGifSlurpMono(GifFileType * GifFile, Sav
  			}
  
  			case EXTENSION_RECORD_TYPE: {
@@ -68,7 +70,7 @@
  				}
  				break;
  			}
-@@ -304,9 +301,9 @@
+@@ -306,9 +301,9 @@ gdip_load_gif_image (void *stream, GpIma
  	loop_counter = FALSE;
  
  	if (from_file) {
@@ -80,7 +82,7 @@
  	}
  	
  	if (gif == NULL) {
-@@ -581,7 +578,11 @@
+@@ -583,7 +578,11 @@ gdip_load_gif_image (void *stream, GpIma
  	}
  
  	FreeExtensionMono(&global_extensions);
@@ -92,7 +94,7 @@
  
  	*image = result;
  	return Ok;
-@@ -597,7 +598,11 @@
+@@ -599,7 +598,11 @@ error:
  
  	if (gif != NULL) {
  		FreeExtensionMono (&global_extensions);
@@ -104,7 +106,7 @@
  	}
  
  	*image = NULL;
-@@ -661,9 +658,9 @@
+@@ -663,9 +666,9 @@ gdip_save_gif_image (void *stream, GpIma
  	}
  
  	if (from_file) {
@@ -116,7 +118,7 @@
  	}
  		
  	if (!fp) {
-@@ -702,7 +699,7 @@
+@@ -704,7 +707,7 @@ gdip_save_gif_image (void *stream, GpIma
  					goto error; 
  				}
  
@@ -125,7 +127,7 @@
  
  				pixbuf = GdipAlloc(pixbuf_size);
  				if (pixbuf == NULL) {
-@@ -793,7 +790,7 @@
+@@ -795,7 +798,7 @@ gdip_save_gif_image (void *stream, GpIma
  				pixbuf = pixbuf_org;
  			} else {
  				cmap_size = 256;
@@ -134,7 +136,7 @@
  
  				red = GdipAlloc(pixbuf_size);
  				green = GdipAlloc(pixbuf_size);
-@@ -824,13 +821,13 @@
+@@ -826,13 +829,13 @@ gdip_save_gif_image (void *stream, GpIma
  						v += 4;
  					}
  				}
@@ -150,7 +152,7 @@
  			cmap->ColorCount = 1 << cmap->BitsPerPixel;
  
  			if ((frame == 0) && (k == 0)) {
-@@ -848,8 +845,10 @@
+@@ -850,8 +853,10 @@ gdip_save_gif_image (void *stream, GpIma
  						Buffer[0] = 1;
  						Buffer[1] = ptr[0];
  						Buffer[2] = ptr[1];
@@ -163,7 +165,7 @@
  					}
  				}
  
-@@ -901,7 +900,7 @@
+@@ -903,7 +908,7 @@ gdip_save_gif_image (void *stream, GpIma
  				pixbuf += bitmap_data->width;
  			}
  
@@ -172,7 +174,7 @@
  			if (red != NULL) {
  				GdipFree (red);
  			}
-@@ -923,13 +930,17 @@
+@@ -925,13 +930,17 @@ gdip_save_gif_image (void *stream, GpIma
  		}
  	}
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libgdiplus.git/commitdiff/dd68097e66638e8ac65b534f64853b7dd4104310