packages: AfterStep/AfterStep.spec, AfterStep/AfterStep-libpng-1.5.patch (N...

[draenog]

Author: draenog                      Date: Mon Jun 18 01:19:54 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix building with libpng-1.5

---- Files affected:
packages/AfterStep:
   AfterStep.spec (1.85 -> 1.86) , AfterStep-libpng-1.5.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/AfterStep/AfterStep.spec
diff -u packages/AfterStep/AfterStep.spec:1.85 packages/AfterStep/AfterStep.spec:1.86
--- packages/AfterStep/AfterStep.spec:1.85	Thu Jul 28 12:07:28 2011
+++ packages/AfterStep/AfterStep.spec	Mon Jun 18 03:19:48 2012
@@ -15,7 +15,7 @@
 Summary(pl.UTF-8):	AfterStep - zarządca okien
 Name:		AfterStep
 Version:	2.2.11
-Release:	0.3
+Release:	0.4
 License:	GPL v2+
 Group:		X11/Window Managers
 Source0:	ftp://ftp.afterstep.org/stable/%{name}-%{version}.tar.bz2
@@ -26,6 +26,7 @@
 Patch1:		%{name}-ldconfig.patch
 Patch2:		%{name}-opt.patch
 Patch3:		%{name}-link.patch
+Patch4:		%{name}-libpng-1.5.patch
 URL:		http://www.afterstep.org/
 BuildRequires:	autoconf >= 2.59-9
 BuildRequires:	automake
@@ -223,6 +224,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 cp -f autoconf/configure*.in .
 
@@ -417,6 +419,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.86  2012/06/18 01:19:48  draenog
+- fix building with libpng-1.5
+
 Revision 1.85  2011/07/28 10:07:28  baggins
 - conditional (off by default) wm-properties (only used in gnome2)
 

================================================================
Index: packages/AfterStep/AfterStep-libpng-1.5.patch
diff -u /dev/null packages/AfterStep/AfterStep-libpng-1.5.patch:1.1
--- /dev/null	Mon Jun 18 03:19:54 2012
+++ packages/AfterStep/AfterStep-libpng-1.5.patch	Mon Jun 18 03:19:48 2012
@@ -0,0 +1,33 @@
+diff -ur AfterStep-2.2.11.orig/libAfterImage/export.c AfterStep-2.2.11/libAfterImage/export.c
+--- AfterStep-2.2.11.orig/libAfterImage/export.c	2010-09-23 21:52:15.000000000 +0100
++++ AfterStep-2.2.11/libAfterImage/export.c	2012-06-18 01:48:11.054109582 +0100
+@@ -496,7 +496,7 @@
+ 	png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL );
+     if ( png_ptr != NULL )
+     	if( (info_ptr = png_create_info_struct(png_ptr)) != NULL )
+-			if( setjmp(png_ptr->jmpbuf) )
++			if( setjmp(png_jmpbuf(png_ptr)) )
+ 			{
+ 				png_destroy_info_struct(png_ptr, (png_infopp) &info_ptr);
+ 				info_ptr = NULL ;
+diff -ur AfterStep-2.2.11.orig/libAfterImage/import.c AfterStep-2.2.11/libAfterImage/import.c
+--- AfterStep-2.2.11.orig/libAfterImage/import.c	2010-09-23 21:57:57.000000000 +0100
++++ AfterStep-2.2.11/libAfterImage/import.c	2012-06-18 01:55:43.547156261 +0100
+@@ -1251,7 +1251,7 @@
+ 			 * the normal method of doing things with libpng).  REQUIRED unless you
+ 			 * set up your own error handlers in the png_create_read_struct() earlier.
+ 			 */
+-			if ( !setjmp (png_ptr->jmpbuf))
++			if ( !setjmp(png_jmpbuf(png_ptr)))
+ 			{
+ 				ASFlagType rgb_flags = ASStorage_RLEDiffCompress|ASStorage_32Bit ;
+ 
+@@ -1468,7 +1468,7 @@
+ 
+ static void asim_png_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
+ {
+-   ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_ptr->io_ptr;
++   ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *) png_get_io_ptr(png_ptr);
+    memcpy(data, buf->buffer, length);
+    buf->buffer += length;
+ }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/AfterStep/AfterStep.spec?r1=1.85&r2=1.86