Mon Feb 6 23:14:50 UTC 2012

author: root <root@rshg054.dnsready.net> 2012-02-06 23:14:50 +0000
committer: root <root@rshg054.dnsready.net> 2012-02-06 23:14:50 +0000
commit: 1fa6edfba8d1e31ca1c0d59e8202cd3c62ccf393 (patch)
tree: 8d7ccc2dc9d08a4c3cde26aa01c887e9a0fc2fa1 /community
parent: bdb5b3e66f6afa586ea147f69af5e4ba388f7615 (diff)
189 files changed, 3772 insertions, 728 deletions
diff --git a/community/amsn/PKGBUILD b/community/amsn/PKGBUILD
index c96ccf33c..0faa75753 100644
--- a/community/amsn/PKGBUILD
+++ b/community/amsn/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 34944 2010-12-13 21:56:56Z jlichtblau $
+# $Id: PKGBUILD 63498 2012-02-05 11:51:24Z ibiru $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jeff Mickey <j@codemac.net>
 
 pkgname=amsn
 pkgver=0.98.4
-pkgrel=1
+pkgrel=2
 pkgdesc="MSN client written in Tcl/Tk"
 arch=('i686' 'x86_64')
 url="http://amsn.sourceforge.net/"
@@ -14,13 +14,20 @@ depends=('tk' 'tls')
 makedepends=('libjpeg' 'libpng' 'farsight2' 'libv4l')
 optdepends=('farsight2: for video conferencing')
 changelog=$pkgname.changelog
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}-src.tar.bz2)
-md5sums=('96fd20e8709ced4443432d125a5e0a5a')
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}-src.tar.bz2 amsn-0.98.4-libpng15.patch amsn-0.98.4-v4l2.patch)
+md5sums=('96fd20e8709ced4443432d125a5e0a5a'
+         '182eef321e78632499c24b3009c085ad'
+         '02d4ec8faed521387d6e44481f43c91a')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-# python2 fix
+  # patch for libpng15
+  patch -Np0 -i $srcdir/amsn-0.98.4-libpng15.patch
+
+  # patch for linux kernel header changes
+  patch -Np0 -i $srcdir/amsn-0.98.4-v4l2.patch
+  # python2 fix
   for file in lang/missing.py plugins/music/infosongbird; do
       sed -i 's_/usr/bin/env python_/usr/bin/env python2_' ${file}
   done
diff --git a/community/amsn/amsn-0.98.4-libpng15.patch b/community/amsn/amsn-0.98.4-libpng15.patch
new file mode 100644
index 000000000..24f875d02
--- /dev/null
+++ b/community/amsn/amsn-0.98.4-libpng15.patch
@@ -0,0 +1,471 @@
+--- utils/TkCximage/src/CxImage/ximapng.cpp
++++ utils/TkCximage/src/CxImage/ximapng.cpp
+@@ -15,7 +15,7 @@
+ void CxImagePNG::ima_png_error(png_struct *png_ptr, char *message)
+ {
+ 	strcpy(info.szLastError,message);
+-	longjmp(png_ptr->jmpbuf, 1);
++	longjmp(png_jmpbuf(png_ptr), 1);
+ }
+ ////////////////////////////////////////////////////////////////////////////////
+ #if CXIMAGE_SUPPORT_DECODE
+@@ -62,7 +62,7 @@
+     /* Set error handling if you are using the setjmp/longjmp method (this is
+     * 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))) {
+ 		/* Free all of the memory associated with the png_ptr and info_ptr */
+ 		delete [] row_pointers;
+ 		png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+@@ -77,15 +77,15 @@
+ 	png_read_info(png_ptr, info_ptr);
+ 
+ 	if (info.nEscape == -1){
+-		head.biWidth = info_ptr->width;
+-		head.biHeight= info_ptr->height;
++		head.biWidth = png_get_image_width(png_ptr, info_ptr);
++		head.biHeight= png_get_image_height(png_ptr, info_ptr);
+ 		info.dwType = CXIMAGE_FORMAT_PNG;
+-		longjmp(png_ptr->jmpbuf, 1);
++		longjmp(png_jmpbuf(png_ptr), 1);
+ 	}
+ 
+ 	/* calculate new number of channels */
+ 	int channels=0;
+-	switch(info_ptr->color_type){
++	switch(png_get_color_type(png_ptr, info_ptr)){
+ 	case PNG_COLOR_TYPE_GRAY:
+ 	case PNG_COLOR_TYPE_PALETTE:
+ 		channels = 1;
+@@ -101,71 +101,76 @@
+ 		break;
+ 	default:
+ 		strcpy(info.szLastError,"unknown PNG color type");
+-		longjmp(png_ptr->jmpbuf, 1);
++		longjmp(png_jmpbuf(png_ptr), 1);
+ 	}
+ 
+ 	//find the right pixel depth used for cximage
+-	int pixel_depth = info_ptr->pixel_depth;
++#if MIGHT_BE_BUGGY
++	int pixel_depth = png_get_pixel_depth(png_ptr, info_ptr);
+ 	if (channels == 1 && pixel_depth>8) pixel_depth=8;
++#endif
++	int pixel_depth;
++	if (channels == 1) pixel_depth=8;
+ 	if (channels == 2) pixel_depth=8;
+ 	if (channels >= 3) pixel_depth=24;
+ 
+-	if (!Create(info_ptr->width, info_ptr->height, pixel_depth, CXIMAGE_FORMAT_PNG)){
+-		longjmp(png_ptr->jmpbuf, 1);
++	if (!Create(png_get_image_width(png_ptr, info_ptr), png_get_image_height(png_ptr, info_ptr), pixel_depth, CXIMAGE_FORMAT_PNG)){
++		longjmp(png_jmpbuf(png_ptr), 1);
+ 	}
+ 
+ 	/* get metrics */
+-	switch (info_ptr->phys_unit_type)
++	png_uint_32 res_x, res_y;
++	int unit_type;
++	png_get_pHYs_dpi(png_ptr, info_ptr, &res_x, &res_y, &unit_type);
++	switch (unit_type)
+ 	{
+ 	case PNG_RESOLUTION_UNKNOWN:
+-		SetXDPI(info_ptr->x_pixels_per_unit);
+-		SetYDPI(info_ptr->y_pixels_per_unit);
++		SetXDPI(res_x);
++		SetYDPI(res_y);
+ 		break;
+ 	case PNG_RESOLUTION_METER:
+-		SetXDPI((long)floor(info_ptr->x_pixels_per_unit * 254.0 / 10000.0 + 0.5));
+-		SetYDPI((long)floor(info_ptr->y_pixels_per_unit * 254.0 / 10000.0 + 0.5));
++		SetXDPI((long)floor(res_x * 254.0 / 10000.0 + 0.5));
++		SetYDPI((long)floor(res_y * 254.0 / 10000.0 + 0.5));
+ 		break;
+ 	}
+ 
+-	if (info_ptr->num_palette>0){
+-		SetPalette((rgb_color*)info_ptr->palette,info_ptr->num_palette);
+-		SetClrImportant(info_ptr->num_palette);
+-	} else if (info_ptr->bit_depth ==2) { //<DP> needed for 2 bpp grayscale PNGs
++	png_colorp palette;
++	int num_palette;
++	png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette);
++	if (num_palette>0){
++		SetPalette((rgb_color*)palette,num_palette);
++		SetClrImportant(num_palette);
++	} else if (png_get_bit_depth(png_ptr, info_ptr) ==2) { //<DP> needed for 2 bpp grayscale PNGs
+ 		SetPaletteColor(0,0,0,0);
+ 		SetPaletteColor(1,85,85,85);
+ 		SetPaletteColor(2,170,170,170);
+ 		SetPaletteColor(3,255,255,255);
+ 	} else SetGrayPalette(); //<DP> needed for grayscale PNGs
+ 	
+-	int nshift = max(0,(info_ptr->bit_depth>>3)-1)<<3;
++	int nshift = max(0,(png_get_bit_depth(png_ptr, info_ptr)>>3)-1)<<3;
+ 
+-	if (info_ptr->num_trans!=0){ //palette transparency
+-		if (info_ptr->num_trans==1){
+-			if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE){
+-#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+-				info.nBkgndIndex = info_ptr->trans_color.index;
+-#else
+-				info.nBkgndIndex = info_ptr->trans_values.index;
+-#endif
++png_uint_32    png_get_tRNS   (png_const_structp   png_ptr,   png_infop
++info_ptr,  png_bytep  *trans_alpha,   int   *num_trans,   png_color_16p
++*trans_color);
++	png_bytep trans_alpha;
++	int num_trans;
++	png_color_16p trans_color;
++	png_get_tRNS(png_ptr, info_ptr, &trans_alpha, &num_trans, &trans_color);
++	if (num_trans!=0){ //palette transparency
++		if (num_trans==1){
++			if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE){
++				info.nBkgndIndex = trans_color->index;
+ 			} else{
+-#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+-				info.nBkgndIndex = info_ptr->trans_color.gray>>nshift;
+-#else
+-				info.nBkgndIndex = info_ptr->trans_values.gray>>nshift;
+-#endif
++				info.nBkgndIndex = trans_color->gray>>nshift;
+ 			}
+ 		}
+-		if (info_ptr->num_trans>1){
++		if (num_trans>1){
+ 			RGBQUAD* pal=GetPalette();
+ 			if (pal){
+ 				DWORD ip;
+-				for (ip=0;ip<min(head.biClrUsed,(unsigned long)info_ptr->num_trans);ip++)
+-#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+-					pal[ip].rgbReserved=info_ptr->trans_alpha[ip];
+-#else
+-					pal[ip].rgbReserved=info_ptr->trans[ip];
+-#endif
+-				for (ip=info_ptr->num_trans;ip<head.biClrUsed;ip++){
++				for (ip=0;ip<min(head.biClrUsed,(unsigned long)num_trans);ip++)
++					pal[ip].rgbReserved=trans_alpha[ip];
++				for (ip=num_trans;ip<head.biClrUsed;ip++){
+ 					pal[ip].rgbReserved=255;
+ 				}
+ 				info.bAlphaPaletteEnabled=true;
+@@ -178,15 +183,9 @@
+ 		int num_trans;
+ 		png_color_16 *image_background;
+ 		if (png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, &image_background)){
+-#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+-			info.nBkgndColor.rgbRed   = (BYTE)(info_ptr->trans_color.red>>nshift);
+-			info.nBkgndColor.rgbGreen = (BYTE)(info_ptr->trans_color.green>>nshift);
+-			info.nBkgndColor.rgbBlue  = (BYTE)(info_ptr->trans_color.blue>>nshift);
+-#else
+-			info.nBkgndColor.rgbRed   = (BYTE)(info_ptr->trans_values.red>>nshift);
+-			info.nBkgndColor.rgbGreen = (BYTE)(info_ptr->trans_values.green>>nshift);
+-			info.nBkgndColor.rgbBlue  = (BYTE)(info_ptr->trans_values.blue>>nshift);
+-#endif
++			info.nBkgndColor.rgbRed   = (BYTE)(trans_color->red>>nshift);
++			info.nBkgndColor.rgbGreen = (BYTE)(trans_color->green>>nshift);
++			info.nBkgndColor.rgbBlue  = (BYTE)(trans_color->blue>>nshift);
+ 			info.nBkgndColor.rgbReserved = 0;
+ 			info.nBkgndIndex = 0;
+ 		}
+@@ -202,15 +201,15 @@
+ 	}
+ 
+ 	// <vho> - flip the RGB pixels to BGR (or RGBA to BGRA)
+-	if (info_ptr->color_type & PNG_COLOR_MASK_COLOR){
++	if (png_get_color_type(png_ptr, info_ptr) & PNG_COLOR_MASK_COLOR){
+ 		png_set_bgr(png_ptr);
+ 	}
+ 
+ 	// <vho> - handle cancel
+-	if (info.nEscape) longjmp(png_ptr->jmpbuf, 1);
++	if (info.nEscape) longjmp(png_jmpbuf(png_ptr), 1);
+ 
+ 	// row_bytes is the width x number of channels x (bit-depth / 8)
+-	row_pointers = new BYTE[info_ptr->rowbytes + 8];
++	row_pointers = new BYTE[png_get_rowbytes(png_ptr, info_ptr) + 8];
+ 
+ 	// turn on interlace handling
+ 	int number_passes = png_set_interlace_handling(png_ptr);
+@@ -221,8 +220,10 @@
+ 		SetCodecOption(0);
+ 	}
+ 
+-	int chan_offset = info_ptr->bit_depth >> 3;
+-	int pixel_offset = info_ptr->pixel_depth >> 3;
++	int bit_depth = png_get_bit_depth(png_ptr, info_ptr);
++	int chan_offset = bit_depth >> 3;
++	//int pixel_offset = info_ptr->pixel_depth >> 3;
++	int pixel_offset = (bit_depth * channels) >> 3;
+ 
+ 	for (int pass=0; pass < number_passes; pass++) {
+ 		iter.Upset();
+@@ -230,7 +231,7 @@
+ 		do	{
+ 
+ 			// <vho> - handle cancel
+-			if (info.nEscape) longjmp(png_ptr->jmpbuf, 1);
++			if (info.nEscape) longjmp(png_jmpbuf(png_ptr), 1);
+ 
+ #if CXIMAGE_SUPPORT_ALPHA	// <vho>
+ 			if (AlphaIsValid()) {
+@@ -241,7 +242,7 @@
+ 				BYTE* prow= iter.GetRow(ay);
+ 
+ 				//recover data from previous scan
+-				if (info_ptr->interlace_type && pass>0 && pass!=7){
++				if (png_get_interlace_type(png_ptr, info_ptr) && pass>0 && pass!=7){
+ 					for(ax=0;ax<head.biWidth;ax++){
+ 						long px = ax * pixel_offset;
+ 						if (channels == 2){
+@@ -278,10 +279,10 @@
+ #endif // CXIMAGE_SUPPORT_ALPHA		// vho
+ 			{
+ 				//recover data from previous scan
+-				if (info_ptr->interlace_type && pass>0){
+-					iter.GetRow(row_pointers, info_ptr->rowbytes);
++				if (png_get_interlace_type(png_ptr, info_ptr) && pass>0){
++					iter.GetRow(row_pointers, png_get_rowbytes(png_ptr, info_ptr));
+ 					//re-expand buffer for images with bit depth > 8
+-					if (info_ptr->bit_depth > 8){
++					if (png_get_bit_depth(png_ptr, info_ptr) > 8){
+ 						for(long ax=(head.biWidth*channels-1);ax>=0;ax--)
+ 							row_pointers[ax*chan_offset] = row_pointers[ax];
+ 					}
+@@ -291,15 +292,15 @@
+ 				png_read_row(png_ptr, row_pointers, NULL);
+ 
+ 				//shrink 16 bit depth images down to 8 bits
+-				if (info_ptr->bit_depth > 8){
++				if (png_get_bit_depth(png_ptr, info_ptr) > 8){
+ 					for(long ax=0;ax<(head.biWidth*channels);ax++)
+ 						row_pointers[ax] = row_pointers[ax*chan_offset];
+ 				}
+ 
+ 				//copy the pixels
+-				iter.SetRow(row_pointers, info_ptr->rowbytes);
++				iter.SetRow(row_pointers, png_get_rowbytes(png_ptr, info_ptr));
+ 				//<DP> expand 2 bpp images only in the last pass
+-				if (info_ptr->bit_depth==2 && pass==(number_passes-1))
++				if (png_get_bit_depth(png_ptr, info_ptr)==2 && pass==(number_passes-1))
+ 					expand2to4bpp(iter.GetRow());
+ 
+ 				//go on
+@@ -340,6 +341,11 @@
+ 	BYTE trans[256];	//for transparency (don't move)
+ 	png_struct *png_ptr;
+ 	png_info *info_ptr;
++	png_uint_32 width, height;
++	png_byte bit_depth;
++	png_byte color_type;
++	png_byte interlace_type;
++	BYTE channels;
+ 
+   cx_try
+   {
+@@ -362,9 +368,8 @@
+    /* Set error handling.  REQUIRED if you aren't supplying your own
+     * error hadnling functions in the png_create_write_struct() call.
+     */
+-	if (setjmp(png_ptr->jmpbuf)){
++	if (setjmp(png_jmpbuf(png_ptr))){
+ 		/* If we get here, we had a problem reading the file */
+-		if (info_ptr->palette) free(info_ptr->palette);
+ 		png_destroy_write_struct(&png_ptr,  (png_infopp)&info_ptr);
+ 		cx_throw("Error saving PNG file");
+ 	}
+@@ -376,20 +381,18 @@
+     png_set_write_fn(png_ptr,hFile,/*(png_rw_ptr)*/user_write_data,/*(png_flush_ptr)*/user_flush_data);
+ 
+ 	/* set the file information here */
+-	info_ptr->width = GetWidth();
+-	info_ptr->height = GetHeight();
+-	info_ptr->pixel_depth = (BYTE)GetBpp();
+-	info_ptr->channels = (GetBpp()>8) ? (BYTE)3: (BYTE)1;
+-	info_ptr->bit_depth = (BYTE)(GetBpp()/info_ptr->channels);
+-	info_ptr->compression_type = info_ptr->filter_type = 0;
+-	info_ptr->valid = 0;
++	width = GetWidth();
++	height = GetHeight();
++	//pixel_depth = (BYTE)GetBpp();
++	channels = (GetBpp()>8) ? (BYTE)3: (BYTE)1;
++	bit_depth = (BYTE)(GetBpp()/channels);
+ 
+ 	switch(GetCodecOption(CXIMAGE_FORMAT_PNG)){
+ 	case 1:
+-		info_ptr->interlace_type = PNG_INTERLACE_ADAM7;
++		interlace_type = PNG_INTERLACE_ADAM7;
+ 		break;
+ 	default:
+-		info_ptr->interlace_type = PNG_INTERLACE_NONE;
++		interlace_type = PNG_INTERLACE_NONE;
+ 	}
+ 
+ 	/* set compression level */
+@@ -399,19 +402,19 @@
+ 
+ 	if (GetNumColors()){
+ 		if (bGrayScale){
+-			info_ptr->color_type = PNG_COLOR_TYPE_GRAY;
++			color_type = PNG_COLOR_TYPE_GRAY;
+ 		} else {
+-			info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
++			color_type = PNG_COLOR_TYPE_PALETTE;
+ 		}
+ 	} else {
+-		info_ptr->color_type = PNG_COLOR_TYPE_RGB;
++		color_type = PNG_COLOR_TYPE_RGB;
+ 	}
+ #if CXIMAGE_SUPPORT_ALPHA
+ 	if (AlphaIsValid()){
+-		info_ptr->color_type |= PNG_COLOR_MASK_ALPHA;
+-		info_ptr->channels++;
+-		info_ptr->bit_depth = 8;
+-		info_ptr->pixel_depth += 8;
++		color_type |= PNG_COLOR_MASK_ALPHA;
++		channels++;
++		bit_depth = 8;
++		//pixel_depth += 8;
+ 	}
+ #endif
+ 
+@@ -428,29 +431,21 @@
+ 	/* set metrics */
+ 	png_set_pHYs(png_ptr, info_ptr, head.biXPelsPerMeter, head.biYPelsPerMeter, PNG_RESOLUTION_METER);
+ 
+-	png_set_IHDR(png_ptr, info_ptr, info_ptr->width, info_ptr->height, info_ptr->bit_depth,
+-				info_ptr->color_type, info_ptr->interlace_type,
++	png_set_IHDR(png_ptr, info_ptr, width, height, bit_depth,
++				color_type, interlace_type,
+ 				PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
+ 
+ 	//<DP> simple transparency
+ 	if (info.nBkgndIndex >= 0){
+-		info_ptr->num_trans = 1;
+-		info_ptr->valid |= PNG_INFO_tRNS;
+-#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+-		info_ptr->trans_alpha = trans;
+-		info_ptr->trans_color.index = (BYTE)info.nBkgndIndex;
+-		info_ptr->trans_color.red   = tc.rgbRed;
+-		info_ptr->trans_color.green = tc.rgbGreen;
+-		info_ptr->trans_color.blue  = tc.rgbBlue;
+-		info_ptr->trans_color.gray  = info_ptr->trans_color.index;
+-#else
+-		info_ptr->trans = trans;
+-		info_ptr->trans_values.index = (BYTE)info.nBkgndIndex;
+-		info_ptr->trans_values.red   = tc.rgbRed;
+-		info_ptr->trans_values.green = tc.rgbGreen;
+-		info_ptr->trans_values.blue  = tc.rgbBlue;
+-		info_ptr->trans_values.gray  = info_ptr->trans_values.index;
+-#endif
++		png_color_16 trans_color;
++
++		trans_color.index = (BYTE)info.nBkgndIndex;
++		trans_color.red   = tc.rgbRed;
++		trans_color.green = tc.rgbGreen;
++		trans_color.blue  = tc.rgbBlue;
++		trans_color.gray  = (BYTE)info.nBkgndIndex;
++
++		png_set_tRNS(png_ptr, info_ptr, trans, 1, &trans_color);
+ 
+ 		// the transparency indexes start from 0 for non grayscale palette
+ 		if (!bGrayScale && head.biClrUsed && info.nBkgndIndex)
+@@ -459,30 +454,27 @@
+ 
+ 	/* set the palette if there is one */
+ 	if (GetPalette()){
+-		if (!bGrayScale){
+-			info_ptr->valid |= PNG_INFO_PLTE;
+-		}
+-
+ 		int nc = GetClrImportant();
+ 		if (nc==0) nc = GetNumColors();
+ 
+ 		if (info.bAlphaPaletteEnabled){
+ 			for(WORD ip=0; ip<nc;ip++)
+ 				trans[ip]=GetPaletteColor((BYTE)ip).rgbReserved;
+-			info_ptr->num_trans = (WORD)nc;
+-			info_ptr->valid |= PNG_INFO_tRNS;
+-#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
+-			info_ptr->trans_alpha = trans;
+-#else
+-			info_ptr->trans = trans;
+-#endif
++			png_set_tRNS(png_ptr, info_ptr, trans, (WORD)nc, NULL);
+ 		}
+ 
+ 		// copy the palette colors
+-		info_ptr->palette = new png_color[nc];
+-		info_ptr->num_palette = (png_uint_16) nc;
+-		for (int i=0; i<nc; i++)
+-			GetPaletteColor(i, &info_ptr->palette[i].red, &info_ptr->palette[i].green, &info_ptr->palette[i].blue);
++		if (!bGrayScale) {
++			png_color *palette;
++
++			palette = (png_color *)png_malloc(png_ptr, nc*sizeof(palette[0]));
++			for (int i=0; i<nc; i++)
++				GetPaletteColor(i, &palette[i].red, &palette[i].green, &palette[i].blue);
++			png_set_PLTE(png_ptr, info_ptr, palette, nc);
++			png_data_freer(png_ptr, info_ptr,
++				       PNG_DESTROY_WILL_FREE_DATA,
++				       PNG_FREE_PLTE);
++		}
+ 	}  
+ 
+ #if CXIMAGE_SUPPORT_ALPHA	// <vho>
+@@ -496,8 +488,8 @@
+ 	}	}	}
+ #endif // CXIMAGE_SUPPORT_ALPHA	// <vho>
+ 
+-	int row_size = max(info.dwEffWidth, info_ptr->width*info_ptr->channels*(info_ptr->bit_depth/8));
+-	info_ptr->rowbytes = row_size;
++	int row_size = max(info.dwEffWidth, png_get_rowbytes(png_ptr, info_ptr));
++	//info_ptr->rowbytes = row_size;
+ 	BYTE *row_pointers = new BYTE[row_size];
+ 
+ 	/* write the file information */
+@@ -515,7 +507,7 @@
+ 			if (AlphaIsValid()){
+ 				for (long ax=head.biWidth-1; ax>=0;ax--){
+ 					c = BlindGetPixelColor(ax,ay);
+-					int px = ax * info_ptr->channels;
++					int px = ax * png_get_channels(png_ptr, info_ptr);
+ 					if (!bGrayScale){
+ 						row_pointers[px++]=c.rgbRed;
+ 						row_pointers[px++]=c.rgbGreen;
+@@ -530,7 +522,7 @@
+ #endif //CXIMAGE_SUPPORT_ALPHA	// <vho>
+ 			{
+ 				iter.GetRow(row_pointers, row_size);
+-				if (info_ptr->color_type == PNG_COLOR_TYPE_RGB) //HACK BY OP
++				if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB) //HACK BY OP
+ 					RGBtoBGR(row_pointers, row_size);
+ 				png_write_row(png_ptr, row_pointers);
+ 			}
+@@ -547,12 +539,6 @@
+ 	/* It is REQUIRED to call this to finish writing the rest of the file */
+ 	png_write_end(png_ptr, info_ptr);
+ 
+-	/* if you malloced the palette, free it here */
+-	if (info_ptr->palette){
+-		delete [] (info_ptr->palette);
+-		info_ptr->palette = NULL;
+-	}
+-
+ 	/* clean up after the write, and free any memory allocated */
+ 	png_destroy_write_struct(&png_ptr, (png_infopp)&info_ptr);
+ 
+--- utils/TkCximage/src/CxImage/ximapng.h
++++ utils/TkCximage/src/CxImage/ximapng.h
+@@ -64,8 +64,8 @@
+ 
+     static void PNGAPI user_error_fn(png_structp png_ptr,png_const_charp error_msg)
+ 	{
+-		strncpy((char*)png_ptr->error_ptr,error_msg,255);
+-		longjmp(png_ptr->jmpbuf, 1);
++		strncpy((char*)png_get_error_ptr(png_ptr),error_msg,255);
++		longjmp(png_jmpbuf(png_ptr), 1);
+ 	}
+ };
+ 
diff --git a/community/amsn/amsn-0.98.4-v4l2.patch b/community/amsn/amsn-0.98.4-v4l2.patch
new file mode 100644
index 000000000..815a6ad19
--- /dev/null
+++ b/community/amsn/amsn-0.98.4-v4l2.patch
@@ -0,0 +1,33 @@
+Add support for v4l2 on Linux so it can compile against modern
+kernel headers. #363201
+
+Patch by Kevin McCarthy <signals@gentoo.org>
+
+--- configure.ac
++++ configure.ac
+@@ -382,6 +382,10 @@
+ 	AC_CHECK_HEADERS(sys/videodev2.h,FOUND_OS=solaris,FOUND_OS=linux)
+ fi
+ 
++if test "$FOUND_OS" = "linux"; then
++    AC_CHECK_HEADERS(linux/videodev2.h)
++fi
++
+ #---------------------------------------------------------------------------------------------
+ 
+ dnl ---------------------------------------------------------------------
+--- utils/linux/capture/capture.h
++++ utils/linux/capture/capture.h
+@@ -33,7 +33,11 @@
+ #ifdef HAVE_SYS_VIDEODEV2_H
+ #   include <sys/videodev2.h>
+ #else
+-#   include <linux/videodev.h>
++	#ifdef HAVE_LINUX_VIDEODEV2_H
++		#include <linux/videodev2.h>
++	#else
++		#include <linux/videodev.h>
++	#endif
+ #endif
+ 
+ #include "grab-ng.h"
diff --git a/community/ario/PKGBUILD b/community/ario/PKGBUILD
index cc59a56fd..03a344b4c 100644
--- a/community/ario/PKGBUILD
+++ b/community/ario/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 52022 2011-07-19 19:38:14Z jlichtblau $
+# $Id: PKGBUILD 63500 2012-02-05 11:51:34Z ibiru $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 
 pkgname=ario
 pkgver=1.5.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A GTK client for MPD (Music player daemon) inspired by Rhythmbox but much lighter and faster"
 arch=('i686' 'x86_64')
 url="http://ario-player.sourceforge.net/"
 license=('GPL')
 depends=('avahi' 'curl' 'dbus-glib' 'gnutls' 'hicolor-icon-theme' 'libglade' 'libmpdclient' 'libnotify' 'libsoup' 'libunique' 'taglib' 'xdg-utils')
-makedepends=('intltool' 'perlxml')
+makedepends=('intltool' 'perl-xml-parser')
 options=('!libtool')
 install=$pkgname.install
 changelog=$pkgname.changelog
@@ -17,14 +17,14 @@ source=(http://downloads.sourceforge.net/sourceforge/$pkgname-player/$pkgname-$p
 sha256sums=('0831281ab8634eb92424b61230eee035822f7f92d8b0526da7316c898239c91e')
 
 build() {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd "${srcdir}/$pkgname-$pkgver"
 
   ./configure --prefix=/usr --sysconfdir=/etc
   make
  }
 
 package () {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd "${srcdir}/$pkgname-$pkgver"
 
-  make DESTDIR=${pkgdir} install
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/community/ario/ario.changelog b/community/ario/ario.changelog
index d2839893f..baca8a7b1 100644
--- a/community/ario/ario.changelog
+++ b/community/ario/ario.changelog
@@ -1,3 +1,6 @@
+2012-01-26  Eric Belanger  <eric@archlinux.org>
+	* Rebuild against libpng 1.5 and libtiff 4.0
+	
 2011-07-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* Update to major release 1.5.1
 
diff --git a/community/armagetronad/PKGBUILD b/community/armagetronad/PKGBUILD
index c3606bde1..c4deac487 100644
--- a/community/armagetronad/PKGBUILD
+++ b/community/armagetronad/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 26100 2010-09-13 15:56:15Z schuay $
+# $Id: PKGBUILD 63502 2012-02-05 11:51:43Z ibiru $
 # Maintainer: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Filippo 'JoeyrS' Civiletti <joeyrs@gmail.com>
 
 pkgname=armagetronad
 pkgver=0.2.8.3.1
-pkgrel=2
+pkgrel=3
 pkgdesc='A Tron Clone in 3D.'
 arch=('i686' 'x86_64')
 url='http://armagetronad.net/'
diff --git a/community/avr-binutils/PKGBUILD b/community/avr-binutils/PKGBUILD
new file mode 100644
index 000000000..ebd67da97
--- /dev/null
+++ b/community/avr-binutils/PKGBUILD
@@ -0,0 +1,74 @@
+# $Id: PKGBUILD 63813 2012-02-05 15:45:13Z bpiotrowski $
+# Maintainer: Brad Fanella <bradfanella@archlinux.us>
+# Contributor: Corrado Primier <bardo@aur.archlinux.org>
+# Contributor: danst0 <danst0@west.de>
+
+pkgname=avr-binutils
+pkgver=2.22
+pkgrel=2
+pkgdesc="A set of programs to assemble and manipulate binary and object files for the avr architecture"
+arch=('i686' 'x86_64')
+url="http://www.gnu.org/software/binutils/"
+license=('GPL')
+depends=('glibc>=2.12-5' 'zlib')
+provides=("binutils-avr=$pkgver")
+replaces=('binutils-avr')
+options=('!libtool' '!distcc' '!ccache')
+source=(http://ftp.gnu.org/gnu/${pkgname/avr-}/${pkgname/avr-}-${pkgver}.tar.bz2{,.sig})
+md5sums=('ee0f10756c84979622b992a4a61ea3f5'
+         '6aea2485019497583e5c3f5fc4a39cd5')
+
+build() {
+	cd "${srcdir}"/${pkgname/avr-}-${pkgver}
+
+	mkdir build
+	cd build
+
+  	CC="gcc -L$(pwd)/bfd/.libs/"
+  	if [ "${CARCH}" = "x86_64" ]; then
+    		../configure --build=$(../config.guess) \
+                	--disable-multilib \
+                 	--disable-nls \
+                 	--enable-64-bit-bfd \
+                 	--enable-install-libbfd \
+                 	--includedir=/usr/$(../config.guess)/include \
+                 	--infodir=/usr/share/info \
+                 	--libdir=/usr/lib \
+                 	--mandir=/usr/share/man \
+                 	--prefix=/usr \
+                 	--target=avr
+	else
+		../configure --build=$(../config.guess) \
+                	--disable-nls \
+                	--enable-install-libbfd \
+                 	--includedir=/usr/$(../config.guess)/include \
+                 	--infodir=/usr/share/info \
+                 	--libdir=/usr/lib \
+                 	--mandir=/usr/share/man \
+                 	--prefix=/usr \
+                 	--target=avr
+  	fi
+
+  	# This checks the host environment and makes sure all the necessary tools are available to compile Binutils.
+  	make configure-host
+
+  	make tooldir=/usr
+}
+
+package() {
+ 	cd "${srcdir}"/${pkgname/avr-}-${pkgver}
+
+	cd build
+	make DESTDIR="${pkgdir}" tooldir=/usr install
+
+  	rm -f ${pkgdir}/usr/lib/libiberty.a
+
+  	for bin in addr2line ar as c++filt gprof ld nm objcopy objdump ranlib readelf size strings strip ; do
+    		rm -f ${pkgdir}/usr/bin/${bin} || return 1
+  	done
+
+  	for info in as bfd binutils configure gprof ld standards; do
+    		mv ${pkgdir}/usr/share/info/${info}.info ${pkgdir}/usr/share/info/avr-${info}.info
+ 	done
+}
+
diff --git a/community/avr-gcc/PKGBUILD b/community/avr-gcc/PKGBUILD
new file mode 100644
index 000000000..ced9b0eb5
--- /dev/null
+++ b/community/avr-gcc/PKGBUILD
@@ -0,0 +1,61 @@
+# $Id: PKGBUILD 63817 2012-02-05 16:15:02Z bpiotrowski $
+# Maintainer: Brad Fanella <bradfanella@archlinux.us>
+# Contributor: Corrado Primier <bardo@aur.archlinux.org>
+# Contributor: danst0 <danst0@west.de>
+
+pkgname=avr-gcc
+pkgver=4.6.2
+pkgrel=1
+pkgdesc="The GNU avr Compiler Collection"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'custom')
+url="http://gcc.gnu.org/"
+depends=('binutils-avr>=2.21' 'cloog' 'ppl' 'gcc-libs>=4.6.0' 'libmpc')
+provides=("gcc-avr=$pkgver")
+replaces=('gcc-avr')
+options=('!ccache' '!distcc' '!emptydirs' '!libtool' '!strip')
+source=(http://ftp.gnu.org/gnu/gcc/${pkgname/avr-}-${pkgver}/gcc-{core,g++}-${pkgver}.tar.bz2)
+md5sums=('0c0e7e35d2215e19de9c97efba507553'
+         '0d75ca7ca35b1e7f252223f9d23a6ad1')
+
+build() {
+	export CFLAGS="-O2 -pipe"
+  	export CXXFLAGS="-O2 -pipe"
+
+  	cd "${srcdir}/${pkgname/avr-}-${pkgver}" 
+
+  	mkdir build
+  	cd build
+  	../configure --disable-libssp \
+        	--disable-nls \
+		--enable-languages=c,c++ \
+		--infodir=/usr/share/info \
+               	--libdir=/usr/lib \
+               	--libexecdir=/usr/lib \
+               	--mandir=/usr/share/man \
+               	--prefix=/usr \
+               	--target=avr \
+               	--with-gnu-as \
+               	--with-gnu-ld \
+               	--with-as=/usr/bin/avr-as \
+               	--with-ld=/usr/bin/avr-ld
+
+  	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname/avr-}-${pkgver}"
+
+  	cd build
+  	make -j1 DESTDIR=${pkgdir} install
+
+  	install -Dm644 "${srcdir}/${pkgname/avr-}-${pkgver}/COPYING.RUNTIME" \
+		"${pkgdir}/usr/share/licenses/${pkgname}/RUNTIME.LIBRARY.EXCEPTION"
+
+  	rm -f ${pkgdir}/usr/lib/libiberty.a
+  	rm -rf ${pkgdir}/usr/share/man/man7
+  	rm -rf ${pkgdir}/usr/share/info
+}
+
+md5sums=('780f614ab18c7a9066dec6387d7490b2'
+         '87ecd60431e41096419dd8a10f76e46b')
diff --git a/community/blender/PKGBUILD b/community/blender/PKGBUILD
index 516791c85..0f23b4ae5 100644
--- a/community/blender/PKGBUILD
+++ b/community/blender/PKGBUILD
@@ -14,7 +14,7 @@ _svn=false
 
 pkgname=blender
 pkgver=2.61
-pkgrel=3
+pkgrel=4
 epoch=3
 pkgdesc="A fully integrated 3D graphics creation suite"
 arch=('i686' 'x86_64')
diff --git a/community/bwbar/PKGBUILD b/community/bwbar/PKGBUILD
index 72b3810c2..8f2620965 100644
--- a/community/bwbar/PKGBUILD
+++ b/community/bwbar/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 59215 2011-11-21 15:20:03Z spupykin $
+# $Id: PKGBUILD 63506 2012-02-05 11:52:02Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Mark Rosenstand <mark@borkware.net>
 
 pkgname=bwbar
 pkgver=1.2.3
-pkgrel=2
+pkgrel=3
 arch=(i686 x86_64)
 pkgdesc="Generates text and graphical readout of the current bandwidth usage."
 url="http://www.kernel.org/pub/software/web/bwbar/"
@@ -16,6 +16,8 @@ md5sums=('766265ddf0615b552ff19d12f78be719')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
+  sed -i '1,1i#include <zlib.h>' bwbar.c
+  sed -i 's|png_ptr->jmpbuf|png_jmpbuf(png_ptr)|' bwbar.c
   ./configure
   make
   install -D -m755 bwbar $pkgdir/usr/bin/bwbar
diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD
index a8f4c645b..4c828e7f3 100644
--- a/community/calibre/PKGBUILD
+++ b/community/calibre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 63441 2012-02-03 13:48:06Z giovanni $
+# $Id: PKGBUILD 63508 2012-02-05 11:52:12Z ibiru $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Petrov Roman <nwhisper@gmail.com>
 # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
 
 pkgname=calibre
 pkgver=0.8.38
-pkgrel=1
+pkgrel=2
 pkgdesc="Ebook management application"
 arch=('i686' 'x86_64') 
 url="http://calibre-ebook.com/"
diff --git a/community/caph/PKGBUILD b/community/caph/PKGBUILD
index 99c4e4366..04307c8e5 100644
--- a/community/caph/PKGBUILD
+++ b/community/caph/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 33204 2010-11-22 23:40:32Z svenstaro $
+# $Id: PKGBUILD 63510 2012-02-05 11:52:20Z ibiru $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: jose <jose1711 [at] gmail (dot) com>
 
 pkgname=caph
 arch=('i686' 'x86_64')
 pkgver=1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A sandbox game based on physics which uses doodles as a primary gameplay element"
 license=('GPL')
 url="http://sourceforge.net/projects/caphgame/"
diff --git a/community/clanlib/PKGBUILD b/community/clanlib/PKGBUILD
index c4b90317a..df5913ecf 100644
--- a/community/clanlib/PKGBUILD
+++ b/community/clanlib/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 60147 2011-12-06 05:24:01Z svenstaro $
+# $Id: PKGBUILD 63514 2012-02-05 11:52:35Z ibiru $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 
 pkgname=clanlib
 pkgver=2.3.4
-pkgrel=1
+pkgrel=2
 pkgdesc="A multi-platform game development library."
 arch=('i686' 'x86_64')
 url="http://clanlib.org/"
diff --git a/community/compiz/PKGBUILD b/community/compiz/PKGBUILD
index eb4a0c1fb..0d049ce7c 100644
--- a/community/compiz/PKGBUILD
+++ b/community/compiz/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=('compiz-core'
 	'compiz-decorator-kde'
 	'compiz-decorator-gtk')
 pkgver=0.8.8
-pkgrel=2
+pkgrel=3
 pkgdesc="Composite manager for Aiglx and Xgl"
 url="http://www.compiz.org/"
 license=('GPL' 'LGPL' 'MIT')
@@ -20,13 +20,14 @@ makedepends=('intltool' 'gnome-control-center' 'libwnck' 'kdebase-workspace'
 options=(!libtool !emptydirs)
 conflicts=('compiz' 'compiz-core-git' 'compiz-git')
 replaces=('compiz')
-source=(http://releases.compiz.org/0.8.8/compiz-$pkgver.tar.gz)
-sha1sums=('01d065db07f6fd6bcad51811ffba69221aff656e')
+source=(http://releases.compiz.org/0.8.8/compiz-$pkgver.tar.gz compiz-build.patch)
+sha1sums=('01d065db07f6fd6bcad51811ffba69221aff656e'
+          '148656352f8a20b3781ee185025c5c8d4b7d720f')
 
 build()
 {
-  cd $srcdir/compiz-$pkgver
-
+  cd "$srcdir/compiz-$pkgver"
+  patch -p1 -i ../compiz-build.patch
   ./configure   --prefix=/usr \
 	    --enable-gnome \
 	    --enable-gtk \
@@ -48,18 +49,18 @@ package_compiz-core()
   depends=('startup-notification' 'librsvg' \
          'libgl' 'dbus' 'mesa' 'libxslt' 'fuse')
 
-  cd $srcdir/compiz-$pkgver
-  make DESTDIR=$pkgdir install
+  cd "$srcdir/compiz-$pkgver"
+  make DESTDIR="$pkgdir" install
 
   # remove stuff which is in one of the decorations
-   rm -rf $pkgdir/usr/bin/{gtk-window-decorator,kde4-window-decorator}
-   rm -rf ${pkgdir}/usr/share/{applications,gnome,gnome-control-center}
-   rm -rf ${pkgdir}/usr/lib/{window-manager-settings,pkgconfig/compiz-gconf.pc,compiz/libgconf*}
-   rm -rf ${pkgdir}/etc
+   rm -rf "$pkgdir"/usr/bin/{gtk-window-decorator,kde4-window-decorator}
+   rm -rf "${pkgdir}"/usr/share/{applications,gnome,gnome-control-center}
+   rm -rf "${pkgdir}"/usr/lib/{window-manager-settings,pkgconfig/compiz-gconf.pc,compiz/libgconf*}
+   rm -rf "${pkgdir}"/etc
 
   # install MIT license
-  install -Dm644 $srcdir/compiz-$pkgver/COPYING.MIT \
-	$pkgdir/usr/share/licenses/compiz-core/COPYING.MIT
+  install -Dm644 "$srcdir/compiz-$pkgver/COPYING.MIT" \
+	"$pkgdir/usr/share/licenses/compiz-core/COPYING.MIT"
 }
 
 package_compiz-decorator-gtk()
@@ -68,39 +69,39 @@ package_compiz-decorator-gtk()
   depends=('gnome-control-center' 'libwnck' 'compiz-core' 'metacity')
   install=compiz-decorator-gtk.install
 
-  cd $srcdir/compiz-$pkgver
+  cd "$srcdir/compiz-$pkgver"
 
   pushd gtk
-  make DESTDIR=$pkgdir install
+  make DESTDIR="$pkgdir" install
   install -Dm644 window-decorator/gwd.schemas \
-                $pkgdir/usr/share/gconf/schemas/gwd.schemas
+                "$pkgdir/usr/share/gconf/schemas/gwd.schemas"
   popd
 
   for i in dbus gconf ini inotify png regex svg glib kconfig
   do
-    rm $srcdir/compiz-$pkgver/metadata/compiz-$i.schemas
+    rm "$srcdir"/compiz-$pkgver/metadata/compiz-$i.schemas
   done
 
   gconf-merge-schema \
-    ${pkgdir}/usr/share/gconf/schemas/compiz-decorator-gtk.schemas \
-        ${srcdir}/compiz-$pkgver/metadata/*.schemas
+    "${pkgdir}"/usr/share/gconf/schemas/compiz-decorator-gtk.schemas \
+        "${srcdir}"/compiz-$pkgver/metadata/*.schemas
 
-  make DESTDIR=$pkgdir install
+  make DESTDIR="$pkgdir" install
 
   # remove stuff which is in one of the other packages
-   rm -rf ${pkgdir}/etc
-   rm -rf $pkgdir/usr/bin/{compiz,kde4-window-decorator}
-   rm -rf $pkgdir/usr/include
-   cd $pkgdir/usr/lib
+   rm -rf "${pkgdir}"/etc
+   rm -rf "$pkgdir"/usr/bin/{compiz,kde4-window-decorator}
+   rm -rf "$pkgdir"/usr/include
+   cd "$pkgdir"/usr/lib
    rm libdecoration*
    rm pkgconfig/{compiz-cube.pc,compiz-scale.pc,compiz.pc,libdecoration.pc}
-   cd ${pkgdir}/usr/lib/compiz
-   rm `ls --hide=*gconf*`
-   rm -rf ${pkgdir}/usr/share/{compiz,locale}
+   cd "${pkgdir}"/usr/lib/compiz
+   rm $(ls --hide=*gconf*)
+   rm -rf "${pkgdir}"/usr/share/{compiz,locale}
    
   # install MIT license
-  install -Dm644 $srcdir/compiz-$pkgver/COPYING.MIT \
-        $pkgdir/usr/share/licenses/compiz-decorator-gtk/COPYING.MIT
+  install -Dm644 "$srcdir"/compiz-$pkgver/COPYING.MIT \
+        "$pkgdir"/usr/share/licenses/compiz-decorator-gtk/COPYING.MIT
 }
 
 package_compiz-decorator-kde()
@@ -108,17 +109,17 @@ package_compiz-decorator-kde()
   pkgdesc="Compiz decorator for KDE"
   depends=('kdebase-workspace' 'compiz-core')
 
-  cd $srcdir/compiz-$pkgver
-  make DESTDIR=$pkgdir install
+  cd "$srcdir"/compiz-$pkgver
+  make DESTDIR="$pkgdir" install
 
   # Let's remove stuff that are in compiz-core package or gtk decorator
-  rm -rf $pkgdir/usr/{include,lib}
-  rm -rf $pkgdir/usr/bin/{compiz,gtk-window-decorator}
-  rm -rf ${pkgdir}/etc
-  rm -rf ${pkgdir}/usr/share/{applications,gnome,gnome-control-center,locale,compiz}
+  rm -rf "$pkgdir"/usr/{include,lib}
+  rm -rf "$pkgdir"/usr/bin/{compiz,gtk-window-decorator}
+  rm -rf "${pkgdir}"/etc
+  rm -rf "${pkgdir}"/usr/share/{applications,gnome,gnome-control-center,locale,compiz}
 
   # install MIT license
-  install -Dm644 $srcdir/compiz-$pkgver/COPYING.MIT \
-        $pkgdir/usr/share/licenses/compiz-decorator-kde/COPYING.MIT
+  install -Dm644 "$srcdir"/compiz-$pkgver/COPYING.MIT \
+        "$pkgdir"/usr/share/licenses/compiz-decorator-kde/COPYING.MIT
 }
 
diff --git a/community/compiz/compiz-build.patch b/community/compiz/compiz-build.patch
new file mode 100644
index 000000000..f22a3fa21
--- /dev/null
+++ b/community/compiz/compiz-build.patch
@@ -0,0 +1,18 @@
+diff -Naur compiz-0.8.8-orig/kde/window-decorator-kde4/window.cpp compiz-0.8.8/kde/window-decorator-kde4/window.cpp
+--- compiz-0.8.8-orig/kde/window-decorator-kde4/window.cpp	2012-01-29 22:05:54.000000000 -0500
++++ compiz-0.8.8/kde/window-decorator-kde4/window.cpp	2012-01-29 22:10:38.000000000 -0500
+@@ -986,10 +986,10 @@
+ {
+     Atom    atom = Atoms::compizWindowBlurDecor;
+     QRegion topQRegion, bottomQRegion, leftQRegion, rightQRegion;
+-    Region  topRegion = NULL;
+-    Region  bottomRegion = NULL;
+-    Region  leftRegion = NULL;
+-    Region  rightRegion = NULL;
++    ::Region  topRegion = NULL;
++    ::Region  bottomRegion = NULL;
++    ::Region  leftRegion = NULL;
++    ::Region  rightRegion = NULL;
+     int     size = 0;
+     int     w, h;
+ 
diff --git a/community/coq/PKGBUILD b/community/coq/PKGBUILD
index 2f2750606..15223d9d4 100644
--- a/community/coq/PKGBUILD
+++ b/community/coq/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=coq
 pkgver=8.3pl3
-pkgrel=1
+pkgrel=2
 pkgdesc='Formal proof management system.'
 arch=('i686' 'x86_64')
 url='http://coq.inria.fr/'
@@ -11,11 +11,11 @@ license=('GPL')
 options=('!emptydirs')
 depends=('gtk2' 'lablgtk2' 'ocaml')
 makedepends=('camlp5-transitional' 'netpbm' 'hevea')
-source=("http://coq.inria.fr/distrib/V${pkgver}/files/${pkgname}-${pkgver}.tar.gz")
+source=("http://coq.inria.fr/distrib/V${pkgver}/files/coq-${pkgver}.tar.gz")
 md5sums=('37e9a52110a025128667c03fed75f9c2')
 
 build() {
-  cd ${pkgname}-${pkgver}
+  cd coq-${pkgver}
 
   ./configure \
     -prefix '/usr' \
@@ -29,7 +29,7 @@ build() {
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
+  cd coq-${pkgver}
 
   make COQINSTALLPREFIX=${pkgdir} install
 
diff --git a/community/critter/PKGBUILD b/community/critter/PKGBUILD
index 56769ac4f..1c01a5742 100644
--- a/community/critter/PKGBUILD
+++ b/community/critter/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 57886 2011-11-04 08:24:44Z lcarlier $
+# $Id: PKGBUILD 63520 2012-02-05 11:53:03Z ibiru $
 # Contributor: Allan McRae <mcrae_allan@hotmail.com>
 # Maintainer: Daniel J Griffiths <griffithsdj@archlinux.us>
 
 pkgname=critter
 _origname=CriticalMass
 pkgver=1.0.2
-pkgrel=5
+pkgrel=6
 pkgdesc="Critical Mass (aka Critter) is an SDL/OpenGL space shoot'em up game"
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/criticalmass"
@@ -13,16 +13,19 @@ license=('GPL')
 depends=('sdl_image' 'sdl_mixer' 'mesa')
 source=(http://downloads.sourceforge.net/sourceforge/criticalmass/$_origname-${pkgver}.tar.bz2
         critter-gcc43.patch
+        criticalmass-1.0.2-libpng15.patch
         critter.desktop)
 md5sums=('e2aff114bffa717fb79c82e1dc473ebe'
          'e936920acce56bfa3b0123ca8b1193a6'
+         '76448ba5b7a42aec8fd2a5d1bc31b8e2'
          '98c17809aed964c445adad09827035df')
 
 build() {
   cd ${srcdir}/$_origname-${pkgver}
 
   patch -Np1 -i ../critter-gcc43.patch
-  sed -i 's|-lpng12|-lpng|g' configure
+  patch -Np0 -i ../criticalmass-1.0.2-libpng15.patch
+  sed -i 's|-lpng12|-lpng15|g' configure
 
   ./configure --prefix=/usr --mandir=/usr/share/man
   make
diff --git a/community/critter/criticalmass-1.0.2-libpng15.patch b/community/critter/criticalmass-1.0.2-libpng15.patch
new file mode 100644
index 000000000..ac1b8c0c6
--- /dev/null
+++ b/community/critter/criticalmass-1.0.2-libpng15.patch
@@ -0,0 +1,31 @@
+--- game/main.cpp
++++ game/main.cpp
+@@ -28,6 +28,8 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ 
++#include <zlib.h>
++
+ void migrateConfig( void)
+ {
+     //if onlineCheck is not set, default it to true
+--- utilssdl/PNG.cpp
++++ utilssdl/PNG.cpp
+@@ -45,7 +45,7 @@
+ {
+     png_size_t check;
+ 
+-    check = fwrite( data, 1, length, (FILE *)(png->io_ptr));
++    check = fwrite( data, 1, length, (FILE *)(png_get_io_ptr(png)));
+     if( check != length)
+     {
+ 	png_error( png, "Write Error");
+@@ -72,7 +72,7 @@
+ 	return false;
+     }
+ 
+-    if( setjmp(_png->jmpbuf))
++    if( setjmp(png_jmpbuf(_png)))
+     {
+ 	fclose( fp);
+ 	png_destroy_write_struct(&_png, (png_infopp)NULL);
diff --git a/community/cwiid/PKGBUILD b/community/cwiid/PKGBUILD
index 8f928328a..ec59807bb 100644
--- a/community/cwiid/PKGBUILD
+++ b/community/cwiid/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 53971 2011-08-10 19:27:06Z schiv $
+# $Id: PKGBUILD 63522 2012-02-05 11:53:14Z ibiru $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Wieland Hoffmann <the_mineo@web.de>
 # Contributor: Birger Moellering <bmoellering@googlemail.com>
 
 pkgname=cwiid
 pkgver=0.6.00
-pkgrel=9
+pkgrel=10
 pkgdesc="Linux Nintendo Wiimote interface"
 arch=('i686' 'x86_64')
 url="http://abstrakraft.org/cwiid"
diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD
index 04e856aa9..d296ddfca 100644
--- a/community/darktable/PKGBUILD
+++ b/community/darktable/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 61213 2011-12-24 17:41:33Z spupykin $
+# $Id: PKGBUILD 63524 2012-02-05 11:53:20Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:  Christian Himpel <chressie at gmail dot com>
 # Contributor: Johannes Hanika <hanatos at gmail dot com>
@@ -6,7 +6,7 @@
 pkgname=darktable
 pkgver=0.9.3
 _pkgver=0.9
-pkgrel=4
+pkgrel=5
 pkgdesc="Utility to organize and develop raw images"
 arch=('i686' 'x86_64')
 url=http://darktable.sf.net/
diff --git a/community/devil/PKGBUILD b/community/devil/PKGBUILD
index 4cf31e845..06eed72cd 100644
--- a/community/devil/PKGBUILD
+++ b/community/devil/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 60209 2011-12-07 16:29:05Z svenstaro $
+# $Id: PKGBUILD 63526 2012-02-05 11:53:30Z ibiru $
 # Maintainer: Laurent Carlier <lordheavym@gmail.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: TheHoff <forums>
 
 pkgname=devil
 pkgver=1.7.8
-pkgrel=9
+pkgrel=10
 pkgdesc="Library for reading several different image formats"
 arch=('i686' 'x86_64')
 url="http://openil.sourceforge.net/"
diff --git a/community/dia/PKGBUILD b/community/dia/PKGBUILD
index 4663a3987..732145cef 100644
--- a/community/dia/PKGBUILD
+++ b/community/dia/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 61137 2011-12-22 11:13:11Z spupykin $
+# $Id: PKGBUILD 63528 2012-02-05 11:53:40Z ibiru $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=dia
 pkgver=0.97.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A GTK+ based diagram creation program"
 arch=('i686' 'x86_64')
 license=('GPL')
diff --git a/community/dillo/PKGBUILD b/community/dillo/PKGBUILD
index 111906348..13600444a 100644
--- a/community/dillo/PKGBUILD
+++ b/community/dillo/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 60152 2011-12-06 08:54:11Z spupykin $
+# $Id: PKGBUILD 63530 2012-02-05 11:53:50Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: dorphell <dorphell@archlinux.org>
 
 pkgname=dillo
 pkgver=3.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A small, fast graphical web browser built on FLTK"
 arch=(i686 x86_64)
 url="http://www.dillo.org"
diff --git a/community/directfb/DirectFB-1.4.9-libpng-1.5.patch b/community/directfb/DirectFB-1.4.9-libpng-1.5.patch
new file mode 100644
index 000000000..e428afbaf
--- /dev/null
+++ b/community/directfb/DirectFB-1.4.9-libpng-1.5.patch
@@ -0,0 +1,244 @@
+From 83180b25e90721e717bf37c5332c22713508786e Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sun, 20 Feb 2011 19:18:19 -0500
+Subject: [PATCH] png: add support for libpng 1.5.x
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ .../idirectfbimageprovider_png.c                   |   56 ++++++++++++-------
+ 1 files changed, 35 insertions(+), 21 deletions(-)
+
+diff --git a/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c b/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c
+index 6d65ea3..7d82c5c 100644
+--- a/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c
++++ b/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c
+@@ -207,7 +207,7 @@ Construct( IDirectFBImageProvider *thiz,
+      if (!data->png_ptr)
+           goto error;
+ 
+-     if (setjmp( data->png_ptr->jmpbuf )) {
++     if (setjmp( png_jmpbuf( data->png_ptr ))) {
+           D_ERROR( "ImageProvider/PNG: Error reading header!\n" );
+           goto error;
+      }
+@@ -292,7 +292,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
+           rect = dst_data->area.wanted;
+      }
+ 
+-     if (setjmp( data->png_ptr->jmpbuf )) {
++     if (setjmp( png_jmpbuf( data->png_ptr ))) {
+           D_ERROR( "ImageProvider/PNG: Error during decoding!\n" );
+ 
+           if (data->stage < STAGE_IMAGE)
+@@ -327,6 +327,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
+      }
+      else {
+           CoreSurfaceBufferLock lock;
++          png_byte bit_depth = png_get_bit_depth( data->png_ptr, data->info_ptr );
+ 
+           ret = dfb_surface_lock_buffer( dst_surface, CSBR_BACK, CSAID_CPU, CSAF_WRITE, &lock );
+           if (ret)
+@@ -334,7 +335,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
+ 
+           switch (data->color_type) {
+                case PNG_COLOR_TYPE_PALETTE:
+-                    if (dst_surface->config.format == DSPF_LUT8 && data->info_ptr->bit_depth == 8) {
++                    if (dst_surface->config.format == DSPF_LUT8 && bit_depth == 8) {
+                          /*
+                           * Special indexed PNG to LUT8 loading.
+                           */
+@@ -377,7 +378,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
+                     }
+                     else {
+                          if (data->color_type == PNG_COLOR_TYPE_GRAY) {
+-                              int num = 1 << data->info_ptr->bit_depth;
++                              int num = 1 << bit_depth;
+ 
+                               for (x=0; x<num; x++) {
+                                    int value = x * 255 / (num - 1);
+@@ -386,7 +387,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
+                               }
+                          }
+ 
+-                         switch (data->info_ptr->bit_depth) {
++                         switch (bit_depth) {
+                               case 8:
+                                    for (y=0; y<data->height; y++) {
+                                         u8  *S = data->image + data->pitch * y;
+@@ -441,7 +442,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz,
+ 
+                               default:
+                                    D_ERROR( "ImageProvider/PNG: Unsupported indexed bit depth %d!\n",
+-                                            data->info_ptr->bit_depth );
++                                            bit_depth );
+                          }
+ 
+                          dfb_scale_linear_32( image_argb, data->width, data->height,
+@@ -594,16 +595,26 @@ png_info_callback( png_structp png_read_ptr,
+                    NULL, NULL, NULL );
+ 
+      if (png_get_valid( data->png_ptr, data->info_ptr, PNG_INFO_tRNS )) {
++          png_bytep     trans;
++          png_color_16p trans_color;
++          int           num_trans;
++
++          png_get_tRNS( data->png_ptr, data->info_ptr, &trans, &num_trans, &trans_color );
++
+           data->color_keyed = true;
+ 
+           /* generate color key based on palette... */
+           if (data->color_type == PNG_COLOR_TYPE_PALETTE) {
+                u32        key;
+-               png_colorp palette    = data->info_ptr->palette;
+-               png_bytep  trans      = data->info_ptr->trans_alpha;
+-               int        num_colors = MIN( MAXCOLORMAPSIZE,
+-                                            data->info_ptr->num_palette );
+-               u8         cmap[3][num_colors];
++               png_colorp palette;
++               int        num_colors;
++               u8        *cmap[3];
++
++               png_get_PLTE( data->png_ptr, data->info_ptr, &palette, &num_colors );
++               num_colors = MIN( MAXCOLORMAPSIZE, num_colors );
++               cmap[0] = alloca (num_colors);
++               cmap[1] = alloca (num_colors);
++               cmap[2] = alloca (num_colors);
+ 
+                for (i=0; i<num_colors; i++) {
+                     cmap[0][i] = palette[i].red;
+@@ -613,7 +624,7 @@ png_info_callback( png_structp png_read_ptr,
+ 
+                key = FindColorKey( num_colors, &cmap[0][0] );
+ 
+-               for (i=0; i<data->info_ptr->num_trans; i++) {
++               for (i=0; i<num_trans; i++) {
+                     if (!trans[i]) {
+                          palette[i].red   = (key & 0xff0000) >> 16;
+                          palette[i].green = (key & 0x00ff00) >>  8;
+@@ -625,20 +636,23 @@ png_info_callback( png_structp png_read_ptr,
+           }
+           else {
+                /* ...or based on trans rgb value */
+-               png_color_16p trans = &data->info_ptr->trans_color;
+-
+-               data->color_key = (((trans->red & 0xff00) << 8) |
+-                                  ((trans->green & 0xff00)) |
+-                                  ((trans->blue & 0xff00) >> 8));
++               data->color_key = (((trans_color->red & 0xff00) << 8) |
++                                  ((trans_color->green & 0xff00)) |
++                                  ((trans_color->blue & 0xff00) >> 8));
+           }
+      }
+ 
+      switch (data->color_type) {
+           case PNG_COLOR_TYPE_PALETTE: {
+-               png_colorp palette    = data->info_ptr->palette;
+-               png_bytep  trans      = data->info_ptr->trans_alpha;
+-               int        num_trans  = data->info_ptr->num_trans;
+-               int        num_colors = MIN( MAXCOLORMAPSIZE, data->info_ptr->num_palette );
++               png_colorp    palette;
++               png_bytep     trans;
++               png_color_16p trans_color;
++               int           num_trans;
++               int           num_colors;
++
++               png_get_PLTE( data->png_ptr, data->info_ptr, &palette, &num_colors );
++               num_colors = MIN( MAXCOLORMAPSIZE, num_colors );
++               png_get_tRNS( data->png_ptr, data->info_ptr, &trans, &num_trans, &trans_color );
+ 
+                for (i=0; i<num_colors; i++) {
+                     data->colors[i].a = (i < num_trans) ? trans[i] : 0xff;
+-- 
+1.7.4.1
+
+From 7a2a36fada3ecdd7f48fcfd782a552598477a8f5 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sun, 20 Feb 2011 19:38:50 -0500
+Subject: [PATCH] tools: add support for libpng 1.5.x
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ tools/directfb-csource.c |   20 +++++++++++++-------
+ tools/mkdfiff.c          |    2 +-
+ tools/mkdgifft.cpp       |    2 +-
+ 3 files changed, 15 insertions(+), 9 deletions(-)
+
+diff --git a/tools/directfb-csource.c b/tools/directfb-csource.c
+index 8f2cbf0..487ea3c 100644
+--- a/tools/directfb-csource.c
++++ b/tools/directfb-csource.c
+@@ -338,7 +338,7 @@ static DFBResult load_image (const char            *filename,
+      if (!png_ptr)
+           goto cleanup;
+ 
+-     if (setjmp (png_ptr->jmpbuf)) {
++     if (setjmp (png_jmpbuf (png_ptr))) {
+           if (desc->preallocated[0].data) {
+                free (desc->preallocated[0].data);
+                desc->preallocated[0].data = NULL;
+@@ -405,17 +405,22 @@ static DFBResult load_image (const char            *filename,
+        }
+ 
+      switch (src_format) {
+-          case DSPF_LUT8:
+-               if (info_ptr->num_palette) {
++          case DSPF_LUT8: {
++               png_colorp png_palette;
++               int        num_palette;
++
++               png_get_PLTE( png_ptr, info_ptr, &png_palette, &num_palette );
++
++               if (num_palette) {
+                     png_byte *alpha;
+                     int       i, num;
+ 
+-                    *palette_size = MIN (info_ptr->num_palette, 256);
++                    *palette_size = MIN (num_palette, 256);
+                     for (i = 0; i < *palette_size; i++) {
+                          palette[i].a = 0xFF;
+-                         palette[i].r = info_ptr->palette[i].red;
+-                         palette[i].g = info_ptr->palette[i].green;
+-                         palette[i].b = info_ptr->palette[i].blue;
++                         palette[i].r = png_palette[i].red;
++                         palette[i].g = png_palette[i].green;
++                         palette[i].b = png_palette[i].blue;
+                     }
+                     if (png_get_valid (png_ptr, info_ptr, PNG_INFO_tRNS)) {
+                          png_get_tRNS (png_ptr, info_ptr, &alpha, &num, NULL);
+@@ -424,6 +429,7 @@ static DFBResult load_image (const char            *filename,
+                     }
+                }
+                break;
++          }
+           case DSPF_RGB32:
+                 png_set_filler (png_ptr, 0xFF,
+ #ifdef WORDS_BIGENDIAN
+diff --git a/tools/mkdfiff.c b/tools/mkdfiff.c
+index 68a3b4f..edb58a7 100644
+--- a/tools/mkdfiff.c
++++ b/tools/mkdfiff.c
+@@ -97,7 +97,7 @@ load_image (const char            *filename,
+      if (!png_ptr)
+           goto cleanup;
+ 
+-     if (setjmp (png_ptr->jmpbuf)) {
++     if (setjmp (png_jmpbuf (png_ptr))) {
+           if (desc->preallocated[0].data) {
+                free (desc->preallocated[0].data);
+                desc->preallocated[0].data = NULL;
+diff --git a/tools/mkdgifft.cpp b/tools/mkdgifft.cpp
+index 96e4220..d4b6bf4 100644
+--- a/tools/mkdgifft.cpp
++++ b/tools/mkdgifft.cpp
+@@ -595,7 +595,7 @@ load_image (const char            *filename,
+      if (!png_ptr)
+           goto cleanup;
+ 
+-     if (setjmp (png_ptr->jmpbuf)) {
++     if (setjmp (png_jmpbuf (png_ptr))) {
+           if (desc->preallocated[0].data) {
+                free (desc->preallocated[0].data);
+                desc->preallocated[0].data = NULL;
+-- 
+1.7.4.1
+
diff --git a/community/directfb/PKGBUILD b/community/directfb/PKGBUILD
index 322155d9f..3a34cb6d3 100644
--- a/community/directfb/PKGBUILD
+++ b/community/directfb/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 53472 2011-08-03 20:58:54Z ebelanger $
+# $Id: PKGBUILD 63532 2012-02-05 11:54:02Z ibiru $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=directfb
 pkgver=1.4.14
-pkgrel=1
+pkgrel=3
 pkgdesc="A thin library that provides hardware graphics acceleration, input device handling and abstraction, integrated windowing system on top of the Linux Framebuffer Device"
 arch=('i686' 'x86_64')
 url="http://www.directfb.org"
@@ -12,14 +12,16 @@ license=('LGPL')
 depends=('gcc-libs' 'libjpeg' 'sdl' 'sysfsutils' 'libpng' 'freetype2')
 options=('!libtool')
 changelog=$pkgname.changelog
-source=(http://www.directfb.org/downloads/Core/DirectFB-${pkgver%.*}/DirectFB-${pkgver}.tar.gz)
-md5sums=('de0745d25a6ac9e337d4d5572df85471')
+source=(http://www.directfb.org/downloads/Core/DirectFB-${pkgver%.*}/DirectFB-${pkgver}.tar.gz DirectFB-1.4.9-libpng-1.5.patch)
+md5sums=('de0745d25a6ac9e337d4d5572df85471'
+         '84f3181e96692efc5ff68e5dac19541f')
 
 build() {
   cd "${srcdir}/DirectFB-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --enable-static --enable-zlib \
-              --enable-x11 --enable-sdl --disable-vnc --disable-osx \
-              --enable-video4linux2 --enable-voodoo
+  patch -p1 -i ../DirectFB-1.4.9-libpng-1.5.patch
+   ./configure --prefix=/usr --sysconfdir=/etc --enable-static --enable-debug \
+     --enable-zlib --enable-x11 --enable-sdl --disable-vnc --disable-osx \
+     --enable-video4linux2 --enable-voodoo
   make
 } 
 
diff --git a/community/djview4/PKGBUILD b/community/djview4/PKGBUILD
index 3923d1b2d..4cb58fc29 100644
--- a/community/djview4/PKGBUILD
+++ b/community/djview4/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 54964 2011-08-29 08:34:07Z bisson $
-# Contributor: Paulo Matias <matiasΘarchlinux-br·org>
-# Contributor: Leslie P. Polzer <polzerΘgnu·org>
-# Contributor: erm67 <erm67Θyahoo·it>
+# $Id: PKGBUILD 63534 2012-02-05 11:54:12Z ibiru $
+# Contributor: Paulo Matias <matias.archlinux-br.org>
+# Contributor: Leslie P. Polzer <polzer.gnu.org>
+# Contributor: erm67 <erm67.yahoo.it>
 # Contributor: Daniel J Griffiths
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=djview4
 pkgver=4.8
-pkgrel=1
+pkgrel=2
 pkgdesc='Portable DjVu viewer and browser plugin'
 url='http://djvu.sourceforge.net/djview4.html'
 license=('GPL')
@@ -22,6 +22,7 @@ build() {
 	cd "${srcdir}/djview-${pkgver}"
 	QTDIR=/usr ./configure --prefix=/usr
 	sed 's/netscape/mozilla/g' -i nsdejavu/Makefile
+	sed 's/swap/rofl_swap/g' -i src/qdjvuwidget.cpp
 	make
 }
 
diff --git a/community/dosbox/PKGBUILD b/community/dosbox/PKGBUILD
index 1f88ecec8..6ddcaeb2d 100644
--- a/community/dosbox/PKGBUILD
+++ b/community/dosbox/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 49481 2011-06-17 21:30:52Z jelle $
+# $Id: PKGBUILD 63536 2012-02-05 11:54:23Z ibiru $
 # Maintainer :
 # Contribute : Jelle van der Waa <jelle@vdwaa.nl>
 # Contributor: James Rayner <james@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=dosbox
 pkgver=0.74
-pkgrel=2
+pkgrel=3
 pkgdesc="An emulator with builtin DOS for running DOS Games"
 arch=('i686' 'x86_64')
 url="http://dosbox.sourceforge.net/"
@@ -17,8 +17,8 @@ source=("http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz"
 	'dosbox.png' 'dosbox.desktop' 'gcc46.patch')
 
 build(){
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i $srcdir/gcc46.patch
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "$srcdir/gcc46.patch"
   sed -i 's/png_check_sig/png_sig_cmp/' configure 
   ./configure   --prefix=/usr \
     --sysconfdir=/etc/dosbox  
@@ -26,19 +26,18 @@ build(){
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install 
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install 
 
 
   # install docs, make does not install them
-  install -d $pkgdir/usr/share/doc/$pkgname
-  install -Dm644 $srcdir/$pkgname-$pkgver/README $pkgdir/usr/share/doc/$pkgname/README
-  install -Dm644 $srcdir/$pkgname-$pkgver/docs/README.video $pkgdir/usr/share/doc/$pkgname/README.video
+  install -Dm644 README "$pkgdir"/usr/share/doc/$pkgname/README
+  install -Dm644 docs/README.video "$pkgdir"/usr/share/doc/$pkgname/README.video
 
-  install -Dm644 ${srcdir}/${pkgname}.png \
-    ${pkgdir}/usr/share/pixmaps/${pkgname}.png 
-  install -Dm644 ${srcdir}/${pkgname}.desktop \
-    ${pkgdir}/usr/share/applications/${pkgname}.desktop 
+  install -Dm644 "${srcdir}/${pkgname}.png" \
+    "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+  install -Dm644 "${srcdir}/${pkgname}.desktop" \
+    "${pkgdir}/usr/share/applications/${pkgname}.desktop"
 }
 md5sums=('b9b240fa87104421962d14eee71351e8'
          '2aac25fc06979e375953fcc36824dc5e'
diff --git a/community/efax-gtk/PKGBUILD b/community/efax-gtk/PKGBUILD
index 98fa4a965..c9363d1a5 100644
--- a/community/efax-gtk/PKGBUILD
+++ b/community/efax-gtk/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 61996 2012-01-13 21:14:06Z giovanni $
+# $Id: PKGBUILD 63538 2012-02-05 11:54:36Z ibiru $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=efax-gtk
 pkgver=3.2.9
-pkgrel=1
+pkgrel=2
 pkgdesc="A GUI front end for the 'efax' fax program"
 arch=('i686' 'x86_64')
 url="http://efax-gtk.sourceforge.net/"
diff --git a/community/emerald/PKGBUILD b/community/emerald/PKGBUILD
index bbed29dc5..c7b2bf8f4 100644
--- a/community/emerald/PKGBUILD
+++ b/community/emerald/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 52293 2011-07-23 10:43:05Z rvanharen $
+# $Id: PKGBUILD 63540 2012-02-05 11:54:48Z ibiru $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: JJDaNiMoTh <jjdanimoth@gmail.com>
 # Contributor: nesl247 <nesl247@gmail.com>
 
 pkgname=emerald
 pkgver=0.8.8
-pkgrel=1
+pkgrel=2
 pkgdesc="Emerald window decorator"
 arch=('i686' 'x86_64')
 url="http://www.compiz.org"
 license=('GPL')
-depends=('compiz-core' 'libwnck' 'gtk2' 'libxres' 'shared-mime-info' 'xdg-utils')
-makedepends=('intltool' 'pkgconfig' 'gettext')
+depends=('compiz-core' 'libwnck' 'gtk2' 'libxres' 'shared-mime-info' 'xdg-utils' \
+         'desktop-file-utils' 'hicolor-icon-theme')
+makedepends=('intltool' 'pkg-config' 'gettext')
 groups=('compiz-fusion' 'compiz-fusion-kde' 'compiz-fusion-gtk')
 options=(!libtool)
 conflicts=('emerald-git')
@@ -20,14 +21,14 @@ source=(http://releases.compiz-fusion.org/${pkgver}/${pkgname}-${pkgver}.tar.bz2
 sha1sums=('a5deb2ae135d1c4dac7b57b2a0415f320ae7c0aa')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-  ./configure --prefix=/usr
+  LIBS+="-lm -ldl" ./configure --prefix=/usr
 
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/community/emerald/emerald.install b/community/emerald/emerald.install
index 6ed258dd4..c2fa624ae 100644
--- a/community/emerald/emerald.install
+++ b/community/emerald/emerald.install
@@ -1,14 +1,13 @@
 post_install() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-  update-mime-database usr/share/mime
+  xdg-icon-resource forceupdate
+  update-mime-database usr/share/mime &> /dev/null
+  update-desktop-database -q
 }
 
 post_upgrade() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-  update-mime-database usr/share/mime
+  post_install
 }
 
 post_remove() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-  update-mime-database usr/share/mime
+  post_install
 }
diff --git a/community/evas-svn/PKGBUILD b/community/evas-svn/PKGBUILD
index 6bb6364d1..a81745658 100755
--- a/community/evas-svn/PKGBUILD
+++ b/community/evas-svn/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 61697 2012-01-06 21:59:30Z rvanharen $
+# $Id: PKGBUILD 63542 2012-02-05 11:54:54Z ibiru $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=evas-svn
 pkgver=66901
-pkgrel=1
+pkgrel=2
 pkgdesc="A hardware-accelerated canvas API for X-Windows"
 arch=('i686' 'x86_64')
 groups=('e17-libs-svn' 'e17-svn')
@@ -22,7 +22,7 @@ _svntrunk="http://svn.enlightenment.org/svn/e/trunk/evas"
 _svnmod="evas"
 
 build() {
-   cd $srcdir
+   cd "$srcdir"
 
 msg "Connecting to $_svntrunk SVN server...."
   if [ -d $_svnmod/.svn ]; then
@@ -44,13 +44,13 @@ msg "Connecting to $_svntrunk SVN server...."
 }
 
 package() {
-  cd $srcdir/$_svnmod-build
-  make DESTDIR=$pkgdir install
+  cd "$srcdir/$_svnmod-build"
+  make DESTDIR="$pkgdir" install
 
 # install license files
-  install -Dm644 $srcdir/$_svnmod-build/COPYING \
-        $pkgdir/usr/share/licenses/$pkgname/COPYING
+  install -Dm644 "$srcdir/$_svnmod-build/COPYING" \
+        "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 
-  rm -r $srcdir/$_svnmod-build
+  rm -r "$srcdir/$_svnmod-build"
 
 }
diff --git a/community/exfat-utils/PKGBUILD b/community/exfat-utils/PKGBUILD
new file mode 100644
index 000000000..95bf5fd88
--- /dev/null
+++ b/community/exfat-utils/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 63825 2012-02-05 21:05:12Z giovanni $
+# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: Alex <mail.avatar@gmail.com>
+
+pkgname=exfat-utils
+pkgver=0.9.6
+pkgrel=2
+pkgdesc="Utilities for exFAT file system"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/exfat/"
+license=('GPL3')
+depends=('glibc')
+makedepends=('scons')
+source=("http://exfat.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
+md5sums=('6722b7a919b4924bc64f86bccfedb0a6')
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  scons CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" install DESTDIR="${pkgdir}/sbin"
+
+  # Install man pages
+  install -Dm444 dump/dumpexfat.8 "${pkgdir}/usr/share/man/man8/dumpexfat.8"
+  install -m444 fsck/exfatfsck.8 "${pkgdir}/usr/share/man/man8"
+  install -m444 mkfs/mkexfatfs.8 "${pkgdir}/usr/share/man/man8"
+  install -m444 label/exfatlabel.8 "${pkgdir}/usr/share/man/man8"
+}
diff --git a/community/extremetuxracer/PKGBUILD b/community/extremetuxracer/PKGBUILD
index 7206154f9..3f00c689d 100644
--- a/community/extremetuxracer/PKGBUILD
+++ b/community/extremetuxracer/PKGBUILD
@@ -1,39 +1,45 @@
-# $Id: PKGBUILD 9321 2010-01-25 01:55:48Z ibiru $
+# $Id: PKGBUILD 63544 2012-02-05 11:55:05Z ibiru $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Eric Belanger <eric.archlinux.org>
 # Contributor: Fabio Scotoni <CCuleX.gmail.com>
-
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
 pkgname=extremetuxracer
 pkgver=0.4
-pkgrel=2
+pkgrel=3
 pkgdesc="Downhill racing game starring Tux"
-arch=('i686' 'x86_64')
+arch=('x86_64' 'i686')
 url="http://www.extremetuxracer.com"
 license=('GPL')
 depends=('sdl_mixer' 'tcl>=8.5.0' 'mesa' 'libpng>=1.4.0' 'freetype2' 'libxi' 'libxmu')
 conflicts=('ppracer' 'etracer')
 replaces=('ppracer' 'etracer')
-source=(http://downloads.sourceforge.net/extremetuxracer/extremetuxracer-$pkgver.tar.gz \
-       $pkgname.png $pkgname.desktop libpng14.patch)
-md5sums=('6830eb4e1ca7c5a541f286ded3853f9f'
-         'a188e4ce61d0376fa42059e13157c5d1'
-         '429974a3d7f4640073e8fbfb4f0f45d2'
-         '0c16eb309df6413397cd886f63361fcc')
+source=("http://downloads.sourceforge.net/extremetuxracer/extremetuxracer-$pkgver.tar.gz"
+       "$pkgname.png"
+       "$pkgname.desktop"
+       "libpng15.patch")
+sha256sums=('5e4057f90e6854e774f251f189b0e676cfd7e2f15779c75544c9ac5b8e30273d'
+            'ec1426171fc80b07b702e373bf9528244a3b224e887ab24b52f90740691e92fb'
+            '349448e8be522bbbe9fd896e875a4add7e02c35d0fafa46c5b10582562da3ca8'
+            '2b693eaf421d56887615fc02d40f742e9b8bf817ae36be1f1f9e33a52719eea8')
 
 build() {
-  cd ${srcdir}/extremetuxracer-$pkgver
-
-  patch -Np1 -i ${srcdir}/libpng14.patch || return 1
-
-  sed -i -e 's/libpng12/libpng14/g' configure || return 1
+  cd "$srcdir/extremetuxracer-$pkgver"
 
+  patch -Np1 -i ${srcdir}/libpng15.patch
+  sed -i -e 's/libpng12/libpng15/g' configure
   ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  make
+}
+
+package() {
+  cd "$srcdir/extremetuxracer-$pkgver"
+  make DESTDIR="$pkgdir" install
 
  # Install icon and desktop file
-  install -D -m644 ${srcdir}/${pkgname}.desktop \
-    ${pkgdir}/usr/share/applications/${pkgname}.desktop || return 1
-  install -D -m644 ${srcdir}/${pkgname}.png \
-    ${pkgdir}/usr/share/pixmaps/${pkgname}.png || return 1
+  install -Dm644 "$srcdir/$pkgname.desktop" \
+    "$pkgdir/usr/share/applications/$pkgname.desktop"
+  install -Dm644 "$srcdir/$pkgname.png" \
+    "$pkgdir/usr/share/pixmaps/$pkgname.png"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/extremetuxracer/libpng15.patch b/community/extremetuxracer/libpng15.patch
new file mode 100644
index 000000000..5c9999857
--- /dev/null
+++ b/community/extremetuxracer/libpng15.patch
@@ -0,0 +1,57 @@
+diff -Nur extremetuxracer-0.4.orig/src/ppgltk/images/png_reader.cpp extremetuxracer-0.4/src/ppgltk/images/png_reader.cpp
+--- extremetuxracer-0.4.orig/src/ppgltk/images/png_reader.cpp	2007-09-01 19:38:12.000000000 +0300
++++ extremetuxracer-0.4/src/ppgltk/images/png_reader.cpp	2010-01-25 03:47:21.000000000 +0200
+@@ -53,7 +53,7 @@
+     if (!info_ptr)
+     {
+         png_destroy_read_struct(&png_ptr,
+-           (png_infopp)NULL, (png_infopp)NULL);
++           NULL, NULL);
+ 		fclose(fp);
+         return;
+     }
+@@ -62,7 +62,7 @@
+     if (!end_info)
+     {
+         png_destroy_read_struct(&png_ptr, &info_ptr,
+-          (png_infopp)NULL);
++          NULL);
+ 		fclose(fp);
+         return;
+     }
+@@ -77,7 +77,7 @@
+ 	
+ 	
+ 	png_get_IHDR(png_ptr, info_ptr, &width, &height,
+-       &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL);
++       &bit_depth, &color_type, &interlace_type, NULL, NULL);
+ 	
+ 	if(bit_depth == 16)
+         png_set_strip_16(png_ptr);
+@@ -88,7 +88,7 @@
+ 		png_set_expand(png_ptr);
+ 		png_read_update_info(png_ptr, info_ptr);
+ 		png_get_IHDR(png_ptr, info_ptr, &width, &height,
+-			   &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL);
++			   &bit_depth, &color_type, &interlace_type, NULL, NULL);
+ 	}
+ 	
+ 	if( color_type == PNG_COLOR_TYPE_GRAY ||
+@@ -96,7 +96,7 @@
+ 		png_set_gray_to_rgb(png_ptr);
+ 		png_read_update_info(png_ptr, info_ptr);
+ 		png_get_IHDR(png_ptr, info_ptr, &width, &height,
+-			   &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL);
++			   &bit_depth, &color_type, &interlace_type, NULL, NULL);
+ 	}
+ 		
+ 	this->width=width;
+@@ -114,7 +114,7 @@
+ 	}
+ 	
+ 	png_read_end(png_ptr, info_ptr);
+-	png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++	png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ 	fclose(fp);
+ }
+ 
diff --git a/community/fbgrab/PKGBUILD b/community/fbgrab/PKGBUILD
index 6ea2b333c..14c947599 100644
--- a/community/fbgrab/PKGBUILD
+++ b/community/fbgrab/PKGBUILD
@@ -1,8 +1,9 @@
-# $Id: PKGBUILD 8867 2010-01-22 03:05:07Z dgriffiths $
+# $Id: PKGBUILD 63546 2012-02-05 11:55:12Z ibiru $
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
+
 pkgname=fbgrab
 pkgver=1.0
-pkgrel=5
+pkgrel=6
 pkgdesc="A framebuffer screenshot grabber"
 arch=(i686 x86_64)
 url="http://hem.bredband.net/gmogmo/fbgrab/"
@@ -14,9 +15,9 @@ md5sums=('7af4d8774684182ed690d5da82d6d234')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
+  sed -i '1,1i#include <zlib.h>' fbgrab.c
   gcc -g -Wall fbgrab.c -lpng -lz -o fbgrab
   strip fbgrab
   install -D -m755 $startdir/src/$pkgname-$pkgver/fbgrab $startdir/pkg/usr/bin/fbgrab
   install -D -m644 $startdir/src/$pkgname-$pkgver/fbgrab.1.man $startdir/pkg/usr/share/man/man1/fbgrab.1
 }
-# vim:syntax=sh
diff --git a/community/fbreader/PKGBUILD b/community/fbreader/PKGBUILD
index 29ac34a54..3cdb3e1e3 100644
--- a/community/fbreader/PKGBUILD
+++ b/community/fbreader/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 58784 2011-11-18 14:18:00Z spupykin $
+# $Id: PKGBUILD 63548 2012-02-05 11:55:20Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=fbreader
 pkgver=0.12.10
-pkgrel=2
+pkgrel=3
 pkgdesc="An e-book reader for Linux"
 arch=('i686' 'x86_64')
 url="http://www.fbreader.org/"
diff --git a/community/fbshot/PKGBUILD b/community/fbshot/PKGBUILD
index 752c53faa..489f897f8 100644
--- a/community/fbshot/PKGBUILD
+++ b/community/fbshot/PKGBUILD
@@ -1,8 +1,10 @@
+# $Id: PKGBUILD 63550 2012-02-05 11:55:26Z ibiru $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: sp42b <sp42b|a_t|gmx.net>
 
 pkgname=fbshot
 pkgver=0.3
-pkgrel=3
+pkgrel=4
 pkgdesc="Takes screenshots (PNG) from your framebuffer device (e.g. console)."
 arch=('i686' 'x86_64')
 url="http://www.sfires.net/fbshot/"
@@ -13,7 +15,8 @@ md5sums=('2cc6cc25cdc4cd447a8b0a9662907635')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  make || return 1
+  sed -i '1,1i#include <zlib.h>' fbshot.c
+  make
   install -Dm755 fbshot $pkgdir/usr/bin/fbshot
   install -Dm644 fbshot.1.man $pkgdir/usr/share/man/man1/fbshot.1
 }
diff --git a/community/fbv/PKGBUILD b/community/fbv/PKGBUILD
index e1cc13f69..a5043eaad 100644
--- a/community/fbv/PKGBUILD
+++ b/community/fbv/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 11511 2010-02-12 23:37:12Z spupykin $
+# $Id: PKGBUILD 63552 2012-02-05 11:55:32Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Aectann <aectann@infoline.su>
 
 pkgname=fbv
 pkgver=1.0b
-pkgrel=4
+pkgrel=5
 pkgdesc="FrameBuffer image viewer"
 arch=('i686' 'x86_64')
 url="http://s-tech.elsat.net.pl/fbv/"
@@ -17,9 +17,9 @@ build() {
   cd $srcdir/$pkgname-$pkgver
   ./configure --prefix=/usr --mandir=/usr/share/man
   sed -i 's|LIBS.*|LIBS=-lpng -ljpeg -lungif -lgif|' Make.conf
-  make || return 1
+  sed -i 's|setjmp(png_ptr->jmpbuf)|setjmp(png_jmpbuf(png_ptr))|' png.c
+  make
   mkdir -p $pkgdir/usr/bin
   mkdir -p $pkgdir/usr/share/man/man1
   make DESTDIR=$pkgdir install
 }
-
diff --git a/community/fityk/PKGBUILD b/community/fityk/PKGBUILD
index ffd72b248..9c95247c7 100644
--- a/community/fityk/PKGBUILD
+++ b/community/fityk/PKGBUILD
@@ -4,12 +4,12 @@
 
 pkgname=fityk
 pkgver=1.1.1
-pkgrel=3
+pkgrel=4
 pkgdesc='A program for nonlinear fitting of analytical functions to data.'
 arch=('i686' 'x86_64')
 url='http://www.unipress.waw.pl/fityk/'
 license=('GPL')
-depends=('xylib' 'shared-mime-info' 'lua' 'gnuplot') # wxgtk supplied by statically linked wxWidgets
+depends=('xylib' 'shared-mime-info' 'lua' 'gnuplot' 'desktop-file-utils') # wxgtk supplied by statically linked wxWidgets
 makedepends=('boost' 'git' 'python-sphinx' 'swig' 'subversion')
 options=('!libtool')
 install='fityk.install'
diff --git a/community/fityk/fityk.install b/community/fityk/fityk.install
index 6b399fa54..df476d572 100644
--- a/community/fityk/fityk.install
+++ b/community/fityk/fityk.install
@@ -1,11 +1,14 @@
 post_install() {
   update-mime-database /usr/share/mime
+  update-desktop-database -q
 }
 
 post_upgrade() {
-  post_install
+  update-mime-database /usr/share/mime
+  update-desktop-database -q
 }
 
 post_remove() {
-  post_install
+  update-mime-database /usr/share/mime
+  update-desktop-database -q
 }
diff --git a/community/flam3/PKGBUILD b/community/flam3/PKGBUILD
index 08759b92d..663f0f332 100644
--- a/community/flam3/PKGBUILD
+++ b/community/flam3/PKGBUILD
@@ -1,20 +1,22 @@
-# $Id: PKGBUILD 59890 2011-12-02 04:26:05Z ebelanger $
+# $Id: PKGBUILD 63556 2012-02-05 11:55:49Z ibiru $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=flam3
 pkgver=3.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Tools to create/display fractal flames: algorithmically generated images and animations"
 arch=('i686' 'x86_64')
 url="http://flam3.com/"
 license=('GPL3')
 depends=('libjpeg' 'libpng' 'libxml2')
 options=('!libtool')
-source=(http://flam3.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('8814515f2e49e034e47cf97e9d2c0e932844abb9')
+source=(http://flam3.googlecode.com/files/${pkgname}-${pkgver}.tar.gz flam3-3.0.1-libpng15.patch)
+sha1sums=('8814515f2e49e034e47cf97e9d2c0e932844abb9'
+          '17ece6cc00899e5135dad2bc79f97dfbd73107a6')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}/src"
+  patch -p1 -i ../../flam3-3.0.1-libpng15.patch
   ./configure --prefix=/usr --enable-shared
   make
 }
diff --git a/community/flam3/flam3-3.0.1-libpng15.patch b/community/flam3/flam3-3.0.1-libpng15.patch
new file mode 100644
index 000000000..61f905589
--- /dev/null
+++ b/community/flam3/flam3-3.0.1-libpng15.patch
@@ -0,0 +1,76 @@
+http://code.google.com/p/flam3/issues/detail?id=8
+
+--- src/png.c
++++ src/png.c
+@@ -142,7 +142,7 @@
+   }
+   if (setjmp(png_jmpbuf(png_ptr))) {
+      if (png_image) {
+-	 for (y = 0 ; y < info_ptr->height ; y++)
++	 for (y = 0 ; y < png_get_image_height(png_ptr, info_ptr) ; y++)
+ 	     free (png_image[y]);
+ 	 free (png_image);
+      }
+@@ -161,19 +161,19 @@
+   png_set_sig_bytes (png_ptr, SIG_CHECK_SIZE);
+   png_read_info (png_ptr, info_ptr);
+ 
+-  if (8 != info_ptr->bit_depth) {
++  if (8 != png_get_bit_depth(png_ptr, info_ptr)) {
+     fprintf(stderr, "bit depth type must be 8, not %d.\n",
+-	    info_ptr->bit_depth);
++	    png_get_bit_depth(png_ptr, info_ptr));
+     return 0;
+   }
+ 
+-  *width = info_ptr->width;
+-  *height = info_ptr->height;
++  *width = png_get_image_width(png_ptr, info_ptr);
++  *height = png_get_image_height(png_ptr, info_ptr);
+   p = q = malloc(4 * *width * *height);
+-  png_image = (png_byte **)malloc (info_ptr->height * sizeof (png_byte*));
++  png_image = (png_byte **)malloc (png_get_image_height(png_ptr, info_ptr) * sizeof (png_byte*));
+ 
+-  linesize = info_ptr->width;
+-  switch (info_ptr->color_type) {
++  linesize = png_get_image_width(png_ptr, info_ptr);
++  switch (png_get_color_type(png_ptr, info_ptr)) {
+     case PNG_COLOR_TYPE_RGB:
+       linesize *= 3;
+       break;
+@@ -182,21 +182,21 @@
+       break;
+   default:
+     fprintf(stderr, "color type must be RGB or RGBA not %d.\n",
+-	    info_ptr->color_type);
++	    png_get_color_type(png_ptr, info_ptr));
+     return 0;
+   }
+ 
+-  for (y = 0 ; y < info_ptr->height ; y++) {
++  for (y = 0 ; y < png_get_image_height(png_ptr, info_ptr) ; y++) {
+     png_image[y] = malloc (linesize);
+   }
+   png_read_image (png_ptr, png_image);
+   png_read_end (png_ptr, info_ptr);
+ 
+-  for (y = 0 ; y < info_ptr->height ; y++) {
++  for (y = 0 ; y < png_get_image_height(png_ptr, info_ptr) ; y++) {
+     unsigned char *s = png_image[y];
+-    for (x = 0 ; x < info_ptr->width ; x++) {
++    for (x = 0 ; x < png_get_image_width(png_ptr, info_ptr) ; x++) {
+ 
+-      switch (info_ptr->color_type) {
++      switch (png_get_color_type(png_ptr, info_ptr)) {
+       case PNG_COLOR_TYPE_RGB:
+ 	p[0] = s[0];
+ 	p[1] = s[1];
+@@ -217,7 +217,7 @@
+     }
+   }
+ 
+-  for (y = 0 ; y < info_ptr->height ; y++)
++  for (y = 0 ; y < png_get_image_height(png_ptr, info_ptr) ; y++)
+     free (png_image[y]);
+   free (png_image);
+   png_destroy_read_struct (&png_ptr, &info_ptr, (png_infopp)NULL);  
diff --git a/community/flowcanvas/PKGBUILD b/community/flowcanvas/PKGBUILD
index ce145f515..39dee6da0 100644
--- a/community/flowcanvas/PKGBUILD
+++ b/community/flowcanvas/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 48184 2011-05-29 16:00:31Z schiv $
+# $Id: PKGBUILD 63558 2012-02-05 11:55:57Z ibiru $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Max a.k.a. Synthead <synthead@gmail.com>
 # Contributor: christhemonkey <christhemonkey at gmail dot com>
 
 pkgname=flowcanvas
 pkgver=0.7.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Gtkmm/Gnomecanvasmm widget for boxes-and-lines style environments"
 arch=('i686' 'x86_64')
 url="http://drobilla.net/software/flowcanvas/"
diff --git a/community/fltk2/PKGBUILD b/community/fltk2/PKGBUILD
index d3da63100..7600f7322 100644
--- a/community/fltk2/PKGBUILD
+++ b/community/fltk2/PKGBUILD
@@ -1,33 +1,28 @@
-# $Id: PKGBUILD 58766 2011-11-18 13:49:19Z spupykin $
+# $Id: PKGBUILD 63560 2012-02-05 11:56:02Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=fltk2
 pkgver=2.0
 _pkgver=2.0.x-alpha-r9166
-pkgrel=7
+pkgrel=8
 pkgdesc="Graphical user interface toolkit for X"
 arch=(i686 x86_64)
 license=('LGPL')
 url="http://www.fltk.org/"
 depends=('libjpeg' 'libpng' 'gcc-libs' 'libxft' 'libxext' 'libxi' 'libxinerama')
 makedepends=('mesa')
-source=(http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/snapshots/fltk-${_pkgver}.tar.bz2
-	libpng14.patch)
-md5sums=('d5e7cd859d2aeb9bb6e13ee298e8b2aa'
-         '93955f17f56ad8b419ca1f8ea8c24a7f')
+source=(http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/snapshots/fltk-${_pkgver}.tar.bz2)
+md5sums=('d5e7cd859d2aeb9bb6e13ee298e8b2aa')
 
 build() {
   cd $srcdir/fltk-${_pkgver}
   [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --enable-threads --enable-xft --enable-shared
-
   patch -p0 src/filename_list.cxx <<EOF
 66c66
 <   int n = scandir(d, list, 0, (int(*)(const void*,const void*))sort);
 ---
 >   int n = scandir(d, list, 0, (int(*)(const dirent64**,const dirent64**))sort);
 EOF
-
-#  patch -Np1 -i "$srcdir/libpng14.patch"
   make
   make DESTDIR=$pkgdir install
 }
diff --git a/community/fox/PKGBUILD b/community/fox/PKGBUILD
index 76f92966a..41a7c1cbb 100644
--- a/community/fox/PKGBUILD
+++ b/community/fox/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 58793 2011-11-18 14:31:12Z spupykin $
+# $Id: PKGBUILD 63562 2012-02-05 11:56:09Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Ben <ben@benmazer.net>
 
 pkgname=fox
 pkgver=1.6.44
-pkgrel=1
+pkgrel=2
 pkgdesc="Free Objects for X: GUI Toolkit for C++"
 arch=('i686' 'x86_64')
 url="http://www.fox-toolkit.org/"
diff --git a/community/freedroidrpg/PKGBUILD b/community/freedroidrpg/PKGBUILD
index 2f3a97380..2921e4396 100644
--- a/community/freedroidrpg/PKGBUILD
+++ b/community/freedroidrpg/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 61165 2011-12-23 11:47:47Z spupykin $
+# $Id: PKGBUILD 63564 2012-02-05 11:56:19Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: nut543 <kfs1@online.no>
 
@@ -6,7 +6,7 @@
 #pkgname=('freedroidrpg' 'freedroidrpg-data')
 pkgname='freedroidrpg'
 pkgver=0.15
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 # depends=('sdl_mixer' 'sdl_image' 'libogg' 'libvorbis' 'libgl' 'freedroidrpg-data')
 depends=('sdl_mixer' 'sdl_image' 'sdl_gfx' 'libogg' 'libvorbis' 'libgl' 'mesa')
diff --git a/community/freewrl/PKGBUILD b/community/freewrl/PKGBUILD
index 56ec0047c..4ff18322b 100644
--- a/community/freewrl/PKGBUILD
+++ b/community/freewrl/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 58829 2011-11-18 16:55:57Z spupykin $
+# $Id: PKGBUILD 63566 2012-02-05 11:56:27Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=freewrl
 pkgver=1.22.10
-pkgrel=7
+pkgrel=8
 pkgdesc="VRML viewer"
 arch=('i686' 'x86_64')
 url="http://freewrl.sourceforge.net/"
diff --git a/community/fuse-exfat/PKGBUILD b/community/fuse-exfat/PKGBUILD
new file mode 100644
index 000000000..1bb0daf0b
--- /dev/null
+++ b/community/fuse-exfat/PKGBUILD
@@ -0,0 +1,25 @@
+# $Id: PKGBUILD 63829 2012-02-05 21:18:47Z giovanni $
+# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: GaoShichao <xgdgsc@gmail.com>
+
+pkgname=fuse-exfat
+pkgver=0.9.6
+pkgrel=2
+pkgdesc="Free exFAT file system implementation"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/exfat/"
+license=('GPL3')
+depends=('fuse')
+makedepends=('scons')
+optdepends=('exfat-utils: utilities for exFAT file system'
+            'util-linux-ng: to mount exFAT volumes automatically')
+source=("http://exfat.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
+md5sums=('809be0bc49c3b2be3f2d0fd115d36709')
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  scons CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" install DESTDIR="${pkgdir}/sbin"
+
+  # Install man page
+  install -Dm444 fuse/mount.exfat-fuse.8 "${pkgdir}/usr/share/man/man8/mount.exfat-fuse.8"
+} 
diff --git a/community/fxdesktop/PKGBUILD b/community/fxdesktop/PKGBUILD
index a4414397b..98eacc23b 100644
--- a/community/fxdesktop/PKGBUILD
+++ b/community/fxdesktop/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 8608 2010-01-21 02:59:29Z dgriffiths $
+# $Id: PKGBUILD 63570 2012-02-05 11:56:40Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sander Jansen <sander@knology.net>
 
 pkgname=fxdesktop
 pkgver=0.1.12
-pkgrel=3
+pkgrel=5
 pkgdesc="Lightweight Desktop Environment"
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/fxdesktop/"
@@ -14,14 +14,12 @@ source=(http://archlinux-stuff.googlecode.com/files/$pkgname-$pkgver.tar.bz2)
 md5sums=('9489e7369b5e052e0b6836a3b0670832')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-
+  cd $srcdir/$pkgname-$pkgver
   # Override default flags
   export CFLAGS="-Wall -O2 -pipe"
   export CXXFLAGS="-Wall -O2 -pipe"
-  [ "$CARCH" = "x86_64" ] && (sed -i -e 's|lib64|lib|g' build/config.linux_x86_64 || return 1)
-
+  [ "$CARCH" = "x86_64" ] && (sed -i -e 's|lib64|lib|g' build/config.linux_x86_64)
   # Compile
-  ./gb --prefix=/usr || return 1
-  ./gb --package-root=$startdir/pkg/usr install || return 1
+  ./gb --prefix=/usr
+  ./gb --package-root=$pkgdir/usr install
 }
diff --git a/community/fxprocessview/PKGBUILD b/community/fxprocessview/PKGBUILD
index 4ef1d3f0f..4596b5e26 100644
--- a/community/fxprocessview/PKGBUILD
+++ b/community/fxprocessview/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 8603 2010-01-21 02:55:46Z dgriffiths $
+# $Id: PKGBUILD 63572 2012-02-05 11:56:52Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sander Jansen <sander@knology.net>
 
 pkgname=fxprocessview
 pkgver=0.5.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Process Viewer"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -16,22 +16,17 @@ md5sums=('5d3cc8d7aec770997c281a743ddfda5a'
 	 '2d2c3d54dcd2404149955f12cccb21a5')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-
+  cd $srcdir/$pkgname-$pkgver
   # Override default flags
   export CFLAGS="-Wall -O2 -pipe"
   export CXXFLAGS="-Wall -O2 -pipe"
-
   # Compile
-  patch -Np1 <../build-fix.patch || return 1
-  ./gb 
-
+  patch -Np1 <../build-fix.patch
+  ./gb
   # gb does not return valid error code
-  [ -f src/fxprocessview ] || return 1
-
-  # make sure destination exists	
-  mkdir -p $startdir/pkg/usr/bin
-
+  [ -f src/fxprocessview ]
+  # make sure destination exists
+  mkdir -p $pkgdir/usr/bin
   # Install
-  ./gb install --package-root=$startdir/pkg/usr 
+  ./gb install --package-root=$pkgdir/usr
 }
diff --git a/community/gambas2/PKGBUILD b/community/gambas2/PKGBUILD
index 946e8a1af..b4fb28737 100644
--- a/community/gambas2/PKGBUILD
+++ b/community/gambas2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 61109 2011-12-21 20:57:20Z andrea $
+# $Id: PKGBUILD 63574 2012-02-05 11:57:16Z ibiru $
 # Maintainer : Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Biru Ionut <ionut@archlinux.ro>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -20,7 +20,7 @@ pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2
          'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb'
          'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt')
 pkgver=2.23.1
-pkgrel=6
+pkgrel=7
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('i686' 'x86_64')
 url="http://gambas.sourceforge.net"
diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD
index 427a2caed..04eee157c 100644
--- a/community/gambas3/PKGBUILD
+++ b/community/gambas3/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 61783 2012-01-07 19:54:03Z lcarlier $
+# $Id: PKGBUILD 63576 2012-02-05 11:57:26Z ibiru $
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 
 pkgbase=gambas3
@@ -13,7 +13,7 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba
          'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal'
          'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') 
 pkgver=3.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('i686' 'x86_64')
 url="http://gambas.sourceforge.net/"
diff --git a/community/gdal/PKGBUILD b/community/gdal/PKGBUILD
index 9bf40aea8..2a6babd3b 100644
--- a/community/gdal/PKGBUILD
+++ b/community/gdal/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 51471 2011-07-09 22:30:40Z rvanharen $
+# $Id: PKGBUILD 63578 2012-02-05 11:57:36Z ibiru $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=gdal
-pkgver=1.8.0
-pkgrel=6
+pkgver=1.9.0
+pkgrel=1
 pkgdesc="A translator library for raster geospatial data formats"
 arch=('i686' 'x86_64')
 url="http://www.gdal.org/"
@@ -16,13 +16,12 @@ optdepends=('postgresql: postgresql database support'
             'mysql: mysql database support'
             'perl:  perl binding support'
             'swig:  perl binding support')
-options=('!libtool' '!makeflags')
+options=('!libtool')
 changelog=$pkgname.changelog
-source=(http://download.osgeo.org/${pkgname}/${pkgname}-${pkgver}.tar.gz \
-	gdal-1.5.1-python-install.patch) 
-
-md5sums=('c762cdab0f7e51a677ba49278a8a263d' '81afc1c26d29cee84aadb6924fe33861')
-
+source=(http://download.osgeo.org/${pkgname}/${pkgname}-${pkgver}.tar.gz
+        gdal-1.5.1-python-install.patch)
+md5sums=('1853f3d8eb5232ae030abe007840cade'
+         '81afc1c26d29cee84aadb6924fe33861')
 
 build() {
   export CFLAGS="$CFLAGS -fno-strict-aliasing"
diff --git a/community/gdk-pixbuf/PKGBUILD b/community/gdk-pixbuf/PKGBUILD
index ada0fc41c..286f0ef52 100644
--- a/community/gdk-pixbuf/PKGBUILD
+++ b/community/gdk-pixbuf/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 63580 2010-01-17 23:27:59Z andrea $
-# Maintainer:
+# $Id: PKGBUILD 63580 2012-02-05 11:57:50Z ibiru $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=gdk-pixbuf
 pkgver=0.22.0
-pkgrel=7
+pkgrel=9
 pkgdesc="Image loading and manipulation library"
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
@@ -13,28 +13,31 @@ license=('GPL' 'LGPL')
 depends=('gtk' 'libtiff' 'libpng')
 makedepends=('libxt')
 options=('!libtool')
-source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.22/${pkgname}-${pkgver}.tar.bz2
+source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.24/${pkgname}-${pkgver}.tar.bz2
 	gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch
 	gdk-pixbuf-0.22.0-bmp_secure.patch
 	gdk-pixbuf-0.22.0-loaders.patch
-        gdk-pixbuf-0.22.0.patch)
+	gdk-pixbuf-0.22.0.patch
+	libpng15.patch)
 md5sums=('05fcb68ceaa338614ab650c775efc2f2'
-	'd1fb93f1ae994875158a7e0c108c36f8'
-	'5f59d5772b1482d885a180dbc581cf84'
-	'3cf31ae0509747f72ac27a9fd96109c2'
-	'e0f5f301ce958b7cea0be631ed7b8e56')
+         'd1fb93f1ae994875158a7e0c108c36f8'
+         '5f59d5772b1482d885a180dbc581cf84'
+         '3cf31ae0509747f72ac27a9fd96109c2'
+         'e0f5f301ce958b7cea0be631ed7b8e56'
+         '16db4dc83d507ebcf15d1beb753a77bc')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   export SED=/bin/sed
-  patch -Np1 -i ${srcdir}/gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch || return 1
-  patch -Np0 -i ${srcdir}/gdk-pixbuf-0.22.0-bmp_secure.patch || return 1
-  patch -Np1 -i ${srcdir}/gdk-pixbuf-0.22.0-loaders.patch || return 1
-  patch -Np0 -i ${srcdir}/gdk-pixbuf-0.22.0.patch || return 1
-  libtoolize --force --copy --automake || return 1
-  autoreconf --force --install || return 1
-  ./configure --prefix=/usr --disable-gtk-doc || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  patch -Np1 -i ${srcdir}/gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch
+  patch -Np0 -i ${srcdir}/gdk-pixbuf-0.22.0-bmp_secure.patch
+  patch -Np1 -i ${srcdir}/gdk-pixbuf-0.22.0-loaders.patch
+  patch -Np0 -i ${srcdir}/gdk-pixbuf-0.22.0.patch
+  patch -Np1 -i ${srcdir}/libpng15.patch
+  libtoolize --force --copy --automake
+  autoreconf --force --install
+  ./configure --prefix=/usr --disable-gtk-doc
+  make
+  make DESTDIR=${pkgdir} install
   rm -rf ${pkgdir}/usr/share/gnome
 }
diff --git a/community/gdk-pixbuf/libpng15.patch b/community/gdk-pixbuf/libpng15.patch
new file mode 100644
index 000000000..e667288f8
--- /dev/null
+++ b/community/gdk-pixbuf/libpng15.patch
@@ -0,0 +1,30 @@
+diff -wbBur gdk-pixbuf-0.22.0/gdk-pixbuf/io-png.c gdk-pixbuf-0.22.0.my/gdk-pixbuf/io-png.c
+--- gdk-pixbuf-0.22.0/gdk-pixbuf/io-png.c	2001-01-24 23:59:23.000000000 +0300
++++ gdk-pixbuf-0.22.0.my/gdk-pixbuf/io-png.c	2012-01-23 13:33:08.000000000 +0400
+@@ -175,7 +175,7 @@
+ 		return NULL;
+ 	}
+ 
+-	if (setjmp (png_ptr->jmpbuf)) {
++	if (setjmp (png_jmpbuf(png_ptr))) {
+ 		png_destroy_read_struct (&png_ptr, &info_ptr, &end_info);
+ 		return NULL;
+ 	}
+@@ -311,7 +311,7 @@
+                 return NULL;
+         }
+ 
+-	if (setjmp (lc->png_read_ptr->jmpbuf)) {
++	if (setjmp (png_jmpbuf(lc->png_read_ptr))) {
+ 		if (lc->png_info_ptr)
+ 			png_destroy_read_struct(&lc->png_read_ptr, NULL, NULL);
+                 g_free(lc);
+@@ -366,7 +366,7 @@
+         lc->max_row_seen_in_chunk = -1;
+         
+         /* Invokes our callbacks as needed */
+-	if (setjmp (lc->png_read_ptr->jmpbuf)) {
++	if (setjmp (png_jmpbuf(lc->png_read_ptr))) {
+ 		return FALSE;
+ 	} else {
+ 		png_process_data(lc->png_read_ptr, lc->png_info_ptr, buf, size);
diff --git a/community/geda-gaf/ChangeLog b/community/geda-gaf/ChangeLog
index 3433c3f92..c8b902cc5 100644
--- a/community/geda-gaf/ChangeLog
+++ b/community/geda-gaf/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-19 Kyle Keen <keenerd@gmail.com>
+	* 1.6.2-2
+	- libpng15 rebuild
+
 2010-12-26 Stefan Husmann <stefan-husmann@t-online.de>
 	* 1.6.1-2
 	- adopted, moved to [community]
diff --git a/community/geda-gaf/PKGBUILD b/community/geda-gaf/PKGBUILD
index 95408aeea..b3e6278b9 100644
--- a/community/geda-gaf/PKGBUILD
+++ b/community/geda-gaf/PKGBUILD
@@ -1,9 +1,10 @@
+# Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Jared Casper <jaredcasper@gmail.com>
-# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
+# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 
 pkgname=geda-gaf
 pkgver=1.6.2
-pkgrel=1
+pkgrel=2
 pkgdesc="gEDA/gaf suite - Contains gschem, gnetlist, gsymcheck, gattrib, utilities and documentation from the gEDA project"
 arch=('i686' 'x86_64')
 url="http://www.gpleda.org"
@@ -19,18 +20,19 @@ md5sums=('35ae86aebc174ec1fc03863fde4c843c')
 
 build ()
 {
-  cd $srcdir/$pkgname-$pkgver/
+  cd "$srcdir/$pkgname-$pkgver/"
   ./configure --prefix=/usr --disable-update-xdg-database 
   make 
 }
+
 package() {
-  cd $srcdir/$pkgname-$pkgver/
-  make DESTDIR=$pkgdir/ install 
+  cd "$srcdir/$pkgname-$pkgver/"
+  make DESTDIR="$pkgdir/" install 
   sed -i 's+/usr/bin/env python+/usr/bin/env python2+' \
-    $pkgdir/usr/bin/garchive
+    "$pkgdir/usr/bin/garchive"
   sed -i 's+/usr/bin/python+/usr/bin/python2+' \
-    $pkgdir/usr/bin/tragesym
+    "$pkgdir/usr/bin/tragesym"
   sed -i 's+/usr/bin/python+/usr/bin/python2+' \
-    $pkgdir/usr/share/doc/$pkgname/examples/lightning_detector/bom
+    "$pkgdir/usr/share/doc/$pkgname/examples/lightning_detector/bom"
 }
 
diff --git a/community/gimp-plugin-mathmap/PKGBUILD b/community/gimp-plugin-mathmap/PKGBUILD
index cc78ce075..e1dc19fd4 100644
--- a/community/gimp-plugin-mathmap/PKGBUILD
+++ b/community/gimp-plugin-mathmap/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 32207 2010-11-11 16:38:32Z stativ $
+# $Id: PKGBUILD 63584 2012-02-05 11:58:06Z ibiru $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 # Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>
 # Contributor: Serge Gielkens <gielkens.serge@mumeli.org>
 pkgname=gimp-plugin-mathmap
 pkgver=1.3.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A GIMP plug-in which allows distortion of images specified by mathematical formulae"
 arch=('i686' 'x86_64')
 url="http://www.complang.tuwien.ac.at/schani/mathmap/"
@@ -14,15 +14,18 @@ makedepends=('doxygen' 'unzip')
 provides=('gimp-mathmap')
 replaces=('gimp-mathmap')
 source=(http://www.complang.tuwien.ac.at/schani/mathmap/files/mathmap-${pkgver}.tar.gz \
-        fix_libnoise_build.patch)
+        fix_libnoise_build.patch libpng15.patch)
 md5sums=('6ff66d070ea410dee1a27283d05b8beb'
-         'eca40de0ba0e6b8d34b7d1f904bc3d18')
+         'eca40de0ba0e6b8d34b7d1f904bc3d18'
+         '9780d6354b7380b772c4616253ecee54')
 
 build() {
   cd "$srcdir/mathmap-$pkgver"
 
   # fix problem with building libnoise
   patch -Np1 < "$srcdir"/fix_libnoise_build.patch
+  # fix for libpng 1.5
+  patch -Np1 < "$srcdir"/libpng15.patch
 
   make
 }
diff --git a/community/gimp-plugin-mathmap/libpng15.patch b/community/gimp-plugin-mathmap/libpng15.patch
new file mode 100644
index 000000000..3cf95387c
--- /dev/null
+++ b/community/gimp-plugin-mathmap/libpng15.patch
@@ -0,0 +1,170 @@
+diff -rup mathmap-1.3.5/rwimg/rwpng.c mathmap-1.3.5.new/rwimg/rwpng.c
+--- mathmap-1.3.5/rwimg/rwpng.c	2009-08-23 13:56:14.000000000 +0200
++++ mathmap-1.3.5.new/rwimg/rwpng.c	2012-01-27 13:02:29.708023734 +0100
+@@ -58,34 +58,34 @@ open_png_file_reading (const char *filen
+     data->end_info = png_create_info_struct(data->png_ptr);
+     assert(data->end_info != 0);
+ 
+-    if (setjmp(data->png_ptr->jmpbuf))
++    if (setjmp(png_jmpbuf(data->png_ptr)))
+ 	assert(0);
+ 
+     png_init_io(data->png_ptr, data->file);
+ 
+     png_read_info(data->png_ptr, data->info_ptr);
+ 
+-    *width = data->info_ptr->width;
+-    *height = data->info_ptr->height;
++    *width = png_get_image_width(data->png_ptr, data->info_ptr);
++    *height = png_get_image_height(data->png_ptr, data->info_ptr);
+ 
+-    if (data->info_ptr->bit_depth != 8 && data->info_ptr->bit_depth != 16)
++    if (png_get_bit_depth(data->png_ptr, data->info_ptr) != 8 && png_get_bit_depth(data->png_ptr, data->info_ptr) != 16)
+     {
+ 	fprintf(stderr, "PNG files are only supported with bit depths 8 and 16.\n");
+ 	/* FIXME: free stuff */
+ 	return 0;
+     }
+ 
+-    if (data->info_ptr->color_type != PNG_COLOR_TYPE_RGB
+-	&& data->info_ptr->color_type != PNG_COLOR_TYPE_RGB_ALPHA
+-	&& data->info_ptr->color_type != PNG_COLOR_TYPE_GRAY
+-	&& data->info_ptr->color_type != PNG_COLOR_TYPE_GRAY_ALPHA)
++    if (png_get_color_type(data->png_ptr, data->info_ptr) != PNG_COLOR_TYPE_RGB
++	&& png_get_color_type(data->png_ptr, data->info_ptr) != PNG_COLOR_TYPE_RGB_ALPHA
++	&& png_get_color_type(data->png_ptr, data->info_ptr) != PNG_COLOR_TYPE_GRAY
++	&& png_get_color_type(data->png_ptr, data->info_ptr) != PNG_COLOR_TYPE_GRAY_ALPHA)
+     {
+ 	fprintf(stderr, "PNG files are only supported in RGB and Gray, with or without alpha.\n");
+ 	/* FIXME: free stuff */
+ 	return 0;
+     }
+ 
+-    if (data->info_ptr->interlace_type != PNG_INTERLACE_NONE)
++    if (png_get_interlace_type(data->png_ptr, data->info_ptr) != PNG_INTERLACE_NONE)
+     {
+ 	fprintf(stderr, "Interlaced PNG files are not supported.\n");
+ 	/* FIXME: free stuff */
+@@ -105,24 +105,24 @@ png_read_lines (void *_data, unsigned ch
+     int bps, spp;
+     unsigned char *row;
+ 
+-    if (setjmp(data->png_ptr->jmpbuf))
++    if (setjmp(png_jmpbuf(data->png_ptr)))
+ 	assert(0);
+ 
+-    if (data->info_ptr->color_type == PNG_COLOR_TYPE_GRAY)
++    if (png_get_color_type(data->png_ptr, data->info_ptr) == PNG_COLOR_TYPE_GRAY)
+ 	spp = 1;
+-    else if (data->info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
++    else if (png_get_color_type(data->png_ptr, data->info_ptr) == PNG_COLOR_TYPE_GRAY_ALPHA)
+ 	spp = 2;
+-    else if (data->info_ptr->color_type == PNG_COLOR_TYPE_RGB)
++    else if (png_get_color_type(data->png_ptr, data->info_ptr) == PNG_COLOR_TYPE_RGB)
+ 	spp = 3;
+     else
+ 	spp = 4;
+ 
+-    if (data->info_ptr->bit_depth == 16)
++    if (png_get_bit_depth(data->png_ptr, data->info_ptr) == 16)
+ 	bps = 2;
+     else
+ 	bps = 1;
+ 
+-    row = (unsigned char*)malloc(data->info_ptr->width * spp * bps);
++    row = (unsigned char*)malloc(png_get_image_width(data->png_ptr, data->info_ptr) * spp * bps);
+ 
+     for (i = 0; i < num_lines; ++i)
+     {
+@@ -131,13 +131,13 @@ png_read_lines (void *_data, unsigned ch
+ 	png_read_row(data->png_ptr, (png_bytep)row, 0);
+ 
+ 	if (spp <= 2)
+-	    for (j = 0; j < data->info_ptr->width; ++j)
++	    for (j = 0; j < png_get_image_width(data->png_ptr, data->info_ptr); ++j)
+ 		for (channel = 0; channel < 3; ++channel)
+-		    lines[i * data->info_ptr->width * 3 + j * 3 + channel] = row[j * spp * bps];
++		    lines[i * png_get_image_width(data->png_ptr, data->info_ptr) * 3 + j * 3 + channel] = row[j * spp * bps];
+ 	else
+-	    for (j = 0; j < data->info_ptr->width; ++j)
++	    for (j = 0; j < png_get_image_width(data->png_ptr, data->info_ptr); ++j)
+ 		for (channel = 0; channel < 3; ++channel)
+-		    lines[i * data->info_ptr->width * 3 + j * 3 + channel]
++		    lines[i * png_get_image_width(data->png_ptr, data->info_ptr) * 3 + j * 3 + channel]
+ 			= row[j * spp * bps + channel * bps];
+     }
+ 
+@@ -151,7 +151,7 @@ png_free_reader_data (void *_data)
+ {
+     png_data_t *data = (png_data_t*)_data;
+ 
+-    if (setjmp(data->png_ptr->jmpbuf))
++    if (setjmp(png_jmpbuf(data->png_ptr)))
+ 	assert(0);
+ 
+     if (data->have_read)
+@@ -180,7 +180,7 @@ open_png_file_writing (const char *filen
+     data->info_ptr = png_create_info_struct(data->png_ptr);
+     assert(data->info_ptr != 0);
+ 
+-    if (setjmp(data->png_ptr->jmpbuf))
++    if (setjmp(png_jmpbuf(data->png_ptr)))
+ 	assert(0);
+ 
+     if (pixel_stride == 4)
+@@ -188,18 +188,9 @@ open_png_file_writing (const char *filen
+ 
+     png_init_io(data->png_ptr, data->file);
+ 
+-    data->info_ptr->width = width;
+-    data->info_ptr->height = height;
+-    data->info_ptr->valid = 0;
+-    data->info_ptr->rowbytes = width * 3;
+-    data->info_ptr->palette = 0;
+-    data->info_ptr->num_palette = 0;
+-    data->info_ptr->num_trans = 0;
+-    data->info_ptr->bit_depth = 8;
+-    data->info_ptr->color_type = PNG_COLOR_TYPE_RGB;
+-    data->info_ptr->compression_type = PNG_COMPRESSION_TYPE_DEFAULT;
+-    data->info_ptr->filter_type = PNG_FILTER_TYPE_DEFAULT;
+-    data->info_ptr->interlace_type = PNG_INTERLACE_NONE;
++    png_set_IHDR(data->png_ptr, data->info_ptr, width, height,
++    8, PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE,
++    PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
+ 
+     png_write_info(data->png_ptr, data->info_ptr);
+ 
+@@ -216,12 +207,12 @@ png_write_lines (void *_data, unsigned c
+     unsigned char *packed_line;
+     int i;
+ 
+-    if (setjmp(data->png_ptr->jmpbuf))
++    if (setjmp(png_jmpbuf(data->png_ptr)))
+ 	assert(0);
+ 
+     if (data->pixel_stride != 3)
+     {
+-	packed_line = (unsigned char*)malloc(data->info_ptr->width * 3);
++	packed_line = (unsigned char*)malloc(png_get_image_width(data->png_ptr, data->info_ptr) * 3);
+ 	assert(packed_line != 0);
+     }
+     else
+@@ -235,7 +226,7 @@ png_write_lines (void *_data, unsigned c
+ 	{
+ 	    int j;
+ 
+-	    for (j = 0; j < data->info_ptr->width; ++j)
++	    for (j = 0; j < png_get_image_width(data->png_ptr, data->info_ptr); ++j)
+ 	    {
+ 		packed_line[j * 3 + 0] = p[j * data->pixel_stride + 0];
+ 		packed_line[j * 3 + 1] = p[j * data->pixel_stride + 1];
+@@ -257,7 +248,7 @@ png_free_writer_data (void *_data)
+ {
+     png_data_t *data = (png_data_t*)_data;
+ 
+-    if (setjmp(data->png_ptr->jmpbuf))
++    if (setjmp(png_jmpbuf(data->png_ptr)))
+ 	assert(0);
+ 
+     png_write_end(data->png_ptr, data->info_ptr);
+Only in mathmap-1.3.5.new/rwimg: rwpng.c.orig
diff --git a/community/gimp-plugin-wavelet-decompose/PKGBUILD b/community/gimp-plugin-wavelet-decompose/PKGBUILD
index 15fdf6542..02c20524d 100644
--- a/community/gimp-plugin-wavelet-decompose/PKGBUILD
+++ b/community/gimp-plugin-wavelet-decompose/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 38078 2011-01-21 15:50:47Z spupykin $
+# $Id: PKGBUILD 63586 2012-02-05 11:58:12Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Denis Kvist <denvist@ya.ru>
 
 pkgname=gimp-plugin-wavelet-decompose
 pkgver=0.1.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Wavelet decompose plugin for Gimp"
 arch=('i686' 'x86_64')
 url="http://registry.gimp.org/node/11742"
@@ -16,11 +16,11 @@ md5sums=('e0cb8670a1c5506d08f57f2300caac24'
          '4de9e41a535f200c2502f0dd8458c43e')
 
 build() {
-    cd "$srcdir/wavelet-decompose-$pkgver"
-    patch -Np1 < ../po_install.diff
-    make
-    install -Dvm755 src/wavelet-decompose \
+  cd "$srcdir/wavelet-decompose-$pkgver"
+  patch -Np1 < ../po_install.diff
+  make
+  install -Dvm755 src/wavelet-decompose \
 	"$pkgdir"/usr/lib/gimp/2.0/plug-ins/wavelet-decompose
-    cd po
-    make LOCALEDIR="$pkgdir"/usr/share/locale install
+  cd po
+  make LOCALEDIR="$pkgdir"/usr/share/locale install
 }
diff --git a/community/gliv/PKGBUILD b/community/gliv/PKGBUILD
index 9875b6eb0..157adabfb 100644
--- a/community/gliv/PKGBUILD
+++ b/community/gliv/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=gliv
 pkgver=1.9.7
-pkgrel=1
+pkgrel=2
 pkgdesc="OpenGL image viewer"
 arch=('i686' 'x86_64')
 url="http://guichaz.free.fr/gliv/"
diff --git a/community/glpng/PKGBUILD b/community/glpng/PKGBUILD
index 0c57c67ae..0c604e544 100644
--- a/community/glpng/PKGBUILD
+++ b/community/glpng/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 55485 2011-09-13 02:26:22Z ebelanger $
+# $Id: PKGBUILD 63590 2012-02-05 11:58:33Z ibiru $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 pkgname=glpng
 pkgver=1.45
-pkgrel=4
+pkgrel=5
 pkgdesc="Toolkit for loading PNG images as OpenGL textures"
 arch=('i686' 'x86_64')
 url="http://www.fifi.org/doc/libglpng-dev/glpng.html"
@@ -12,19 +12,13 @@ depends=('libpng' 'libgl')
 makedepends=('mesa')
 source=(http://ftp.de.debian.org/debian/pool/main/libg/libglpng/libglpng_${pkgver}.orig.tar.gz
         Makefile
-        libglpng-1.45-debian.patch
-        libpng14.patch
+        libpng15.patch
         license)
-md5sums=('9e0daad8e39fbf3179c73c0d3f74f104'
-         '0b24e9cb527d4ed1c43dd743d49d2b54'
-         '51ee01e61a70d91977b791a03e579b0f'
-         '50e00b9de0b376d7fb5fd812dc7beac9'
-         'cd066652a6e5dbd7c1fc303b8e03417a')
-
 build() {
   cd "$srcdir/libglpng-1.45.orig"
-  patch -Np1 -i "$srcdir/libglpng-1.45-debian.patch"
-  patch -Np1 -i "$srcdir/libpng14.patch"
+
+  patch -Np1 -i "$srcdir/libpng15.patch"
+
   cp "$srcdir/Makefile" .
   make libglpng.so.1.45
 }
@@ -35,3 +29,7 @@ package() {
   install -Dm644 "$srcdir/license" \
     "$pkgdir/usr/share/licenses/glpng/license"
 }
+md5sums=('9e0daad8e39fbf3179c73c0d3f74f104'
+         '0b24e9cb527d4ed1c43dd743d49d2b54'
+         'f3f0c0a3f867c5856d922c18677ef2a2'
+         'cd066652a6e5dbd7c1fc303b8e03417a')
diff --git a/community/glpng/libpng15.patch b/community/glpng/libpng15.patch
new file mode 100644
index 000000000..89e9bf67e
--- /dev/null
+++ b/community/glpng/libpng15.patch
@@ -0,0 +1,83 @@
+diff -aur libglpng-1.45.orig/include/GL/glpng.h libglpng-1.45.new/include/GL/glpng.h
+--- libglpng-1.45.orig/include/GL/glpng.h	2000-07-10 21:27:00.000000000 +0200
++++ libglpng-1.45.new/include/GL/glpng.h	2012-01-19 19:34:43.994280259 +0100
+@@ -57,7 +57,7 @@
+ #define PNG_SIMPLEMIPMAP PNG_SIMPLEMIPMAPS
+ 
+ /* Transparency parameters */
+-#define PNG_CALLBACK  -3 /* Call the callback function to generate alpha   */
++#define PNG_CALLBACKT  -3 /* Call the callback function to generate alpha   */
+ #define PNG_ALPHA     -2 /* Use alpha channel in PNG file, if there is one */
+ #define PNG_SOLID     -1 /* No transparency                                */
+ #define PNG_STENCIL    0 /* Sets alpha to 0 for r=g=b=0, 1 otherwise       */
+diff -aur libglpng-1.45.orig/src/glpng.c libglpng-1.45.new/src/glpng.c
+--- libglpng-1.45.orig/src/glpng.c	2000-07-10 21:27:10.000000000 +0200
++++ libglpng-1.45.new/src/glpng.c	2012-01-19 19:39:37.379311651 +0100
+@@ -29,7 +29,7 @@
+ #include <GL/gl.h>
+ #include <stdlib.h>
+ #include <math.h>
+-#include "png/png.h"
++#include <png.h>
+ 
+ /* Used to decide if GL/gl.h supports the paletted extension */
+ #ifdef GL_COLOR_INDEX1_EXT
+@@ -113,6 +113,7 @@
+ 	}
+ }
+ 
++#ifdef _WIN32
+ static int ExtSupported(const char *x) {
+ 	static const GLubyte *ext = NULL;
+ 	const char *c;
+@@ -129,6 +130,7 @@
+ 
+ 	return 0;
+ }
++#endif
+ 
+ #define GET(o) ((int)*(data + (o)))
+ 
+@@ -269,14 +271,14 @@
+ 	if (pinfo == NULL) return 0;
+ 
+ 	fread(header, 1, 8, fp);
+-	if (!png_check_sig(header, 8)) return 0;
++	if (!png_sig_cmp(header, 0, 8)) return 0;
+ 
+ 	png = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+ 	info = png_create_info_struct(png);
+ 	endinfo = png_create_info_struct(png);
+ 
+ 	// DH: added following lines
+-	if (setjmp(png->jmpbuf))
++	if (setjmp(png_jmpbuf(png)))
+ 	{
+ 		png_destroy_read_struct(&png, &info, &endinfo);
+ 		return 0;
+@@ -373,14 +375,14 @@
+ 	png_uint_32 i;
+ 
+ 	fread(header, 1, 8, fp);
+-	if (!png_check_sig(header, 8)) return 0;
++	if (png_sig_cmp(header, 0, 8)) return 0;
+ 
+ 	png = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+ 	info = png_create_info_struct(png);
+ 	endinfo = png_create_info_struct(png);
+ 
+ 	// DH: added following lines
+-	if (setjmp(png->jmpbuf))
++	if (setjmp(png_jmpbuf(png)))
+ 	{
+ 		png_destroy_read_struct(&png, &info, &endinfo);
+ 		return 0;
+@@ -559,7 +561,7 @@
+ 			#define ALPHA *q
+ 
+ 			switch (trans) {
+-				case PNG_CALLBACK:
++				case PNG_CALLBACKT:
+ 					FORSTART
+ 						ALPHA = AlphaCallback((unsigned char) r, (unsigned char) g, (unsigned char) b);
+ 					FOREND
diff --git a/community/gmerlin-avdecoder/PKGBUILD b/community/gmerlin-avdecoder/PKGBUILD
index dbdc62f80..c915337bf 100644
--- a/community/gmerlin-avdecoder/PKGBUILD
+++ b/community/gmerlin-avdecoder/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 61443 2011-12-31 13:20:56Z ibiru $
+# $Id: PKGBUILD 63594 2012-02-05 11:58:46Z ibiru $
 # Maintainer: Mateusz Herych <heniekk@gmail.com>
 
 pkgname=gmerlin-avdecoder
 pkgver=1.1.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Media decoding library"
 arch=('i686' 'x86_64')
 url="http://gmerlin.sourceforge.net/avdec_frame.html"
diff --git a/community/gmerlin/PKGBUILD b/community/gmerlin/PKGBUILD
index adb56b50c..ef8b7aa08 100644
--- a/community/gmerlin/PKGBUILD
+++ b/community/gmerlin/PKGBUILD
@@ -1,21 +1,22 @@
-# $Id: PKGBUILD 58153 2011-11-07 10:55:45Z spupykin $
+# $Id: PKGBUILD 63592 2012-02-05 11:58:41Z ibiru $
 # Maintainer: Mateusz Herych <heniekk@gmail.com>
 
 pkgname=gmerlin
 pkgver=1.0.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Multimedia architecture for Linux"
 arch=('i686' 'x86_64')
 url="http://openmovieeditor.sourceforge.net/HomePage"
 license=('GPL')
-depends=('gavl' 'libxml2' 'gtk2' 'libxv' 'mesa' 'libvisual' 'libcdio>=0.82' 'musicbrainz' 'mjpegtools')
-makedepends=('alsa-lib' 'jack' 'libquicktime' 'pulseaudio' 'v4l-utils')
+depends=('gavl' 'libxml2' 'gtk2' 'libxv' 'libvisual' 'libcdio>=0.82' 'musicbrainz' 'mjpegtools' 'hicolor-icon-theme' 'libgl')
+makedepends=('alsa-lib' 'jack' 'libquicktime' 'pulseaudio' 'v4l-utils' 'mesa')
 optdepends=('alsa-lib: for ALSA support'
 	    'jack: for JACK support'
 	    'libquicktime: for movie encoding'
 	    'pulseaudio: for PulseAudio support'
 	    'v4l-utils: for video conversion')
-options=('!libtool')
+options=('!libtool' '!makeflags')
+install=gmerlin.install
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
 	libpng.patch)
 md5sums=('60d3c5081c8685ee7bc1afdfac8f6dc6'
@@ -26,8 +27,10 @@ build() {
 
   rm -rf cpuinfo.sh
 
-  patch -p1 <$srcdir/libpng.patch
+  patch -p1 -i "$srcdir/libpng.patch"
   ./configure --prefix=/usr --without-doxygen
+  sed -i 's|LIBS = -lgavl|LIBS = -lgavl -ldl -lpthread -lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lxml2 -lgdk-x11-2.0 -lgdk_pixbuf-2.0 -lX11|' {lib,tests,apps/*}/Makefile
+  sed -i 's|ln -sf $(DESTDIR)$(pkgdatadir)|ln -sf $(pkgdatadir)|' icons/Makefile
   make
 }
 
@@ -35,5 +38,4 @@ package() {
   cd "$srcdir/$pkgname-$pkgver"
 
   make DESTDIR="$pkgdir" install
-  rm -rf "$pkgdir/usr/share/info/dir"
 }
diff --git a/community/gmerlin/gmerlin.install b/community/gmerlin/gmerlin.install
new file mode 100644
index 000000000..c7625c2f1
--- /dev/null
+++ b/community/gmerlin/gmerlin.install
@@ -0,0 +1,25 @@
+infodir=usr/share/info
+filelist=(gmerlin.info)
+
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  [[ -x usr/bin/install-info ]] || return 0
+  for file in "${filelist[@]}"; do
+    install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install "$1"
+}
+
+pre_remove() {
+  [[ -x usr/bin/install-info ]] || return 0
+  for file in "${filelist[@]}"; do
+    install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
+  done
+}
+
+post_remove() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD
index ccfbf4d53..049f0fe11 100644
--- a/community/gmic/PKGBUILD
+++ b/community/gmic/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 61559 2012-01-02 22:44:42Z spupykin $
+# $Id: PKGBUILD 63596 2012-02-05 11:58:54Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: farid <farid at archlinuc-br.org>
@@ -7,7 +7,7 @@
 pkgbase=gmic
 pkgname=('gmic' 'gimp-plugin-gmic')
 pkgver=1.5.0.8
-pkgrel=1
+pkgrel=2
 pkgdesc="image procession framework"
 arch=('i686' 'x86_64')
 license=('custom:CeCILL')
@@ -29,6 +29,7 @@ build() {
   sed -i 's|OPENCV_CFLAGS = .*|OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include/opencv `pkg-config --cflags opencv`|' src/Makefile
   sed -i 's|OPENCV_LDFLAGS = .*|OPENCV_LDFLAGS = `pkg-config --libs opencv`|' src/Makefile
   sed -i 's|cp -f gmic_gimp.*||' src/Makefile
+  sed -i 's|ln -s $(DESTDIR)$(USR)|ln -s $(USR)|' src/Makefile
   patch -p1 <$srcdir/opencv-buildfix.patch
   make -C src all
 }
diff --git a/community/gnash/PKGBUILD b/community/gnash/PKGBUILD
index df42c396b..348db3561 100644
--- a/community/gnash/PKGBUILD
+++ b/community/gnash/PKGBUILD
@@ -4,7 +4,7 @@
 pkgbase=gnash
 pkgname=(gnash-common gnash-gtk)
 pkgver=0.8.9
-pkgrel=8
+pkgrel=9
 arch=(i686 x86_64)
 url="http://www.gnu.org/software/gnash/"
 license=(GPL3)
@@ -45,6 +45,8 @@ build() {
     --enable-media=gst,ffmpeg \
     --enable-hwaccel=vaapi
 
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+
   make
 }
 
diff --git a/community/gnubiff-gtk/PKGBUILD b/community/gnubiff-gtk/PKGBUILD
index 2ebd79695..a632caace 100644
--- a/community/gnubiff-gtk/PKGBUILD
+++ b/community/gnubiff-gtk/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD 53956 2011-08-10 14:39:02Z spupykin $
+# $Id: PKGBUILD 63602 2012-02-05 11:59:50Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Tom K <tomk@runbox.com>
 # Contributor: Todd Musall <tmusall@gmail.com>
 
 pkgname=gnubiff-gtk
-pkgver=2.2.13
-pkgrel=3
+pkgver=2.2.14
+pkgrel=1
 pkgdesc="Mail notification program that checks for mail and displays headers when new mail has arrived. GTK version."
 arch=('i686' 'x86_64')
 url="http://gnubiff.sourceforge.net/"
 license=("GPL")
-depends=('libglade' 'openssl' 'popt')
+depends=('libglade' 'gtk3' 'openssl' 'popt')
 makedepends=('intltool')
-conflicts=(gnubiff)
+conflicts=('gnubiff')
 source=(http://downloads.sourceforge.net/sourceforge/gnubiff/gnubiff-$pkgver.tar.gz
 	build.patch)
-md5sums=('65423957eb027b94c9e661611c0e4271'
+md5sums=('f2a2c3485d2f3f0adff1b7665c2f3b24'
          '96fde605eb69e300f6014546d4339beb')
 
 build() {
   cd $srcdir/gnubiff-$pkgver
-  patch -p1 <../build.patch
+#  patch -p1 <../build.patch
   export LDFLAGS=-lX11
   ./configure --prefix=/usr --disable-gnome --disable-fam --with-password --with-password-string="65423957eb027b94c9e661611c0e4271"
   make
diff --git a/community/gnubiff/PKGBUILD b/community/gnubiff/PKGBUILD
index 5dd567d8a..03485f1f1 100644
--- a/community/gnubiff/PKGBUILD
+++ b/community/gnubiff/PKGBUILD
@@ -1,55 +1,29 @@
-# $Id: PKGBUILD 53951 2011-08-10 14:38:08Z spupykin $
+# $Id: PKGBUILD 63600 2012-02-05 11:59:28Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Tom K <tomk@runbox.com>
 # Contributor: Todd Musall <tmusall@gmail.com>
 
 pkgname=gnubiff
-pkgver=2.2.13
-pkgrel=2
+pkgver=2.2.14
+pkgrel=1
 pkgdesc="Mail notification program that checks for mail and displays headers when new mail has arrived"
 arch=('i686' 'x86_64')
 url="http://gnubiff.sourceforge.net/"
 license=("GPL")
-depends=('libglade' 'gtk2' 'popt')
+depends=('libglade' 'gtk3' 'popt')
 makedepends=('perlxml' 'intltool')
 conflicts=(gnubiff-gtk)
 source=(http://downloads.sourceforge.net/gnubiff/gnubiff-$pkgver.tar.gz)
-md5sums=('65423957eb027b94c9e661611c0e4271')
+md5sums=('f2a2c3485d2f3f0adff1b7665c2f3b24')
 
 build() {
   [ "$GNOMEDIR" = "" ] && GNOMEDIR=/usr
-  cd $startdir/src/gnubiff-$pkgver
-
-  patch -p2 src/support.h <<EOF
-diff -wbBur gnubiff-2.2.10/src/support.h gnubiff-2.2.10.my/src/support.h
---- gnubiff-2.2.10/src/support.h	2008-03-22 05:08:51.000000000 +0300
-+++ gnubiff-2.2.10.my/src/support.h	2008-04-22 14:21:58.000000000 +0400
-@@ -35,6 +35,9 @@
- #endif
- #include "nls.h"
- 
-+#include <stdlib.h>
-+#define EXIT_SUCCESS 0
-+#define EXIT_FAILURE 1
- 
- #include <glib.h>
- #include <sstream>
-@@ -131,6 +134,9 @@
- 		if ((pos == end) && (last < num))
- 			result << sep << num;
- 
-+		if ((pos == end) && (last != num))
-+		  result << sep << num;
-+	
- 		// Save new number
- 		inf_bound = last = num;
- 	}
-EOF
+  cd $srcdir/gnubiff-$pkgver
 
   ./configure --prefix=/usr --with-password --with-password-string="65423957eb027b94c9e661611c0e4271" \
 	--disable-fam --disable-gnome
   make
-  make DESTDIR=$startdir/pkg install
+  make DESTDIR=$pkgdir install
 
   rm -rf ${pkgdir}/usr/share/info/dir
 }
diff --git a/community/gnustep-gui/PKGBUILD b/community/gnustep-gui/PKGBUILD
index 624656ee9..39b928cba 100644
--- a/community/gnustep-gui/PKGBUILD
+++ b/community/gnustep-gui/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 58379 2011-11-12 16:02:38Z spupykin $
+# $Id: PKGBUILD 63604 2012-02-05 11:59:59Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Sebastian Sareyko <public@nooms.de>
 
 pkgname=gnustep-gui
 pkgver=0.20.0
-pkgrel=2
+pkgrel=3
 pkgdesc="The GNUstep GUI class library"
 arch=('i686' 'x86_64')
 url="http://www.gnustep.org/"
diff --git a/community/gpac/PKGBUILD b/community/gpac/PKGBUILD
index ff5f9784e..a654aac4e 100644
--- a/community/gpac/PKGBUILD
+++ b/community/gpac/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 61715 2012-01-06 22:18:07Z ebelanger $
+# $Id: PKGBUILD 63606 2012-02-05 12:00:04Z ibiru $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=gpac
 pkgver=3824
-pkgrel=1
+pkgrel=2
 pkgdesc="A multimedia framework based on the MPEG-4 Systems standard"
 arch=('i686' 'x86_64')
 url="http://gpac.sourceforge.net"
diff --git a/community/gpsim/PKGBUILD b/community/gpsim/PKGBUILD
index 809a2b973..311a70a32 100644
--- a/community/gpsim/PKGBUILD
+++ b/community/gpsim/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 53898 2011-08-09 13:35:24Z spupykin $
+# $Id: PKGBUILD 63608 2012-02-05 12:00:08Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: mickael9 <mickael9 at gmail dot com>
 
 pkgname=gpsim
 pkgver=0.26.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A full-featured software simulator for Microchip PIC microcontrollers"
 arch=(i686 x86_64)
 url="http://gpsim.sourceforge.net/"
diff --git a/community/grace/PKGBUILD b/community/grace/PKGBUILD
index 3a74d0fb0..0c0296724 100644
--- a/community/grace/PKGBUILD
+++ b/community/grace/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 46737 2011-05-11 10:00:50Z spupykin $
+# $Id: PKGBUILD 63610 2012-02-05 12:00:16Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: damir <damir@archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=grace
 pkgver=5.1.22
-pkgrel=5
+pkgrel=6
 pkgdesc="2D plotting tool"
 arch=(i686 x86_64)
 url="http://plasma-gate.weizmann.ac.il/Grace/"
@@ -17,6 +17,8 @@ md5sums=('672356466f18fe59ed21a8fb44f9851d')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
+  sed -i '1,1i#include <zlib.h>' src/rstdrv.c
+  sed -i 's|png_ptr->jmpbuf|png_jmpbuf(png_ptr)|g' src/rstdrv.c
   ./configure   --prefix=/usr --exec-prefix=/usr \
 		--enable-grace-home=/usr/share/grace \
 		--includedir=/usr/include --libdir=/usr/lib \
diff --git a/community/grafx2/PKGBUILD b/community/grafx2/PKGBUILD
index 43da08b43..d7756ee14 100644
--- a/community/grafx2/PKGBUILD
+++ b/community/grafx2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 57828 2011-11-03 10:14:39Z arodseth $
+# $Id: PKGBUILD 63612 2012-02-05 12:00:25Z ibiru $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Simon Parzer <simon.parzer@gmail.com>
 pkgname=grafx2
 pkgver=2.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Pixelart-oriented painting program"
 arch=('x86_64' 'i686')
 url="http://code.google.com/p/grafx2/"
@@ -23,7 +23,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}/src"
+  cd "$srcdir/$pkgname/src"
 
   msg2 "Packaging files..."
   make prefix="/usr" DESTDIR="$pkgdir" install
diff --git a/community/gsql/PKGBUILD b/community/gsql/PKGBUILD
index 88d05ff87..be3937b83 100644
--- a/community/gsql/PKGBUILD
+++ b/community/gsql/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 58755 2011-11-18 13:09:30Z spupykin $
+# $Id: PKGBUILD 63614 2012-02-05 12:00:35Z ibiru $
 # Contributor: Michael Kanis <mkanis@gmx.de>
 
 pkgname=gsql
 pkgver=0.2.2
-pkgrel=3
+pkgrel=4
 pkgdesc="Integrated database development tool for GNOME"
 url="http://gsql.org/"
 license=('GPL')
diff --git a/community/gtk-chtheme/PKGBUILD b/community/gtk-chtheme/PKGBUILD
index 5621dce39..fbce248ad 100644
--- a/community/gtk-chtheme/PKGBUILD
+++ b/community/gtk-chtheme/PKGBUILD
@@ -1,27 +1,29 @@
+# $Id: PKGBUILD 63616 2012-02-05 12:00:48Z ibiru $
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=gtk-chtheme
 pkgver=0.3.1
-pkgrel=6
+pkgrel=7
 pkgdesc="This little program lets you change your Gtk+ 2.0 theme. A better alternative to switch2"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://plasmasturm.org/programs/gtk-chtheme/"
 depends=('gtk2')
-source=(http://plasmasturm.org/programs/gtk-chtheme/${pkgname}-${pkgver}.tar.bz2)
+source=("http://plasmasturm.org/programs/gtk-chtheme/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('f688053bf26dd6c4f1cd0bf2ee33de2a')
 
 build() {
-	cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}-${pkgver}
 
-	# Fix xdg compliancy
-	sed -i 's|-DGTK.*||' Makefile
-	sed -i 's|theme_list(g_.*|&\n\tread_theme_list(g_strconcat(g_get_user_data_dir(), "/themes", NULL));|' main.c
-	make || return 1
+  # Fix xdg compliancy
+  sed -i 's|-DGTK.*||' Makefile
+  sed -i 's|theme_list(g_.*|&\n\tread_theme_list(g_strconcat(g_get_user_data_dir(), "/themes", NULL));|' main.c
+  make
 }
 
 package() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-	install -Dm755 gtk-chtheme ${pkgdir}/usr/bin/gtk-chtheme || return 1
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  install -Dm755 gtk-chtheme ${pkgdir}/usr/bin/gtk-chtheme
 }
diff --git a/community/gtk-engine-murrine/PKGBUILD b/community/gtk-engine-murrine/PKGBUILD
index b14fa5f7f..c8cf2b616 100644
--- a/community/gtk-engine-murrine/PKGBUILD
+++ b/community/gtk-engine-murrine/PKGBUILD
@@ -1,4 +1,5 @@
-# $Id: PKGBUILD 34751 2010-12-12 15:03:53Z tdziedzic $
+# $Id: PKGBUILD 63618 2012-02-05 12:00:53Z ibiru $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
 # Contributor: detto <detto-brumm@freenet.de>
@@ -6,7 +7,7 @@
 
 pkgname=gtk-engine-murrine
 pkgver=0.98.1.1
-pkgrel=2
+pkgrel=3
 pkgdesc="GTK2 engine to make your desktop look like a 'murrina', an italian word meaning the art glass works done by Venicians glass blowers."
 arch=('i686' 'x86_64')
 url="http://cimitan.com/murrine/project/murrine"
@@ -19,17 +20,14 @@ sha256sums=('e6a2af72674403d06c03e067d915004e8d9cdeec206f3350c7f3ee595b139912')
 
 build() {
   cd murrine-${pkgver}
-
   ./configure \
     --prefix=/usr \
     --enable-animation \
     --enable-animationrtl
-
   make
 }
 
 package() {
   cd murrine-${pkgver}
-
   make DESTDIR=${pkgdir} install
 }
diff --git a/community/guake/0001-Retrieve-port-as-int.2.patch b/community/guake/0001-Retrieve-port-as-int.2.patch
new file mode 100644
index 000000000..3fde26dc2
--- /dev/null
+++ b/community/guake/0001-Retrieve-port-as-int.2.patch
@@ -0,0 +1,25 @@
+From efcd1d8d3cdc354f46bc2485e7e3394f8578b7ba Mon Sep 17 00:00:00 2001
+From: pingou <pingou@pingoured.fr>
+Date: Mon, 23 Aug 2010 09:54:35 +0200
+Subject: [PATCH] Retrieve port as int
+
+---
+ src/guake.py |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/guake.py b/src/guake.py
+index 6214fb2..40e688f 100644
+--- a/src/guake.py
++++ b/src/guake.py
+@@ -1099,7 +1099,7 @@ class Guake(SimpleGladeApp):
+                 ssl_port = port
+             else:
+                 ssl_host = self.client.get_string('/system/proxy/secure_host')
+-                ssl_port = self.client.get_string('/system/proxy/secure_port')
++                ssl_port = self.client.get_int('/system/proxy/secure_port')
+ 
+             if self.client.get_bool(proxy + 'use_authentication'):
+                 auth_user = self.client.get_string(
+-- 
+1.7.2.1
+
diff --git a/community/guake/PKGBUILD b/community/guake/PKGBUILD
index 96bc8f472..cd40f51be 100644
--- a/community/guake/PKGBUILD
+++ b/community/guake/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 33304 2010-11-23 20:21:25Z angvp $
-# Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
+# $Id: PKGBUILD 63620 2012-02-05 12:01:07Z ibiru $
+# Maintainer: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Wilson Pinto Júnior (N3RD3X) <n3rd3x@linuxmail.org>
 pkgname=guake
 pkgver=0.4.2
-pkgrel=4
+pkgrel=5
 pkgdesc='is a drop-down terminal for Gnome Desktop Environment'
 arch=('i686' 'x86_64')
-url='http://guake-terminal.org'
+url='http://guake.org'
 license=('GPL')
 depends=('python-notify' 'vte' 'gconf' 'python2-gconf' 'dbus-python' 'notification-daemon')
 makedepends=('libx11' 'pkgconfig' 'perlxml' 'intltool')
 install=guake.install
-source=(http://trac.guake-terminal.org/files/guake-$pkgver.tar.gz
+source=(http://guake.org/files/guake-$pkgver.tar.gz
         http://guake.org/raw-attachment/ticket/246/0001-Retrieve-port-as-int.2.patch)
 md5sums=('1f0feff3bfc15c998147dbf07d9d8a8e'
          '9aca6ba8e46ae1b69958cda0e03320ff')
@@ -27,5 +27,9 @@ build() {
 
   ./configure --sysconfdir=/usr/share --prefix=/usr --disable-static
   make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 }
diff --git a/community/hatari/PKGBUILD b/community/hatari/PKGBUILD
index d0250b55b..750c9bf10 100644
--- a/community/hatari/PKGBUILD
+++ b/community/hatari/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 55846 2011-09-23 18:34:08Z lcarlier $
+# $Id: PKGBUILD 63626 2012-02-05 12:01:45Z ibiru $
 # Maintainer: Shinlun Hsieh <yngwiexx@yahoo.com.tw>
 
 pkgname=hatari
 pkgver=1.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc='An Atari ST and STE emulator'
 arch=('i686' 'x86_64')
 url='http://hatari.sourceforge.net/'
diff --git a/community/htmldoc/PKGBUILD b/community/htmldoc/PKGBUILD
index ded19e284..b498e00f1 100644
--- a/community/htmldoc/PKGBUILD
+++ b/community/htmldoc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 52181 2011-07-21 12:03:40Z spupykin $
+# $Id: PKGBUILD 63628 2012-02-05 12:01:52Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Simon Rutishauser <simon.rutishauser@gmx.ch>
 
 pkgname=htmldoc
 pkgver=1.8.27
-pkgrel=6
+pkgrel=7
 pkgdesc="Produce PDF or Postscript from HTML documents including TOCs and Indices"
 arch=(i686 x86_64)
 url="http://www.htmldoc.org"
@@ -16,7 +16,7 @@ md5sums=('35589e7b8fe9c54e11be87cd5aec4dcc')
 
 build() {
   cd $srcdir/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --mandir=${pkgdir}/usr/share/man
+  ./configure --prefix=/usr
   make
 }
 
diff --git a/community/icoutils/PKGBUILD b/community/icoutils/PKGBUILD
index d9c24c298..8f8813cbd 100644
--- a/community/icoutils/PKGBUILD
+++ b/community/icoutils/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=icoutils
 pkgver=0.29.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Extracts and converts images in MS Windows(R) icon and cursor files.'
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -15,16 +15,13 @@ md5sums=('b58f375e0f8731595e8d0ecdc3a0acb9')
 
 build() {
   cd ${pkgname}-${pkgver}
-
   ./configure \
     --prefix=/usr \
     --mandir=/usr/share/man
-
   make
 }
 
 package() {
   cd ${pkgname}-${pkgver}
-
   make DESTDIR=${pkgdir} install
 }
diff --git a/community/irrlicht/PKGBUILD b/community/irrlicht/PKGBUILD
index 8dd14decd..c4b0ceccd 100644
--- a/community/irrlicht/PKGBUILD
+++ b/community/irrlicht/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 56796 2011-10-12 23:30:10Z svenstaro $
+# $Id: PKGBUILD 63632 2012-02-05 12:02:14Z ibiru $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Hilton Medeiros <medeiros.hilton AT gmail DOT com>
 # Contributor: Ali H. Caliskan <ali.h.caliskan AT gmail DOT com>
@@ -7,19 +7,26 @@
 
 pkgname=irrlicht
 pkgver=1.7.2
-pkgrel=3
+pkgrel=4
 pkgdesc="An open source high performance realtime 3D graphics engine."
 arch=('i686' 'x86_64')
 url="http://irrlicht.sourceforge.net/"
 license=('ZLIB')
 depends=('libgl' 'libjpeg' 'bzip2' 'libpng')
-makedepends=('mesa')
-source=("http://downloads.sourceforge.net/irrlicht/$pkgname-$pkgver.zip")
-md5sums=('eb627d4c432bf73f12bc6d9ddc700b07')
+makedepends=('mesa' 'unzip')
+source=("http://downloads.sourceforge.net/irrlicht/$pkgname-$pkgver.zip"
+        "irrlicht-1.7.2-libpng15.patch")
+md5sums=('eb627d4c432bf73f12bc6d9ddc700b07'
+         'a7f8d4aa1bc2880bbeaf3449e09f69a5')
+noextract=($pkgname-$pkgver.zip)
 
 build() {
+  unzip $pkgname-$pkgver.zip
+
   cd $srcdir/$pkgname-$pkgver
 
+  patch -Np0 < $srcdir/irrlicht-1.7.2-libpng15.patch
+
   sed -i -e '/^#.*NON_SYSTEM_ZLIB/d' \
          -e '/^#.*NON_SYSTEM_JPEG/d' \
          -e '/^#.*NON_SYSTEM_LIB_PNG/d' \
diff --git a/community/irrlicht/irrlicht-1.7.2-libpng15.patch b/community/irrlicht/irrlicht-1.7.2-libpng15.patch
new file mode 100644
index 000000000..a1426bf29
--- /dev/null
+++ b/community/irrlicht/irrlicht-1.7.2-libpng15.patch
@@ -0,0 +1,40 @@
+--- source/Irrlicht/CImageLoaderPNG.cpp
++++ source/Irrlicht/CImageLoaderPNG.cpp
+@@ -28,7 +28,7 @@
+ static void png_cpexcept_error(png_structp png_ptr, png_const_charp msg)
+ {
+ 	os::Printer::log("PNG FATAL ERROR", msg, ELL_ERROR);
+-	longjmp(png_ptr->jmpbuf, 1);
++	longjmp(png_jmpbuf(png_ptr), 1);
+ }
+ 
+ // PNG function for file reading
+@@ -37,7 +37,7 @@
+ 	png_size_t check;
+ 
+ 	// changed by zola {
+-	io::IReadFile* file=(io::IReadFile*)png_ptr->io_ptr;
++	io::IReadFile* file=(io::IReadFile*)png_get_io_ptr(png_ptr);
+ 	check=(png_size_t) file->read((void*)data,(u32)length);
+ 	// }
+ 
+--- source/Irrlicht/CImageWriterPNG.cpp
++++ source/Irrlicht/CImageWriterPNG.cpp
+@@ -35,7 +35,7 @@
+ static void png_cpexcept_error(png_structp png_ptr, png_const_charp msg)
+ {
+ 	os::Printer::log("PNG FATAL ERROR", msg, ELL_ERROR);
+-	longjmp(png_ptr->jmpbuf, 1);
++	longjmp(png_jmpbuf(png_ptr), 1);
+ }
+ 
+ // PNG function for file writing
+@@ -43,7 +43,7 @@
+ {
+ 	png_size_t check;
+ 
+-	io::IWriteFile* file=(io::IWriteFile*)png_ptr->io_ptr;
++	io::IWriteFile* file=(io::IWriteFile*)png_get_io_ptr(png_ptr);
+ 	check=(png_size_t) file->write((const void*)data,(u32)length);
+ 
+ 	if (check != length)
diff --git a/community/jwm/PKGBUILD b/community/jwm/PKGBUILD
index 6fe9358d5..2caf2a506 100644
--- a/community/jwm/PKGBUILD
+++ b/community/jwm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 56063 2011-09-30 07:00:29Z kkeen $
+# $Id: PKGBUILD 63634 2012-02-05 12:02:20Z ibiru $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=jwm
 pkgver=2.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A lightweight window manager for the X11 Window System"
 arch=('i686' 'x86_64')
 url="http://joewing.net/programs/jwm/"
diff --git a/community/kovpn/PKGBUILD b/community/kovpn/PKGBUILD
index 13b780799..20b76bfc4 100644
--- a/community/kovpn/PKGBUILD
+++ b/community/kovpn/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 58772 2011-11-18 14:01:32Z spupykin $
+# $Id: PKGBUILD 63636 2012-02-05 12:02:32Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Douglas Soares de Andrade <dsandrade@gmail.com>
 
 pkgname=kovpn
 pkgver=0.3pre7
 _pkgver=0.3.pre7
-pkgrel=5
+pkgrel=6
 pkgdesc="An OpenVPN client management interface for KDE"
 arch=('i686' 'x86_64')
 url="http://www.kde-apps.org/content/show.php?content=37043"
diff --git a/community/leptonica/PKGBUILD b/community/leptonica/PKGBUILD
index d5e3fec82..9aaa55a76 100644
--- a/community/leptonica/PKGBUILD
+++ b/community/leptonica/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 57411 2011-10-27 08:39:19Z spupykin $
+# $Id: PKGBUILD 63638 2012-02-05 12:02:42Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Christoph Drexler <chrdr at gmx dot at>
 
 pkgname=leptonica
 pkgver=1.68
-pkgrel=2
+pkgrel=3
 pkgdesc="Software that is broadly useful for image processing and image analysis applications"
 arch=('i686' 'x86_64')
 url="http://www.leptonica.com/"
@@ -24,6 +24,7 @@ md5sums=('5cd7092f9ff2ca7e3f3e73bfcd556403')
 
 build() {
   cd ${srcdir}/leptonica-${pkgver}
+  sed -i '1,1i#include <zlib.h>' src/pngio.c
   ./configure --prefix=/usr
   make
 }
diff --git a/community/libgeotiff/PKGBUILD b/community/libgeotiff/PKGBUILD
index a7e2823f6..f8c13285c 100644
--- a/community/libgeotiff/PKGBUILD
+++ b/community/libgeotiff/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 27066 2010-09-17 00:46:59Z bfanella $
+# $Id: PKGBUILD 63640 2012-02-05 12:02:48Z ibiru $
 # Maintainer: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=libgeotiff
 pkgver=1.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A TIFF based interchange format for georeferenced raster imagery"
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://www.remotesensing.org/geotiff"
 depends=('libtiff' 'proj' 'libjpeg>=7')
-options=('!makeflags')
+options=('!makeflags' '!libtool')
 source=(ftp://ftp.remotesensing.org/pub/geotiff/libgeotiff/$pkgname-$pkgver.tar.gz)
 md5sums=('6ac3c22e44711e9a3add9044e40b9527')
 
diff --git a/community/libgtksourceviewmm2/PKGBUILD b/community/libgtksourceviewmm2/PKGBUILD
index 1542c58e1..a9c611216 100644
--- a/community/libgtksourceviewmm2/PKGBUILD
+++ b/community/libgtksourceviewmm2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 33294 2010-11-23 19:37:10Z heftig $
+# $Id: PKGBUILD 63642 2012-02-05 12:02:56Z ibiru $
 # Maintainer: Roman Kyrylych <roman@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 
 pkgname=libgtksourceviewmm2
 pkgver=2.10.1
-pkgrel=1
+pkgrel=2
 pkgdesc='A C++ API for gtksourceview2'
 arch=('i686' 'x86_64')
 url='http://projects.gnome.org/gtksourceviewmm/'
diff --git a/community/libharu/PKGBUILD b/community/libharu/PKGBUILD
index 160373489..ecbd647ad 100644
--- a/community/libharu/PKGBUILD
+++ b/community/libharu/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 51967 2011-07-18 20:03:48Z spupykin $
+# $Id: PKGBUILD 63644 2012-02-05 12:03:04Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer : SpepS <dreamspepser at yahoo dot it>
 # Contributor: Auguste <auguste@gmail.com>
@@ -6,18 +6,21 @@
 
 pkgname=libharu
 pkgver=2.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="C/C++ library for generating PDF documents"
 url="http://libharu.org/wiki/Main_Page"
 arch=('i686' 'x86_64')
 license=('custom:ZLIB')
 depends=('libpng' 'gcc-libs')
 options=(!libtool)
-source=("http://libharu.org/files/$pkgname-$pkgver.tar.gz")
-md5sums=('63da8e087744f1d6cf16f9501b1cb766')
+source=("http://libharu.org/files/$pkgname-$pkgver.tar.gz"
+	libpng15.patch)
+md5sums=('63da8e087744f1d6cf16f9501b1cb766'
+         '3793dd30017474bcd277af3b419bc0f6')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+  patch -p1 <$srcdir/libpng15.patch
   ./configure --prefix=/usr
   make
 }
diff --git a/community/libharu/libpng15.patch b/community/libharu/libpng15.patch
new file mode 100644
index 000000000..05a8d39fc
--- /dev/null
+++ b/community/libharu/libpng15.patch
@@ -0,0 +1,302 @@
+diff -wbBur libharu-2.2.1/src/hpdf_image_png.c libharu-2.2.1.my/src/hpdf_image_png.c
+--- libharu-2.2.1/src/hpdf_image_png.c	2010-02-08 12:27:51.000000000 +0300
++++ libharu-2.2.1.my/src/hpdf_image_png.c	2012-01-23 12:53:05.000000000 +0400
+@@ -110,13 +110,13 @@
+ {
+     png_uint_32 len = png_get_rowbytes(png_ptr, info_ptr);
+     png_bytep* row_pointers = HPDF_GetMem (image->mmgr,
+-                info_ptr->height * sizeof (png_bytep));
++                png_image_height(png_ptr, info_ptr) * sizeof (png_bytep));
+ 
+     if (row_pointers) {
+         HPDF_UINT i;
+ 
+-        HPDF_MemSet (row_pointers, 0, info_ptr->height * sizeof (png_bytep));
+-        for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) {
++        HPDF_MemSet (row_pointers, 0, png_image_height(png_ptr, info_ptr) * sizeof (png_bytep));
++        for (i = 0; i < (HPDF_UINT)png_image_height(png_ptr, info_ptr); i++) {
+             row_pointers[i] = HPDF_GetMem (image->mmgr, len);
+ 
+             if (image->error->error_no != HPDF_OK)
+@@ -126,7 +126,7 @@
+         if (image->error->error_no == HPDF_OK) {
+             png_read_image(png_ptr, row_pointers);
+             if (image->error->error_no == HPDF_OK) {       /* add this line */
+-                for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) {
++                for (i = 0; i < (HPDF_UINT)png_image_height(png_ptr, info_ptr); i++) {
+                     if (HPDF_Stream_Write (image->stream, row_pointers[i], len) !=
+                             HPDF_OK)
+                         break;
+@@ -135,7 +135,7 @@
+         }
+ 
+         /* clean up */
+-        for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) {
++        for (i = 0; i < (HPDF_UINT)png_image_height(png_ptr, info_ptr); i++) {
+             HPDF_FreeMem (image->mmgr, row_pointers[i]);
+         }
+ 
+@@ -156,7 +156,7 @@
+     if (buf_ptr) {
+         HPDF_UINT i;
+ 
+-        for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) {
++        for (i = 0; i < (HPDF_UINT)png_image_height(png_ptr, info_ptr); i++) {
+             png_read_rows(png_ptr, (png_byte**)&buf_ptr, NULL, 1);
+             if (image->error->error_no != HPDF_OK)
+                 break;
+@@ -183,13 +183,13 @@
+ 	HPDF_UINT i, j;
+ 	png_bytep *row_ptr;
+ 
+-	row_ptr = HPDF_GetMem (image->mmgr, info_ptr->height * sizeof(png_bytep));
++	row_ptr = HPDF_GetMem (image->mmgr, png_image_height(png_ptr, info_ptr) * sizeof(png_bytep));
+ 	if (!row_ptr) {
+ 		return HPDF_FAILD_TO_ALLOC_MEM;
+ 	} else {
+ 		png_uint_32 len = png_get_rowbytes(png_ptr, info_ptr);
+ 
+-		for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) {
++		for (i = 0; i < (HPDF_UINT)png_image_height(png_ptr, info_ptr); i++) {
+ 			row_ptr[i] = HPDF_GetMem(image->mmgr, len);
+ 			if (!row_ptr[i]) {
+ 				for (; i >= 0; i--) {
+@@ -207,19 +207,19 @@
+ 		goto Error;
+ 	}
+ 
+-	for (j = 0; j < info_ptr->height; j++) {
+-		for (i = 0; i < info_ptr->width; i++) {
+-			smask_data[info_ptr->width * j + i] = (row_ptr[j][i] < num_trans) ? trans[row_ptr[j][i]] : 0xFF;
++	for (j = 0; j < png_image_height(png_ptr, info_ptr); j++) {
++		for (i = 0; i < png_image_width(png_ptr, info_ptr); i++) {
++			smask_data[png_image_width(png_ptr, info_ptr) * j + i] = (row_ptr[j][i] < num_trans) ? trans[row_ptr[j][i]] : 0xFF;
+ 		}
+ 
+-		if (HPDF_Stream_Write (image->stream, row_ptr[j], info_ptr->width) != HPDF_OK) {
++		if (HPDF_Stream_Write (image->stream, row_ptr[j], png_image_width(png_ptr, info_ptr)) != HPDF_OK) {
+ 			ret = HPDF_FILE_IO_ERROR;
+ 			goto Error;
+ 		}
+ 	}
+ 
+ Error:
+-	for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) {
++	for (i = 0; i < (HPDF_UINT)png_image_height(png_ptr, info_ptr); i++) {
+ 		HPDF_FreeMem (image->mmgr, row_ptr[i]);
+ 	}
+ 
+@@ -245,13 +245,13 @@
+ 		return HPDF_INVALID_PNG_IMAGE;
+ 	}
+ 
+-	row_ptr = HPDF_GetMem (image->mmgr, info_ptr->height * sizeof(png_bytep));
++	row_ptr = HPDF_GetMem (image->mmgr, png_image_height(png_ptr, info_ptr) * sizeof(png_bytep));
+ 	if (!row_ptr) {
+ 		return HPDF_FAILD_TO_ALLOC_MEM;
+ 	} else {
+ 		png_uint_32 len = png_get_rowbytes(png_ptr, info_ptr);
+ 
+-		for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) {
++		for (i = 0; i < (HPDF_UINT)png_image_height(png_ptr, info_ptr); i++) {
+ 			row_ptr[i] = HPDF_GetMem(image->mmgr, len);
+ 			if (!row_ptr[i]) {
+ 				for (; i >= 0; i--) {
+@@ -271,12 +271,12 @@
+ 
+ 	switch (color_type) {
+ 		case PNG_COLOR_TYPE_RGB_ALPHA:
+-			row_len = 3 * info_ptr->width * sizeof(png_byte);
+-			for (j = 0; j < info_ptr->height; j++) {
+-				for (i = 0; i < info_ptr->width; i++) {
++			row_len = 3 * png_image_width(png_ptr, info_ptr) * sizeof(png_byte);
++			for (j = 0; j < png_image_height(png_ptr, info_ptr); j++) {
++				for (i = 0; i < png_image_width(png_ptr, info_ptr); i++) {
+ 					row = row_ptr[j];
+ 					memmove(row + (3 * i), row + (4*i), 3);
+-					smask_data[info_ptr->width * j + i] = row[4 * i + 3];
++					smask_data[png_image_width(png_ptr, info_ptr) * j + i] = row[4 * i + 3];
+ 				}
+ 
+ 				if (HPDF_Stream_Write (image->stream, row, row_len) != HPDF_OK) {
+@@ -286,12 +286,12 @@
+ 			}
+ 			break;
+ 		case PNG_COLOR_TYPE_GRAY_ALPHA:
+-			row_len = info_ptr->width * sizeof(png_byte);
+-			for (j = 0; j < info_ptr->height; j++) {
+-				for (i = 0; i < info_ptr->width; i++) {
++			row_len = png_image_width(png_ptr, info_ptr) * sizeof(png_byte);
++			for (j = 0; j < png_image_height(png_ptr, info_ptr); j++) {
++				for (i = 0; i < png_image_width(png_ptr, info_ptr); i++) {
+ 					row = row_ptr[j];
+ 					row[i] = row[2 * i];
+-					smask_data[info_ptr->width * j + i] = row[2 * i + 1];
++					smask_data[png_image_width(png_ptr, info_ptr) * j + i] = row[2 * i + 1];
+ 				}
+ 
+ 				if (HPDF_Stream_Write (image->stream, row, row_len) != HPDF_OK) {
+@@ -306,7 +306,7 @@
+ 	}
+ 
+ Error:
+-	for (i = 0; i < (HPDF_UINT)info_ptr->height; i++) {
++	for (i = 0; i < (HPDF_UINT)png_image_height(png_ptr, info_ptr); i++) {
+ 		HPDF_FreeMem (image->mmgr, row_ptr[i]);
+ 	}
+ 
+@@ -448,7 +448,7 @@
+ 	}
+ 
+ 	/* 16bit images are not supported. */
+-	if (info_ptr->bit_depth == 16) {
++	if (png_get_bit_depth(png_ptr, info_ptr) == 16) {
+ 		png_set_strip_16(png_ptr);
+ 	}
+ 
+@@ -458,7 +458,7 @@
+ 	}
+ 
+ 	/* check palette-based images for transparent areas and load them immediately if found */
+-	if (xref && PNG_COLOR_TYPE_PALETTE & info_ptr->color_type) {
++	if (xref && PNG_COLOR_TYPE_PALETTE & png_get_color_type(png_ptr, info_ptr)) {
+ 		png_bytep trans;
+ 		int num_trans;
+ 		HPDF_Dict smask;
+@@ -478,10 +478,10 @@
+ 		smask->header.obj_class |= HPDF_OSUBCLASS_XOBJECT;
+ 		ret = HPDF_Dict_AddName (smask, "Type", "XObject");
+ 		ret += HPDF_Dict_AddName (smask, "Subtype", "Image");
+-		ret += HPDF_Dict_AddNumber (smask, "Width", (HPDF_UINT)info_ptr->width);
+-		ret += HPDF_Dict_AddNumber (smask, "Height", (HPDF_UINT)info_ptr->height);
++		ret += HPDF_Dict_AddNumber (smask, "Width", (HPDF_UINT)png_image_width(png_ptr, info_ptr));
++		ret += HPDF_Dict_AddNumber (smask, "Height", (HPDF_UINT)png_image_height(png_ptr, info_ptr));
+ 		ret += HPDF_Dict_AddName (smask, "ColorSpace", "DeviceGray");
+-		ret += HPDF_Dict_AddNumber (smask, "BitsPerComponent", (HPDF_UINT)info_ptr->bit_depth);
++		ret += HPDF_Dict_AddNumber (smask, "BitsPerComponent", (HPDF_UINT)png_get_bit_depth(png_ptr, info_ptr));
+ 
+ 		if (ret != HPDF_OK) {
+ 			HPDF_Dict_Free(smask);
+@@ -489,7 +489,7 @@
+ 			goto Exit;
+ 		}
+ 
+-		smask_data = HPDF_GetMem(image->mmgr, info_ptr->width * info_ptr->height);
++		smask_data = HPDF_GetMem(image->mmgr, png_image_width(png_ptr, info_ptr) * png_image_height(png_ptr, info_ptr));
+ 		if (!smask_data) {
+ 			HPDF_Dict_Free(smask);
+ 			ret = HPDF_FAILD_TO_ALLOC_MEM;
+@@ -503,7 +503,7 @@
+ 			goto Exit;
+ 		}
+ 
+-		if (HPDF_Stream_Write(smask->stream, smask_data, info_ptr->width * info_ptr->height) != HPDF_OK) {
++		if (HPDF_Stream_Write(smask->stream, smask_data, png_image_width(png_ptr, info_ptr) * png_image_height(png_ptr, info_ptr)) != HPDF_OK) {
+ 			HPDF_FreeMem(image->mmgr, smask_data);
+ 			HPDF_Dict_Free(smask);
+ 			ret = HPDF_FILE_IO_ERROR;
+@@ -513,9 +513,9 @@
+ 
+ 
+ 		ret += CreatePallet(image, png_ptr, info_ptr);
+-		ret += HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)info_ptr->width);
+-		ret += HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)info_ptr->height);
+-		ret += HPDF_Dict_AddNumber (image, "BitsPerComponent",	(HPDF_UINT)info_ptr->bit_depth);
++		ret += HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)png_image_width(png_ptr, info_ptr));
++		ret += HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)png_image_height(png_ptr, info_ptr));
++		ret += HPDF_Dict_AddNumber (image, "BitsPerComponent",	(HPDF_UINT)png_get_bit_depth(png_ptr, info_ptr));
+ 		ret += HPDF_Dict_Add (image, "SMask", smask);
+ 
+ 		png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+@@ -526,7 +526,7 @@
+ 
+ 	/* read images with alpha channel right away 
+ 	   we have to do this because image transparent mask must be added to the Xref */
+-	if (xref && PNG_COLOR_MASK_ALPHA & info_ptr->color_type) {
++	if (xref && PNG_COLOR_MASK_ALPHA & png_get_color_type(png_ptr, info_ptr)) {
+ 		HPDF_Dict smask;
+ 		png_bytep smask_data;
+ 
+@@ -539,10 +539,10 @@
+ 		smask->header.obj_class |= HPDF_OSUBCLASS_XOBJECT;
+ 		ret = HPDF_Dict_AddName (smask, "Type", "XObject");
+ 		ret += HPDF_Dict_AddName (smask, "Subtype", "Image");
+-		ret += HPDF_Dict_AddNumber (smask, "Width", (HPDF_UINT)info_ptr->width);
+-		ret += HPDF_Dict_AddNumber (smask, "Height", (HPDF_UINT)info_ptr->height);
++		ret += HPDF_Dict_AddNumber (smask, "Width", (HPDF_UINT)png_image_width(png_ptr, info_ptr));
++		ret += HPDF_Dict_AddNumber (smask, "Height", (HPDF_UINT)png_image_height(png_ptr, info_ptr));
+ 		ret += HPDF_Dict_AddName (smask, "ColorSpace", "DeviceGray");
+-		ret += HPDF_Dict_AddNumber (smask, "BitsPerComponent", (HPDF_UINT)info_ptr->bit_depth);
++		ret += HPDF_Dict_AddNumber (smask, "BitsPerComponent", (HPDF_UINT)png_get_bit_depth(png_ptr, info_ptr));
+ 
+ 		if (ret != HPDF_OK) {
+ 			HPDF_Dict_Free(smask);
+@@ -550,7 +550,7 @@
+ 			goto Exit;
+ 		}
+ 
+-		smask_data = HPDF_GetMem(image->mmgr, info_ptr->width * info_ptr->height);
++		smask_data = HPDF_GetMem(image->mmgr, png_image_width(png_ptr, info_ptr) * png_image_height(png_ptr, info_ptr));
+ 		if (!smask_data) {
+ 			HPDF_Dict_Free(smask);
+ 			ret = HPDF_FAILD_TO_ALLOC_MEM;
+@@ -564,7 +564,7 @@
+ 			goto Exit;
+ 		}
+ 
+-		if (HPDF_Stream_Write(smask->stream, smask_data, info_ptr->width * info_ptr->height) != HPDF_OK) {
++		if (HPDF_Stream_Write(smask->stream, smask_data, png_image_width(png_ptr, info_ptr) * png_image_height(png_ptr, info_ptr)) != HPDF_OK) {
+ 			HPDF_FreeMem(image->mmgr, smask_data);
+ 			HPDF_Dict_Free(smask);
+ 			ret = HPDF_FILE_IO_ERROR;
+@@ -572,14 +572,14 @@
+ 		}
+ 		HPDF_FreeMem(image->mmgr, smask_data);
+ 
+-		if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) {
++		if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY_ALPHA) {
+ 			ret += HPDF_Dict_AddName (image, "ColorSpace", "DeviceGray");
+ 		} else {
+ 			ret += HPDF_Dict_AddName (image, "ColorSpace", "DeviceRGB");
+ 		}
+-		ret += HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)info_ptr->width);
+-		ret += HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)info_ptr->height);
+-		ret += HPDF_Dict_AddNumber (image, "BitsPerComponent",	(HPDF_UINT)info_ptr->bit_depth);
++		ret += HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)png_image_width(png_ptr, info_ptr));
++		ret += HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)png_image_height(png_ptr, info_ptr));
++		ret += HPDF_Dict_AddNumber (image, "BitsPerComponent",	(HPDF_UINT)png_get_bit_depth(png_ptr, info_ptr));
+ 		ret += HPDF_Dict_Add (image, "SMask", smask);
+ 
+ 		png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+@@ -589,9 +589,9 @@
+ 	/* if the image has color palette, copy the pallet of the image to
+ 	 * create color map.
+ 	 */
+-	if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
++	if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE)
+ 		ret = CreatePallet(image, png_ptr, info_ptr);
+-	else if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY)
++	else if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY)
+ 		ret = HPDF_Dict_AddName (image, "ColorSpace", "DeviceGray");
+ 	else
+ 		ret = HPDF_Dict_AddName (image, "ColorSpace", "DeviceRGB");
+@@ -617,16 +617,16 @@
+ 	}
+ 
+ 	/* setting the info of the image. */
+-	if (HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)info_ptr->width)
++	if (HPDF_Dict_AddNumber (image, "Width", (HPDF_UINT)png_image_width(png_ptr, info_ptr))
+ 			!= HPDF_OK)
+ 		goto Exit;
+ 
+-	if (HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)info_ptr->height)
++	if (HPDF_Dict_AddNumber (image, "Height", (HPDF_UINT)png_image_height(png_ptr, info_ptr))
+ 			!= HPDF_OK)
+ 		goto Exit;
+ 
+ 	if (HPDF_Dict_AddNumber (image, "BitsPerComponent",
+-				(HPDF_UINT)info_ptr->bit_depth) != HPDF_OK)
++				(HPDF_UINT)png_get_bit_depth(png_ptr, info_ptr)) != HPDF_OK)
+ 		goto Exit;
+ 
+ 	/* clean up */
diff --git a/community/libinfinity/PKGBUILD b/community/libinfinity/PKGBUILD
index 4dc307ca4..817166b0f 100644
--- a/community/libinfinity/PKGBUILD
+++ b/community/libinfinity/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 54465 2011-08-18 15:07:27Z bluewind $
+# $Id: PKGBUILD 63646 2012-02-05 12:03:09Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Gregory Haynes <greg@greghaynes.net>
 
 pkgname=libinfinity
 pkgver=0.5.1
-pkgrel=2
+pkgrel=3
 pkgdesc="An implementation of the Infininote protocol written in GObject-based C"
 arch=('i686' 'x86_64')
 url="http://gobby.0x539.de"
diff --git a/community/libmatchbox/PKGBUILD b/community/libmatchbox/PKGBUILD
index 63eb2cb29..7024885ce 100644
--- a/community/libmatchbox/PKGBUILD
+++ b/community/libmatchbox/PKGBUILD
@@ -1,23 +1,26 @@
-# $Id: PKGBUILD 58821 2011-11-18 16:44:16Z spupykin $
+# $Id: PKGBUILD 63648 2012-02-05 12:03:24Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Henrique C. Alves <hcarvalhoalves@gmail.com>
 
 pkgname=libmatchbox
 pkgver=1.9
-pkgrel=4
+pkgrel=5
 pkgdesc="Base library for Matchbox WM"
 arch=('i686' 'x86_64')
 license=('LGPL')
 depends=('pango' 'libpng' 'libjpeg>=7' 'xsettings-client' 'libxext')
 options=('!libtool')
 url="http://matchbox-project.org/"
-source=(http://matchbox-project.org/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2)
-md5sums=('9f73e7515cc4679171a5db180dc1343b')
+source=(http://matchbox-project.org/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2
+	libpng15.patch)
+md5sums=('9f73e7515cc4679171a5db180dc1343b'
+         '09f782c76fe313efd0e87fabb276e2fe')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   sed -i 's|png_check_sig( header, 8 )|png_sig_cmp( header, 0, 8 ) == 0|' libmb/mbpixbuf.c
-  ./configure --prefix=/usr --enable-pango --enable-jpeg --enable-xsettings
+  patch -Rp1 <$srcdir/libpng15.patch
+  LDFLAGS="-lX11" ./configure --prefix=/usr --enable-pango --enable-jpeg --enable-xsettings
   make
   make DESTDIR="$pkgdir" install
 }
diff --git a/community/libmatchbox/libpng15.patch b/community/libmatchbox/libpng15.patch
new file mode 100644
index 000000000..6c4ddef4d
--- /dev/null
+++ b/community/libmatchbox/libpng15.patch
@@ -0,0 +1,23 @@
+diff -wbBur libmatchbox-1.9/libmb/mbpixbuf.c libmatchbox-1.9.org/libmb/mbpixbuf.c
+--- libmatchbox-1.9/libmb/mbpixbuf.c	2012-01-19 21:57:56.000000000 +0400
++++ libmatchbox-1.9.org/libmb/mbpixbuf.c	2006-07-26 23:12:25.000000000 +0400
+@@ -247,7 +247,7 @@
+     return NULL;
+   }
+ 
+-  if ( setjmp( png_jmpbuf(png_ptr) ) ) {
++  if ( setjmp( png_ptr->jmpbuf ) ) {
+     png_destroy_read_struct( &png_ptr, &info_ptr, NULL);
+     fclose(fd);
+     return NULL;
+@@ -269,8 +269,8 @@
+       ( color_type == PNG_COLOR_TYPE_GRAY_ALPHA ))
+     png_set_gray_to_rgb(png_ptr);
+  
+-  if ( png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA 
+-       || png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY_ALPHA
++  if ( info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA 
++       || info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA
+        )
+     *has_alpha = 1;
+   else
diff --git a/community/luakit/PKGBUILD b/community/luakit/PKGBUILD
index af16ee713..e92f5a99f 100644
--- a/community/luakit/PKGBUILD
+++ b/community/luakit/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=luakit
 pkgver=2011.07.22
-pkgrel=4
+pkgrel=3
 pkgdesc='Highly configurable, micro-browser framework based on the WebKit web content engine and the GTK+ toolkit. "Stable" release.'
 arch=('i686' 'x86_64')
 url='http://www.luakit.org/projects/luakit'
diff --git a/community/luminancehdr/PKGBUILD b/community/luminancehdr/PKGBUILD
index f29d49477..d37734038 100644
--- a/community/luminancehdr/PKGBUILD
+++ b/community/luminancehdr/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 61083 2011-12-21 20:51:24Z andrea $
+# $Id: PKGBUILD 63654 2012-02-05 12:03:48Z ibiru $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 # Contributor: Dmitry N. Shilov <stormblast@land.ru>
 
 pkgname=luminancehdr
 pkgver=2.1.0
-pkgrel=6
+pkgrel=7
 pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging'
 arch=('i686' 'x86_64')
 url='http://qtpfsgui.sourceforge.net/'
diff --git a/community/luminancehdr/luminancehdr.changelog b/community/luminancehdr/luminancehdr.changelog
index 378053ef5..807541292 100644
--- a/community/luminancehdr/luminancehdr.changelog
+++ b/community/luminancehdr/luminancehdr.changelog
@@ -1,3 +1,6 @@
+2012-01-27  Eric Belanger  <eric@archlinux.org>
+	* Rebuild against libpng 1.5 and libtiff 4.0
+
 2011-08-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* luminancehdr 2.1.0-1
 
diff --git a/community/luxrender/PKGBUILD b/community/luxrender/PKGBUILD
index 3cb9ad56e..c611ffdc6 100644
--- a/community/luxrender/PKGBUILD
+++ b/community/luxrender/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 61377 2011-12-29 13:55:18Z stativ $
+# $Id: PKGBUILD 63656 2012-02-05 12:03:53Z ibiru $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 # Initial contributor: flixie <69one@gmx.net>
 # Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org>
 pkgname=luxrender
 pkgver=0.8
 _pkgver=45d3e13eb94c
-pkgrel=11
+pkgrel=12
 pkgdesc="Rendering system for physically correct, unbiased image synthesis"
 arch=('i686' 'x86_64')
 url="http://www.luxrender.net/"
diff --git a/community/mapnik/PKGBUILD b/community/mapnik/PKGBUILD
index 98af0c4d7..4034a978d 100644
--- a/community/mapnik/PKGBUILD
+++ b/community/mapnik/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 59948 2011-12-02 20:59:31Z ibiru $
+# $Id: PKGBUILD 63658 2012-02-05 12:04:01Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: David Dent <thewinch@gmail.com>
 # Contributor: orbisvicis <orbisvicis@gmail.com>
 
 pkgname=mapnik
 pkgver=0.7.1
-pkgrel=12
+pkgrel=13
 pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps."
 arch=('i686' 'x86_64')
 url="http://mapnik.org/"
@@ -34,7 +34,7 @@ build() {
 
   #patch SConstruct so libs end up in /usr/lib not /usr/lib64 on X86_64
   sed -i -e "/LIBDIR_SCHEMA=/s/lib64/lib/" SConstruct
-
+  sed -i 's|png_ptr->io_ptr|png_get_io_ptr(png_ptr)|g' src/png_reader.cpp
   sed -i 's/-ansi -Wall/-ansi -DBOOST_FILESYSTEM_VERSION=2 -Wall/' SConstruct
 
   scons configure \
@@ -46,7 +46,6 @@ build() {
 package(){
   cd "$srcdir/$pkgname-$pkgver"
   scons install
-
   # fix permissions on SCons-autogenerated files
   chmod 644 "${pkgdir}/usr/lib/python2.7/site-packages/mapnik/paths.py"
 }
diff --git a/community/megaglest/PKGBUILD b/community/megaglest/PKGBUILD
index 6df58d747..592833c16 100644
--- a/community/megaglest/PKGBUILD
+++ b/community/megaglest/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 62705 2012-01-24 21:51:26Z svenstaro $
+# $Id: PKGBUILD 63660 2012-02-05 12:04:09Z ibiru $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
  
 pkgname=megaglest
-pkgver=3.6.0.3
-pkgrel=1
+pkgver=3.6.0.2
+pkgrel=2
 pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world."
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/megaglest/"
@@ -13,7 +13,7 @@ depends=('curl' 'megaglest-data' 'xerces-c' 'sdl' 'libvorbis' 'openal' 'libgl' '
          'libircclient' 'miniupnpc' 'wxgtk')
 makedepends=('ftjam' 'cmake' 'mesa')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.tar.xz")
-md5sums=('e939cbbb85c35e66c67ec2aa6f6b7f0b')
+md5sums=('9d840a04b41aef2cba503de7bf433b8d')
 
 build() {
   cd "${srcdir}"/"${pkgname}"-"${pkgver}"/
diff --git a/community/megaglest/megaglest.sh b/community/megaglest/megaglest.sh
new file mode 100644
index 000000000..571a01be7
--- /dev/null
+++ b/community/megaglest/megaglest.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+ # Wrapper script for Megaglest.
+ 
+ MAINDIR=/usr/share/megaglest
+ BASEDIR="$HOME/.config"
+ DIR="$BASEDIR/megaglest"
+ if [ ! -d "$DIR" ]; then
+ mkdir -p $DIR
+ fi
+ cd $DIR
+ [ -f glest.ini ] || cp /usr/share/megaglest/glest.ini .
+ [ -h megaglest ] || ln -s /usr/share/megaglest/megaglest .
+ [ -f servers.ini ] || cp $MAINDIR/servers.ini .
+ [ -f glestkeys.ini ] || cp $MAINDIR/glestkeys.ini .
+ for i in data scenarios techs tilesets tutorials; do
+ [ -h $i ] || ln -s $MAINDIR/$i .
+ done
+ [ -d maps ] || mkdir maps
+ [ -d screens ] || mkdir screens
+ cd maps
+ for i in $MAINDIR/maps/*; do
+ [ -h `basename $i` ] || ln -s $i .
+ done
+ cd ..
+ 
+ exec ./megaglest
+\ No newline at end of file
diff --git a/community/metapixel/PKGBUILD b/community/metapixel/PKGBUILD
index 056f40d52..1e5300fca 100644
--- a/community/metapixel/PKGBUILD
+++ b/community/metapixel/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 53817 2011-08-08 13:44:50Z lfleischer $
+# $Id: PKGBUILD 63662 2012-02-05 12:04:18Z ibiru $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Daniel Isenmann <daniel.isenmann [at] gmx [dot] de>
 
 pkgname=metapixel
 pkgver=1.0.2
-pkgrel=2
+pkgrel=3
 pkgdesc='A program for generating photomosaics.'
 arch=('i686' 'x86_64')
 url='http://www.complang.tuwien.ac.at/schani/metapixel/'
 license=('GPL')
-depends=('libungif' 'libjpeg' 'libpng' 'perl')
+depends=('giflib' 'libjpeg' 'libpng' 'perl')
 source=("http://www.complang.tuwien.ac.at/schani/metapixel/files/${pkgname}-${pkgver}.tar.gz"
         'metapixel-1.0.2-libpng-1.5.patch')
 md5sums=('af5d77d38826756af213a08e3ada9941'
@@ -18,9 +18,6 @@ md5sums=('af5d77d38826756af213a08e3ada9941'
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  sed -i 's/lgif/lungif/g' Makefile
-  sed -ie '58,58d' Makefile
-
   patch -p1 -i ../metapixel-1.0.2-libpng-1.5.patch
 
   make
@@ -28,5 +25,8 @@ build() {
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  
+  install -dm0755 "${pkgdir}/usr/share/man/man1"
+
   make PREFIX="${pkgdir}/usr" install
 }
diff --git a/community/mldonkey/PKGBUILD b/community/mldonkey/PKGBUILD
index 4d7b7ffb8..ea5a0f175 100644
--- a/community/mldonkey/PKGBUILD
+++ b/community/mldonkey/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 54810 2011-08-26 12:19:01Z cbrannon $
+# $Id: PKGBUILD 63664 2012-02-05 12:04:35Z ibiru $
 # Maintainer: Chris Brannon <cmbrannon79@gmail.com>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>   
 
 pkgname=mldonkey
 pkgver=3.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A multi-network P2P client"
 arch=('i686' 'x86_64')
 url="http://mldonkey.sourceforge.net/"
diff --git a/community/mtpaint/PKGBUILD b/community/mtpaint/PKGBUILD
index 2aacb7fff..839f4bf6d 100644
--- a/community/mtpaint/PKGBUILD
+++ b/community/mtpaint/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 61499 2012-01-02 02:35:06Z arodseth $
+# $Id: PKGBUILD 63668 2012-02-05 12:04:57Z ibiru $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 # Contributor: yosh64 <yosh64.at.gmail.dot.com>
 pkgname=mtpaint
 pkgver=3.40
-pkgrel=1
+pkgrel=2
 pkgdesc="Simple GTK2 paint program for creating icons and pixel based artwork"
 arch=('x86_64' 'i686')
 url="http://mtpaint.sourceforge.net/"
@@ -12,14 +12,14 @@ license=('GPL3')
 depends=('gtk2' 'giflib' 'openjpeg' 'desktop-file-utils' 'lcms2')
 install=mtpaint.install
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2"
-        "libpng14.patch")
+        "libpng15.patch")
 sha256sums=('ef321d2b404839c7b909bdf5283eb22a37fbdd35b4cc9e380ddc400573d7c890'
             'be51d45d1146d6c61d1c2c12d1712134da5048dd7314e2741ff336cac6838de3')
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
-	patch -Np1 -i "$srcdir/libpng14.patch"
+	patch -Np1 -i "$srcdir/libpng15.patch"
 	./configure --prefix=/usr --mandir=/usr/share/man/man1 man intl gif jpeg tiff
   sed -i 's:-lpng:-lpng -lgif:' _conf.txt
 	make
diff --git a/community/mtpaint/libpng15.patch b/community/mtpaint/libpng15.patch
new file mode 100644
index 000000000..7df3b2127
--- /dev/null
+++ b/community/mtpaint/libpng15.patch
@@ -0,0 +1,21 @@
+diff -upr mtpaint-3.31.orig/src/png.c mtpaint-3.31/src/png.c
+--- mtpaint-3.31.orig/src/png.c	2010-01-25 00:43:07.000000000 +0200
++++ mtpaint-3.31/src/png.c	2010-01-25 00:43:39.000000000 +0200
+@@ -539,7 +539,7 @@ static int load_png(char *file_name, ls_
+ 	if (settings->bpp == 3)
+ 	{
+ 		png_set_strip_16(png_ptr);
+-		png_set_gray_1_2_4_to_8(png_ptr);
++		png_set_expand_gray_1_2_4_to_8(png_ptr);
+ 		png_set_palette_to_rgb(png_ptr);
+ 		png_set_gray_to_rgb(png_ptr);
+ 
+@@ -644,7 +644,7 @@ static int load_png(char *file_name, ls_
+ 		png_set_strip_alpha(png_ptr);
+ 		png_set_packing(png_ptr);
+ 		if ((color_type == PNG_COLOR_TYPE_GRAY) && (bit_depth < 8))
+-			png_set_gray_1_2_4_to_8(png_ptr);
++			png_set_expand_gray_1_2_4_to_8(png_ptr);
+ 		for (i = 0; i < height; i++)
+ 		{
+ 			row_pointers[i] = settings->img[CHN_IMAGE] + i * width;
diff --git a/community/mypaint/PKGBUILD b/community/mypaint/PKGBUILD
index bdb479906..5117a9227 100644
--- a/community/mypaint/PKGBUILD
+++ b/community/mypaint/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 59299 2011-11-22 22:00:51Z spupykin $
+# $Id: PKGBUILD 63672 2012-02-05 12:05:19Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jon Nordby <jononor@gmail.com>
 
 pkgname=mypaint
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A fast and easy painting application for digital painters, with brush dynamics"
 arch=('i686' 'x86_64')
 url="http://mypaint.intilinux.com/"
diff --git a/community/naev/PKGBUILD b/community/naev/PKGBUILD
index d6464d992..4c6138156 100644
--- a/community/naev/PKGBUILD
+++ b/community/naev/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 48678 2011-06-04 13:28:51Z svenstaro $
+# $Id: PKGBUILD 63674 2012-02-05 12:05:32Z ibiru $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Johan Rehnberg <cleanrock@gmail.com>
 
 pkgname=naev
 pkgver=0.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc='2D action/rpg space game'
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/naev/"
@@ -17,6 +17,8 @@ md5sums=('f7d754a17ace87aac540d0d6d48313d6')
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  sed -i "41 i #include <zlib.h>" src/opengl.c
+
   ./configure --prefix=/usr --disable-debug --disable-shave --with-ndata-path=/usr/share/naev/ndata-${pkgver}
   make
 }
diff --git a/community/nestopia/PKGBUILD b/community/nestopia/PKGBUILD
index 0cff030f3..c73ddbce7 100644
--- a/community/nestopia/PKGBUILD
+++ b/community/nestopia/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 53185 2011-07-31 19:02:49Z spupykin $
+# $Id: PKGBUILD 63676 2012-02-05 12:05:46Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Tiago Pierezan Camargo <tcamargo@gmail.com>
 # Contributor: robb_force <robb_force@holybuffalo.net>
 
 pkgname=nestopia
 pkgver=1.40h
-pkgrel=4
+pkgrel=5
 pkgdesc='An NES emulator featuring cycle exact emulation, a ridiculous number of mappers, and lots of custom sound chips.'
 url='http://rbelmont.mameworld.info/?page_id=200'
 license=('GPL')
diff --git a/community/netsurf/PKGBUILD b/community/netsurf/PKGBUILD
index beddbb372..618c5a76b 100644
--- a/community/netsurf/PKGBUILD
+++ b/community/netsurf/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 59684 2011-11-29 11:46:42Z arodseth $
+# $Id: PKGBUILD 63678 2012-02-05 12:05:59Z ibiru $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
 # Contributor: Georgij Kondratjev <smpuj@bk.ru>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 pkgname=netsurf
 pkgver=2.8
-pkgrel=2
+pkgrel=3
 pkgdesc="Lightweight and fast web browser"
 arch=('x86_64' 'i686')
 url="http://www.netsurf-browser.org/"
@@ -25,6 +25,8 @@ md5sums=('4f28912e5df4b826b819e175265bcc9c'
 build() {
   cd "$srcdir/$pkgname"
 
+  sed 's:libpng:libpng15:' -i gtk/Makefile.target
+  sed 's:libpng:libpng15:' -i monkey/Makefile.target
   make PREFIX=/usr TARGET=gtk
 }
 
diff --git a/community/netsurf/PKGBUILD.wip b/community/netsurf/PKGBUILD.wip
new file mode 100644
index 000000000..592ca0268
--- /dev/null
+++ b/community/netsurf/PKGBUILD.wip
@@ -0,0 +1,59 @@
+# $Id: PKGBUILD 62434 2012-01-20 02:23:51Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Paulo Matias <matiasΘarchlinux-br·org>
+# Contributor: Georgij Kondratjev <smpuj@bk.ru>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+pkgname=netsurf
+pkgver=2.8
+pkgrel=3
+pkgdesc="Lightweight and fast web browser"
+arch=('x86_64' 'i686')
+url="http://www.netsurf-browser.org/"
+license=('GPL')
+depends=('libmng' 'curl' 'libglade' 'librsvg' 'desktop-file-utils' 'libnsbmp' 'libnsgif' 'hubbub' 'libcss' 'hubbub' 'libpng')
+makedepends=('re2c' 'lcms' 'setconf')
+provides=('netsurf')
+conflicts=('netsurf')
+install=netsurf.install
+source=("netsurf.png::http://ubuntu.allmyapps.com/data/n/e/netsurf-netsurf-web-browser/icon_48x48_netsurf.png"
+        "http://www.netsurf-browser.org/downloads/releases/$pkgname-$pkgver-src.tar.gz"
+        "$pkgname.desktop")
+md5sums=('4f28912e5df4b826b819e175265bcc9c'
+         '49c41f281f3e9ca28a24da505fad2e3a'
+         '85e0af265e77607596fd90db9ac707ad')
+
+build() {
+  cd "$srcdir/$pkgname"
+
+  #sed 's:libpng:libpng15:' -i gtk/Makefile.target
+  #setconf Makefile.defaults NETSURF_USE_PNG NO
+  #setconf Makefile.defaults NETSURF_USE_RSVG NO
+  #setconf Makefile.defaults NETSURF_USE_MNG NO
+  #setconf Makefile.defaults NETSURF_USE_BMP NO
+  #setconf Makefile.defaults NETSURF_USE_GIF NO
+  #setconf Makefile.defaults NETSURF_USE_JPEG NO
+
+  #setconf gtk/Makefile.target NETSURF_FEATURE_RSVG_CFLAGS "-DWITH_RSVG -pthread -lrsvg-2 -lgio-2.0 -lgdk_pixbuf-2.0 -lcairo -lgmodule-2.0 -lgobject-2.0 -lgthread-2.0 -lrt -lglib-2.0 -pthread -I/usr/include/librsvg-2.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/cairo -I/usr/include/libpng -I/usr/include/pixman-1 -I/usr/include/freetype2"
+  #sed 's:$(eval $(call pkg_config_find_and_add,RSVG,librsvg-2.0,SVG)):#:' -i gtk/Makefile.target
+
+  setconf Makefile.defaults CFLAGS "-lm"
+
+  #sed 's:$(Q)$(CC) -o $(EXETARGET) $(OBJECTS) $(LDFLAGS):echo $(LDFLAGS)\n\t$(Q)$(CC) -o $(EXETARGET) $(OBJECTS) $(LDFLAGS):' -i Makefile
+
+  #LDFLAGS="-lm" make PREFIX=/usr TARGET=gtk
+  LDFLAGS="-lm" make PREFIX=/usr TARGET=gtk
+}
+
+package() {
+  cd "$srcdir/$pkgname"
+
+  make install PREFIX=/usr DESTDIR="$pkgdir"
+  install -Dm644 "../$pkgname.png" \
+    "$pkgdir/usr/share/pixmaps/$pkgname.png"
+  install -Dm644 "../$pkgname.desktop" \
+    "$pkgdir/usr/share/applications/$pkgname.desktop"
+  install -Dm644 COPYING \
+    "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/nvclock/PKGBUILD b/community/nvclock/PKGBUILD
index 4eda3735f..ac863cc81 100644
--- a/community/nvclock/PKGBUILD
+++ b/community/nvclock/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 37680 2011-01-16 14:37:03Z lfleischer $
+# $Id: PKGBUILD 63680 2012-02-05 12:06:13Z ibiru $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Markus Meissner <markus@meissna.de>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=nvclock
 pkgver=0.8b4
-pkgrel=2
+pkgrel=3
 pkgdesc='A small utility which allows users to overclock NVIDIA based video cards.'
 arch=('i686' 'x86_64')
 url='http://www.linuxhardware.org/nvclock/'
@@ -16,16 +16,19 @@ install='nvclock.install'
 options=('!makeflags')
 source=("http://www.linuxhardware.org/${pkgname}/${pkgname}${pkgver}.tar.gz"
         'nvclock-0.8b4-buildfix.patch'
+        'nvclock-0.8b4-linkfix.patch'
         'nvclock.desktop-use-gksu.patch')
 md5sums=('23f1b3ebf40f35d76d5fdac50f66ab11'
          '1da24b50dd6a8c4704fa550a3e1a8b53'
+         'b812646787ea44e693fd2288612f25ad'
          '98fc1995721d0b0e8ff6d448869eee6d')
 
 build(){
   cd "${srcdir}/${pkgname}${pkgver}"
 
-  # build fix from Fedora
+  # build and link fixes from Fedora
   patch -Np1 -i "${srcdir}/nvclock-0.8b4-buildfix.patch"
+  patch -Np1 -i "${srcdir}/nvclock-0.8b4-linkfix.patch"
 
   # Make ".desktop" file use gksu(1).
   patch -Np0 -i "${srcdir}/nvclock.desktop-use-gksu.patch"
diff --git a/community/nvclock/nvclock-0.8b4-linkfix.patch b/community/nvclock/nvclock-0.8b4-linkfix.patch
new file mode 100644
index 000000000..0029d1c74
--- /dev/null
+++ b/community/nvclock/nvclock-0.8b4-linkfix.patch
@@ -0,0 +1,18 @@
+diff -upNr nvclock0.8b4.orign/src/gtk/Makefile.in nvclock0.8b4/src/gtk/Makefile.in
+--- nvclock0.8b4.orign/src/gtk/Makefile.in	2008-05-11 12:25:46.000000000 +0200
++++ nvclock0.8b4/src/gtk/Makefile.in	2010-02-13 19:56:24.204078277 +0100
+@@ -20,12 +20,12 @@ endif
+ ifeq ($(HAVE_NVCONTROL), yes)
+     DEPS=$(libbackend) $(libnvcontrol)
+     INCLUDES=@X11_CFLAGS@ -I./backend -I./nvcontrol -I.. -I../..
+-    LIBS=@GTK_LIBS@ -L../backend -lbackend -L../nvcontrol -lnvcontrol
++    LIBS=@GTK_LIBS@ -L../backend -lbackend -L../nvcontrol -lnvcontrol -lX11 -lXext -ldl
+     OBJECTS=banner.o gl.o hw.o main.o settings.o
+ else
+     DEPS=$(libbackend)
+     INCLUDES=-I./backend -I./nvcontrol -I.. -I../..
+-    LIBS=@GTK_LIBS@ -L../backend -lbackend
++    LIBS=@GTK_LIBS@ -L../backend -lbackend -lX11 -lXext -ldl
+     OBJECTS=banner.o hw.o main.o settings.o
+ endif
+ 
diff --git a/community/ogmrip/PKGBUILD b/community/ogmrip/PKGBUILD
index 8d157decc..6d616a9cd 100644
--- a/community/ogmrip/PKGBUILD
+++ b/community/ogmrip/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 56646 2011-10-09 12:12:21Z jlichtblau $
+# $Id: PKGBUILD 63682 2012-02-05 12:06:35Z ibiru $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Daenyth
 # Contributor: Allan McRae <allan@archlinux.org>
@@ -6,12 +6,12 @@
 
 pkgname=ogmrip
 pkgver=0.13.7
-pkgrel=2
+pkgrel=3
 pkgdesc="Libraries and GTK2 interface for DVD ripping using mencoder"
 arch=('i686' 'x86_64')
 url="http://ogmrip.sourceforge.net/"
 license=('GPL')
-depends=('libdvdread>=4.1.3' 'mplayer' 'mencoder' 'enca' 'pkgconfig' 'gconf' 'libglade' 'libnotify' 'enchant')
+depends=('libdvdread>=4.1.3' 'mplayer' 'mencoder' 'enca' 'pkg-config' 'gconf' 'libglade' 'libnotify' 'enchant')
 makedepends=('patch' 'intltool' 'perl-xml-parser' 'faac' 'lame' 'mkvtoolnix' 'libtheora' 'ogmtools' 'gpac' 'vorbis-tools' 'tesseract')
 optdepends=('faac: support for the AAC audio codec'
             'lame: support for the MP3 audio codec'
@@ -25,18 +25,19 @@ optdepends=('faac: support for the AAC audio codec'
             'tesseract: support for the SRT subtitle format')
 options=('!libtool' '!makeflags')
 changelog=$pkgname.changelog
+install=ogmrip.install
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 sha256sums=('362060e4c1944f020f9a491d9a8af53cd3bf4f94d4f5beb8d3d855ebf17d9c2a')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   ./configure --prefix=/usr --sysconfdir=/usr/share
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-  make DESTDIR=${pkgdir} install
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/community/ogmrip/ogmrip.changelog b/community/ogmrip/ogmrip.changelog
index 922355602..1bd5c70ae 100644
--- a/community/ogmrip/ogmrip.changelog
+++ b/community/ogmrip/ogmrip.changelog
@@ -1,3 +1,7 @@
+2012-01-26  Eric Belanger  <eric@archlinux.org>
+	* Rebuild against libpng 1.5 and libtiff 4.0
+	* Add .install file
+
 2011-10-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* ogmrip O.13.7-1
 
diff --git a/community/ogmrip/ogmrip.install b/community/ogmrip/ogmrip.install
new file mode 100644
index 000000000..660593cf5
--- /dev/null
+++ b/community/ogmrip/ogmrip.install
@@ -0,0 +1,11 @@
+post_install() {
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/community/openimageio/PKGBUILD b/community/openimageio/PKGBUILD
index b6cdcd8c1..dd91ef261 100644
--- a/community/openimageio/PKGBUILD
+++ b/community/openimageio/PKGBUILD
@@ -4,7 +4,7 @@
 _pkg=OpenImageIO
 pkgname=openimageio
 pkgver=0.10.4
-pkgrel=3
+pkgrel=5
 pkgdesc="A library for reading and writing images, including classes, utilities, and applications."
 arch=(i686 x86_64)
 url="http://www.openimageio.org/"
@@ -13,8 +13,10 @@ depends=('openexr' 'boost-libs' 'jasper' 'glew')
 makedepends=('cmake' 'qt' 'python2' 'boost')
 optdepends=('qt: iv image viewer' 'python2: bindings support')
 options=(!buildflags)
-source=("https://github.com/$_pkg/oiio/tarball/Release-${pkgver/_/-}")
-md5sums=('08a1bc2b82862ad5547bba569f4f633f')
+source=("https://github.com/$_pkg/oiio/tarball/Release-${pkgver/_/-}"
+        "openimageio-0.10.2-libpng15.patch")
+md5sums=('08a1bc2b82862ad5547bba569f4f633f'
+         'd12829808610a54b6bc3350dc5419db3')
 
 build() {
   cd "$srcdir"/$_pkg*
@@ -22,7 +24,10 @@ build() {
   # remove insecure rpath
   sed -i "/RPATH/d" src/CMakeLists.txt
 
-  make debug
+  patch -d src/ -Np0 < $srcdir/openimageio-0.10.2-libpng15.patch
+
+  # strange bug on i686, see https://github.com/OpenImageIO/oiio/issues/204
+  [[ $CARCH == "i686" ]] && make debug || make
 }
 
 package() {
diff --git a/community/openimageio/openimageio-0.10.2-libpng15.patch b/community/openimageio/openimageio-0.10.2-libpng15.patch
new file mode 100644
index 000000000..97375d5fb
--- /dev/null
+++ b/community/openimageio/openimageio-0.10.2-libpng15.patch
@@ -0,0 +1,11 @@
+--- ico.imageio/icooutput.cpp
++++ ico.imageio/icooutput.cpp
+@@ -32,6 +32,8 @@
+ #include <cstdlib>
+ #include <cmath>
+ 
++#include <zlib.h> /* Z_BEST_COMPRESSION */
++
+ #include "ico.h"
+ #include "../png.imageio/png_pvt.h"
+ 
diff --git a/community/openmotif/PKGBUILD b/community/openmotif/PKGBUILD
index de442f87d..26f37cc92 100644
--- a/community/openmotif/PKGBUILD
+++ b/community/openmotif/PKGBUILD
@@ -1,11 +1,10 @@
-# $Id: PKGBUILD 59163 2011-11-21 12:54:58Z spupykin $
+# $Id: PKGBUILD 63686 2012-02-05 12:06:47Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Enrico Morelli <morelli@cerm.unifi.it>
 
-
 pkgname=openmotif
 pkgver=2.3.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Open Motif"
 arch=('i686' 'x86_64')
 url="http://www.motifzone.org/"
@@ -18,25 +17,12 @@ source=(http://www.motifzone.org/files/public_downloads/openmotif/2.3/$pkgver/op
 md5sums=('fd27cd3369d6c7d5ef79eccba524f7be')
 
 build() {
-_automakever=`pacman -Q automake | cut -f 2 -d \  | cut -f 1 -d -`
+  _automakever=1.11
 
   cd $srcdir/openmotif-$pkgver
 
-  [ $NOEXTRACT -eq 1 ] || patch -p0 Makefile.in <<EOF
---- Makefile.in.org	2007-06-11 09:32:01.000000000 +0400
-+++ Makefile.in	2007-06-19 19:13:04.000000000 +0400
-@@ -249,8 +249,7 @@
-              include \\
-              tools \\
-              clients \\
--             doc \\
--             demos
-+             doc
-
- AUTOMAKE_OPTIONS = 1.4
- all: all-recursive
-EOF
-
+  sed -i 's|.*demos.*||g' Makefile.in Makefile.am
+  sed -i 's|doc \\|doc|g' Makefile.in Makefile.am
   sed -i 's#if (!png_check_sig(sig, 8))#if (png_sig_cmp(sig, 0, 8))#' lib/Xm/Png.c
 
   ln -s -f /usr/share/automake-${_automakever}/compile compile
@@ -48,10 +34,8 @@ EOF
   ln -s -f /usr/share/libtool/config/ltmain.sh ltmain.sh
   touch NEWS AUTHORS
 
-  [ $NOEXTRACT -eq 1 ] || autoreconf -i;
-
+  [ $NOEXTRACT -eq 1 ] || autoreconf -i
   [ $CARCH == "x86_64" ] && export CFLAGS="$CFLAGS -fPIC"
-
   [ $NOEXTRACT -eq 1 ] || ./configure --with-x --prefix=/usr
   make -j1
 
diff --git a/community/openscenegraph/PKGBUILD b/community/openscenegraph/PKGBUILD
index 7b5cce6c0..0366a02f5 100644
--- a/community/openscenegraph/PKGBUILD
+++ b/community/openscenegraph/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 61921 2012-01-10 23:41:50Z ebelanger $
+# $Id: PKGBUILD 63688 2012-02-05 12:06:54Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Hans Janssen <janserv@gmail.com>
 # Contributor: my64 <packages@obordes.com>
@@ -6,7 +6,7 @@
 
 pkgname=openscenegraph
 pkgver=3.0.1
-pkgrel=3
+pkgrel=4
 pkgdesc="An Open Source, high performance real-time graphics toolkit"
 arch=('i686' 'x86_64')
 license=('custom:OSGPL')
diff --git a/community/openttd/PKGBUILD b/community/openttd/PKGBUILD
index a17e7c43d..2848f7af2 100644
--- a/community/openttd/PKGBUILD
+++ b/community/openttd/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 60078 2011-12-04 22:02:23Z lcarlier $
+# $Id: PKGBUILD 63690 2012-02-05 12:07:04Z ibiru $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 
 pkgname=openttd
-pkgver=1.1.4
+pkgver=1.1.5
 pkgrel=1
 pkgdesc='An engine for running Transport Tycoon Deluxe.'
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ install=openttd.install
 optdepends=('openttd-opengfx: free graphics' 
             'openttd-opensfx: free soundset')
 source=("http://binaries.openttd.org/releases/${pkgver}/${pkgname}-${pkgver}-source.tar.xz")
-md5sums=('d1c48ddf616bd0d269c4cd35ef8a8a39')
+md5sums=('aea731c9f87c53955269446d580ee19e')
 
 build() {
   cd ${pkgname}-${pkgver} 
diff --git a/community/paraview/PKGBUILD b/community/paraview/PKGBUILD
index cf71d6d81..32fce25f2 100644
--- a/community/paraview/PKGBUILD
+++ b/community/paraview/PKGBUILD
@@ -4,12 +4,12 @@
 
 pkgname=paraview
 pkgver=3.12.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Parallel Visualization Application using VTK'
 arch=('i686' 'x86_64')
 url='http://www.paraview.org'
 license=('custom')
-depends=('qt' 'python2' 'libgl' 'libxml2' 'unixodbc' 'postgresql-libs' 'libxt' 'qtwebkit' 'libmysqlclient' 'mesa' 'openmpi' 'boost-libs' 'hdf5' 'libcgns2' 'libtiff')
+depends=('qt' 'python2' 'libgl' 'libxml2' 'unixodbc' 'postgresql-libs' 'libxt' 'qtwebkit' 'libmysqlclient' 'mesa' 'openmpi' 'boost-libs' 'hdf5' 'libcgns2' 'libtiff' 'libtheora')
 makedepends=('cmake' 'desktop-file-utils' 'boost')
 source=("http://paraview.org/files/v${pkgver:0:4}/ParaView-${pkgver}.tar.gz"
         'paraview.png'
@@ -37,7 +37,7 @@ build() {
 
   # flags to enable using system libs
   local cmake_system_flags=""
-  for lib in HDF5 FREETYPE JPEG PNG TIFF ZLIB EXPAT LIBXML2; do
+  for lib in HDF5 FREETYPE JPEG PNG TIFF ZLIB EXPAT LIBXML2 OGGTHEORA; do
     cmake_system_flags+="-DVTK_USE_SYSTEM_${lib}:BOOL=ON "
   done
 
diff --git a/community/patchage/PKGBUILD b/community/patchage/PKGBUILD
index e7c6516a0..0a9e2b4c3 100644
--- a/community/patchage/PKGBUILD
+++ b/community/patchage/PKGBUILD
@@ -1,11 +1,10 @@
-# $Id: PKGBUILD 56003 2011-09-28 17:57:04Z schiv $
+# $Id: PKGBUILD 63694 2012-02-05 12:07:28Z ibiru $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Max Pray a.k.a. Synthead <synthead@gmail.com>
 # Contributor: clarence <catchfire at gmail dot com>
-
 pkgname=patchage
 pkgver=0.5.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A modular patch bay for audio and MIDI systems"
 arch=('i686' 'x86_64')
 url="http://drobilla.net/software/patchage"
@@ -14,8 +13,8 @@ depends=('dbus-glib' 'libglademm' 'hicolor-icon-theme'
          'raul' 'flowcanvas<1.0.0' 'jack')
 makedepends=('boost' 'python2')
 install=$pkgname.install
-source=(http://download.drobilla.net/$pkgname-$pkgver.tar.bz2)
-md5sums=('3f1c297c8c6b998563d1a2fbc215cf85')
+source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2")
+sha256sums=('9bb9d1ba0205c0ad95c6dbecba56c513ff706f1057348d33ff7567bc9cbd89d2')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/pcsclite/PKGBUILD b/community/pcsclite/PKGBUILD
index 20c5f045c..b58f512a7 100644
--- a/community/pcsclite/PKGBUILD
+++ b/community/pcsclite/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 61967 2012-01-11 17:03:39Z giovanni $
+# $Id: PKGBUILD 63833 2012-02-06 00:38:50Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com>
 
 pkgname=pcsclite
-pkgver=1.8.1
-pkgrel=3
+pkgver=1.8.2
+pkgrel=1
 pkgdesc="PC/SC Architecture smartcard middleware library"
 arch=('i686' 'x86_64')
 url="https://alioth.debian.org/projects/pcsclite/"
 license=('BSD')
 depends=('udev')
-makedepends=('pkgconfig')
+makedepends=('pkg-config')
 options=('!libtool' '!docs')
-source=("https://alioth.debian.org/frs/download.php/3687/pcsc-lite-${pkgver}.tar.bz2"
+source=("https://alioth.debian.org/frs/download.php/3695/pcsc-lite-${pkgver}.tar.bz2"
         'pcscd')
-md5sums=('fd035e4f610eba6fa545159e60d0d780'
+md5sums=('cb7156346e9478c19085c918b605ed43'
          'c97b6bce695222efb0f003d8e8369010')
 
 build() {
diff --git a/community/performous/PKGBUILD b/community/performous/PKGBUILD
index ba8c7a3db..71d46daae 100644
--- a/community/performous/PKGBUILD
+++ b/community/performous/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 59954 2011-12-02 20:59:56Z ibiru $
+# $Id: PKGBUILD 63696 2012-02-05 12:07:40Z ibiru $
 # Maintainer : Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
 
 pkgname=performous
 pkgver=0.6.1
-pkgrel=11
+pkgrel=12
 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"'
 arch=('i686' 'x86_64')
 url="http://performous.org/"
@@ -16,10 +16,12 @@ makedepends=('cmake' 'pkgconfig' 'help2man' 'boost>=1.48')
 optdepends=('performous-freesongs: free songs for performous')
 source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/Performous-$pkgver-Source.tar.bz2
         boost-filesystem-v3.patch
-        ffmpeg-0.8.patch::"http://performous.git.sourceforge.net/git/gitweb.cgi?p=performous/performous;a=patch;h=18449f6e56451f68b980c8359a4d1dc06f82db1a")
+        ffmpeg-0.8.patch::"http://performous.git.sourceforge.net/git/gitweb.cgi?p=performous/performous;a=patch;h=18449f6e56451f68b980c8359a4d1dc06f82db1a"
+	png15.patch)
 md5sums=('451a759de77984b5a699e91107fe52e2'
          '42a8c825d80b0de16bd5752d2a80e585'
-         'ff0ffa681dfaa09c4f42133a65309bf0')
+         'ff0ffa681dfaa09c4f42133a65309bf0'
+         '89157d5e21b0efd09fcbeee299d23c7e')
 
 build() {
   cd ${srcdir}/Performous-${pkgver}-Source
@@ -28,6 +30,8 @@ build() {
   patch -Np1 -i ../boost-filesystem-v3.patch
   # fix with ffmpeg-0.8
   patch -Np1 -i ../ffmpeg-0.8.patch
+  # fix for libpng 1.5
+  patch -Np1 -i ../png15.patch
 
   mkdir -p build
   cd build
diff --git a/community/performous/png15.patch b/community/performous/png15.patch
new file mode 100644
index 000000000..b6fb8fb14
--- /dev/null
+++ b/community/performous/png15.patch
@@ -0,0 +1,33 @@
+diff -ur Performous-0.6.1-Source/cmake/Modules/FindPng.cmake Performous-0.6.1a-Source/cmake/Modules/FindPng.cmake
+--- Performous-0.6.1-Source/cmake/Modules/FindPng.cmake	2010-10-31 17:05:44.000000000 +0100
++++ Performous-0.6.1a-Source/cmake/Modules/FindPng.cmake	2012-01-29 01:07:56.339648832 +0100
+@@ -10,7 +10,7 @@
+ 
+ include(LibFindMacros)
+ 
+-libfind_pkg_check_modules(Png_PKGCONF Png)
++libfind_pkg_check_modules(Png_PKGCONF libpng)
+ 
+ find_path(Png_INCLUDE_DIR
+   NAMES pngconf.h
+@@ -18,7 +18,7 @@
+ )
+ 
+ find_library(Png_LIBRARY
+-  NAMES png png12 png14
++  NAMES png png12 png14 png15
+   PATHS ${Png_PKGCONF_LIBRARY_DIRS}
+ )
+ 
+diff -ur Performous-0.6.1-Source/game/image.hh Performous-0.6.1a-Source/game/image.hh
+--- Performous-0.6.1-Source/game/image.hh	2010-10-31 17:05:43.000000000 +0100
++++ Performous-0.6.1a-Source/game/image.hh	2012-01-29 01:44:16.050575186 +0100
+@@ -26,7 +26,7 @@
+ 	}
+ 	void loadPNG_internal(png_structp pngPtr, png_infop infoPtr, std::ifstream& file, std::vector<unsigned char>& image, std::vector<png_bytep>& rows, unsigned& w, unsigned& h) {
+ 		if (setjmp(png_jmpbuf(pngPtr))) throw std::runtime_error("Reading PNG failed");
+-		png_set_read_fn(pngPtr,(voidp)&file, readPngHelper);
++		png_set_read_fn(pngPtr, &file, readPngHelper);
+ 		png_read_info(pngPtr, infoPtr);
+ 		png_set_expand(pngPtr);  // Expand everything to RGB(A)
+ 		png_set_strip_16(pngPtr);  // Strip everything down to 8 bit/component
diff --git a/community/perl-gnome2-wnck/PKGBUILD b/community/perl-gnome2-wnck/PKGBUILD
index 25e0df822..0f4c28d26 100644
--- a/community/perl-gnome2-wnck/PKGBUILD
+++ b/community/perl-gnome2-wnck/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 47727 2011-05-25 02:44:57Z tdziedzic $
+# $Id: PKGBUILD 63698 2012-02-05 12:07:47Z ibiru $
 # Maintainer Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 
 pkgname=perl-gnome2-wnck
 pkgver=0.16
-pkgrel=4
+pkgrel=5
 pkgdesc="Perl interface to the Window Navigator Construction Kit"
 arch=('i686' 'x86_64')
 license=("GPL" "Artistic")
@@ -16,17 +16,13 @@ md5sums=('439f4569ffd7af96ef1d3feaab23760e')
 
 build() {
   cd Gnome2-Wnck-${pkgver}
-
   PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-
   make
 }
 
 package() {
   cd Gnome2-Wnck-${pkgver}
-
   make install DESTDIR=${pkgdir}
-
   find ${pkgdir} -name '.packlist' -delete
   find ${pkgdir} -name '*.pod' -delete
 }
diff --git a/community/perl-gtk2-sexy/PKGBUILD b/community/perl-gtk2-sexy/PKGBUILD
index 6b4789bd2..44f110e1f 100644
--- a/community/perl-gtk2-sexy/PKGBUILD
+++ b/community/perl-gtk2-sexy/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 47716 2011-05-25 02:28:38Z tdziedzic $
+# $Id: PKGBUILD 63700 2012-02-05 12:07:55Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Charles Mauch <cmauch@gmail.com>
 # Creator: Florian Ragwitz <http://search.cpan.org/~/>
 
 pkgname=perl-gtk2-sexy
 pkgver=0.05
-pkgrel=5
+pkgrel=6
 pkgdesc="Perl/CPAN Module Gtk2::Sexy"
 arch=('i686' 'x86_64')
 url="http://search.cpan.org/dist/Gtk2-Sexy"
@@ -18,17 +18,13 @@ md5sums=('3e291808250d7b956ba8443013a1b461')
 
 build() {
   cd Gtk2-Sexy-${pkgver}
-
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor 
-
-  make 
+  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+  make
 }
 
 package() {
   cd Gtk2-Sexy-${pkgver}
-
-  make install DESTDIR=${pkgdir} 
-
+  make install DESTDIR=${pkgdir}
   find ${pkgdir} -name '.packlist' -delete
   find ${pkgdir} -name '*.pod' -delete
 }
diff --git a/community/perl-gtk2-trayicon/PKGBUILD b/community/perl-gtk2-trayicon/PKGBUILD
index a4cdb9e76..531aa6fe0 100644
--- a/community/perl-gtk2-trayicon/PKGBUILD
+++ b/community/perl-gtk2-trayicon/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 47733 2011-05-25 02:54:41Z tdziedzic $
+# $Id: PKGBUILD 63702 2012-02-05 12:08:02Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Tom K <tomk@runbox.com>
 
 pkgname=perl-gtk2-trayicon
 pkgver=0.06
-pkgrel=7
+pkgrel=8
 pkgdesc="Perl interface to the EggTrayIcon library"
 arch=('i686' 'x86_64')
 url="http://search.cpan.org/dist/Gtk2-TrayIcon/"
@@ -17,17 +17,13 @@ md5sums=('522c328f14681a25d76eeaf317e05049')
 
 build() {
   cd  Gtk2-TrayIcon-${pkgver}
-
   PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-
   make
 }
 
 package() {
   cd  Gtk2-TrayIcon-${pkgver}
-
   make install DESTDIR=${pkgdir}
-
   find ${pkgdir} -name '.packlist' -delete
   find ${pkgdir} -name '*.pod' -delete
 }
diff --git a/community/perl-gtk2-webkit/PKGBUILD b/community/perl-gtk2-webkit/PKGBUILD
index 269e6080a..190a668f2 100644
--- a/community/perl-gtk2-webkit/PKGBUILD
+++ b/community/perl-gtk2-webkit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 47720 2011-05-25 02:33:54Z tdziedzic $
+# $Id: PKGBUILD 63704 2012-02-05 12:08:14Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 
 pkgname=perl-gtk2-webkit
 pkgver=0.09
-pkgrel=1
+pkgrel=2
 pkgdesc="Gtk2::WebKit"
 arch=('i686' 'x86_64')
 url="http://search.cpan.org/dist/Gtk2-WebKit"
@@ -16,17 +16,13 @@ md5sums=('e696fc2b15d6189370e19bce9a9e56f3')
 
 build() {
   cd Gtk2-WebKit-${pkgver}
-
   PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-
   make
 }
 
 package() {
   cd Gtk2-WebKit-${pkgver}
-
   make install DESTDIR=${pkgdir}
-
   find ${pkgdir} -name '.packlist' -delete
   find ${pkgdir} -name '*.pod' -delete
 }
diff --git a/community/pidgin-libnotify/PKGBUILD b/community/pidgin-libnotify/PKGBUILD
index cf9378755..500f5d532 100644
--- a/community/pidgin-libnotify/PKGBUILD
+++ b/community/pidgin-libnotify/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=pidgin-libnotify
 pkgver=0.14
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 pkgdesc="pidgin plugin that enables popups when someone logs in or messages you."
 url="http://gaim-libnotify.sourceforge.net/"
diff --git a/community/pingus/PKGBUILD b/community/pingus/PKGBUILD
index 63c876fb9..52d8a8b06 100644
--- a/community/pingus/PKGBUILD
+++ b/community/pingus/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 61223 2011-12-24 23:23:29Z lcarlier $
+# $Id: PKGBUILD 63708 2012-02-05 12:08:32Z ibiru $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 
 pkgname=pingus
 pkgver=0.7.6
-pkgrel=1
+pkgrel=2
 pkgdesc="A Lemmings clone, i.e. a level-based puzzle game."
 arch=('i686' 'x86_64')
 url="http://pingus.seul.org"
 license=('GPL')
 depends=('sdl_image' 'sdl_mixer' 'libgl' 'boost-libs>=1.48')
 makedepends=('scons' 'boost>=1.48' 'mesa')
-source=(http://pingus.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 pingus.desktop)
+source=(http://pingus.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2
+	pingus.desktop)
 md5sums=('561798686f34d3fa4e69135d655f47ac'
          '9eec34047bdcff49e08f41e81764e20c')
 sha1sums=('b5f5a25d71beb197c9466fb8928018a377f56487'
diff --git a/community/png2ico/PKGBUILD b/community/png2ico/PKGBUILD
index 8a5f7a330..ef13d303d 100644
--- a/community/png2ico/PKGBUILD
+++ b/community/png2ico/PKGBUILD
@@ -1,8 +1,11 @@
-# $Id: PKGBUILD 8479 2010-01-20 08:15:47Z dgriffiths $
+# $Id: PKGBUILD 63710 2012-02-05 12:08:36Z ibiru $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
+# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
+
 pkgname=png2ico
 pkgver=20021208
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 pkgdesc="Converts PNG files to Windows icon resource files"
 url="http://www.winterdrache.de/freeware/png2ico/"
@@ -12,8 +15,12 @@ source=(http://www.winterdrache.de/freeware/png2ico/data/$pkgname-src-2002-12-08
 md5sums=('9b663df81c826cd564638cba2e6bc75b')
 
 build() {
-  cd $srcdir/$pkgname
-  make || return 1
-  install -D -m755 png2ico $pkgdir/usr/bin/png2ico
-  install -D -m644 doc/png2ico.1 $pkgdir/usr/share/man/man1/png2ico.1
+  cd ${srcdir}/${pkgname}
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}
+  install -D -m755 png2ico ${pkgdir}/usr/bin/png2ico
+  install -D -m644 doc/png2ico.1 ${pkgdir}/usr/share/man/man1/png2ico.1
 }
diff --git a/community/podofo/PKGBUILD b/community/podofo/PKGBUILD
index f154e016f..a4527f47e 100644
--- a/community/podofo/PKGBUILD
+++ b/community/podofo/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 59830 2011-11-30 22:21:17Z giovanni $
+# $Id: PKGBUILD 63712 2012-02-05 12:08:41Z ibiru $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: BlackEagle < ike DOT devolder AT gmail DOT com >
 # Contributor: Preecha Patumchareonpol <yumyai at gmail.com> 
 
 pkgname=podofo
 pkgver=0.9.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A C++ library to work with the PDF file format"
 arch=('i686' 'x86_64')
 url="http://podofo.sourceforge.net"
diff --git a/community/prboom/PKGBUILD b/community/prboom/PKGBUILD
index f33cec1fe..a7af51cb7 100644
--- a/community/prboom/PKGBUILD
+++ b/community/prboom/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 57863 2011-11-03 19:29:22Z lfleischer $
+# $Id: PKGBUILD 63714 2012-02-05 12:08:47Z ibiru $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Thayer Williams <thayer@archlinux.org>
 # Contributor: dale <dale@archlinux.org>
 
 pkgname=prboom
 pkgver=2.5.0
-pkgrel=5
+pkgrel=6
 pkgdesc='A game engine which provides a program to play Doom levels.'
 url='http://prboom.sourceforge.net/'
 license=('GPL2')
diff --git a/community/pyqt3/PKGBUILD b/community/pyqt3/PKGBUILD
index 862ea062e..990cec25f 100644
--- a/community/pyqt3/PKGBUILD
+++ b/community/pyqt3/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 37900 2011-01-18 23:30:00Z andrea $
-# Maintainer:
+# $Id: PKGBUILD 63716 2012-02-05 12:08:52Z ibiru $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net>
 
 pkgname=pyqt3
 pkgver=3.18.1
-pkgrel=9
+pkgrel=10
 pkgdesc="A set of Python bindings for the Qt3 toolkit"
 arch=('i686' 'x86_64')
 url="http://www.riverbankcomputing.com/software/pyqt/intro"
@@ -16,13 +16,10 @@ md5sums=('f1d120495d1aaf393819e988c0a7bb7e')
 
 build() {
   cd ${srcdir}/PyQt-x11-gpl-${pkgver}
-
   . /etc/profile.d/qt3.sh
-
   echo yes | python2 configure.py -b /usr/bin \
     -d /usr/lib/python2.7/site-packages \
     -v /usr/share/sip
-
   make
 }
 
diff --git a/community/python-galago-gtk/PKGBUILD b/community/python-galago-gtk/PKGBUILD
index 1589d3e41..c05c783a6 100644
--- a/community/python-galago-gtk/PKGBUILD
+++ b/community/python-galago-gtk/PKGBUILD
@@ -1,8 +1,10 @@
-# $Id: PKGBUILD 29291 2010-10-12 16:29:20Z foutrelis $
+# $Id: PKGBUILD 63720 2012-02-05 12:09:04Z ibiru $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
+
 pkgname=python-galago-gtk
 pkgver=0.5.0
-pkgrel=5
+pkgrel=6
 pkgdesc="A library of simple functions that are optimized for various CPUs"
 arch=('i686' 'x86_64')
 url="http://galago-project.org"
diff --git a/community/python2-matplotlib/PKGBUILD b/community/python2-matplotlib/PKGBUILD
index 102421f30..f269b7659 100644
--- a/community/python2-matplotlib/PKGBUILD
+++ b/community/python2-matplotlib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 56824 2011-10-13 21:31:09Z stephane $
+# $Id: PKGBUILD 63718 2012-02-05 12:08:58Z ibiru $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> 
@@ -6,7 +6,7 @@
 
 pkgname=python2-matplotlib
 pkgver=1.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A python plotting library, making publication quality plots"
 arch=('i686' 'x86_64')
 url="http://matplotlib.sourceforge.net/"
diff --git a/community/qcad/PKGBUILD b/community/qcad/PKGBUILD
index 50853b837..28cacf696 100644
--- a/community/qcad/PKGBUILD
+++ b/community/qcad/PKGBUILD
@@ -1,10 +1,12 @@
+# $Id: PKGBUILD 63722 2012-02-05 12:09:17Z ibiru $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: Giovanni Scafora <linuxmania@gmail.com>
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=qcad
 pkgver=2.0.5.0
-pkgrel=8
+pkgrel=9
 pkgdesc="A 2D CAD package based upon Qt"
 arch=('i686' 'x86_64')
 url="http://www.ribbonsoft.com/qcad.html"
@@ -12,19 +14,18 @@ license=('GPL2')
 depends=('qt3')
 options=(libtool)
 source=(http://www.ribbonsoft.com/archives/$pkgname/$pkgname-$pkgver-1-community.src.tar.gz
-        qcad.xpm 
-        QCad.desktop 
-        qcad-intptr.patch 
+        qcad.xpm
+        QCad.desktop
+        qcad-intptr.patch
         qcad.patch)
        # http://ghost1227.com/files/misc/qm.tar.gz)
-md5sums=('96b6a56027782aec953c9c4e64c5998c' \
-	 'da32fec0d2fb85d96126bf28bb0ab9ff' \
-         'b4d1eb6724b4b41f191f1ab6fd859c39' \
-	 '92f900fe1fd3a8f841232b587b49c7da' \
-         '7e6779b1e3b10da1eb4daf36d93f8479' \
-	 '89f78319babd39a14679af8112f9e12c')
+md5sums=('96b6a56027782aec953c9c4e64c5998c'
+         'da32fec0d2fb85d96126bf28bb0ab9ff'
+         'b4d1eb6724b4b41f191f1ab6fd859c39'
+         '92f900fe1fd3a8f841232b587b49c7da'
+         '7e6779b1e3b10da1eb4daf36d93f8479')
 
-build () {
+build() {
   export PATH="/opt/qt/bin:$PATH"
   export QTDIR=/opt/qt
 
@@ -32,26 +33,21 @@ build () {
 
   #Arch64 fix - gentoo patch
   [ "$CARCH" = "x86_64" ] && patch -p1 < ../qcad-intptr.patch
-  patch -p1 < ../qcad.patch || return 1
-  sed -i "s:"-pedantic"::g" mkspecs/defs.pro || return 1
+  patch -p1 < ../qcad.patch
+  sed -i "s:"-pedantic"::g" mkspecs/defs.pro
 
   cd scripts
-  ./build_qcad.sh notrans || return 1
+  ./build_qcad.sh notrans
 }
 
 package() {
   cd ${srcdir}/${pkgname}-2.0.5.0-1-community.src/qcad
 
-  install -D -m755 qcad ${pkgdir}/usr/bin/qcad || return 1
-  install -d ${pkgdir}/usr/share/{qcad,pixmaps,applications} || return 1
-  install -m644 ../../qcad.xpm ${pkgdir}/usr/share/pixmaps/qcad.xpm || return 1
+  install -D -m755 qcad ${pkgdir}/usr/bin/qcad
+  install -d ${pkgdir}/usr/share/{qcad,pixmaps,applications}
+  install -m644 ../../qcad.xpm ${pkgdir}/usr/share/pixmaps/qcad.xpm
   install -m644 ../../QCad.desktop \
-    ${pkgdir}/usr/share/applications/QCad.desktop || return 1
-  cp -r fonts patterns data library machines ${pkgdir}/usr/share/qcad || return 1
+    ${pkgdir}/usr/share/applications/QCad.desktop
+  cp -r fonts patterns data library machines ${pkgdir}/usr/share/qcad
   #cp -r ${srcdir}/qm ${pkgdir}/usr/share/qcad/
 }
-md5sums=('96b6a56027782aec953c9c4e64c5998c'
-         'da32fec0d2fb85d96126bf28bb0ab9ff'
-         'b4d1eb6724b4b41f191f1ab6fd859c39'
-         '92f900fe1fd3a8f841232b587b49c7da'
-         '7e6779b1e3b10da1eb4daf36d93f8479')
diff --git a/community/qpxtool/PKGBUILD b/community/qpxtool/PKGBUILD
index 9d8987cb2..9147bc92d 100644
--- a/community/qpxtool/PKGBUILD
+++ b/community/qpxtool/PKGBUILD
@@ -1,26 +1,28 @@
-# $Id: PKGBUILD 15647 2010-04-13 11:41:23Z spupykin $
+# $Id: PKGBUILD 63724 2012-02-05 12:09:25Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Krzysztof Stasiorowski <krzysiekst@gmail.com>
 
 pkgname=qpxtool
 pkgver=0.7.1_002
-pkgrel=1
+pkgrel=3
 pkgdesc="Allows better controll over optical drives to include QChecks and optimization settings."
 arch=('i686' 'x86_64')
 url="http://qpxtool.sourceforge.net/"
 license=('GPL')
 depends=('qt')
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('755321a0196b16d06857550aac74ff50')
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
+	libpng15.patch)
+md5sums=('755321a0196b16d06857550aac74ff50'
+         'ab9af7610277652c77c6d114422b2266')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-
   # Fix strict aliasing warnings
   export CFLAGS="$CFLAGS -fno-strict-aliasing"
   sed -i 's|lib64|lib|' configure
+  patch -p1 <$srcdir/libpng15.patch
   ./configure --prefix=/usr
-  make || return 1
+  make
   mkdir -p $pkgdir/usr/bin
   make DESTDIR=$pkgdir install
 }
diff --git a/community/qpxtool/libpng15.patch b/community/qpxtool/libpng15.patch
new file mode 100644
index 000000000..05e6f49d2
--- /dev/null
+++ b/community/qpxtool/libpng15.patch
@@ -0,0 +1,127 @@
+diff -wbBur qpxtool-0.7.1_002/console/f1tattoo/f1tattoo.cpp qpxtool-0.7.1_002.my/console/f1tattoo/f1tattoo.cpp
+--- qpxtool-0.7.1_002/console/f1tattoo/f1tattoo.cpp	2009-11-25 10:55:44.000000000 +0300
++++ qpxtool-0.7.1_002.my/console/f1tattoo/f1tattoo.cpp	2012-01-23 13:53:37.000000000 +0400
+@@ -129,28 +129,28 @@
+ 
+ 	png_read_info(png_ptr, info_ptr);
+ 
+-	printf("Image size: %ld x %ld\n", info_ptr->width, info_ptr->height);
++	printf("Image size: %u x %u\n", png_get_image_width(png_ptr, info_ptr), png_get_image_height(png_ptr, info_ptr));
+ 
+-	if (info_ptr->width != 3744U || info_ptr->height != rows ) {
++	if (png_get_image_width(png_ptr, info_ptr) != 3744U || png_get_image_height(png_ptr, info_ptr) != rows ) {
+ 		printf("Image should be 3744 x %d", rows);
+ 		return 1;
+ 	}
+ 
+-//	width = info_ptr->width;
+-//	height = info_ptr->height;
+-//	bit_depth = info_ptr->bit_depth;
++//	width = png_get_image_width(png_ptr, info_ptr);
++//	height = png_get_image_height(png_ptr, info_ptr);
++//	bit_depth = png_get_bit_depth(png_ptr, info_ptr);
+ 
+ 	number_of_passes = png_set_interlace_handling(png_ptr);
+ 	png_read_update_info(png_ptr, info_ptr);
+ 
+-	printf("Color type: [%d] ", info_ptr->color_type);
+-	switch (info_ptr->color_type) {
++	printf("Color type: [%d] ", png_get_color_type(png_ptr, info_ptr));
++	switch (png_get_color_type(png_ptr, info_ptr)) {
+ 	    case PNG_COLOR_TYPE_GRAY:
+ 			printf("PNG_COLOR_TYPE_GRAY\n");
+ 			break;
+ 	    case PNG_COLOR_TYPE_PALETTE:
+ 			printf("PNG_COLOR_TYPE_PALETTE\n");
+-			if (!(info_ptr->valid & PNG_INFO_PLTE)) {
++			if (!(png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE))) {
+ 				printf("PNG color type is indexed, but no palette found!");
+ 				goto err_read_png;
+ 			}
+@@ -168,49 +168,53 @@
+ 			printf("unlnown PNG color type!\n");
+ 			goto err_read_png;
+ 	}
+-	printf("Bit depth : %d\n", info_ptr->bit_depth);
+-	if (info_ptr->bit_depth != 8) {
++	printf("Bit depth : %d\n", png_get_bit_depth(png_ptr, info_ptr));
++	if (png_get_bit_depth(png_ptr, info_ptr) != 8) {
+ 		printf("Unsupported bit depth!\n");
+ 		goto err_read_png;
+ 	}
+-	if (info_ptr->valid & PNG_INFO_PLTE) {
+-		printf("Palette   : %d colors\n", info_ptr->num_palette);
++
++	int num_palette;
++	png_colorp plte;
++	png_get_PLTE(png_ptr, info_ptr, &plte, &num_palette);
++
++	if (png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)) {
++		printf("Palette   : %d colors\n", num_palette);
+ 	} else {
+ 		printf("Palette   : NO\n");
+ 	}
+-	printf("ROW bytes : %ld\n", info_ptr->rowbytes);
+-
++	printf("ROW bytes : %d\n", png_get_rowbytes(png_ptr, info_ptr));
+ 
+ 	raw_row_pointer = buf;
+-	png_row_pointer = (png_byte*) malloc(info_ptr->rowbytes);
++	png_row_pointer = (png_byte*) malloc(png_get_rowbytes(png_ptr, info_ptr));
+ 	for (row=0; row<rows; row++) {
+ 		if (setjmp(png_jmpbuf(png_ptr))) {
+ 			printf("png_jmpbuf failed!\n");
+ 			goto err_read_png;
+ 		}
+ 		png_read_row(png_ptr, png_row_pointer, NULL);
+-		if (info_ptr->width < 3744U)
++		if (png_get_image_width(png_ptr, info_ptr) < 3744U)
+ 			memset(raw_row_pointer, 0, 3744);
+ 
+-		switch (info_ptr->color_type) {
++		switch (png_get_color_type(png_ptr, info_ptr)) {
+ 		    case PNG_COLOR_TYPE_GRAY:
+-				for (col=0; col<info_ptr->width; col++) {
++				for (col=0; col<png_get_image_width(png_ptr, info_ptr); col++) {
+ 					raw_row_pointer[col] = png_row_pointer[col] ^ 0xFF;
+ //					memcpy(raw_row_pointer, png_row_pointer, 3744);
+ 				}
+ 				break;
+ 		    case PNG_COLOR_TYPE_PALETTE:
+-				for (col=0; col<info_ptr->width; col++) {
++				for (col=0; col<png_get_image_width(png_ptr, info_ptr); col++) {
+ 					c = png_row_pointer[col];
+-					r = info_ptr->palette[c].red;
+-					g = info_ptr->palette[c].green;
+-					b = info_ptr->palette[c].blue;
++					r = plte[c].red;
++					g = plte[c].green;
++					b = plte[c].blue;
+ 					c = (r*11 + g*16 + b*5) / 32;
+ 					raw_row_pointer[col] = c ^ 0xFF;
+ 				}
+ 				break;
+ 		    case PNG_COLOR_TYPE_RGB:
+-				for (col=0; col<info_ptr->width; col++) {
++				for (col=0; col<png_get_image_width(png_ptr, info_ptr); col++) {
+ 					r = png_row_pointer[col*3];
+ 					g = png_row_pointer[col*3+1];
+ 					b = png_row_pointer[col*3+2];
+@@ -219,7 +223,7 @@
+ 				}
+ 				break;
+ 		    case PNG_COLOR_TYPE_RGB_ALPHA:
+-				for (col=0; col<info_ptr->width; col++) {
++				for (col=0; col<png_get_image_width(png_ptr, info_ptr); col++) {
+ 					r = png_row_pointer[col*4];
+ 					g = png_row_pointer[col*4+1];
+ 					b = png_row_pointer[col*4+2];
+@@ -228,7 +232,7 @@
+ 				}
+ 				break;
+ 		    case PNG_COLOR_TYPE_GRAY_ALPHA:
+-				for (col=0; col<info_ptr->width; col++) {
++				for (col=0; col<png_get_image_width(png_ptr, info_ptr); col++) {
+ 					raw_row_pointer[col] = png_row_pointer[col*2] ^ 0xFF;
+ 				}
+ 				break;
diff --git a/community/quilt/PKGBUILD b/community/quilt/PKGBUILD
index 637179fe1..f872009d6 100644
--- a/community/quilt/PKGBUILD
+++ b/community/quilt/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 60696 2011-12-17 00:36:28Z seblu $
-# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net>
+# $Id: PKGBUILD 63831 2012-02-06 00:30:28Z seblu $
+# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Contributor: Peter Richard Lewis <plewis@aur.archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org>
 
 pkgname=quilt
-pkgver=0.50
+pkgver=0.51
 pkgrel=1
 pkgdesc='Manage a series of patches by keeping track of the changes each patch makes'
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ url='http://savannah.nongnu.org/projects/quilt'
 license=('GPL2')
 depends=('diffstat' 'gawk' 'patch' 'diffutils' 'gettext')
 source=("http://savannah.nongnu.org/download/quilt/${pkgname}-${pkgver}.tar.gz")
-md5sums=('ff5e1e041363c3af3c8fda4b968c9d1d')
+md5sums=('d56d23d5212297d5777502e84dc0ee80')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/community/rawstudio/PKGBUILD b/community/rawstudio/PKGBUILD
index 337f08e7a..eabd7858c 100644
--- a/community/rawstudio/PKGBUILD
+++ b/community/rawstudio/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 56347 2011-10-05 19:08:35Z andrea $
+# $Id: PKGBUILD 63726 2012-02-05 12:09:34Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=rawstudio
 pkgver=2.0
-pkgrel=3
+pkgrel=5
 pkgdesc="An open source raw-image converter written in GTK+"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -15,11 +15,14 @@ depends=('exiv2' 'libgphoto2' 'flickcurl' 'libjpeg' 'fftw' 'gconf' 'lensfun'
 	 'raptor1' 'lcms' 'gtk2')
 install=${pkgname}.install
 options=('!libtool')
-source=(http://rawstudio.org/files/release/${pkgname}-${pkgver}.tar.gz)
-md5sums=('b2f86b8ca6b83ad954e3104c4cb89e9b')
+source=(http://rawstudio.org/files/release/${pkgname}-${pkgver}.tar.gz
+	libpng15.patch)
+md5sums=('b2f86b8ca6b83ad954e3104c4cb89e9b'
+         '2f8b7acbe10d8096ce613cbea7986fd3')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 <$srcdir/libpng15.patch
   ./configure --prefix=/usr
   make
 }
diff --git a/community/rawstudio/libpng15.patch b/community/rawstudio/libpng15.patch
new file mode 100644
index 000000000..6d3b85968
--- /dev/null
+++ b/community/rawstudio/libpng15.patch
@@ -0,0 +1,40 @@
+diff -wbBur rawstudio-2.0/plugins/load-gdk/exiv2-colorspace.cpp rawstudio-2.0.my/plugins/load-gdk/exiv2-colorspace.cpp
+--- rawstudio-2.0/plugins/load-gdk/exiv2-colorspace.cpp	2011-02-24 01:35:18.000000000 +0300
++++ rawstudio-2.0.my/plugins/load-gdk/exiv2-colorspace.cpp	2012-01-23 15:03:22.000000000 +0400
+@@ -102,8 +102,8 @@
+ 	{
+ 		*linear_guess = FALSE;
+ 		RSColorSpace* profile = NULL;
+-		const gchar *icc_profile_title;
+-		const gchar *icc_profile;
++		png_charp icc_profile_title;
++		png_bytep icc_profile;
+ 		guint icc_profile_size;
+ 		png_structp png_ptr = png_create_read_struct(
+ 				PNG_LIBPNG_VER_STRING,
+@@ -125,11 +125,11 @@
+ 
+ 					int compression_type;
+ 					/* Extract embedded ICC profile */
+-					if (info_ptr->valid & PNG_INFO_iCCP)
++					if (png_get_valid(png_ptr, info_ptr, PNG_INFO_iCCP))
+ 					{
+ 						png_uint_32 retval = png_get_iCCP (png_ptr, info_ptr,
+-													(png_charpp) &icc_profile_title, &compression_type,
+-													(png_charpp) &icc_profile, (png_uint_32*) &icc_profile_size);
++													&icc_profile_title, &compression_type,
++													&icc_profile, (png_uint_32*) &icc_profile_size);
+ 						if (retval != 0)
+ 						{
+ 							RSIccProfile *icc = rs_icc_profile_new_from_memory((gchar*)icc_profile, icc_profile_size, TRUE);
+diff -wbBur rawstudio-2.0/plugins/output-pngfile/output-pngfile.c rawstudio-2.0.my/plugins/output-pngfile/output-pngfile.c
+--- rawstudio-2.0/plugins/output-pngfile/output-pngfile.c	2011-03-26 04:52:29.000000000 +0300
++++ rawstudio-2.0.my/plugins/output-pngfile/output-pngfile.c	2012-01-23 15:04:59.000000000 +0400
+@@ -23,6 +23,7 @@
+ #include <gettext.h>
+ #include "config.h"
+ #include <png.h>
++#include <zlib.h>
+ 
+ #define RS_TYPE_PNGFILE (rs_pngfile_type)
+ #define RS_PNGFILE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RS_TYPE_PNGFILE, RSPngfile))
diff --git a/community/rawtherapee/PKGBUILD b/community/rawtherapee/PKGBUILD
index cc4126ef1..cb30236db 100644
--- a/community/rawtherapee/PKGBUILD
+++ b/community/rawtherapee/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 61903 2012-01-10 14:41:19Z stativ $
+# $Id: PKGBUILD 63728 2012-02-05 12:09:41Z ibiru $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky AT gmail.com>
 # Contributor: Bogdan Szczurek <thebodzio(at)gmail.com>
 # Contributor: Vaclav Kramar <vaclav.kramar@tiscali.cz>
 # Contributor: Archie <mymaud@gmail.com>
 
 pkgname=rawtherapee
-pkgver=4.0.6
+pkgver=4.0.7
 pkgrel=1
 pkgdesc="RAW photo editor"
 arch=('i686' 'x86_64')
 url="http://www.rawtherapee.com/"
-license=('GPL')
-depends=('bzip2' 'gtkmm' 'libiptcdata' 'lcms2' 'desktop-file-utils' 'hicolor-icon-theme')
+license=('GPL3')
+depends=('gtkmm' 'libiptcdata' 'lcms2' 'desktop-file-utils' 'hicolor-icon-theme')
 makedepends=('mercurial' 'cmake')
 install=rawtherapee.install
 source=()
diff --git a/community/remmina-plugins/PKGBUILD b/community/remmina-plugins/PKGBUILD
index 7b6007a69..e80c927c3 100644
--- a/community/remmina-plugins/PKGBUILD
+++ b/community/remmina-plugins/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 54479 2011-08-18 15:08:28Z bluewind $
+# $Id: PKGBUILD 63730 2012-02-05 12:09:50Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Stijn Segers <francesco dot borromini at gmail dot com>
 
 pkgname=remmina-plugins
 pkgver=0.9.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Remina plugins"
 #"Remmina supports multiple network protocols in an integrated and consistant user interface.
 # Currently RDP, VNC, XDMCP and SSH are supported."
diff --git a/community/root/PKGBUILD b/community/root/PKGBUILD
index 729d3377f..d277db4ec 100644
--- a/community/root/PKGBUILD
+++ b/community/root/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=root
 pkgver=5.32.00
-pkgrel=2
+pkgrel=3
 pkgdesc='C++ data analysis framework and interpreter from CERN.'
 arch=('i686' 'x86_64')
 url='http://root.cern.ch'
@@ -16,25 +16,31 @@ options=('!emptydirs')
 source=("ftp://root.cern.ch/root/root_v${pkgver}.source.tar.gz"
         'root.sh'
         'rootd'
-        'root.xml')
+        'root.xml'
+        'fix-mathcore-generation-r42566.diff')
 md5sums=('1c30e4e6eeae62ff1ad5118cd1309679'
          '0e883ad44f99da9bc7c23bc102800b62'
          'efd06bfa230cc2194b38e0c8939e72af'
-         'e2cf69b204192b5889ceb5b4dedc66f7')
+         'e2cf69b204192b5889ceb5b4dedc66f7'
+         '12877cabd620284f50ea16ef97a54aac')
 
 build() {
   cd root
 
+  # temporary workaround: remove on next patch release after 5.32.00
+  # bug reported at: https://savannah.cern.ch/bugs/?90906
+  patch -Np0 -i ${srcdir}/fix-mathcore-generation-r42566.diff
+
   if [ ${CARCH} == 'i686' ]; then
     TARGET=linux;
   else
     TARGET=linuxx8664gcc;
   fi
 
-  # python2 switch
-  find . -type f -exec sed -i -e 's_#!/usr/bin/env python_&2_' \
-                              -e 's/python -O/python2 -O/g' \
-                              -e 's/python -c/python2 -c/g' {} \;
+  msg 'python2 switch'
+  find . -type f -exec sed -e 's_#!/usr/bin/env python_&2_' \
+                           -e 's/python -O/python2 -O/g' \
+                           -e 's/python -c/python2 -c/g' -i {} \;
   sed \
     -e 's/python 2/python2 2/g' \
     -i configure
@@ -45,15 +51,16 @@ build() {
     -e 's/python /python2 /' \
     -i config/genreflex.in config/genreflex-rootcint.in
 
+  local sys_libs=""
+  for sys_lib in ftgl freetype glew pcre zlib lzma; do
+    sys_libs+="--disable-builtin-${sys_lib} "
+  done
+  # move from aur if possible
+  #--disable-builtin-afterimage \
+
   ./configure \
     ${TARGET} \
     --prefix=/usr \
-    --disable-builtin-ftgl \
-    --disable-builtin-freetype \
-    --disable-builtin-glew \
-    --disable-builtin-pcre \
-    --disable-builtin-zlib \
-    --disable-builtin-lzma \
     --enable-gdml \
     --enable-gsl-shared \
     --enable-minuit2 \
@@ -61,10 +68,8 @@ build() {
     --enable-roofit \
     --enable-python \
     --with-python-incdir=/usr/include/python2.7 \
-    --with-python-libdir=/usr/lib
-
-    # move from aur
-    #--disable-builtin-afterimage \
+    --with-python-libdir=/usr/lib \
+    ${sys_libs}
 
   make
 }
diff --git a/community/root/fix-mathcore-generation-r42566.diff b/community/root/fix-mathcore-generation-r42566.diff
new file mode 100644
index 000000000..ae22c23c0
--- /dev/null
+++ b/community/root/fix-mathcore-generation-r42566.diff
@@ -0,0 +1,40 @@
+Index: cint/cint/src/typedef.cxx
+===================================================================
+--- cint/cint/src/typedef.cxx	(revision 42564)
++++ cint/cint/src/typedef.cxx	(revision 42566)
+@@ -297,18 +297,27 @@
+       }
+       c = G__fgetname_template(type1, 0, "{");
+    }
+-   if (!strcmp(type1, "::")) {  // FIXME: This makes no sense, there cannot be typedef ::{...};
++   if (!strcmp(type1, "::")) {
+       // skip a :: without a namespace in front of it (i.e. global namespace!)
+       c = G__fgetspace(); // skip the next ':'
+       c = G__fgetname_template(type1, 0, "{");
+    }
+-   if (!strncmp(type1, "::", 2)) { // Strip a leading :: (global namespace operator)
+-      // A leading '::' causes other typename matching functions to fail so
+-      // we remove it. This is not the ideal solution (neither was the one
+-      // above since it does not allow for distinction between global
+-      // namespace and local namespace) ... but at least it is an improvement
+-      // over the current behavior.
+-      strcpy((char*)type1, type1 + 2);  // Okay since we reduce the size ...
++   if (!strncmp(type1, "::", 2)) {
++      // Strip a leading :: (global namespace operator).
++      // A leading '::' causes other typename matching
++      // functions to fail so we remove it. This is not
++      // the ideal solution (neither is the one above)
++      // since it does not allow for decriminating between
++      // global namespace and local namespace, but at
++      // least it is an improvement over the current
++      // behavior.
++      //
++      // Note: We must use memmove because the source
++      //       and destination strings overlap!
++      //
++      int t1len = strlen(type1);
++      memmove(type1, type1 + 2, t1len - 2);
++      type1.Set(t1len - 2, '\0');
+    }
+    while (isspace(c)) {
+       len = strlen(type1);
diff --git a/community/ruby-gtk2/PKGBUILD b/community/ruby-gtk2/PKGBUILD
index 0db9d7688..3d71aeb10 100644
--- a/community/ruby-gtk2/PKGBUILD
+++ b/community/ruby-gtk2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 61675 2012-01-06 12:11:34Z arodseth $
+# $Id: PKGBUILD 63819 2012-02-05 18:41:40Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Eric Bélanger
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
@@ -6,14 +6,14 @@
 # Contributor: kritoke <kritoke@nospam.gmail.com>
 pkgbase=ruby-gtk2
 pkgname=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-gio2' 'ruby-glib2' 'ruby-gtk2' 'ruby-pango')
-pkgver=1.0.3
-pkgrel=2
+pkgver=1.1.2
+pkgrel=1
 arch=('x86_64' 'i686')
 url="http://ruby-gnome2.sourceforge.jp/"
 license=('LGPL')
 makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk2')
 source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz")
-sha256sums=('e4fab8f2778c29b4c814109741d886c6f0725cfbb85b851aaf42d8f635ff515c')
+sha256sums=('a16da4335c3e65ccab22e38caa55843fe2df18d55987c7be3f9dfc70866e2aaf')
 
 build() {
 	cd "$srcdir/ruby-gtk2-$pkgver"
diff --git a/community/sage-mathematics/PKGBUILD b/community/sage-mathematics/PKGBUILD
index d240ce248..4b4dff9ad 100644
--- a/community/sage-mathematics/PKGBUILD
+++ b/community/sage-mathematics/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=sage-mathematics
 pkgver=4.7.2
-pkgrel=2
+pkgrel=3
 pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.'
 url='http://www.sagemath.org'
 arch=('i686' 'x86_64')
diff --git a/community/scantailor/PKGBUILD b/community/scantailor/PKGBUILD
index 96c166249..b69f026c3 100644
--- a/community/scantailor/PKGBUILD
+++ b/community/scantailor/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 53336 2011-08-03 00:10:13Z spupykin $
+# $Id: PKGBUILD 63736 2012-02-05 12:10:28Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Denis Terskov aka neurosurgeon <terskov.den@gmail.com>
 
 pkgname=scantailor
 pkgver=0.9.10
-pkgrel=1
+pkgrel=2
 pkgdesc="Interactive post-processing tool for scanned pages"
 arch=(i686 x86_64)
 url="http://scantailor.sourceforge.net"
diff --git a/community/scorched3d/PKGBUILD b/community/scorched3d/PKGBUILD
index 42e9f414d..8a481c910 100644
--- a/community/scorched3d/PKGBUILD
+++ b/community/scorched3d/PKGBUILD
@@ -3,7 +3,7 @@
  
 pkgname=scorched3d
 pkgver=43.2a
-pkgrel=1
+pkgrel=2
 pkgdesc="A 3d artillery combat game"
 arch=('i686' 'x86_64')
 url="http://www.scorched3d.co.uk/"
@@ -16,12 +16,14 @@ source=("http://downloads.sourceforge.net/${pkgname}/Scorched3D-${pkgver}-src.ta
         'scorched3d.png.uu'
         'scorched3d-42.1-gcc43.patch'
         'scorched3d-42.1-fixups.patch'
+        'scorched3d-libpng1.5.patch'
         'libpng14.patch')
 md5sums=('876de173218fd83a2b0a30255ba694fa'
          'b951f2150004e10fdff3e6226f1a3939'
          '178a281333006c6a5a92919865c1d7af'
          '053769f77a38c252eef1d967b18e93e6'
          'dfde556559d95bca07c4a390c60790b4'
+         'ec6958191751b5a2c44aa15abfc75269'
          'c8c03855fd3693122fd39427fa3638c1')
 
 build() {
@@ -29,6 +31,7 @@ build() {
 
 #  patch -Np1 -i ${srcdir}/scorched3d-42.1-gcc43.patch
   patch -Np1 -i ${srcdir}/scorched3d-42.1-fixups.patch
+  patch -Np1 -i ${srcdir}/scorched3d-libpng1.5.patch
 #  patch -Np0 -i ${srcdir}/libpng14.patch
 
   WANT_WXGTK=gtk2
diff --git a/community/scorched3d/scorched3d-libpng1.5.patch b/community/scorched3d/scorched3d-libpng1.5.patch
new file mode 100644
index 000000000..4e8f003b8
--- /dev/null
+++ b/community/scorched3d/scorched3d-libpng1.5.patch
@@ -0,0 +1,74 @@
+--- ./src/common/image/ImagePngFactory.cpp.old	2011-09-12 12:34:30.114461019 +0200
++++ ./src/common/image/ImagePngFactory.cpp	2011-09-12 12:39:28.566425593 +0200
+@@ -104,7 +104,7 @@
+ 
+ static void user_png_error(png_structp png_ptr, png_const_charp msg) 
+ {
+-	longjmp(png_ptr->jmpbuf,1);
++	longjmp(png_jmpbuf(png_ptr),1);
+ }
+ 
+ static void user_png_warning(png_structp png_ptr, png_const_charp msg) 
+--- ./src/client/client/LoadPNG.cpp.old	2011-09-12 12:45:49.167380419 +0200
++++ ./src/client/client/LoadPNG.cpp	2011-09-12 14:11:14.961772024 +0200
+@@ -28,6 +28,8 @@
+ 	int row, i;
+ 	volatile int ckey = -1;
+ 	png_color_16 *transv;
++	png_colorp  png_palette;
++	int         num_palette;
+ 
+ 	if ( !src ) {
+ 		/* The error message has been set in SDL_RWFromFile */
+@@ -58,7 +60,7 @@
+ 	 * the normal method of doing things with libpng).  REQUIRED unless you
+ 	 * set up your own error handlers in png_create_read_struct() earlier.
+ 	 */
+-	if ( setjmp(png_ptr->jmpbuf) ) {
++	if ( setjmp(png_jmpbuf(png_ptr)) ) {
+ 		error = "Error reading the PNG file.";
+ 		goto done;
+ 	}
+@@ -127,9 +129,9 @@
+ 			Rmask = 0x000000FF;
+ 			Gmask = 0x0000FF00;
+ 			Bmask = 0x00FF0000;
+-			Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0;
++			Amask = (png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0;
+ 		} else {
+-		        int s = (info_ptr->channels == 4) ? 0 : 8;
++		        int s = (png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8;
+ 			Rmask = 0xFF000000 >> s;
+ 			Gmask = 0x00FF0000 >> s;
+ 			Bmask = 0x0000FF00 >> s;
+@@ -137,7 +139,7 @@
+ 		}
+ 	}
+ 	surface = SDL_AllocSurface(SDL_SWSURFACE, width, height,
+-			bit_depth*info_ptr->channels, Rmask,Gmask,Bmask,Amask);
++			bit_depth*png_get_channels(png_ptr, info_ptr), Rmask,Gmask,Bmask,Amask);
+ 	if ( surface == NULL ) {
+ 		error = "Out of memory";
+ 		goto done;
+@@ -185,12 +187,15 @@
+ 		    palette->colors[i].g = i;
+ 		    palette->colors[i].b = i;
+ 		}
+-	    } else if (info_ptr->num_palette > 0 ) {
+-		palette->ncolors = info_ptr->num_palette; 
+-		for( i=0; i<info_ptr->num_palette; ++i ) {
+-		    palette->colors[i].b = info_ptr->palette[i].blue;
+-		    palette->colors[i].g = info_ptr->palette[i].green;
+-		    palette->colors[i].r = info_ptr->palette[i].red;
++	    } else {
++	    	png_get_PLTE(png_ptr, info_ptr, &png_palette, &num_palette);
++	    	if (num_palette > 0 ) {
++			palette->ncolors = num_palette; 
++			for( i=0; i<num_palette; ++i ) {
++			    palette->colors[i].b = png_palette[i].blue;
++			    palette->colors[i].g = png_palette[i].green;
++			    palette->colors[i].r = png_palette[i].red;
++			}
+ 		}
+ 	    }
+ 	}
diff --git a/community/scummvm-tools/PKGBUILD b/community/scummvm-tools/PKGBUILD
index 1dba7faf0..e58621d12 100644
--- a/community/scummvm-tools/PKGBUILD
+++ b/community/scummvm-tools/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 58732 2011-11-18 08:41:40Z svenstaro $
+# $Id: PKGBUILD 63740 2012-02-05 12:10:55Z ibiru $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Jérémie Dimino <jeremie@dimino.org>
 # Contributor: Sebastian Hase <sebastian_hase@gmx.de>
 # Contributor: Joe Davison <joe@thosedamnpeanuts.com>
 pkgname=scummvm-tools
 pkgver=1.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A set of tools that enable you to convert, compress and decode game datafiles for ScummVM"
 url="http://www.scummvm.org/"
 license=('GPL')
diff --git a/community/sigil/PKGBUILD b/community/sigil/PKGBUILD
index c3d982595..5b3e1f11f 100644
--- a/community/sigil/PKGBUILD
+++ b/community/sigil/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 62685 2012-01-24 13:11:44Z giovanni $
+# $Id: PKGBUILD 63837 2012-02-06 01:19:19Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
 
 pkgname=sigil
-pkgver=0.5.0
+pkgver=0.5.1
 pkgrel=1
 pkgdesc="A WYSIWYG ebook editor"
 arch=('i686' 'x86_64') 
@@ -14,7 +14,7 @@ makedepends=('cmake')
 install=sigil.install
 source=("http://sigil.googlecode.com/files/Sigil-${pkgver}-Code.zip"
         "${pkgname}.desktop")
-md5sums=('8deb8ae451d485698ab9330dccfe46e5'
+md5sums=('82a2a764e38eb1372dbe43597055957d'
          'fef6aa492af487ccccd6b133635cee5a')
 
 build() {
diff --git a/community/silly/PKGBUILD b/community/silly/PKGBUILD
index 390c82194..12ac8800a 100644
--- a/community/silly/PKGBUILD
+++ b/community/silly/PKGBUILD
@@ -1,24 +1,26 @@
-# $Id: PKGBUILD 63954 2010-01-19 05:25:26Z eric $
+# $Id: PKGBUILD 63742 2012-02-05 12:11:01Z ibiru $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 # Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de>
 
 pkgname=silly
 pkgver=0.1.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Simple Image Loading LibrarY, a part of the CEGUI project"
 arch=('i686' 'x86_64')
 url="http://www.cegui.org.uk/wiki/index.php/SILLY"
 license=('MIT')
 depends=('libjpeg' 'libpng' 'gcc-libs')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/crayzedsgui/SILLY-${pkgver}.tar.gz)
-md5sums=('c3721547fced7792a36ffc9ce6ec23fd')
-sha1sums=('ef5c8ed6c5c57d7d792dbb9e02006c3770334869')
+source=(http://downloads.sourceforge.net/crayzedsgui/SILLY-${pkgver}.tar.gz
+        silly-libpng1.5.patch)
+md5sums=('c3721547fced7792a36ffc9ce6ec23fd'
+         '530551c2942aea6fa20f10d06f1e604f')
 
 build() {
   cd "${srcdir}/SILLY-${pkgver}"
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" || return 1
+  patch -Np1 < $srcdir/silly-libpng1.5.patch
+  ./configure --prefix=/usr
+  make
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }
diff --git a/community/silly/silly-libpng1.5.patch b/community/silly/silly-libpng1.5.patch
new file mode 100644
index 000000000..0b2d27252
--- /dev/null
+++ b/community/silly/silly-libpng1.5.patch
@@ -0,0 +1,14 @@
+ILLY-0.1.0/src/loaders/SILLYPNGImageLoader.cpp~ SILLY-0.1.0/src/loaders/SILLYPNGImageLoader.cpp
+--- SILLY-0.1.0/src/loaders/SILLYPNGImageLoader.cpp~    2006-06-19 00:42:12.000000000 +0200
++++ SILLY-0.1.0/src/loaders/SILLYPNGImageLoader.cpp 2011-12-06 14:38:31.738251526 +0100
+@@ -64,10 +64,7 @@ void PNG_error_function(png_structp png_
+                         png_const_charp error)
+ {
+     //  printf("PNG Error: %s\n", error);
+-    // copied from libpng's pngerror.cpp
+-    jmp_buf buf;
+-    memcpy(buf, png_ptr->jmpbuf, sizeof(jmp_buf));
+-    longjmp(buf, 1);
++    png_longjmp(png_ptr, 1);
+ }
+
diff --git a/community/smc/PKGBUILD b/community/smc/PKGBUILD
index b93398345..cd69b6236 100644
--- a/community/smc/PKGBUILD
+++ b/community/smc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 59966 2011-12-02 21:00:57Z ibiru $
+# $Id: PKGBUILD 63744 2012-02-05 12:11:13Z ibiru $
 # Maintainer:
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Kritoke <typeolinux@yahoo.com>
 
 pkgname=smc
 pkgver=1.9
-pkgrel=13
+pkgrel=14
 pkgdesc="Secret Maryo Chronicles"
 arch=('i686' 'x86_64')
 url="http://www.secretmaryo.org/"
@@ -22,24 +22,25 @@ md5sums=('75ab7826303c49aec25b052a8b90287f'
          'efca7580e28748625eb676c9d24ee122')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "$srcdir/$pkgname-$pkgver"
 
   # to remove when smc will be compatible with cegui-0.7.x
-  patch -Np1 -i ${srcdir}/smc-for-cegui-v0-7.diff
+  patch -Np1 -i "${srcdir}/smc-for-cegui-v0-7.diff"
   # fix for boost-1.46
   export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2"
 
   ./autogen.sh
-  ./configure --prefix=/usr
+  LIBS+="-lX11 -lboost_system" ./configure --prefix=/usr
+  make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "$srcdir/$pkgname-$pkgver"
 
-  make install DESTDIR=$pkgdir
+  make install DESTDIR="$pkgdir"
   # install some freedesktop.org compatibility
-  install -Dm644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop
-  install -Dm644 $srcdir/$pkgname.png $pkgdir/usr/share/pixmaps/$pkgname.png
+  install -Dm644 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
+  install -Dm644 "$srcdir/$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
 
-  rm -rf $pkgdir/usr/share/smc/
+  rm -rf "$pkgdir/usr/share/smc/"
 }
diff --git a/community/speed-dreams/PKGBUILD b/community/speed-dreams/PKGBUILD
index 990763d56..39a6dec8a 100644
--- a/community/speed-dreams/PKGBUILD
+++ b/community/speed-dreams/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 56288 2011-10-04 20:51:38Z svenstaro $
+# $Id: PKGBUILD 63748 2012-02-05 12:11:31Z ibiru $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Adrián Chaves Fernández, aka Gallaecio <adriyetichaves@gmail.com>
 # Contributor: Shahar Weiss <sweiss4@gmx.net> (build() code from his TORCS' PKGBUILD)
 pkgname=speed-dreams
 pkgver=2.0.0b1
 _pkgver=2.0.0-b1-r3937
-pkgrel=1
+pkgrel=2
 pkgdesc="A racing simulator with rich graphics and physics"
 arch=('i686' 'x86_64')
 url="http://speed-dreams.sourceforge.net/"
 license=('GPL2')
 depends=('sdl' 'freealut' 'freeglut' 'libpng' 'libxi' 'libxmu' 'libxrandr' 'plib>=1.8.3' 'libjpeg' 'zlib' 'enet' 'speed-dreams-data')
 makedepends=('cmake' 'p7zip')
+noextract=(${pkgname}-${_pkgver}-src.tar.7z)
 source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${_pkgver}-src.tar.7z"
         "${pkgname}.desktop")
 md5sums=('5299fe23aec3641827039ae3c69de460'
diff --git a/community/synergy/PKGBUILD b/community/synergy/PKGBUILD
index e23adadc2..eb02f0ce2 100644
--- a/community/synergy/PKGBUILD
+++ b/community/synergy/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Dale Blount <dale@archlinux.org>
 
 pkgname=synergy
-pkgver=1.3.8
+pkgver=1.4.6
 pkgrel=1
 pkgdesc="Share a single mouse and keyboard between multiple computers"
 url="http://synergy-foss.org"
@@ -36,5 +36,5 @@ package() {
   install -Dm644 $srcdir/$pkgname-$pkgver-Source/doc/${pkgname}.conf.example "${pkgdir}/etc" 
   install -Dm755 $srcdir/${pkgname}s.rc "${pkgdir}/etc/rc.d/${pkgname}s" 
 }
-md5sums=('3534c65ecfa6e47d7899c57975442f03'
+md5sums=('3e1ecc4fcbfe6b130ac0c86c674f6db3'
          '8f8c01add9bf6e3ae9f37a36ca6345b6')
diff --git a/community/synfig/PKGBUILD b/community/synfig/PKGBUILD
index 53671e957..7f6eb2c40 100644
--- a/community/synfig/PKGBUILD
+++ b/community/synfig/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 60363 2011-12-12 09:57:03Z spupykin $
+# $Id: PKGBUILD 63750 2012-02-05 12:11:41Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Franco Iacomella <yaco@gnu.org>
 
 pkgname=synfig
 pkgver=0.63.03
-pkgrel=1
+pkgrel=2
 pkgdesc="Professional vector animation program (CLI renderer only)"
 arch=(i686 x86_64)
 url="http://synfig.org"
diff --git a/community/ted/PKGBUILD b/community/ted/PKGBUILD
index 0a62bc597..3695c15dc 100644
--- a/community/ted/PKGBUILD
+++ b/community/ted/PKGBUILD
@@ -1,31 +1,36 @@
-# $Id: PKGBUILD 9087 2010-01-23 13:12:23Z foutrelis $
+# $Id: PKGBUILD 63752 2012-02-05 12:11:51Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=ted
 pkgver=2.21
-pkgrel=2
+pkgrel=4
 pkgdesc="An easy rich text processor (with footnote support)"
 arch=('i686' 'x86_64')
 url="http://www.nllgg.nl/Ted/"
 depends=('bash' 'libtiff' 'libxmu' 'libxpm' 'libpng' 'gtk2')
 license=('GPL')
-source=(ftp://ftp.nluug.nl/pub/editors/$pkgname/$pkgname-$pkgver.src.tar.gz)
-md5sums=('34ae855938a3b364eb587cca504ba356')
+source=(ftp://ftp.nluug.nl/pub/editors/$pkgname/$pkgname-$pkgver.src.tar.gz 
+        ted-2.21-libpng15.patch)
+md5sums=('34ae855938a3b364eb587cca504ba356'
+         '0c339b0fa7aec6b150e07e9027cd360c')
 
 build() {
-  cd $srcdir/Ted-$pkgver
-  sed -i "s|--with-GTK|--with-GTK --prefix=/usr/share|g" Makefile || return 1
-  # libpng 1.4
-  sed -i "s|png_info_init|png_create_info_struct|g" bitmap/bmpng.c || return 1
-  make compile.shared || return 1
-  make package.shared || return 1
-  mkdir -p $pkgdir/usr/share/
-  cd $pkgdir/usr/share/
-  tar -zxvf $srcdir/Ted-$pkgver/tedPackage/ted-$pkgver-linux-$CARCH.tar.gz || return 1
+  cd "$srcdir/Ted-$pkgver"
+  sed -i "s|--with-GTK|--with-GTK --prefix=/usr/share|g" Makefile
+  patch -p0 -i ../ted-2.21-libpng15.patch
+  make compile.shared
+  make package.shared
+}
+
+package() {
+  cd "$srcdir/Ted-$pkgver"
+  mkdir -p "$pkgdir/usr/share/"
+  cd "$pkgdir/usr/share/"
+  tar -zxvf "$srcdir/Ted-$pkgver/tedPackage/ted-$pkgver-linux-$CARCH.tar.gz"
   mv bin ../
-  mkdir -p $pkgdir/usr/share/man/man1
-  cd $pkgdir/usr/share/Ted/
-  mv Ted.1 rtf2pdf.1 rtf2ps.1 ../../share/man/man1/ || return 1
+  mkdir -p "$pkgdir/usr/share/man/man1"
+  cd "$pkgdir/usr/share/Ted/"
+  mv Ted.1 rtf2pdf.1 rtf2ps.1 ../../share/man/man1/
   sed -i "s|usr/local/afm|usr/share/Ted/afm|g" gsafm.sh
-  mv *.sh $pkgdir/usr/bin/ || return 1
+  mv *.sh "$pkgdir/usr/bin/"
 }
diff --git a/community/ted/ted-2.21-libpng15.patch b/community/ted/ted-2.21-libpng15.patch
new file mode 100644
index 000000000..afd30f9a4
--- /dev/null
+++ b/community/ted/ted-2.21-libpng15.patch
@@ -0,0 +1,423 @@
+This patch is from netbsd pkgsrc
+
+ftp://ftp.netbsd.org/pub/NetBSD/packages/pkgsrc/editors/ted/patches/
+
+--- bitmap/bmpng.c
++++ bitmap/bmpng.c
+@@ -20,23 +20,32 @@
+ /*									*/
+ /************************************************************************/
+ 
+-static int bpPngiToBitmap(	const png_info *		pngi,
++static int bpPngiToBitmap(	const png_structp		pngp,
++				png_info *			pngi,
+ 				BitmapDescription *		bd )
+     {
+     unsigned int	col;
++    png_uint_32		res_x, res_y;
++    int			unit_type= 0;
+ 
+-    bd->bdPixelsWide= pngi->width;
+-    bd->bdPixelsHigh= pngi->height;
++    bd->bdPixelsWide= png_get_image_width( pngp, pngi );
++    bd->bdPixelsHigh= png_get_image_height( pngp, pngi );
+     bd->bdHasAlpha= 0;
+ 
+-    switch( pngi->color_type )
++    switch( png_get_color_type( pngp, pngi ) )
+ 	{
+ 	case PNG_COLOR_TYPE_PALETTE:
++	    {
++	    int		num_palette;
++	    png_colorp	palette;
++
++	    png_get_PLTE( pngp, pngi, &palette, &num_palette );
++
+ 	    bd->bdColorEncoding= BMcoRGB8PALETTE;
+-	    bd->bdColorCount= pngi->num_palette;
++	    bd->bdColorCount= num_palette;
+ 	    bd->bdBitsPerSample= 8;
+ 	    bd->bdSamplesPerPixel= 3;
+-	    bd->bdBitsPerPixel= pngi->bit_depth;
++	    bd->bdBitsPerPixel= png_get_bit_depth( pngp, pngi );
+ 
+ 	    bd->bdRGB8Palette= (RGB8Color *)
+ 				malloc( bd->bdColorCount* sizeof(RGB8Color) );
+@@ -46,47 +55,51 @@ static int bpPngiToBitmap(	const png_inf
+ 
+ 	    for ( col= 0; col < bd->bdColorCount; col++ )
+ 		{
+-		bd->bdRGB8Palette[col].rgb8Red= pngi->palette[col].red;
+-		bd->bdRGB8Palette[col].rgb8Green= pngi->palette[col].green;
+-		bd->bdRGB8Palette[col].rgb8Blue= pngi->palette[col].blue;
++		bd->bdRGB8Palette[col].rgb8Red= palette[col].red;
++		bd->bdRGB8Palette[col].rgb8Green= palette[col].green;
++		bd->bdRGB8Palette[col].rgb8Blue= palette[col].blue;
+ 		bd->bdRGB8Palette[col].rgb8Alpha= 0;
+ 		}
++	    }
+ 	    break;
+ 
+ 	case PNG_COLOR_TYPE_RGB:
+ 	    bd->bdColorEncoding= BMcoRGB;
+-	    bd->bdBitsPerSample= pngi->bit_depth;
+-	    bd->bdSamplesPerPixel= pngi->channels;
+-	    bd->bdBitsPerPixel= pngi->pixel_depth;
++	    bd->bdBitsPerSample= png_get_bit_depth( pngp, pngi );
++	    bd->bdSamplesPerPixel= png_get_channels( pngp, pngi );
++	    bd->bdBitsPerPixel= bd->bdSamplesPerPixel* bd->bdBitsPerSample;
+ 	    break;
+ 
+ 	case PNG_COLOR_TYPE_GRAY:
+ 	    bd->bdColorEncoding= BMcoWHITEBLACK;
+-	    bd->bdBitsPerSample= pngi->bit_depth;
+-	    bd->bdSamplesPerPixel= pngi->channels;
+-	    bd->bdBitsPerPixel= pngi->pixel_depth;
++	    bd->bdBitsPerSample= png_get_bit_depth( pngp, pngi );
++	    bd->bdSamplesPerPixel= png_get_channels( pngp, pngi );
++	    bd->bdBitsPerPixel= bd->bdSamplesPerPixel* bd->bdBitsPerSample;
+ 	    break;
+ 
+ 	case PNG_COLOR_TYPE_RGB_ALPHA:
+ 	    bd->bdHasAlpha= 1;
+ 	    bd->bdColorEncoding= BMcoRGB;
+-	    bd->bdBitsPerSample= pngi->bit_depth;
+-	    bd->bdSamplesPerPixel= pngi->channels;
+-	    bd->bdBitsPerPixel= pngi->pixel_depth;
++	    bd->bdBitsPerSample= png_get_bit_depth( pngp, pngi );
++	    bd->bdSamplesPerPixel= png_get_channels( pngp, pngi );
++	    bd->bdBitsPerPixel= bd->bdSamplesPerPixel* bd->bdBitsPerSample;
+ 	    break;
+ 
+ 	case PNG_COLOR_TYPE_GRAY_ALPHA:
+ 	    bd->bdHasAlpha= 1;
+-	    LDEB(pngi->color_type); return -1;
++	    LDEB(png_get_color_type( pngp, pngi )); return -1;
+ 
+ 	default:
+-	    LDEB(pngi->color_type); return -1;
++	    LDEB(png_get_color_type( pngp, pngi )); return -1;
+ 	}
+ 
+-    bd->bdBytesPerRow= pngi->rowbytes;
++    bd->bdBytesPerRow= png_get_rowbytes( pngp, pngi );
+     bd->bdBufferLength= bd->bdBytesPerRow* bd->bdPixelsHigh;
+ 
+-    switch( pngi->phys_unit_type )
++    if  ( !  png_get_pHYs( pngp, pngi, &res_x, &res_y, &unit_type ) )
++	{ unit_type= PNG_RESOLUTION_UNKNOWN;	}
++
++    switch( unit_type )
+ 	{
+ 	case PNG_RESOLUTION_UNKNOWN:
+ 	    bd->bdUnit= BMunPIXEL;
+@@ -96,12 +109,12 @@ static int bpPngiToBitmap(	const png_inf
+ 
+ 	case PNG_RESOLUTION_METER:
+ 	    bd->bdUnit= BMunM;
+-	    bd->bdXResolution= pngi->x_pixels_per_unit;
+-	    bd->bdYResolution= pngi->y_pixels_per_unit;
++	    bd->bdXResolution= res_x;
++	    bd->bdYResolution= res_y;
+ 	    break;
+ 
+ 	default:
+-	    LDEB(pngi->phys_unit_type);
++	    LDEB(unit_type);
+ 	    return -1;
+ 	}
+ 
+@@ -119,11 +132,11 @@ static int bmPngReadContents(	png_info *
+     unsigned char *		buffer;
+ 
+     numberOfPasses= 1;
+-    if  ( pngi->interlace_type )
++    if  ( png_get_interlace_type( png, pngi ) )
+ 	{ numberOfPasses= png_set_interlace_handling( png ); }
+ 
+-    if  ( pngi->color_type == PNG_COLOR_TYPE_RGB	&&
+-	  pngi->bit_depth == 16				)
++    if  ( png_get_color_type( png, pngi ) == PNG_COLOR_TYPE_RGB	&&
++	  png_get_bit_depth( png, pngi ) == 16			)
+ 	{
+ 	const unsigned short	one= 1;
+ 	const unsigned char *	testEndian= (const unsigned char *)&one;
+@@ -133,9 +146,6 @@ static int bmPngReadContents(	png_info *
+ 	}
+ 
+     png_start_read_image( png );
+-    /*
+-    png_read_update_info( png, pngi );
+-    */
+ 
+     buffer= (unsigned char *)malloc( bd->bdBufferLength );
+     if  ( ! buffer )
+@@ -236,9 +246,9 @@ int bmPngReadPng(	BitmapDescription *	bd
+ 
+     png_read_info( pngp, pngip );
+ 
+-    if  ( bpPngiToBitmap( pngip, bd ) )
++    if  ( bpPngiToBitmap( pngp, pngip, bd ) )
+ 	{
+-	LLLDEB(pngip->color_type,bd->bdColorCount,bd->bdRGB8Palette); 
++	LLDEB(bd->bdColorCount,bd->bdRGB8Palette); 
+ 	png_destroy_read_struct( &pngp, &pngip, (png_infop *)0 );
+ 	return -1;
+ 	}
+@@ -282,44 +292,43 @@ int bmCanWritePngFile( const BitmapDescr
+ 
+ static int bpPngiFromBitmap(	png_structp			png,
+ 				png_info *			pngi,
++				png_colorp *			pPalette,
+ 				const BitmapDescription *       bd )
+     {
+-    png_info_init( pngi );
+-    pngi->width= bd->bdPixelsWide;
+-    pngi->height= bd->bdPixelsHigh;
++    int			bit_depth;
++    int			color_type;
++    png_color_8		sig_bit;
+ 
+     switch( bd->bdUnit )
+ 	{
+ 	case BMunM:
+-	    pngi->phys_unit_type= PNG_RESOLUTION_METER;
+-	    pngi->x_pixels_per_unit= bd->bdXResolution;
+-	    pngi->y_pixels_per_unit= bd->bdYResolution;
+-	    pngi->valid |= PNG_INFO_pHYs;
++	    png_set_pHYs( png, pngi,
++			    bd->bdXResolution,
++			    bd->bdYResolution,
++			    PNG_RESOLUTION_METER);
+ 	    break;
+ 
+ 	case BMunINCH:
+-	    pngi->phys_unit_type= PNG_RESOLUTION_METER;
+-	    pngi->x_pixels_per_unit= (int)( 39.37* bd->bdXResolution );
+-	    pngi->y_pixels_per_unit= (int)( 39.37* bd->bdYResolution );
+-	    pngi->valid |= PNG_INFO_pHYs;
++	    png_set_pHYs( png, pngi,
++			    (int)( 39.37* bd->bdXResolution ),
++			    (int)( 39.37* bd->bdYResolution ),
++			    PNG_RESOLUTION_METER);
+ 	    break;
+ 
+ 	case BMunPOINT:
+-	    pngi->phys_unit_type= PNG_RESOLUTION_METER;
+-	    pngi->x_pixels_per_unit= POINTS_PER_M* bd->bdXResolution;
+-	    pngi->y_pixels_per_unit= POINTS_PER_M* bd->bdYResolution;
+-	    pngi->valid |= PNG_INFO_pHYs;
++	    png_set_pHYs( png, pngi,
++			    POINTS_PER_M* bd->bdXResolution,
++			    POINTS_PER_M* bd->bdYResolution,
++			    PNG_RESOLUTION_METER);
+ 	    break;
+ 
+ 	case BMunPIXEL:
+-	    pngi->phys_unit_type= PNG_RESOLUTION_UNKNOWN;
+-	    pngi->x_pixels_per_unit= 1;
+-	    pngi->y_pixels_per_unit= 1;
++	    png_set_pHYs(png, pngi, 1, 1, PNG_RESOLUTION_UNKNOWN);
+ 	    break;
+ 
+ 	default:
+ 	    LDEB(bd->bdUnit);
+-	    pngi->phys_unit_type= PNG_RESOLUTION_UNKNOWN;
++	    png_set_pHYs(png, pngi, 1, 1, PNG_RESOLUTION_UNKNOWN);
+ 	    break;
+ 	}
+ 
+@@ -329,41 +338,48 @@ static int bpPngiFromBitmap(	png_structp
+ 
+ 	case BMcoBLACKWHITE:
+ 	case BMcoWHITEBLACK:
+-	    pngi->bit_depth= bd->bdBitsPerPixel;
++	    bit_depth= bd->bdBitsPerPixel;
+ 	    if  ( bd->bdHasAlpha )
+-		{ pngi->color_type= PNG_COLOR_TYPE_GRAY_ALPHA;	}
+-	    else{ pngi->color_type= PNG_COLOR_TYPE_GRAY;	}
+-	    pngi->sig_bit.gray= bd->bdBitsPerSample;
++		{ color_type= PNG_COLOR_TYPE_GRAY_ALPHA;	}
++	    else{ color_type= PNG_COLOR_TYPE_GRAY;		}
++	    sig_bit.gray= bd->bdBitsPerSample;
+ 	    break;
+ 
+ 	case BMcoRGB:
+-	    pngi->bit_depth= bd->bdBitsPerSample;
++	    bit_depth= bd->bdBitsPerSample;
+ 	    if  ( bd->bdHasAlpha )
+-		{ pngi->color_type= PNG_COLOR_TYPE_RGB_ALPHA;	}
+-	    else{ pngi->color_type= PNG_COLOR_TYPE_RGB;		}
+-	    pngi->sig_bit.red= bd->bdBitsPerSample;
+-	    pngi->sig_bit.green= bd->bdBitsPerSample;
+-	    pngi->sig_bit.blue= bd->bdBitsPerSample;
++		{ color_type= PNG_COLOR_TYPE_RGB_ALPHA;	}
++	    else{ color_type= PNG_COLOR_TYPE_RGB;	}
++	    sig_bit.red= bd->bdBitsPerSample;
++	    sig_bit.green= bd->bdBitsPerSample;
++	    sig_bit.blue= bd->bdBitsPerSample;
+ 	    break;
+ 
+ 	case BMcoRGB8PALETTE:
+-	    pngi->bit_depth= bd->bdBitsPerPixel;
+-	    pngi->color_type= PNG_COLOR_TYPE_PALETTE;
++	    bit_depth= bd->bdBitsPerPixel;
++	    color_type= PNG_COLOR_TYPE_PALETTE;
+ 
+-	    pngi->valid |= PNG_INFO_PLTE;
+-	    pngi->palette= (png_color *)malloc( 256* sizeof( png_color ) );
+-	    if  ( ! pngi->palette )
+-		{ XDEB(pngi->palette); return -1;	}
+-	    pngi->num_palette= bd->bdColorCount;
+-	    pngi->sig_bit.red= bd->bdBitsPerSample;
+-	    pngi->sig_bit.green= bd->bdBitsPerSample;
+-	    pngi->sig_bit.blue= bd->bdBitsPerSample;
+-	    for ( i= 0; i < pngi->num_palette; i++ )
++	    if  ( bd->bdColorCount > PNG_MAX_PALETTE_LENGTH )
+ 		{
+-		pngi->palette[i].red= bd->bdRGB8Palette[i].rgb8Red;
+-		pngi->palette[i].green= bd->bdRGB8Palette[i].rgb8Green;
+-		pngi->palette[i].blue= bd->bdRGB8Palette[i].rgb8Blue;
++		LLDEB(bd->bdColorCount,PNG_MAX_PALETTE_LENGTH);
++		return -1;
+ 		}
++
++	    *pPalette= (png_color *)malloc( PNG_MAX_PALETTE_LENGTH*
++						    sizeof( png_color ) );
++	    if  ( ! *pPalette )
++		{ XDEB(*pPalette); return -1;	}
++	    sig_bit.red= bd->bdBitsPerSample;
++	    sig_bit.green= bd->bdBitsPerSample;
++	    sig_bit.blue= bd->bdBitsPerSample;
++	    for ( i= 0; i < bd->bdColorCount; i++ )
++		{
++		(*pPalette)[i].red= bd->bdRGB8Palette[i].rgb8Red;
++		(*pPalette)[i].green= bd->bdRGB8Palette[i].rgb8Green;
++		(*pPalette)[i].blue= bd->bdRGB8Palette[i].rgb8Blue;
++		}
++
++	    png_set_PLTE( png, pngi, (*pPalette), bd->bdColorCount );
+ 	    break;
+ 
+ 	default:
+@@ -371,7 +387,13 @@ static int bpPngiFromBitmap(	png_structp
+ 	    return -1;
+ 	}
+ 
+-    pngi->interlace_type= 0;
++    png_set_sBIT( png, pngi, &sig_bit );
++    png_set_IHDR( png, pngi,
++			bd->bdPixelsWide, bd->bdPixelsHigh,
++			bit_depth, color_type,
++			PNG_INTERLACE_NONE,
++			PNG_COMPRESSION_TYPE_BASE,
++			PNG_FILTER_TYPE_BASE );
+ 
+     return 0;
+     }
+@@ -395,8 +417,8 @@ static void bmPngWriteContents(	png_stru
+ 	    }
+ 	}
+ 
+-    if  ( pngi->color_type == PNG_COLOR_TYPE_RGB	&&
+-	  bd->bdBitsPerSample == 16			)
++    if  ( png_get_color_type( png, pngi ) == PNG_COLOR_TYPE_RGB	&&
++	  bd->bdBitsPerSample == 16				)
+ 	{
+ 	const unsigned short	one= 1;
+ 	const unsigned char *	testEndian= (const unsigned char *)&one;
+@@ -431,9 +453,9 @@ static void bmPngWriteContents(	png_stru
+ 	    from= scratch;
+ 	    }
+ 
+-	if  ( pngi->color_type == PNG_COLOR_TYPE_RGB	&&
+-	      bd->bdBitsPerSample == 16			&&
+-	      scratch					)
++	if  ( png_get_color_type( png, pngi ) == PNG_COLOR_TYPE_RGB	&&
++	      bd->bdBitsPerSample == 16					&&
++	      scratch							)
+ 	    {
+ 	    int			col;
+ 	    const BmUint16 *	fr= (const BmUint16 *)from;
+@@ -453,10 +475,6 @@ static void bmPngWriteContents(	png_stru
+ 
+     png_write_end( png, pngi );
+ 
+-    if  ( bd->bdColorEncoding == BMcoRGB8PALETTE	&&
+-	  pngi->palette					)
+-	{ free( pngi->palette );	}
+-
+     if  ( scratch )
+ 	{ free( scratch );	}
+ 
+@@ -510,50 +528,43 @@ int bmPngWritePng(		const BitmapDescript
+ 				const unsigned char *		buffer,
+ 				SimpleOutputStream *		sos )
+     {
++    int			rval= 0;
+     png_structp		pngp= (png_structp)0;
+     png_infop		pngip= (png_infop)0;
++    png_colorp		palette= (png_colorp)0;
+ 
+     pngp = png_create_write_struct( PNG_LIBPNG_VER_STRING, (void *)0,
+ 				    (png_error_ptr)0, (png_error_ptr)0 );
+     if  ( ! pngp )
+-	{ LDEB(1); return -1;	}
++	{ XDEB(pngp); rval= -1; goto ready;	}
+ 
+     pngip = png_create_info_struct( pngp );
+     if  ( ! pngip )
+-	{
+-	LDEB(1);
+-	png_destroy_write_struct( &pngp, (png_infop *)0 );
+-	return -1;
+-	}
++	{ XDEB(pngip); rval= -1; goto ready;	}
++
++    /*
++    As the info struct is built by libpng this is not needed:
++    (The call will disappear from libpng in version 1.4)
++    png_info_init( pngi ); 
++    */
+ 
+     if  ( setjmp( png_jmpbuf( pngp ) ) )
+-	{
+-	LDEB(1);
+-	png_destroy_write_struct( &pngp, &pngip );
+-	/*  Crashes:
+-	if  ( bd->bdColorEncoding == BMcoRGB8PALETTE	&&
+-	      pngip->palette				)
+-	    { free( pngip->palette );	}
+-	*/
+-	return -1;
+-	}
++	{ LDEB(1); rval= -1; goto ready;	}
+ 
+     png_init_io( pngp, (FILE *)0 );
+     png_set_write_fn( pngp, (void *)sos, bmPngWriteBytes, bmPngFlushBytes );
+ 
+-    if  ( bpPngiFromBitmap( pngp, pngip, bd ) )
+-	{
+-	LDEB(bd->bdColorEncoding);
+-	png_destroy_write_struct( &pngp, &pngip );
+-	return -1;
+-	}
+-
+-    /*
+-    png_write_info( pngp, pngip );
+-    */
++    if  ( bpPngiFromBitmap( pngp, pngip, &palette, bd ) )
++	{ LDEB(bd->bdColorEncoding); rval= -1; goto ready; }
+ 
+     bmPngWriteContents( pngp, pngip, buffer, bd );
+ 
++  ready:
++
++    if  ( palette )
++	{ free( palette );	}
++
+     png_destroy_write_struct( &pngp, &pngip );
+-    return 0;
++
++    return rval;
+     }
diff --git a/community/tmw/PKGBUILD b/community/tmw/PKGBUILD
index 53de9a0a3..66ee80a3a 100644
--- a/community/tmw/PKGBUILD
+++ b/community/tmw/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 46816 2011-05-12 17:56:23Z mherych $
+# $Id: PKGBUILD 63754 2012-02-05 12:11:59Z ibiru $
 # Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
 # Maintainer: Mateusz Herych <heniekk@gmail.com>
 
 pkgname=tmw
 pkgver=0.5.2
-pkgrel=1
+pkgrel=2
 pkgdesc="The Mana World (TMW) is a serious effort to create an innovative free and open source MMORPG."
 arch=('i686' 'x86_64')
 url="http://themanaworld.org"
@@ -16,12 +16,12 @@ source=(http://downloads.sourceforge.net/sourceforge/themanaworld/$pkgname-$pkgv
 md5sums=('c843ef420aced82db1e51fa14e80174a')
 
 build() {
-    cd $srcdir
+    cd "$srcdir"
     cmake . -DCMAKE_INSTALL_PREFIX=/usr
     make
 }
 
 package() {
-    cd $srcdir
-    make DESTDIR=$pkgdir install
+    cd "$srcdir"
+    make DESTDIR="$pkgdir" install
 }
diff --git a/community/torcs/PKGBUILD b/community/torcs/PKGBUILD
index 1d6c27f91..f6a4e9380 100644
--- a/community/torcs/PKGBUILD
+++ b/community/torcs/PKGBUILD
@@ -1,22 +1,21 @@
-# $Id: PKGBUILD 61835 2012-01-08 19:53:39Z spupykin $
+# $Id: PKGBUILD 63756 2012-02-05 12:12:13Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Shahar Weiss <sweiss4@gmx.net>
 
 pkgname=torcs
-pkgver=1.3.2_test2
+pkgver=1.3.2
 pkgrel=1
 pkgdesc="A 3D racing cars simulator using OpenGL"
 url="http://torcs.sourceforge.net"
 license=("GPL")
 arch=('i686' 'x86_64')
-depends=('freeglut' 'libpng' 'freealut' 'libxi' 'libxmu' 'libxrandr' 'torcs-data'
-	 'libvorbis')
+depends=('freeglut' 'libpng' 'freealut' 'libxi' 'libxmu' 'libxrandr' 'libvorbis')
 makedepends=('plib')
 options=('!makeflags')
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver/_/-}.tar.bz2
         torcs.desktop
         torcs-gcc.patch)
-md5sums=('7851c1149587451bd64a6a55d785af40'
+md5sums=('254b8f4c14d067dd63da8d54d3cfdba8'
          '328e419e9f985c3e7b69924fe299330d'
          '5ae7e903df37300d3b8744328c756bff')
 
@@ -28,6 +27,7 @@ build() {
 }
 
 package() {
+  depends=(${depends[@]} "torcs-data=$pkgver")
   cd $srcdir/$pkgname-${pkgver/_/-}
   make DESTDIR=${pkgdir} install
   install -D -m644 Ticon.png ${pkgdir}/usr/share/pixmaps/torcs.png
diff --git a/community/tuxpaint/PKGBUILD b/community/tuxpaint/PKGBUILD
index 782eb0534..d0b06469d 100644
--- a/community/tuxpaint/PKGBUILD
+++ b/community/tuxpaint/PKGBUILD
@@ -1,38 +1,39 @@
-# $Id: PKGBUILD 26451 2010-09-15 18:28:06Z schuay $
+# $Id: PKGBUILD 63759 2012-02-05 12:12:25Z ibiru $
 # Maintainer: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Sergio Jovani Guzman <moret.sjg@gmail.com>
 # Adopted: royrocks <royrocks13@gmail.com>
 pkgname=tuxpaint
 pkgver=0.9.21
-pkgrel=4
+pkgrel=5
 pkgdesc="Tux Paint is a free drawing program designed for young children."
 arch=('i686' 'x86_64')
 url="http://www.tuxpaint.org"
 license=('GPL')
 backup=('etc/tuxpaint/tuxpaint.conf')
 depends=('python2' 'fribidi' 'sdl_ttf' 'sdl_mixer' 'sdl_image' 'sdl_pango' 'libpaper' 'librsvg')
-source=(http://downloads.sourceforge.net/sourceforge/tuxpaint/$pkgname-$pkgver.tar.gz)
-md5sums=('a88401d1860648098eeed819cff038fa')
-sha1sums=('082a179a3cb44ee17af47421bc92125a890846e4')
+source=(http://downloads.sourceforge.net/sourceforge/tuxpaint/$pkgname-$pkgver.tar.gz tuxpaint-0.9.21-libpng1.5.patch)
+md5sums=('a88401d1860648098eeed819cff038fa'
+         '11d11119b3316c13f7b7a77048317bce')
+sha1sums=('082a179a3cb44ee17af47421bc92125a890846e4'
+          '5595a65ebabc46bebd2d0670589effc8dbdd4e0c')
 
 build() {
- cd $srcdir/$pkgname-$pkgver
+ cd "$srcdir/$pkgname-$pkgver"
 
  # python2 fix
  for file in docs/zh_tw/mkTuxpaintIM.py fonts/locale/zh_tw_docs/maketuxfont.py; do
     sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file
  done
 
+ patch -p0 -i ../tuxpaint-0.9.21-libpng1.5.patch
+ sed -i 's/$(ARCH_LINKS)/$(ARCH_LINKS) -lpng/' Makefile
  echo "Categories=Game;KidsGame;Graphics;RasterGraphics;" >> src/tuxpaint.desktop
  make PREFIX=/usr
 }
 
 package() {
- cd $srcdir/$pkgname-$pkgver
- make PREFIX=/usr DESTDIR=$startdir/pkg CONFDIR=$pkgdir/etc MAN_PREFIX=$pkgdir/usr/share/man  X11_ICON_PREFIX=$pkgdir/usr/share/pixmaps KDE_PREFIX="" KDE_ICON_PREFIX="" install
- install -D -m 644 $srcdir/$pkgname-$pkgver/src/tuxpaint.desktop $pkgdir/usr/share/applications/tuxpaint.desktop
- chmod -R 644 $pkgdir/usr/share/doc/tuxpaint-dev/*
- chmod 755 $pkgdir/usr/share/doc/tuxpaint-dev/html
- mkdir -p $pkgdir/etc/tuxpaint
- mv $pkgdir/etc/tuxpaint.conf $pkgdir/etc/tuxpaint/
+ cd "$srcdir/$pkgname-$pkgver"
+ make PREFIX=/usr DESTDIR="$pkgdir" GNOME_PREFIX=/usr X11_ICON_PREFIX="$pkgdir/usr/share/pixmaps" install
+ chmod -R 644 "$pkgdir"/usr/share/doc/tuxpaint-dev/*
+ chmod 755 "$pkgdir/usr/share/doc/tuxpaint-dev/html"
 }
diff --git a/community/tuxpaint/tuxpaint-0.9.21-libpng1.5.patch b/community/tuxpaint/tuxpaint-0.9.21-libpng1.5.patch
new file mode 100644
index 000000000..25e80cd2a
--- /dev/null
+++ b/community/tuxpaint/tuxpaint-0.9.21-libpng1.5.patch
@@ -0,0 +1,19 @@
+http://tuxpaint.cvs.sourceforge.net/viewvc/tuxpaint/tuxpaint/src/tuxpaint.c?r1=1.828&r2=1.829
+No longer directly accessing PNG structure members directly, now using png_set_IHDR(). (Patch from SF.net Bug #3386433)
+
+--- src/tuxpaint.c	2011/07/29 21:27:39	1.828
++++ src/tuxpaint.c	2011/08/08 17:59:12	1.829
+@@ -13425,12 +13425,7 @@
+       {
+ 	png_init_io(png_ptr, fi);
+ 
+-	info_ptr->width = surf->w;
+-	info_ptr->height = surf->h;
+-	info_ptr->bit_depth = 8;
+-	info_ptr->color_type = PNG_COLOR_TYPE_RGB;
+-	info_ptr->interlace_type = 1;
+-	info_ptr->valid = 0;	/* will be updated by various png_set_FOO() functions */
++        png_set_IHDR(png_ptr, info_ptr, surf->w, surf->h, 8, PNG_COLOR_TYPE_RGB, 1, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
+ 
+ 	png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr,
+ 				   PNG_sRGB_INTENT_PERCEPTUAL);
diff --git a/community/tvtime/PKGBUILD b/community/tvtime/PKGBUILD
index 59a5792c6..00442105e 100644
--- a/community/tvtime/PKGBUILD
+++ b/community/tvtime/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 59091 2011-11-21 09:46:20Z spupykin $
+# $Id: PKGBUILD 63761 2012-02-05 12:12:36Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:thefatprecious <marty@loomar.com>
 
 pkgname=tvtime
 pkgver=1.0.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A high quality television application for use with video capture cards"
 arch=('i686' 'x86_64')
 url='http://tvtime.sourceforge.net/'
@@ -26,6 +26,7 @@ build() {
   patch -p1 < ../tvtime-1.0.2+linux-headers-2.6.18.patch
   patch -p1 < ../tvtime-1.0.2-gcc41.patch
   patch -p1 < ../tvtime-1.0.2-locale_t.patch
+  sed -i '1,1i#include <zlib.h>' src/pngoutput.c
   [ -f Makefile ] || ./configure --prefix=/usr --mandir=/usr/share/man --localstatedir=/var --sysconfdir=/etc
   make
   make DESTDIR=$pkgdir install
diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD
index 7339633aa..f28badfda 100644
--- a/community/virtualbox/PKGBUILD
+++ b/community/virtualbox/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 60899 2011-12-19 18:08:37Z ibiru $
+# $Id: PKGBUILD 63763 2012-02-05 12:13:00Z ibiru $
 #Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgbase=virtualbox
 pkgname=('virtualbox' 'virtualbox-archlinux-additions' 'virtualbox-sdk' 'virtualbox-source')
 pkgver=4.1.8
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -16,7 +16,7 @@ source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}
         10-vboxdrv.rules  vboxdrv-reference.patch LocalConfig.kmk vboxbuild
         change_default_driver_dir.patch vbox-service.conf vbox-service.rc)
 
-_extramodules=extramodules-3.1-ARCH
+_extramodules=extramodules-3.2-ARCH
 _kernver="$(cat /lib/modules/${_extramodules}/version)"
 
 build() {
@@ -40,7 +40,7 @@ build() {
 
 package_virtualbox() {
     pkgdesc="Powerful x86 virtualization for enterprise as well as home use"
-    depends=('virtualbox-modules' 'libxml2' 'libxcursor' 'libidl2' 'libxinerama' 'sdl' 'libxmu' 'curl' 'libvncserver' 'libpng')
+    depends=('virtualbox-modules' 'libxml2' 'libxcursor' 'libxinerama' 'sdl' 'libxmu' 'curl' 'libvncserver' 'libpng')
     optdepends=('qt: for VirtualBox GUI'
                 'vde2: Virtual Distributed Ethernet support'
                 'virtualbox-sdk: developer kit'
@@ -149,7 +149,7 @@ package_virtualbox-sdk() {
 
 package_virtualbox-archlinux-additions(){
     pkgdesc="Additions only for Arch Linux guests (userspace tools)"
-    depends=("virtualbox-archlinux-modules=$pkgver" 'gcc-libs' 'libxmu' 'xorg-xrandr')
+    depends=("virtualbox-archlinux-modules=$pkgver" 'gcc-libs' 'libxmu' 'xorg-xrandr' 'libxfixes')
     replaces=('virtualbox-guest-additions')
     conflicts=('virtualbox-guest-additions')
 
diff --git a/community/virtviewer/PKGBUILD b/community/virtviewer/PKGBUILD
index 6abbad324..1798634b9 100644
--- a/community/virtviewer/PKGBUILD
+++ b/community/virtviewer/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 54218 2011-08-14 19:34:13Z spupykin $
+# $Id: PKGBUILD 63765 2012-02-05 12:13:04Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jonathan Wiersma <archaur at jonw dot org>
 
 pkgname=virtviewer
 pkgver=0.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A lightweight interface for interacting with the graphical display of virtualized guest OS."
 depends=('gtk-vnc' 'libglade>=2.6.0' 'libvirt')
 makedepends=('intltool')
diff --git a/community/vtk/PKGBUILD b/community/vtk/PKGBUILD
index 78af11f86..c1984cfb6 100644
--- a/community/vtk/PKGBUILD
+++ b/community/vtk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 61185 2011-12-23 22:04:01Z tdziedzic $
+# $Id: PKGBUILD 63769 2012-02-05 12:13:32Z ibiru $
 # Maintainer: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Christofer Bertonha <christoferbertonha at gmail dot com>
 # Contributor: leepesjee <lpeschier at xs4all dot nl>
@@ -9,12 +9,12 @@
 
 pkgname=vtk
 pkgver=5.8.0
-pkgrel=7
+pkgrel=8
 pkgdesc='A software system for 3D computer graphics, image processing, and visualization which supports a wide variety of visualization algorithms and advanced modeling techniques.'
 arch=('i686' 'x86_64')
 url='http://www.vtk.org'
 license=('BSD')
-depends=('libpng' 'libtiff' 'freetype2' 'boost' 'ffmpeg' 'qt' 'lesstif' 'mysql')
+depends=('libpng' 'libtiff' 'libjpeg-turbo' 'freetype2' 'boost' 'ffmpeg' 'qt' 'lesstif' 'mysql' 'hdf5' 'expat' 'libtheora')
 makedepends=('cmake' 'java-environment' 'doxygen' 'gnuplot' 'mesa' 'python2' 'tk')
 optdepends=('python2: python bindings'
             'java-runtime: java bindings'
@@ -53,6 +53,15 @@ build() {
   mkdir build
   cd build
 
+  # flags to enable using system libs
+  local cmake_system_flags=""
+  for lib in HDF5 EXPAT FREETYPE JPEG PNG TIFF ZLIB LIBXML2 OGGTHEORA; do # LIBPROJ4
+    cmake_system_flags+="-DVTK_USE_SYSTEM_${lib}:BOOL=ON "
+  done
+
+  # flags to use python2 instead of python which is 3.x.x on archlinux
+  local cmake_system_python_flags="-DPYTHON_EXECUTABLE:PATH=/usr/bin/python2 -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python2.7 -DPYTHON_LIBRARY:PATH=/usr/lib/libpython2.7.so"
+
   cmake \
     -Wno-dev \
     -DBUILD_SHARED_LIBS:BOOL=ON \
@@ -65,13 +74,6 @@ build() {
     -DVTK_USE_HYBRID:BOOL=ON \
     -DVTK_USE_PARALLEL:BOOL=ON \
     -DVTK_USE_PATENTED:BOOL=ON \
-    -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \
-    -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \
-    -DVTK_USE_SYSTEM_JPEG:BOOL=ON \
-    -DVTK_USE_SYSTEM_PNG:BOOL=ON \
-    -DVTK_USE_SYSTEM_TIFF:BOOL=ON \
-    -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \
-    -DVTK_USE_SYSTEM_LIBXML2:BOOL=ON \
     -DVTK_USE_BOOST:BOOL=ON \
     -DVTK_USE_INFOVIS:BOOL=ON \
     -DVTK_USE_GL2PS:BOOL=ON \
@@ -86,9 +88,8 @@ build() {
     -DVTK_INSTALL_QT_PLUGIN_DIR:STRING="/usr/lib/qt/plugins" \
     -DVTK_USE_GUISUPPORT:BOOL=ON \
     -DCMAKE_CXX_FLAGS="-D__STDC_CONSTANT_MACROS" \
-    -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
-    -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
-    -DPYTHON_EXECUTABLE=/usr/bin/python2 \
+    ${cmake_system_flags} \
+    ${cmake_system_python_flags} \
     ${srcdir}/VTK
 
   make
diff --git a/community/w3cam/PKGBUILD b/community/w3cam/PKGBUILD
index 5d85e2d99..d0e0dcc6d 100644
--- a/community/w3cam/PKGBUILD
+++ b/community/w3cam/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 59116 2011-11-21 11:03:42Z spupykin $
+# $Id: PKGBUILD 63771 2012-02-05 12:13:37Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Christian Schmidt <mucknert@gmx.net>
 
 pkgname=w3cam
 pkgver=0.7.2
-pkgrel=9
+pkgrel=10
 pkgdesc="a small and fast CGI program to retrieve images from a video4linux device."
 arch=('i686' 'x86_64')
 url="http://mpx.freeshell.net/"
diff --git a/community/warmux/PKGBUILD b/community/warmux/PKGBUILD
index 473e98ef7..dcf0fecad 100644
--- a/community/warmux/PKGBUILD
+++ b/community/warmux/PKGBUILD
@@ -1,25 +1,31 @@
-# $Id: PKGBUILD 47366 2011-05-22 06:58:10Z lcarlier $
+# $Id: PKGBUILD 63773 2012-02-05 12:13:45Z ibiru $
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: pukyxd 
 # Maintainer: Daenyth <Daenyth+Arch AT gmail DOT com>
 
 pkgname=warmux
 pkgver=11.04.1
-pkgrel=3
+pkgrel=4
 pkgdesc="A clone of the worms game"
 arch=('i686' 'x86_64')
 url="http://www.wormux.org/"
 license=('GPL')
 makedepends=('pkgconfig' 'libxml++' 'sdl_image' 'sdl_gfx>=2.0.19' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2')
 replaces=('wormux')
-source=(http://download.gna.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('26ff65c43a9bb61a3f0529c98b943e35')
+source=(http://download.gna.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+	include-zlib.patch
+	gcc-fix.patch)
+md5sums=('26ff65c43a9bb61a3f0529c98b943e35'
+         'c8285955e880f80e3c68312715a3061c'
+         '693176b72c9568c0c223be76ea7dd0d2')
 
 build() { 
   cd "${srcdir}/${pkgname}-${pkgver/.1/}"
 
-  #gcc 4.6.0 fix
-  #sed -i '27i#include <stddef.h>' lib/warmux/include/WARMUX_action.h
+  # libpng 1.5 fix
+  patch -Np1 -i ../include-zlib.patch
+  # gcc fix
+  patch -Np1 -i ../gcc-fix.patch
 
   ./configure --prefix=/usr
   make
diff --git a/community/warmux/gcc-fix.patch b/community/warmux/gcc-fix.patch
new file mode 100644
index 000000000..d4ceb0746
--- /dev/null
+++ b/community/warmux/gcc-fix.patch
@@ -0,0 +1,25 @@
+## i-love-you-lordheavy.patch [diff]
+diff -ru warmux-11.04/lib/warmux/action/action.cpp warmux-11.04-new/lib/warmux/action/action.cpp
+--- warmux-11.04/lib/warmux/action/action.cpp	2011-04-28 21:03:14.000000000 +0200
++++ warmux-11.04-new/lib/warmux/action/action.cpp	2012-01-29 09:51:16.680251815 +0100
+@@ -81,7 +81,7 @@
+ }
+ 
+ // Build an action from a network packet
+-Action::Action(const char *buffer, DistantComputer* _creator)
++Action::Action(char *buffer, DistantComputer* _creator)
+ {
+   m_creator = _creator;
+ 
+diff -ru warmux-11.04/lib/warmux/include/WARMUX_action.h warmux-11.04-new/lib/warmux/include/WARMUX_action.h
+--- warmux-11.04/lib/warmux/include/WARMUX_action.h	2011-04-28 21:03:13.000000000 +0200
++++ warmux-11.04-new/lib/warmux/include/WARMUX_action.h	2012-01-29 09:52:14.246921833 +0100
+@@ -168,7 +168,7 @@
+   Action(Action_t type, Double value1, Double value2);
+ 
+   // Build an action from a network packet
+-  Action(const char* buffer, DistantComputer* _creator);
++  Action(char* buffer, DistantComputer* _creator);
+ 
+   ~Action();
+ 
diff --git a/community/warmux/include-zlib.patch b/community/warmux/include-zlib.patch
new file mode 100644
index 000000000..c7e77aba1
--- /dev/null
+++ b/community/warmux/include-zlib.patch
@@ -0,0 +1,11 @@
+diff -uNr warmux-11.04.orig/src/graphic/surface.cpp warmux-11.04/src/graphic/surface.cpp
+--- warmux-11.04.orig/src/graphic/surface.cpp	2011-09-19 09:26:52.392650465 +0200
++++ warmux-11.04/src/graphic/surface.cpp	2011-09-19 09:26:19.417648189 +0200
+@@ -25,6 +25,7 @@
+ #include <SDL_image.h>
+ #include <SDL_rotozoom.h>
+ #include <png.h>
++#include <zlib.h>
+ 
+ #include "graphic/surface.h"
+ #include "tool/math_tools.h"
diff --git a/community/warzone2100/PKGBUILD b/community/warzone2100/PKGBUILD
index 334c92f3e..c3acd0b53 100644
--- a/community/warzone2100/PKGBUILD
+++ b/community/warzone2100/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 57212 2011-10-24 14:41:07Z lcarlier $
+# $Id: PKGBUILD 63775 2012-02-05 12:13:50Z ibiru $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Angelo Theodorou <encelo@users.sourceforge.net>
 
 pkgname=warzone2100
 pkgver=2.3.9
-pkgrel=1
+pkgrel=2
 pkgdesc="3D realtime strategy game on a future Earth"
 url="http://wz2100.net/"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('sdl_net' 'libgl' 'openal' 'libjpeg' 'libpng' 'libvorbis' 'libtheora' 'libmad' 'physfs' 'quesoglc' 'popt' 'ttf-dejavu')
-makedepends=('gawk' 'bison' 'flex' 'zip' 'unzip' 'mesa')
+depends=('sdl_net' 'libgl' 'openal' 'libjpeg' 'libpng' 'libvorbis' 'libtheora' 'libmad' 'mesa' 'physfs' 'quesoglc' 'popt' 'ttf-dejavu')
+makedepends=('gawk' 'bison' 'flex' 'zip' 'unzip')
 source=("http://downloads.sourceforge.net/project/warzone2100/releases/${pkgver}/${pkgname}-${pkgver}.tar.gz")
 md5sums=('7185090a089c9c0e0eca7535a8f25dca')
 
diff --git a/community/widelands/PKGBUILD b/community/widelands/PKGBUILD
index 4d207a5a6..6f540efaa 100644
--- a/community/widelands/PKGBUILD
+++ b/community/widelands/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 57518 2011-10-29 21:39:24Z lcarlier $
+# $Id: PKGBUILD 63777 2012-02-05 12:14:08Z ibiru $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Arkham <arkham at archlinux dot us>
 # Contributor: Christoph Zeiler <rabyte*gmail>
@@ -6,17 +6,19 @@
 pkgname=widelands
 pkgver=16
 _realver=build16
-pkgrel=4
+pkgrel=5
 pkgdesc="A realtime strategy game with emphasis on economy and transport"
 arch=('i686' 'x86_64')
 url="http://widelands.org/"
 license=('GPL')
 makedepends=('cmake' 'boost' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'ggz-client-libs' 'lua' 'glew' 'python2')
 source=(http://launchpad.net/$pkgname/build16/$_realver/+download/$pkgname-$_realver-src.tar.bz2
+        widelands-0.16-libpng15.patch
         $pkgname.desktop
         $pkgname.png
         $pkgname.sh)
 md5sums=('3d8c28e145b73c64d8ed1625319d25a2'
+         'e492620b071cbd1db04280173653a67c'
          '15820bf099fd6f16251fe70a75c534bb'
          '3dfda7e9ca76ca00dd98d745d0ceb328'
          '7cae50aba5ed0cd2cfeea79124637b46')
@@ -24,6 +26,8 @@ md5sums=('3d8c28e145b73c64d8ed1625319d25a2'
 build() {
     cd $srcdir/$pkgname-$_realver-src
 
+    patch -Np0 < $srcdir/widelands-0.16-libpng15.patch
+
     mkdir -p build/compile && cd build/compile
 
     cmake ../.. -DCMAKE_BUILD_TYPE=Release \
diff --git a/community/widelands/widelands-0.16-libpng15.patch b/community/widelands/widelands-0.16-libpng15.patch
new file mode 100644
index 000000000..9f733e7b9
--- /dev/null
+++ b/community/widelands/widelands-0.16-libpng15.patch
@@ -0,0 +1,61 @@
+--- src/graphic/SDL_mng.cc
++++ src/graphic/SDL_mng.cc
+@@ -276,7 +276,7 @@
+ 	 * the normal method of doing things with libpng).  REQUIRED unless you
+ 	 * set up your own error handlers in png_create_read_struct() earlier.
+ 	 */
+-	if (setjmp(png_ptr->jmpbuf)) {
++	if (setjmp(png_jmpbuf(png_ptr))) {
+ 		SDL_SetError("Error reading the PNG file.");
+ 		goto done;
+ 	}
+@@ -356,9 +356,9 @@
+ 			Rmask = 0x000000FF;
+ 			Gmask = 0x0000FF00;
+ 			Bmask = 0x00FF0000;
+-			Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0;
++			Amask = (png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0;
+ 		} else {
+-			int const s = (info_ptr->channels == 4) ? 0 : 8;
++			int const s = (png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8;
+ 			Rmask = 0xFF000000 >> s;
+ 			Gmask = 0x00FF0000 >> s;
+ 			Bmask = 0x0000FF00 >> s;
+@@ -369,7 +369,7 @@
+ 		SDL_AllocSurface
+ 			(SDL_SWSURFACE,
+ 			 width, height,
+-			 bit_depth * info_ptr->channels,
++			 bit_depth * png_get_channels(png_ptr, info_ptr),
+ 			 Rmask, Gmask, Bmask, Amask);
+ 	if (not surface) {
+ 		SDL_SetError("Out of memory");
+@@ -407,6 +407,9 @@
+ 	/* read rest of file, get additional chunks in info_ptr - REQUIRED */
+ 	png_read_end(png_ptr, info_ptr);
+ 
++	png_colorp png_palette;
++	int png_num_palette;
++
+ 	/* Load the palette, if any */
+ 	if ((palette = surface->format->palette)) {
+ 		if (color_type == PNG_COLOR_TYPE_GRAY) {
+@@ -416,12 +419,12 @@
+ 				palette->colors[i].g = i;
+ 				palette->colors[i].b = i;
+ 			}
+-		} else if (info_ptr->num_palette > 0) {
+-			palette->ncolors = info_ptr->num_palette;
+-			for (uint32_t i = 0; i < info_ptr->num_palette; ++i) {
+-				palette->colors[i].b = info_ptr->palette[i].blue;
+-				palette->colors[i].g = info_ptr->palette[i].green;
+-				palette->colors[i].r = info_ptr->palette[i].red;
++		} else if (png_num_palette > 0) {
++			palette->ncolors = png_num_palette;
++			for (uint32_t i = 0; i < png_num_palette; ++i) {
++				palette->colors[i].b = png_palette[i].blue;
++				palette->colors[i].g = png_palette[i].green;
++				palette->colors[i].r = png_palette[i].red;
+ 			}
+ 		}
+ 	}
diff --git a/community/xautomation/PKGBUILD b/community/xautomation/PKGBUILD
index 1fc7aff75..39472db42 100644
--- a/community/xautomation/PKGBUILD
+++ b/community/xautomation/PKGBUILD
@@ -1,21 +1,25 @@
-# $Id: PKGBUILD 57187 2011-10-23 16:31:38Z lfleischer $
+# $Id: PKGBUILD 63780 2012-02-05 12:14:20Z ibiru $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: raubkopierer <mail[dot]sensenmann[at]gmail[dot]com>
 
 pkgname=xautomation
 pkgver=1.05
-pkgrel=1
+pkgrel=2
 pkgdesc='Controls X from the command line and does "visual scraping".'
 url='http://hoopajoo.net/projects/xautomation.html'
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('libpng' 'libxtst')
-source=("http://hoopajoo.net/static/projects/${pkgname}-${pkgver}.tar.gz")
-md5sums=('4526ea5085a680a3ae8629af1731e5fa')
+source=("http://hoopajoo.net/static/projects/${pkgname}-${pkgver}.tar.gz"
+        'xautomation-1.05-fix-libs.patch')
+md5sums=('4526ea5085a680a3ae8629af1731e5fa'
+         'a8d8b12ed180ce9693f706d0f75d97fe')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  patch -p1 -i ../xautomation-1.05-fix-libs.patch
+
   ./configure --prefix=/usr 
   make
 }
diff --git a/community/xautomation/xautomation-1.05-fix-libs.patch b/community/xautomation/xautomation-1.05-fix-libs.patch
new file mode 100644
index 000000000..ee3f9247a
--- /dev/null
+++ b/community/xautomation/xautomation-1.05-fix-libs.patch
@@ -0,0 +1,24 @@
+diff -rup xautomation-1.05.orig/Makefile.am xautomation-1.05/Makefile.am
+--- xautomation-1.05.orig/Makefile.am	2009-04-14 18:06:23.000000000 +0200
++++ xautomation-1.05/Makefile.am	2012-01-27 02:06:44.016492587 +0100
+@@ -1,7 +1,7 @@
+ bin_PROGRAMS = xte rgb2pat png2pat visgrep pat2ppm patextract xmousepos
+ man_MANS = pat2ppm.1 patextract.1 png2pat.1 rgb2pat.1 visgrep.1 xautomation.7 xmousepos.1 xte.1
+ xte_SOURCES = xte.c debug.c kbd.h keysym_map.h multikey_map.h
+-xte_LDADD = $(X_LIBS) $(X_EXTRALIBS) -lXtst
++xte_LDADD = $(X_LIBS) $(X_EXTRALIBS) -lXtst -lX11
+ rgb2pat_SOURCES = rgb2pat.c image.c image.h debug.c debug.h
+ rgb2pat_LDADD = -lpng
+ png2pat_SOURCES = png2pat.c image.c image.h debug.c debug.h
+diff -rup xautomation-1.05.orig/Makefile.in xautomation-1.05/Makefile.in
+--- xautomation-1.05.orig/Makefile.in	2011-09-07 00:48:19.000000000 +0200
++++ xautomation-1.05/Makefile.in	2012-01-27 02:14:02.010831581 +0100
+@@ -220,7 +220,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ man_MANS = pat2ppm.1 patextract.1 png2pat.1 rgb2pat.1 visgrep.1 xautomation.7 xmousepos.1 xte.1
+ xte_SOURCES = xte.c debug.c kbd.h keysym_map.h multikey_map.h
+-xte_LDADD = $(X_LIBS) $(X_EXTRALIBS) -lXtst
++xte_LDADD = $(X_LIBS) $(X_EXTRALIBS) -lXtst -lX11
+ rgb2pat_SOURCES = rgb2pat.c image.c image.h debug.c debug.h
+ rgb2pat_LDADD = -lpng
+ png2pat_SOURCES = png2pat.c image.c image.h debug.c debug.h
diff --git a/community/xemacs/PKGBUILD b/community/xemacs/PKGBUILD
index 4b9728fc0..3a649abc1 100644
--- a/community/xemacs/PKGBUILD
+++ b/community/xemacs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 61961 2012-01-11 15:22:47Z stephane $
+# $Id: PKGBUILD 63784 2012-02-05 12:14:51Z ibiru $
 # Maintainer: juergen <juergen@archlinux.org>
 # Contributor : Stéphane Gaudreault <stephane@archlinux.org>
 
 pkgname=xemacs
 pkgver=21.5.31
-pkgrel=4
+pkgrel=5
 pkgdesc="An highly customizable open source text editor and application development system forked from GNU Emacs"
 arch=('i686' 'x86_64')
 url="http://www.xemacs.org/"
diff --git a/community/xloadimage/PKGBUILD b/community/xloadimage/PKGBUILD
index edff1665e..077f71eff 100644
--- a/community/xloadimage/PKGBUILD
+++ b/community/xloadimage/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 59105 2011-11-21 10:35:15Z spupykin $
+# $Id: PKGBUILD 63786 2012-02-05 12:15:07Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Eric Belanger <belanger@astro.umontreal.ca>
 # Contributor: Link Dupont <link@subpop.net>
 
 pkgname=xloadimage
 pkgver=4.1
-pkgrel=11
+pkgrel=12
 pkgdesc="An utility to view many different types of images under X11"
 arch=(i686 x86_64)
 #url="http://world.std.com/~jimf/xloadimage.html"
@@ -15,15 +15,18 @@ depends=('libtiff' 'libpng' 'libx11' 'libxext')
 makedepends=('patch' 'imake')
 source=(http://archlinux-stuff.googlecode.com/files/xloadimage.$pkgver-1.tar.gz
 	license.txt
-	enable-image-types.patch)
+	enable-image-types.patch
+	png15-tiff4.patch)
 md5sums=('86b42b1b628a9c00008b7deec21e1175'
          'cc16a51aeb5083b8ff07939dfe244130'
-         '3a2703925011276fd2d2bd139b676487')
+         '3a2703925011276fd2d2bd139b676487'
+         'c797cfc3f4588b96275d82c2c9cc7025')
 
 build() {
   cd $srcdir/$pkgname.$pkgver
 
   patch -p1 <$srcdir/enable-image-types.patch
+  patch -p1 <$srcdir/png15-tiff4.patch
   xmkmf
   make
 
diff --git a/community/xloadimage/png15-tiff4.patch b/community/xloadimage/png15-tiff4.patch
new file mode 100644
index 000000000..8536e36f3
--- /dev/null
+++ b/community/xloadimage/png15-tiff4.patch
@@ -0,0 +1,50 @@
+diff -wbBur xloadimage.4.1/png.c xloadimage.4.1.my/png.c
+--- xloadimage.4.1/png.c	2011-02-11 14:47:37.000000000 +0300
++++ xloadimage.4.1.my/png.c	2012-01-19 11:58:44.000000000 +0400
+@@ -75,7 +75,7 @@
+ {
+   debug(" #error ");
+   output_warn( png_ptr, str);
+-  longjmp(png_ptr->jmpbuf, 1);	/* return control to outer routine */
++  longjmp(png_jmpbuf(png_ptr), 1);	/* return control to outer routine */
+ }
+ 
+ 
+@@ -164,7 +164,7 @@
+     png_destroy_read_struct(png_pp, info_pp, end_pp);
+     return 0;
+   }
+-  if (setjmp((*png_pp)->jmpbuf)) {
++  if (setjmp(png_jmpbuf(*png_pp))) {
+     /* On error */
+     png_destroy_read_struct(png_pp, info_pp, end_pp);
+     return 0;
+@@ -220,7 +220,7 @@
+     zclose(zinput_file);
+     return 0;
+   }
+-  if (setjmp(png_ptr->jmpbuf)) {
++  if (setjmp(png_jmpbuf(png_ptr))) {
+     /* On error */
+     freeImage(image);
+     png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
+diff -wbBur xloadimage.4.1/tiff.c xloadimage.4.1.my/tiff.c
+--- xloadimage.4.1/tiff.c	2011-02-11 14:47:38.000000000 +0300
++++ xloadimage.4.1.my/tiff.c	2012-01-19 12:00:00.000000000 +0400
+@@ -34,14 +34,14 @@
+      struct tiff_info *info;
+ {
+   ZFILE *zf;
+-  TIFFHeader th;
++  TIFFHeaderCommon th;
+   TIFF *tiff;
+ 
+   zf = zopen(fullname);
+ 
+   /* read TIFF header and see if it looks right
+    */
+-  if ((zread(zf, (byte *)&th, sizeof(TIFFHeader)) == sizeof(TIFFHeader)) &&
++  if ((zread(zf, (byte *)&th, sizeof(TIFFHeaderCommon)) == sizeof(TIFFHeaderCommon)) &&
+       ((th.tiff_magic == TIFF_BIGENDIAN) ||
+        (th.tiff_magic == TIFF_LITTLEENDIAN))) {
+ 
diff --git a/community/xmoto/PKGBUILD b/community/xmoto/PKGBUILD
index 64a776beb..0a865690d 100644
--- a/community/xmoto/PKGBUILD
+++ b/community/xmoto/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 64796 2010-01-22 08:19:26Z eric $
+# $Id: $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Travis Willard <travisw@wmpub.ca> 
 # Contributor: Denis (dtonator@gmail.com)
 
 pkgname=xmoto
-pkgver=0.5.8
+pkgver=0.5.9
 pkgrel=1
 pkgdesc="A challenging 2D motocross platform game, where physics play an important role."
 arch=('i686' 'x86_64')
@@ -13,12 +13,16 @@ license=('GPL')
 depends=('bzip2' 'libjpeg' 'libpng' 'lua' 'sdl_mixer' 'ode=0.11.1' 'curl' 
 	 'mesa' 'sqlite3' 'sdl_ttf' 'desktop-file-utils' 'sdl_net' 'libxdg-basedir' 'libxml++')
 install=xmoto.install
-source=("http://download.tuxfamily.org/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}-src.tar.gz")
-sha1sums=('a5197e10f0c37cfefbab55723c8d0760234fb4ce')
+source=("http://download.tuxfamily.org/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}-src.tar.gz"
+        'xmoto-0.5.9-libpng15.patch')
+sha1sums=('07757accce78151dc8873bef8270df0e56196772'
+          '27f52bd30772f67898e0bfd8c1e12478a4848192')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
+  patch -Np1 -i "${srcdir}/xmoto-0.5.9-libpng15.patch"
+
   # build and install 
   ./configure LDFLAGS="-L/usr/lib" --prefix=/usr --disable-sdltest
 
diff --git a/community/xmoto/xmoto-0.5.9-libpng15.patch b/community/xmoto/xmoto-0.5.9-libpng15.patch
new file mode 100644
index 000000000..0410c81c5
--- /dev/null
+++ b/community/xmoto/xmoto-0.5.9-libpng15.patch
@@ -0,0 +1,10 @@
+--- a/src/image/tim_png.cpp	2011-10-11 22:18:11.000000000 +0200
++++ b/src/image/tim_png.cpp	2012-01-19 19:58:24.000000000 +0100
+@@ -24,6 +24,7 @@
+  */
+ #include <stdio.h>
+ #include <string.h>
++#include <zlib.h>
+ #include "tim.h"
+ #include "png.h"
+ 
diff --git a/community/xnc/PKGBUILD b/community/xnc/PKGBUILD
index b26a556c6..bba6b27df 100644
--- a/community/xnc/PKGBUILD
+++ b/community/xnc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 58678 2011-11-17 15:02:45Z spupykin $
+# $Id: PKGBUILD 63790 2012-02-05 12:15:33Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=xnc
 pkgver=5.0.4
-pkgrel=4
+pkgrel=6
 pkgdesc="X nortern captain file manager"
 arch=(i686 x86_64)
 url="http://xnc.jinr.ru/"
@@ -11,13 +11,18 @@ license=('GPL')
 depends=('gcc-libs' 'libpng' 'libtiff' 'libsm' 'libxext' 'libjpeg>=7')
 makedepends=('libxt')
 options=('!makeflags')
-source=(http://xnc.jinr.ru/src-5/xnc-$pkgver.src.tar.gz xnc-gcc44.patch)
+#source=(http://xnc.jinr.ru/src-5/xnc-$pkgver.src.tar.gz xnc-gcc44.patch)
+source=(ftp://ftp.archlinux.org/other/community/xnc/xnc-$pkgver.src.tar.gz
+	xnc-gcc44.patch
+	libpng15.patch)
 md5sums=('62446cdfdf5730f125fb351a658c0bd3'
-         'c0037a081824bca691e59a4ec68b6686')
+         'c0037a081824bca691e59a4ec68b6686'
+         '7159af1c645fda860f0e5057100651ad')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   patch -p1 <$srcdir/xnc-gcc44.patch
+  patch -p1 <$srcdir/libpng15.patch
   ./configure --prefix=/usr --mandir=/usr/share/man
   make
   make DESTDIR="$pkgdir" install
diff --git a/community/xnc/libpng15.patch b/community/xnc/libpng15.patch
new file mode 100644
index 000000000..53b941b81
--- /dev/null
+++ b/community/xnc/libpng15.patch
@@ -0,0 +1,63 @@
+diff -wbBur xnc-5.0.4/src/lib/image2/sdl_image/IMG_png.c xnc-5.0.4.my/src/lib/image2/sdl_image/IMG_png.c
+--- xnc-5.0.4/src/lib/image2/sdl_image/IMG_png.c	2002-08-05 14:43:09.000000000 +0400
++++ xnc-5.0.4.my/src/lib/image2/sdl_image/IMG_png.c	2012-01-19 13:46:48.000000000 +0400
+@@ -138,7 +138,7 @@
+ 	 * the normal method of doing things with libpng).  REQUIRED unless you
+ 	 * set up your own error handlers in png_create_read_struct() earlier.
+ 	 */
+-	if ( setjmp(png_ptr->jmpbuf) ) {
++	if ( setjmp(png_jmpbuf(png_ptr)) ) {
+ 		IMG_SetError("Error reading the PNG file.");
+ 		goto done;
+ 	}
+@@ -207,9 +207,9 @@
+ 			Rmask = 0x000000FF;
+ 			Gmask = 0x0000FF00;
+ 			Bmask = 0x00FF0000;
+-			Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0;
++			Amask = (png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0;
+ 		} else {
+-		        int s = (info_ptr->channels == 4) ? 0 : 8;
++		        int s = (png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8;
+ 			Rmask = 0xFF000000 >> s;
+ 			Gmask = 0x00FF0000 >> s;
+ 			Bmask = 0x0000FF00 >> s;
+@@ -217,7 +217,7 @@
+ 		}
+ 	}
+ 	surface = SDL_AllocSurface(SDL_SWSURFACE, width, height,
+-			bit_depth*info_ptr->channels, Rmask,Gmask,Bmask,Amask);
++			bit_depth*png_get_channels(png_ptr, info_ptr), Rmask,Gmask,Bmask,Amask);
+ 	if ( surface == NULL ) {
+ 		IMG_SetError("Out of memory");
+ 		goto done;
+@@ -252,6 +252,10 @@
+ 	/* read rest of file, get additional chunks in info_ptr - REQUIRED */
+ 	png_read_end(png_ptr, info_ptr);
+ 
++	png_colorp plte;
++	int num_palette;
++	png_get_PLTE(png_ptr, info_ptr, &plte, &num_palette);
++
+ 	/* Load the palette, if any */
+ 	palette = surface->format->palette;
+ 	if ( palette ) {
+@@ -262,12 +266,12 @@
+ 		    palette->colors[i].g = i;
+ 		    palette->colors[i].b = i;
+ 		}
+-	    } else if (info_ptr->num_palette > 0 ) {
+-		palette->ncolors = info_ptr->num_palette; 
+-		for( i=0; i<info_ptr->num_palette; ++i ) {
+-		    palette->colors[i].b = info_ptr->palette[i].blue;
+-		    palette->colors[i].g = info_ptr->palette[i].green;
+-		    palette->colors[i].r = info_ptr->palette[i].red;
++	    } else if (num_palette > 0 ) {
++		palette->ncolors = num_palette;
++		for( i=0; i<num_palette; ++i ) {
++		    palette->colors[i].b = plte[i].blue;
++		    palette->colors[i].g = plte[i].green;
++		    palette->colors[i].r = plte[i].red;
+ 		}
+ 	    }
+ 	}
diff --git a/community/xplanet/PKGBUILD b/community/xplanet/PKGBUILD
index be1d39f2e..08fb15229 100644
--- a/community/xplanet/PKGBUILD
+++ b/community/xplanet/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 52172 2011-07-21 07:16:17Z spupykin $
+# $Id: PKGBUILD 63792 2012-02-05 12:15:38Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: dorphell <dorphell@archlinux.org>
 # Committer: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=xplanet
 pkgver=1.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="An Xearth wannabe"
 arch=(i686 x86_64)
 url="http://xplanet.sourceforge.net/"
diff --git a/community/xvkbd/PKGBUILD b/community/xvkbd/PKGBUILD
index c06e2583a..f468d6f48 100644
--- a/community/xvkbd/PKGBUILD
+++ b/community/xvkbd/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 58680 2011-11-17 15:09:35Z spupykin $
+# $Id: PKGBUILD 63496 2012-02-05 11:51:10Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Benjamin Andresen <benny@klapmuetz.org>
 # Contributor: Mikko Seppдlд <t-r-a-y@mbnet.fi>
 
 pkgname=xvkbd
 pkgver=3.2
-pkgrel=2
+pkgrel=3
 pkgdesc="virtual (graphical) keyboard program for X Window System"
 arch=('i686' 'x86_64')
 url="http://homepage3.nifty.com/tsato/xvkbd/"
 license=('GPL')
-depends=('libxmu' 'xaw3d' 'glibc' 'libxt' 'libxtst' 'libxp')
+depends=('libxmu' 'xaw3d' 'glibc' 'libxt' 'libxtst' 'libxp' 'libxpm')
 makedepends=('imake')
 source=(http://homepage3.nifty.com/tsato/xvkbd/xvkbd-$pkgver.tar.gz)
 md5sums=('1bce8d6c27e6e7df92ec09b414f82dad')
author	root <root@rshg054.dnsready.net>	2012-02-06 23:14:50 +0000
committer	root <root@rshg054.dnsready.net>	2012-02-06 23:14:50 +0000
commit	1fa6edfba8d1e31ca1c0d59e8202cd3c62ccf393 (patch)
tree	8d7ccc2dc9d08a4c3cde26aa01c887e9a0fc2fa1 /community
parent	bdb5b3e66f6afa586ea147f69af5e4ba388f7615 (diff)