Fix build failure with png-1.5. Update to 2.2.11

11 files changed, 148 insertions, 79 deletions

diff --git a/wm/afterstep/patches/patch-Makefile.in b/wm/afterstep/patches/patch-Makefile.in
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/wm/afterstep/patches/patch-Makefile.in
diff --git a/wm/afterstep/patches/patch-ab b/wm/afterstep/patches/patch-ab
deleted file mode 100644
index ee9a0169ea1..00000000000
--- a/wm/afterstep/patches/patch-ab
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2006/10/02 23:52:51 rillig Exp $
-
-POSIX test(1) does not have a "==" operator.
-
---- configure.orig	2006-10-03 01:46:57.000000000 +0200
-+++ configure	2006-10-03 01:47:58.000000000 +0200
-@@ -1802,7 +1802,7 @@ fi;
- # Check whether --enable-reuse-font or --disable-reuse-font was given.
- if test "${enable_reuse_font+set}" = set; then
-   enableval="$enable_reuse_font"
--  if test x$enableval == "xyes"; then
-+  if test x$enableval = "xyes"; then
- cat >>confdefs.h <<\_ACEOF
- #define MODULE_REUSE_LOADED_FONT 1
- _ACEOF
-@@ -5844,7 +5844,7 @@ fi
- 
- have_shmimage=no
- 
--if test "x$CYGWIN" == "xyes"; then
-+if test "x$CYGWIN" = "xyes"; then
- 	enable_shmimage=no
- fi
- 
diff --git a/wm/afterstep/patches/patch-ac b/wm/afterstep/patches/patch-ac
deleted file mode 100644
index f5d8487c3bf..00000000000
--- a/wm/afterstep/patches/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2007/03/07 04:41:57 rillig Exp $
-
---- Makefile.in.orig	2005-07-13 16:58:20.000000000 +0200
-+++ Makefile.in	2007-03-07 05:24:32.000000000 +0100
-@@ -40,10 +40,10 @@ subdirs		= libAfterBase libAfterImage li
- #		  src/Sound @SCRIPT_DIR@
- 
- all:	AfterStep.desktop.final
--	@for I in ${subdirs}; do if [ -d $$I ]; then (cd $$I; ${MAKE} $@ || exit 1); fi; done
-+	@for I in ${subdirs}; do if [ -d $$I ]; then (cd $$I && ${MAKE} $@) || exit 1; fi; done
- 
- libs:	AfterStep.desktop.final
--	@for I in ${libdirs} ; do if [ -d $$I ]; then (cd $$I; ${MAKE} $@ || exit 1); fi; done
-+	@for I in ${libdirs} ; do if [ -d $$I ]; then (cd $$I && ${MAKE} $@) || exit 1; fi; done
- 
- AfterStep.desktop.final:
- 	@$(CP) AfterStep.desktop AfterStep.desktop.final; \
diff --git a/wm/afterstep/patches/patch-afterstep_desktop_desklets_desklet.display b/wm/afterstep/patches/patch-afterstep_desktop_desklets_desklet.display
new file mode 100644
index 00000000000..c9c79766a2c
--- /dev/null
+++ b/wm/afterstep/patches/patch-afterstep_desktop_desklets_desklet.display
@@ -0,0 +1,22 @@
+$NetBSD: patch-afterstep_desktop_desklets_desklet.display,v 1.1 2013/04/07 10:36:54 cheusov Exp $
+* fix bash-ism
+--- afterstep/desktop/desklets/desklet.display.orig	2007-09-12 15:33:23.000000000 +0000
++++ afterstep/desktop/desklets/desklet.display
+@@ -8,7 +8,7 @@ then
+     for i in `ls $pfad |grep -v $self`
+     do
+     echo "$pfad - > $i -> $1"
+-	if [ $1 == $i ]
++	if [ $1 = $i ]
+ 	then
+ 	    found=1
+ 	    if [ -f $pfad$1/config ]
+@@ -20,7 +20,7 @@ then
+ 	    fi
+ 	fi
+     done
+-    if [ $found == 1 ]
++    if [ $found = 1 ]
+     then
+ 	"$pfad$1/$1" | ascompose -T ASdesklet.$1 --override -f - -q -g $x$y -I
+     else
diff --git a/wm/afterstep/patches/patch-configure b/wm/afterstep/patches/patch-configure
new file mode 100644
index 00000000000..5d0b698c922
--- /dev/null
+++ b/wm/afterstep/patches/patch-configure
@@ -0,0 +1,13 @@
+$NetBSD: patch-configure,v 1.1 2013/04/07 10:36:54 cheusov Exp $
+* fix bash-ism
+--- configure.orig	2011-01-13 19:27:10.000000000 +0000
++++ configure
+@@ -1810,7 +1810,7 @@ fi;
+ # Check whether --enable-reuse-font or --disable-reuse-font was given.
+ if test "${enable_reuse_font+set}" = set; then
+   enableval="$enable_reuse_font"
+-  if test x$enableval == "xyes"; then
++  if test x$enableval = "xyes"; then
+ cat >>confdefs.h <<\_ACEOF
+ #define MODULE_REUSE_LOADED_FONT 1
+ _ACEOF
diff --git a/wm/afterstep/patches/patch-libAfterBase_ashash.c b/wm/afterstep/patches/patch-libAfterBase_ashash.c
index e3e391b7c0e..5133dff5358 100644
--- a/wm/afterstep/patches/patch-libAfterBase_ashash.c
+++ b/wm/afterstep/patches/patch-libAfterBase_ashash.c
@@ -1,8 +1,17 @@
-$NetBSD: patch-libAfterBase_ashash.c,v 1.1 2012/05/04 16:36:10 joerg Exp $
+$NetBSD: patch-libAfterBase_ashash.c,v 1.2 2013/04/07 10:36:54 cheusov Exp $
 
---- libAfterBase/ashash.c.orig	2012-05-04 14:37:05.000000000 +0000
+--- libAfterBase/ashash.c.orig	2008-03-17 22:42:32.000000000 +0000
 +++ libAfterBase/ashash.c
-@@ -503,7 +503,7 @@ remove_curr_hash_item (ASHashIterator * 
+@@ -39,7 +39,7 @@
+ static ASHashItem*  deallocated_mem[DEALLOC_CACHE_SIZE+10] ;
+ static unsigned int deallocated_used = 0 ;
+ 
+-static inline void 
++static void 
+ free_ashash_item( ASHashItem *item ) 
+ {
+ 
+@@ -531,7 +531,7 @@ remove_curr_hash_item (ASHashIterator * 
  		}
  }
  
@@ -11,7 +20,7 @@ $NetBSD: patch-libAfterBase_ashash.c,v 1.1 2012/05/04 16:36:10 joerg Exp $
  curr_hash_value (ASHashIterator * iterator)
  {
  	if (iterator)
-@@ -514,7 +514,7 @@ curr_hash_value (ASHashIterator * iterat
+@@ -542,7 +542,7 @@ curr_hash_value (ASHashIterator * iterat
  	return (ASHashableValue) ((char *)NULL);
  }
  
diff --git a/wm/afterstep/patches/patch-libAfterBase_ashash.h b/wm/afterstep/patches/patch-libAfterBase_ashash.h
deleted file mode 100644
index a137a193f88..00000000000
--- a/wm/afterstep/patches/patch-libAfterBase_ashash.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-libAfterBase_ashash.h,v 1.1 2012/05/04 16:36:10 joerg Exp $
-
---- libAfterBase/ashash.h.orig	2012-05-04 14:37:03.000000000 +0000
-+++ libAfterBase/ashash.h
-@@ -133,8 +133,8 @@ unsigned long list_hash_items (ASHashTab
- 
- Bool start_hash_iteration (ASHashTable * hash, ASHashIterator * iterator);
- Bool next_hash_item (ASHashIterator * iterator);
--inline ASHashableValue curr_hash_value (ASHashIterator * iterator);
--inline void *curr_hash_data (ASHashIterator * iterator);
-+ASHashableValue curr_hash_value (ASHashIterator * iterator);
-+void *curr_hash_data (ASHashIterator * iterator);
- void remove_curr_hash_item (ASHashIterator * iterator, Bool destroy);
- 
- 
diff --git a/wm/afterstep/patches/patch-libAfterBase_asvector.c b/wm/afterstep/patches/patch-libAfterBase_asvector.c
index 6a604b0884f..27e485b2d39 100644
--- a/wm/afterstep/patches/patch-libAfterBase_asvector.c
+++ b/wm/afterstep/patches/patch-libAfterBase_asvector.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-libAfterBase_asvector.c,v 1.1 2012/05/04 16:36:10 joerg Exp $
+$NetBSD: patch-libAfterBase_asvector.c,v 1.2 2013/04/07 10:36:54 cheusov Exp $
 
---- libAfterBase/asvector.c.orig	2012-05-04 14:36:35.000000000 +0000
+--- libAfterBase/asvector.c.orig	2008-12-02 22:35:37.000000000 +0000
 +++ libAfterBase/asvector.c
 @@ -126,7 +126,7 @@ LOCAL_DEBUG_CALLER_OUT("0x%lX, 0x%lX, %l
  
@@ -20,3 +20,21 @@ $NetBSD: patch-libAfterBase_asvector.c,v 1.1 2012/05/04 16:36:10 joerg Exp $
  {
      register int i ;
      /* word copying is usually faster then raw memory copying */
+@@ -210,7 +210,7 @@ LOCAL_DEBUG_OUT ("index = %d, offset = %
+     }
+ }
+ 
+-inline void vector_move_data_down( ASVector *v, int index, int offset, int length )
++void vector_move_data_down( ASVector *v, int index, int offset, int length )
+ {
+     register int i ;
+     /* word copying is usually faster then raw memory copying */
+@@ -244,7 +244,7 @@ LOCAL_DEBUG_OUT ("index = %d, offset = %
+     }
+ }
+ 
+-inline void vector_set_data( ASVector *v, void *data, int offset, int length)
++void vector_set_data( ASVector *v, void *data, int offset, int length)
+ {
+     register int i ;
+     /* word copying is usually faster then raw memory copying */
diff --git a/wm/afterstep/patches/patch-libAfterBase_asvector.h b/wm/afterstep/patches/patch-libAfterBase_asvector.h
index 53e79d9ffb4..d4edfbc074b 100644
--- a/wm/afterstep/patches/patch-libAfterBase_asvector.h
+++ b/wm/afterstep/patches/patch-libAfterBase_asvector.h
@@ -1,13 +1,13 @@
-$NetBSD: patch-libAfterBase_asvector.h,v 1.1 2012/05/04 16:36:10 joerg Exp $
+$NetBSD: patch-libAfterBase_asvector.h,v 1.2 2013/04/07 10:36:54 cheusov Exp $
 
---- libAfterBase/asvector.h.orig	2012-05-04 14:36:33.000000000 +0000
+--- libAfterBase/asvector.h.orig	2008-09-15 22:43:12.000000000 +0000
 +++ libAfterBase/asvector.h
 @@ -38,7 +38,7 @@ ASVector *append_vector( ASVector *v, vo
  /* returns index on success, -1 on failure */
  int vector_insert_elem( ASVector *v, void *data, size_t size, void *sibling, int before );
- int vector_relocate_elem( ASVector *v, void *data, unsigned int new_index );
--inline size_t vector_find_data( ASVector *v, void *data );
-+size_t vector_find_data( ASVector *v, void *data );
+ int vector_relocate_elem (ASVector *v, unsigned int index, unsigned int new_index);
+-inline size_t vector_find_data (ASVector *v, void *data );
++size_t vector_find_data (ASVector *v, void *data );
  int vector_find_elem( ASVector *v, void *data );
  /* returns 1 on success, 0 on failure */
  int vector_remove_elem( ASVector *v, void *data );
diff --git a/wm/afterstep/patches/patch-libAfterImage_asfont.c b/wm/afterstep/patches/patch-libAfterImage_asfont.c
index d85121ec156..d5fde178149 100644
--- a/wm/afterstep/patches/patch-libAfterImage_asfont.c
+++ b/wm/afterstep/patches/patch-libAfterImage_asfont.c
@@ -1,13 +1,58 @@
-$NetBSD: patch-libAfterImage_asfont.c,v 1.1 2012/05/04 16:36:10 joerg Exp $
+$NetBSD: patch-libAfterImage_asfont.c,v 1.2 2013/04/07 10:36:54 cheusov Exp $
 
---- libAfterImage/asfont.c.orig	2012-05-04 14:38:20.000000000 +0000
+--- libAfterImage/asfont.c.orig	2008-08-15 21:47:37.000000000 +0000
 +++ libAfterImage/asfont.c
-@@ -1352,7 +1352,7 @@ utf8_to_unicode ( const unsigned char *s
+@@ -367,7 +367,7 @@ release_font( ASFont *font )
+ 	return res ;
+ }
+ 
+-static inline void
++static void
+ free_glyph_data( register ASGlyph *asg )
+ {
+     if( asg->pixmap )
+@@ -1268,7 +1268,7 @@ load_freetype_glyphs( ASFont *font )
+ }
+ #endif
+ 
+-static inline ASGlyph *get_unicode_glyph( const UNICODE_CHAR uc, ASFont *font )
++static ASGlyph *get_unicode_glyph( const UNICODE_CHAR uc, ASFont *font )
+ {
+ 	register ASGlyphRange *r;
+ 	ASGlyph *asg = NULL ;
+@@ -1300,7 +1300,7 @@ LOCAL_DEBUG_OUT( "%sFound glyph for char
+ }
+ 
+ 
+-static inline ASGlyph *get_character_glyph( const unsigned char c, ASFont *font )
++static ASGlyph *get_character_glyph( const unsigned char c, ASFont *font )
+ {
+ 	return get_unicode_glyph( CHAR2UNICODE(c), font );
+ }
+@@ -1368,7 +1368,7 @@ utf8_to_unicode ( const unsigned char *s
      return 0;
  }
  
--inline ASGlyph *get_utf8_glyph( const char *utf8, ASFont *font )
+-static inline ASGlyph *get_utf8_glyph( const char *utf8, ASFont *font )
 +static ASGlyph *get_utf8_glyph( const char *utf8, ASFont *font )
  {
  	UNICODE_CHAR uc = utf8_to_unicode ( (const unsigned char*)utf8 );
- 	return get_unicode_glyph( uc, font );
+ 	LOCAL_DEBUG_OUT( "translated to Unicode 0x%lX(%ld), UTF8 size = %d", uc, uc, UTF8_CHAR_SIZE(utf8[0]) );
+@@ -1773,7 +1773,7 @@ get_fancy_text_size( const void *src_tex
+ 	return get_text_size_internal( src_text, font, &internal_attr, width, height, length, x_positions );
+ }
+ 
+-inline static void
++static void
+ render_asglyph( CARD8 **scanlines, CARD8 *row,
+                 int start_x, int y, int width, int height,
+ 				CARD32 ratio )
+@@ -1812,7 +1812,7 @@ render_asglyph( CARD8 **scanlines, CARD8
+ 	}
+ }
+ 
+-inline static void
++static void
+ render_asglyph_over( CARD8 **scanlines, CARD8 *row,
+                 int start_x, int y, int width, int height,
+ 				CARD32 value )
diff --git a/wm/afterstep/patches/patch-libAfterImage_import.c b/wm/afterstep/patches/patch-libAfterImage_import.c
index 5909a49bb29..784902713aa 100644
--- a/wm/afterstep/patches/patch-libAfterImage_import.c
+++ b/wm/afterstep/patches/patch-libAfterImage_import.c
@@ -1,10 +1,8 @@
-$NetBSD: patch-libAfterImage_import.c,v 1.1 2011/04/05 12:02:00 wiz Exp $
-
-Fix build with png-1.5.
-
---- libAfterImage/import.c.orig	2005-06-21 22:58:24.000000000 +0000
+$NetBSD: patch-libAfterImage_import.c,v 1.2 2013/04/07 10:36:54 cheusov Exp $
+* fix for png-1.5
+--- libAfterImage/import.c.orig	2010-09-23 20:57:57.000000000 +0000
 +++ libAfterImage/import.c
-@@ -876,7 +876,7 @@ png2ASImage( const char * path, ASImageI
+@@ -1251,7 +1251,7 @@ png2ASImage_int( void *data, png_rw_ptr 
  			 * the normal method of doing things with libpng).  REQUIRED unless you
  			 * set up your own error handlers in the png_create_read_struct() earlier.
  			 */
@@ -12,4 +10,24 @@ Fix build with png-1.5.
 +			if ( !setjmp (png_jmpbuf(png_ptr)))
  			{
  				ASFlagType rgb_flags = ASStorage_RLEDiffCompress|ASStorage_32Bit ;
- 				
+ 
+@@ -1447,8 +1447,8 @@ png2ASImage_int( void *data, png_rw_ptr 
+ 		}
+ 		/* clean up after the read, and free any memory allocated - REQUIRED */
+ 		png_destroy_read_struct (&png_ptr, &info_ptr, (png_infopp) NULL);
+-		if (info_ptr)
+-			free (info_ptr);
++//		if (info_ptr)
++//			free (info_ptr);
+ 	}
+ 
+ #if defined(LOCAL_DEBUG) && !defined(NO_DEBUG_OUTPUT)
+@@ -1468,7 +1468,7 @@ typedef struct ASImPNGReadBuffer
+ 
+ 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;
+ }