Tue Jun 24 03:25:03 UTC 2014

21 files changed, 687 insertions, 49 deletions

diff --git a/extra/cinepaint/LICENSE b/extra/cinepaint/LICENSE
new file mode 100644
index 000000000..746207229
--- /dev/null
+++ b/extra/cinepaint/LICENSE
@@ -0,0 +1,25 @@
+Copyright (c) 2005, Kai-Uwe Behrmann
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met: 
+    * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer. 
+    * Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.ntributors may be used to endorse or promote
+    products derived from this software without specific prior written
+    permission. 
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
diff --git a/extra/cinepaint/PKGBUILD b/extra/cinepaint/PKGBUILD
new file mode 100644
index 000000000..aa9a6ab01
--- /dev/null
+++ b/extra/cinepaint/PKGBUILD
@@ -0,0 +1,54 @@
+# $Id: PKGBUILD 213128 2014-05-19 14:15:58Z svenstaro $
+# Maintainer:
+# Contributor: tobias [tobias.archlinux.org]
+
+pkgname=cinepaint
+_realver=1.0-4
+pkgver=${_realver/-/.}
+pkgrel=2
+epoch=1
+pkgdesc="Sophisticated graphics manipulation programm supporting > 8bit pictures"
+arch=('i686' 'x86_64')
+license=('LGPL' 'GPL' 'MIT')
+url="http://www.cinepaint.org"
+depends=('gtk2' 'openexr' 'lcms' 'libxpm' 'fltk' 'ftgl' 'libxxf86vm')
+makedepends=('python2' 'gutenprint>=5.2.9' 'optipng')
+optdepends=('python2: for python plug-ins'
+            'gutenprint: for print plug-ins'
+            'ghostscript: for pdf plug-ins')
+install=cinepaint.install
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$_realver.tar.gz
+        LICENSE cinepaint-libpng15.patch)
+sha1sums=('2049958784d211cc0be8f41f3473433479ba71fe'
+          'ca8411db87f3fc51bbdfade22f4e1f555b2ee19e'
+          '3dfc9f06f02791aee59b60d33ddf9d305b0f1de5')
+
+prepare() {
+  cd $pkgname-$_realver
+  patch -p1 -i ../cinepaint-libpng15.patch
+  find . -name \*.png -exec optipng -quiet -force -fix {} +
+}
+
+build() {
+  export LDFLAGS="$LDFLAGS -lstdc++ -lm -lX11"
+
+  cd $pkgname-$_realver
+  ./configure --prefix=/usr \
+    --libdir=/usr/lib --mandir=/usr/share/man \
+    --enable-gtk2 --enable-pygimp --with-python=/usr/bin/python2
+
+  find . -name Makefile -exec sed -i 's/-Wl,,/-Wl,/g' {} +
+
+  make
+}
+
+package() {
+  cd $pkgname-$_realver
+  make DESTDIR="$pkgdir" install
+
+  sed -i -e "s|-I$srcdir/cinepaint||" -e "s|-I$srcdir/cinepaint/lib||" \
+    -e "/libcinepaint.la/d" -e "s|$srcdir/cinepaint/lib/.libs/\$dlname||" \
+    "$pkgdir/usr/bin/cinepainttool"
+  sed -i "s/cinepaint.png/cinepaint/" "$pkgdir/usr/share/applications/cinepaint.desktop"
+  install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
diff --git a/extra/cinepaint/cinepaint-libpng15.patch b/extra/cinepaint/cinepaint-libpng15.patch
new file mode 100644
index 000000000..e22edafae
--- /dev/null
+++ b/extra/cinepaint/cinepaint-libpng15.patch
@@ -0,0 +1,452 @@
+diff -Naur cinepaint.old/plug-ins/png/png.c cinepaint/plug-ins/png/png.c
+--- cinepaint.old/plug-ins/png/png.c	2012-01-23 12:39:42.000000000 -0500
++++ cinepaint/plug-ins/png/png.c	2012-01-23 12:39:50.000000000 -0500
+@@ -390,6 +390,16 @@
+   gchar		*progress;	/* Title for progress display... */
+   guchar	alpha[256],	/* Index -> Alpha */
+   		*alpha_ptr;	/* Temporary pointer */
++  png_byte     color_type;
++  png_byte     bit_depth;
++  png_colorp palette;
++  int num_palette;
++  png_charpp iccp_name;
++  int compression_type;
++  png_bytepp iccp_profile;
++  png_uint_32 iccp_proflen;
++  png_uint_32 width, height;
++  png_byte channels;
+ 
+  /*
+   * PNG 0.89 and newer have a sane, forwards compatible constructor.
+@@ -405,7 +415,7 @@
+   info = (png_infop)calloc(sizeof(png_info), 1);
+ #endif /* PNG_LIBPNG_VER > 88 */
+ 
+-  if (setjmp (pp->jmpbuf))
++  if (setjmp (png_jmpbuf(pp)))
+   {
+     g_message ("%s\nPNG error. File corrupted?", filename);
+     return image;
+@@ -442,21 +452,26 @@
+   */
+ 
+   png_read_info(pp, info);
++  color_type = png_get_color_type(pp, info);
++  width=png_get_image_width(pp, info);
++  height=png_get_image_height(pp, info);
+ 
+  /*
+   * Latest attempt, this should be my best yet :)
+   */
+ 
++  bit_depth = png_get_bit_depth(pp, info);
++
+ #ifndef WORDS_BIGENDIAN
+-  if(info->bit_depth == 16)
++  if(bit_depth == 16)
+ 	  png_set_swap(pp);
+ #endif
+ 
+-  if (info->color_type == PNG_COLOR_TYPE_GRAY && info->bit_depth < 8) {
++  if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
+     png_set_expand(pp);
+   }
+ 
+-  if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8) {
++  if (color_type == PNG_COLOR_TYPE_PALETTE && bit_depth < 8) {
+     png_set_packing(pp);
+   }
+ 
+@@ -464,8 +479,8 @@
+   * Expand G+tRNS to GA, RGB+tRNS to RGBA
+   */
+ 
+-  if (info->color_type != PNG_COLOR_TYPE_PALETTE &&
+-                       (info->valid & PNG_INFO_tRNS)) {
++  if (color_type != PNG_COLOR_TYPE_PALETTE &&
++      (png_get_valid(pp, info, PNG_INFO_tRNS))) {
+     png_set_expand(pp);
+   }
+ 
+@@ -482,7 +497,7 @@
+ 
+ #if PNG_LIBPNG_VER > 99
+   if (png_get_valid(pp, info, PNG_INFO_tRNS) &&
+-      info->color_type == PNG_COLOR_TYPE_PALETTE)
++      color_type == PNG_COLOR_TYPE_PALETTE)
+   {
+     png_get_tRNS(pp, info, &alpha_ptr, &num, NULL);
+     /* Copy the existing alpha values from the tRNS chunk */
+@@ -505,9 +520,9 @@
+ 
+   png_read_update_info(pp, info);
+   
+-  if(info->bit_depth==16)
++  if(bit_depth==16)
+   {
+-	  switch (info->color_type)
++	  switch (color_type)
+ 	  {
+ 		  case PNG_COLOR_TYPE_RGB :		/* RGB */
+ 			  bpp        = 6;
+@@ -545,7 +560,7 @@
+   }
+   else
+   {
+-	  switch (info->color_type)
++	  switch (color_type)
+ 	  {
+ 		  case PNG_COLOR_TYPE_RGB :		/* RGB */
+ 			  bpp        = 3;
+@@ -582,7 +597,7 @@
+ 	  };
+   }
+ 
+-  image = gimp_image_new(info->width, info->height, image_type);
++  image = gimp_image_new(width, height, image_type);
+   if (image == -1)
+   {
+     g_message("Can't allocate new image\n%s", filename);
+@@ -595,7 +610,7 @@
+   * Create the "background" layer to hold the image...
+   */
+ 
+-  layer = gimp_layer_new(image, _("Background"), info->width, info->height,
++  layer = gimp_layer_new(image, _("Background"), width, height,
+                          layer_type, 100, NORMAL_MODE);
+   gimp_image_add_layer(image, layer, 0);
+ 
+@@ -627,20 +642,21 @@
+ 
+   empty= 0; /* by default assume no full transparent palette entries */
+ 
+-  if (info->color_type & PNG_COLOR_MASK_PALETTE) {
++  if (color_type & PNG_COLOR_MASK_PALETTE) {
+ 
+ #if PNG_LIBPNG_VER > 99
++    png_get_PLTE(pp, info, &palette, &num_palette);
+     if (png_get_valid(pp, info, PNG_INFO_tRNS)) {
+       for (empty= 0; empty < 256 && alpha[empty] == 0; ++empty);
+         /* Calculates number of fully transparent "empty" entries */
+ 
+-      gimp_image_set_cmap(image, (guchar *) (info->palette + empty),
+-                          info->num_palette - empty);
++      gimp_image_set_cmap(image, (guchar *) (palette + empty),
++                          num_palette - empty);
+     } else {
+-      gimp_image_set_cmap(image, (guchar *)info->palette, info->num_palette);
++      gimp_image_set_cmap(image, (guchar *)palette, num_palette);
+     }
+ #else
+-    gimp_image_set_cmap(image, (guchar *)info->palette, info->num_palette);
++    gimp_image_set_cmap(image, (guchar *)palette, num_palette);
+ #endif /* PNG_LIBPNG_VER > 99 */
+ 
+   }
+@@ -659,18 +675,19 @@
+   */
+ 
+   tile_height = gimp_tile_height ();
+-  pixel       = g_new(guchar, tile_height * info->width * bpp);
++  pixel       = g_new(guchar, tile_height * width * bpp);
+   pixels      = g_new(guchar *, tile_height);
++  channels=png_get_channels(pp, info);
+ 
+-  if(info->bit_depth==16)
++  if(bit_depth==16)
+   {
+ 	  for (i = 0; i < tile_height; i ++)
+-		  pixels[i] = pixel + info->width * info->channels * i * 2;
++		  pixels[i] = pixel + width * channels * i * 2;
+   }
+   else
+   {
+ 	  for (i = 0; i < tile_height; i ++)
+-		  pixels[i] = pixel + info->width * info->channels * i;
++		  pixels[i] = pixel + width * channels * i;
+   }
+ 
+   for (pass = 0; pass < num_passes; pass ++)
+@@ -680,11 +697,11 @@
+ 	   */
+ 
+ 	  for (begin = 0, end = tile_height;
+-			  begin < info->height;
++			  begin < height;
+ 			  begin += tile_height, end += tile_height)
+ 	  {
+-		  if (end > info->height)
+-			  end = info->height;
++		  if (end > height)
++			  end = height;
+ 
+ 		  num = end - begin;
+ 
+@@ -697,20 +714,21 @@
+ 		  gimp_pixel_rgn_set_rect(&pixel_rgn, pixel, 0, begin,
+ 				  drawable->width, num);
+ 
+-		  gimp_progress_update(((double)pass + (double)end / (double)info->height) /
++		  gimp_progress_update(((double)pass + (double)end / (double)height) /
+ 				  (double)num_passes);
+ 	  };
+   };
+ 
+ #if defined(PNG_iCCP_SUPPORTED)
+   /* set icc profile */
+-  if (info->iccp_proflen > 0) {
+-    gimp_image_set_icc_profile_by_mem (image, info->iccp_proflen,
+-                                              info->iccp_profile,
+-                                              ICC_IMAGE_PROFILE);
++  png_get_iCCP(pp, info,  (png_charpp)iccp_name, &compression_type, iccp_profile, &iccp_proflen);
++  if (iccp_proflen > 0) {
++    gimp_image_set_icc_profile_by_mem (image, iccp_proflen,
++				       (gchar *)iccp_profile,
++				       ICC_IMAGE_PROFILE);
+     printf ("%s:%d %s() set embedded profile \"%s\"\n",
+              __FILE__,__LINE__,__func__,
+-                                              info->iccp_name);
++	    (char *)iccp_name);
+   }
+ #endif
+ 
+@@ -808,6 +826,14 @@
+                 blue;           /* Used for palette background */
+   time_t	cutime;         /* Time since epoch */
+   struct tm	*gmt;		/* GMT broken down */
++  png_byte     color_type;
++  png_byte     bit_depth;
++  int filter_method=0;
++  png_colorp palette;
++  int num_palette;
++  png_charpp iccp_name;
++  png_uint_32 height;
++  int compression_type;
+ 
+  /*
+   * PNG 0.89 and newer have a sane, forwards compatible constructor.
+@@ -824,7 +849,7 @@
+   info = (png_infop)calloc(sizeof(png_info), 1);
+ #endif /* PNG_LIBPNG_VER > 88 */
+ 
+-  if (setjmp (pp->jmpbuf))
++  if (setjmp (png_jmpbuf(pp)))
+   {
+     g_message ("%s\nPNG error. Couldn't save image", filename);
+     return 0;
+@@ -857,15 +882,6 @@
+   drawable = gimp_drawable_get (drawable_ID);
+   type     = gimp_drawable_type (drawable_ID);
+ 
+- /*
+-  * Set the image dimensions, bit depth, interlacing and compression
+-  */
+-
+-  png_set_compression_level (pp, pngvals.compression_level);
+-
+-  info->width          = drawable->width;
+-  info->height         = drawable->height;
+-  info->interlace_type = pngvals.interlaced;
+ 
+  /*
+   * Set color type and remember bytes per pixel count 
+@@ -874,71 +890,69 @@
+   switch (type)
+   {
+     case RGB_IMAGE :
+-        info->color_type = PNG_COLOR_TYPE_RGB;
+-	info->bit_depth      = 8;
++        color_type = PNG_COLOR_TYPE_RGB;
++	bit_depth      = 8;
+         bpp              = 3;
+         break;
+     case RGBA_IMAGE :
+-        info->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
+-	info->bit_depth      = 8;
++        color_type = PNG_COLOR_TYPE_RGB_ALPHA;
++	bit_depth      = 8;
+         bpp              = 4;
+         break;
+     case GRAY_IMAGE :
+-        info->color_type = PNG_COLOR_TYPE_GRAY;
+-	info->bit_depth      = 8;
++        color_type = PNG_COLOR_TYPE_GRAY;
++	bit_depth      = 8;
+         bpp              = 1;
+         break;
+     case GRAYA_IMAGE :
+-        info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
+-	info->bit_depth      = 8;
++        color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
++	bit_depth      = 8;
+         bpp              = 2;
+         break;
+     case INDEXED_IMAGE :
+ 	bpp		 = 1;
+-	info->bit_depth      = 8;
+-        info->color_type = PNG_COLOR_TYPE_PALETTE;
+-	info->valid      |= PNG_INFO_PLTE;
+-        info->palette= (png_colorp) gimp_image_get_cmap(image_ID, &num_colors);
+-        info->num_palette= num_colors;
++	bit_depth      = 8;
++        color_type = PNG_COLOR_TYPE_PALETTE;
++	png_get_valid(pp, info, PNG_INFO_PLTE);
++	png_set_PLTE(pp, info, (png_colorp) gimp_image_get_cmap(image_ID, &num_colors), num_colors);
+         break;
+     case INDEXEDA_IMAGE :
+ 	bpp		 = 2;
+-	info->bit_depth      = 8;
+-	info->color_type = PNG_COLOR_TYPE_PALETTE;
++	bit_depth      = 8;
++	color_type = PNG_COLOR_TYPE_PALETTE;
+ 	respin_cmap (pp, info, image_ID); /* fix up transparency */
+ 	break;
+     case U16_RGB_IMAGE :
+-        info->color_type = PNG_COLOR_TYPE_RGB;
+-	info->bit_depth      = 16;
++        color_type = PNG_COLOR_TYPE_RGB;
++	bit_depth      = 16;
+         bpp              = 6;
+         break;
+     case U16_RGBA_IMAGE :
+-        info->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
+-	info->bit_depth      = 16;
++        color_type = PNG_COLOR_TYPE_RGB_ALPHA;
++	bit_depth      = 16;
+         bpp              = 8;
+         break;
+     case U16_GRAY_IMAGE :
+-        info->color_type = PNG_COLOR_TYPE_GRAY;
+-	info->bit_depth      = 16;
++        color_type = PNG_COLOR_TYPE_GRAY;
++	bit_depth      = 16;
+         bpp              = 2;
+         break;
+     case U16_GRAYA_IMAGE :
+-        info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
+-	info->bit_depth      = 16;
++        color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
++	bit_depth      = 16;
+         bpp              = 4;
+         break;
+     case U16_INDEXED_IMAGE :
+ 	bpp		 = 2;
+-	info->bit_depth      = 16;
+-        info->color_type = PNG_COLOR_TYPE_PALETTE;
+-	info->valid      |= PNG_INFO_PLTE;
+-        info->palette= (png_colorp) gimp_image_get_cmap(image_ID, &num_colors);
+-        info->num_palette= num_colors;
++	bit_depth      = 16;
++        color_type = PNG_COLOR_TYPE_PALETTE;
++	png_get_valid(pp, info, PNG_INFO_PLTE);
++	png_set_PLTE(pp, info, (png_colorp) gimp_image_get_cmap(image_ID, &num_colors), num_colors);
+         break;
+     case U16_INDEXEDA_IMAGE :
+ 	bpp		 = 4;
+-	info->bit_depth      = 16;
+-	info->color_type = PNG_COLOR_TYPE_PALETTE;
++	bit_depth      = 16;
++	color_type = PNG_COLOR_TYPE_PALETTE;
+ 	respin_cmap (pp, info, image_ID); /* fix up transparency */
+ 	break;
+     default:
+@@ -950,30 +964,36 @@
+   * Fix bit depths for (possibly) smaller colormap images
+   */
+   
+-  if (info->valid & PNG_INFO_PLTE) {
+-    if (info->num_palette <= 2)
+-      info->bit_depth= 1;
+-    else if (info->num_palette <= 4)
+-      info->bit_depth= 2;
+-    else if (info->num_palette <= 16)
+-      info->bit_depth= 4;
++  if (png_get_valid(pp, info, PNG_INFO_PLTE)) {
++    png_get_PLTE(pp, info, &palette, &num_palette);
++    if (num_palette <= 2)
++      bit_depth= 1;
++    else if (num_palette <= 4)
++      bit_depth= 2;
++    else if (num_palette <= 16)
++      bit_depth= 4;
+     /* otherwise the default is fine */
+   }
+ 
++ png_set_compression_level (pp, pngvals.compression_level);
++ png_set_IHDR(pp, info, drawable->width, drawable->height,
++	      bit_depth, color_type, pngvals.interlaced, compression_type, filter_method);
++
++
+   // write icc profile
+ #if defined(PNG_iCCP_SUPPORTED)
+   if (gimp_image_has_icc_profile (image_ID, ICC_IMAGE_PROFILE)) {
+-    int size;
++    int  size;
+     char *buffer;
+     
+     buffer = gimp_image_get_icc_profile_by_mem (image_ID, &size,
+                                                 ICC_IMAGE_PROFILE);
+     png_set_iCCP (pp, info,
+            gimp_image_get_icc_profile_description (image_ID, ICC_IMAGE_PROFILE),
+-                  0, buffer, size);
++                  0, (png_const_bytep)buffer, size);
+     printf ("%s:%d %s() embedd icc profile \"%s\"\n",
+              __FILE__,__LINE__,__func__,
+-                                              info->iccp_name);
++	    (char *)iccp_name);
+   }
+ #endif
+ 
+@@ -1039,13 +1059,13 @@
+   * Convert unpacked pixels to packed if necessary
+   */
+ 
+-  if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8)
++  if (color_type == PNG_COLOR_TYPE_PALETTE && bit_depth < 8)
+     png_set_packing(pp);
+ 
+   /* Set swapping for 16 bit per sample images */
+   
+ #ifndef WORDS_BIGENDIAN
+-  if (info->bit_depth == 16)
++  if (bit_depth == 16)
+ 	  png_set_swap(pp);
+ #endif
+   
+@@ -1063,6 +1083,7 @@
+ 
+   gimp_pixel_rgn_init(&pixel_rgn, drawable, 0, 0, drawable->width,
+                       drawable->height, FALSE, FALSE);
++  height=png_get_image_height(pp, info);
+ 
+   for (pass = 0; pass < num_passes; pass ++)
+   {
+@@ -1077,7 +1098,7 @@
+ 	num = end - begin;
+ 	
+ 	gimp_pixel_rgn_get_rect (&pixel_rgn, pixel, 0, begin, drawable->width, num);
+-        if (info->valid & PNG_INFO_tRNS) {
++        if (png_get_valid(pp, info, PNG_INFO_tRNS)) {
+           for (i = 0; i < num; ++i) {
+ 	    fixed= pixels[i];
+             for (k = 0; k < drawable->width; ++k) {
+@@ -1085,7 +1106,7 @@
+             }
+           }
+        /* Forgot this case before, what if there are too many colors? */
+-        } else if (info->valid & PNG_INFO_PLTE && bpp == 2) {
++        } else if (png_get_valid(pp, info, PNG_INFO_PLTE) && bpp == 2) {
+           for (i = 0; i < num; ++i) {
+ 	    fixed= pixels[i];
+             for (k = 0; k < drawable->width; ++k) {
+@@ -1095,9 +1116,8 @@
+         }
+ 	
+ 	png_write_rows (pp, pixels, num);
+-	
+ 	gimp_progress_update (((double)pass + (double)end /
+-                    (double)info->height) / (double)num_passes);
++                    (double)height) / (double)num_passes);
+       };
+   };
+ 
diff --git a/extra/cinepaint/cinepaint-missing-include.patch b/extra/cinepaint/cinepaint-missing-include.patch
new file mode 100644
index 000000000..ed159213a
--- /dev/null
+++ b/extra/cinepaint/cinepaint-missing-include.patch
@@ -0,0 +1,11 @@
+diff -Naur cinepaint-orig/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp cinepaint/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp
+--- cinepaint-orig/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp	2012-04-20 18:51:10.625503826 -0400
++++ cinepaint/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp	2012-04-20 18:52:04.478835055 -0400
+@@ -32,6 +32,7 @@
+ 
+ #include <list>
+ #include <string>
++#include <unistd.h>
+ 
+ #include "icc_modell_beobachter.h"
+ 
diff --git a/extra/cinepaint/cinepaint.install b/extra/cinepaint/cinepaint.install
new file mode 100644
index 000000000..5e5cfef4d
--- /dev/null
+++ b/extra/cinepaint/cinepaint.install
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  update-desktop-database -q
+}
diff --git a/extra/easytag/PKGBUILD b/extra/easytag/PKGBUILD
index 9b0ed0fb9..70ec0260d 100644
--- a/extra/easytag/PKGBUILD
+++ b/extra/easytag/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 212164 2014-05-09 16:55:37Z guillaume $
+# $Id: PKGBUILD 215370 2014-06-23 18:51:25Z guillaume $
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Kevin Piche <kevin@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=easytag
-pkgver=2.2.2
+pkgver=2.2.3
 pkgrel=1
 pkgdesc='Simple application for viewing and editing tags in audio files'
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ depends=('id3lib' 'libid3tag' 'gtk3' 'libvorbis' 'flac' 'speex' 'wavpack' 'tagli
          'desktop-file-utils' 'hicolor-icon-theme' 'opusfile')
 install=${pkgname}.install
 source=(http://download.gnome.org/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('fb21ac51975c90c58c5dc38c28aa1030d6fa3420bc6b8406f085e34df9e14164')
+sha256sums=('f49cadc868a67faeb99bdbedc21a3009783609b380d098412c4799ec48aeaeb3')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/empathy/PKGBUILD b/extra/empathy/PKGBUILD
index fd7f00414..25124e36e 100644
--- a/extra/empathy/PKGBUILD
+++ b/extra/empathy/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 213435 2014-05-23 23:08:17Z heftig $
+# $Id: PKGBUILD 215391 2014-06-23 19:55:35Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=empathy
-pkgver=3.12.2
+pkgver=3.12.4
 pkgrel=1
 pkgdesc="A GNOME instant messaging client using the Telepathy framework."
 arch=(i686 x86_64)
@@ -19,7 +19,7 @@ options=('!makeflags')
 groups=(gnome)
 install=empathy.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('414d0c6b1a30b1afbf35ad04b0b9ff3ada3e06fab797a50a7147cdfe0905e7cd')
+sha256sums=('056a1fc27e9aa1f9df4d4d91353e04ca2e1b0fcc6bf082a9108f9dbb9870c978')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/folks/PKGBUILD b/extra/folks/PKGBUILD
index b093decb1..dfbd37a36 100644
--- a/extra/folks/PKGBUILD
+++ b/extra/folks/PKGBUILD
@@ -1,30 +1,29 @@
-# $Id: PKGBUILD 211631 2014-04-21 18:28:13Z jgc $
+# $Id: PKGBUILD 215389 2014-06-23 19:53:29Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=folks
 pkgver=0.9.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Library to aggregates people into metacontacts"
 arch=(i686 x86_64)
 url="http://telepathy.freedesktop.org/wiki/Folks"
 license=(LGPL2.1)
 depends=(telepathy-glib libgee libxml2 evolution-data-server zeitgeist)
-makedepends=(gobject-introspection intltool vala git)
+makedepends=(gobject-introspection intltool vala)
 install=folks.install
 options=('!emptydirs')
-source=(git://git.gnome.org/folks#commit=0085cb463849e5b30d4b4c58da63a5df3fd0d0be)
-md5sums=('SKIP')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-${pkgver}.tar.xz)
+md5sums=('aeaeb5a8e7277b167b9f055f372b9d5d')
 
 build() {
-  cd $pkgname
-  NOCONFIGURE=1 ./autogen.sh
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --disable-schemas-compile \
     --disable-libsocialweb-backend --disable-fatal-warnings
   make
 }
 
 package() {
-  cd $pkgname
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
 
diff --git a/extra/foomatic/PKGBUILD b/extra/foomatic/PKGBUILD
new file mode 100644
index 000000000..c79c71bd3
--- /dev/null
+++ b/extra/foomatic/PKGBUILD
@@ -0,0 +1,86 @@
+# $Id: PKGBUILD 208610 2014-03-24 16:45:27Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+
+pkgbase="foomatic"
+pkgname=('foomatic-db' 'foomatic-db-engine' 'foomatic-db-nonfree')
+arch=('i686' 'x86_64') # needs to be changed  in the subpackages when makepkg will support it
+pkgver=20140324
+pkgrel=1
+epoch=3
+
+makedepends=('cups' 'perl' 'libxml2' 'enscript' 'perl' 'net-snmp' 'bash' 'bzr')
+url="http://www.linuxprinting.org/foomatic.html"
+options=('!emptydirs')
+
+# check http://bzr.linuxfoundation.org/loggerhead/openprinting/foomatic/
+# for latest commits and development, identical to foomatic-4.0 branch
+
+source=(foomatic-db-engine::bzr+http://bzr.linuxfoundation.org/openprinting/foomatic/foomatic-db-engine/#revision=368       #2014-03-20
+        foomatic-db::bzr+http://bzr.linuxfoundation.org/openprinting/foomatic/foomatic-db/#revision=1255                    #2014-03-19
+        foomatic-db-nonfree::bzr+http://bzr.linuxfoundation.org/openprinting/foomatic/foomatic-db-nonfree/#revision=40      #2013-09-25
+)
+md5sums=('SKIP'
+         'SKIP'
+         'SKIP')
+
+pkgver() {
+  date +%Y%m%d
+}
+
+package_foomatic-db() {
+
+ pkgdesc="Foomatic - The collected knowledge about printers, drivers, and driver options in XML files, used by foomatic-db-engine to generate PPD files."
+# arch=('any')
+ license=('GPL' 'custom')
+ depends=('perl' 'libxml2')
+ replaces=('foomatic-db-ppd' 'foomatic-db-hpijs')
+ conflicts=('foomatic-db-ppd' 'foomatic-db-hpijs')
+ provides=('foomatic-db-hpijs')
+
+   cd ${srcdir}/${pkgname}
+   bzr revno
+   echo $pkgver
+   ./make_configure
+   ./configure --prefix=/usr
+   make DESTDIR=${pkgdir} install
+   install -v -Dm644 ${srcdir}/${pkgname}/COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+}
+
+package_foomatic-db-engine() {
+
+ pkgdesc="Foomatic - Foomatic's database engine generates PPD files from the data in Foomatic's XML database. It also contains scripts to directly generate print queues and handle jobs."
+# arch=('i686' 'x86_64')
+ license=('GPL')
+ depends=('perl' 'libxml2' "cups-filters>=1.0.42" 'bash')
+
+   export LIB_CUPS="/usr/lib/cups"
+   cd ${srcdir}/foomatic-db-engine
+   bzr revno
+   ./make_configure
+   ./configure --prefix=/usr \
+      --sbindir=/usr/bin
+   make
+   eval `perl -V:archname`
+   make DESTDIR=${pkgdir} \
+        INSTALLARCHLIB=/usr/lib/perl5/vendor_perl/ \
+        INSTALLSITELIB=/usr/lib/perl5/vendor_perl/ \
+        INSTALLSITEARCH=/usr/lib/perl5/vendor_perl/ install
+   /usr/bin/find ${pkgdir} -name '.packlist' -delete
+   # fix permissions
+   chmod 755 ${pkgdir}/usr/lib{,/perl5,/perl5/vendor_perl}
+}
+
+package_foomatic-db-nonfree() {
+
+ pkgdesc="Foomatic - database extension consisting of manufacturer-supplied PPD files released under non-free licenses"
+# arch=('any')
+ license=('custom')
+ depends=('perl' 'libxml2' "foomatic-db-engine" 'foomatic-db')
+
+   cd ${srcdir}/foomatic-db-nonfree
+   bzr revno
+   ./make_configure
+   ./configure --prefix=/usr
+   make DESTDIR=${pkgdir} install
+   install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+}
diff --git a/extra/four-in-a-row/PKGBUILD b/extra/four-in-a-row/PKGBUILD
index 10fc65e57..cc57994cc 100644
--- a/extra/four-in-a-row/PKGBUILD
+++ b/extra/four-in-a-row/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 213465 2014-05-23 23:34:13Z heftig $
+# $Id: PKGBUILD 215384 2014-06-23 19:35:51Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=four-in-a-row
-pkgver=3.12.2
+pkgver=3.12.3
 pkgrel=1
 pkgdesc="Make lines of the same color to win"
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ install=four-in-a-row.install
 url="https://live.gnome.org/Four-in-a-row"
 groups=('gnome-extra')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('6180612c70a04e70f17bc165fdfccc8c7984e6ed7d3c2870221cf596864545ef')
+sha256sums=('a445b745d2ae025fcd733734538b94dacc22afe0d7e0227d8da2aeb0a343d560')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-calculator/PKGBUILD b/extra/gnome-calculator/PKGBUILD
index c4345f85b..bbf4f8ab1 100644
--- a/extra/gnome-calculator/PKGBUILD
+++ b/extra/gnome-calculator/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 214066 2014-06-03 08:33:44Z jgc $
+# $Id: PKGBUILD 215383 2014-06-23 19:34:37Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-calculator
-pkgver=3.12.2
+pkgver=3.12.3
 pkgrel=1
 pkgdesc="GNOME Scientific calculator"
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ options=(!emptydirs)
 url="http://www.gnome.org"
 install=gnome-calculator.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('da9dd34286979e88430b236982bf0c8b4415cd0c0caa0c19228fb521c08abe60')
+sha256sums=('201022e26759462d1c0c3e32e0560d6b8c25540a6cfeeb9aca518837e053c32e')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-online-accounts/PKGBUILD b/extra/gnome-online-accounts/PKGBUILD
index 829117754..7a44a84d6 100644
--- a/extra/gnome-online-accounts/PKGBUILD
+++ b/extra/gnome-online-accounts/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 213525 2014-05-24 00:30:53Z heftig $
+# $Id: PKGBUILD 215376 2014-06-23 19:16:33Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gnome-online-accounts
-pkgver=3.12.2
+pkgver=3.12.3
 pkgrel=1
 pkgdesc="GNOME service to access online accounts"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@ depends=('webkitgtk' 'json-glib' 'libnotify' 'rest' 'hicolor-icon-theme' 'libsec
 makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl')
 install=$pkgname.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('cac7758e09d32eb54af50ab6b23d65da0c8d48c555c8db011a0cf5b977d542ec')
+sha256sums=('afd7e2f0e6eccbde92f10183ea366c95b579767c540442ef82e4009d7759eda6')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-robots/PKGBUILD b/extra/gnome-robots/PKGBUILD
index c24fb1a84..11ce8f9d5 100644
--- a/extra/gnome-robots/PKGBUILD
+++ b/extra/gnome-robots/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 213510 2014-05-24 00:15:30Z heftig $
+# $Id: PKGBUILD 215386 2014-06-23 19:42:58Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-robots
-pkgver=3.12.2
+pkgver=3.12.3
 pkgrel=1
 pkgdesc="Avoid the robots and make them crash into each other"
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ install=gnome-robots.install
 url="https://live.gnome.org/Robots"
 groups=('gnome-extra')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('7a826835777611ce28a0e54b8e4cb3b221c200557ad155f7bd3aeacea29c97de')
+sha256sums=('3e89935f80c0d17b7bc9a56314ef309341cb90c3938c85d5f52524e24b032902')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-terminal/PKGBUILD b/extra/gnome-terminal/PKGBUILD
index 943275064..02ec60f87 100644
--- a/extra/gnome-terminal/PKGBUILD
+++ b/extra/gnome-terminal/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 213505 2014-05-24 00:01:09Z heftig $
+# $Id: PKGBUILD 215397 2014-06-23 20:16:43Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-terminal
-pkgver=3.12.2
+pkgver=3.12.3
 pkgrel=1
 pkgdesc="The GNOME Terminal Emulator"
 arch=(i686 x86_64)
@@ -16,7 +16,7 @@ url="http://www.gnome.org"
 groups=('gnome')
 install=gnome-terminal.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('ea19ce610af2873d26e1e75491415e17af6a5080366db966f9220fdeea5ebecd')
+sha256sums=('8450da259fb485289d61fdbe5b59037be068e0dbdd5c7dd8216b60cd49d55528')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD
index b32f1363c..7707805cb 100644
--- a/extra/gtk2/PKGBUILD
+++ b/extra/gtk2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 210498 2014-04-14 20:07:01Z jgc $
+# $Id: PKGBUILD 215395 2014-06-23 20:11:12Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gtk2
 pkgname=('gtk2' 'gtk-update-icon-cache')
-pkgver=2.24.23
+pkgver=2.24.24
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
@@ -12,7 +12,7 @@ makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxc
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz
         gtkrc xid-collision-debug.patch)
-sha256sums=('a0a406e27e9b5e7d6b2c4334212706ed5cdcd41e713e66c9ae950655dd61517c'
+sha256sums=('12ceb2e198c82bfb93eb36348b6e9293c8fdcd60786763d04cfec7ebe7ed3d6d'
             'b77a427df55a14182c10ad7e683b4d662df2846fcd38df2aa8918159d6be3ae2'
             'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
 
diff --git a/extra/gtkhtml4/PKGBUILD b/extra/gtkhtml4/PKGBUILD
index 3a9455df2..5b59934e3 100644
--- a/extra/gtkhtml4/PKGBUILD
+++ b/extra/gtkhtml4/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 213457 2014-05-23 23:29:13Z heftig $
+# $Id: PKGBUILD 215378 2014-06-23 19:29:00Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtkhtml4
 _pkgbasename=gtkhtml
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=1
 pkgdesc="A lightweight HTML renderer/editor widget for GTK3"
 arch=(i686 x86_64)
@@ -12,7 +12,7 @@ depends=('gtk3' 'enchant' 'iso-codes' 'libsoup')
 makedepends=('intltool')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver:0:3}/$_pkgbasename-$pkgver.tar.xz)
-sha256sums=('558bf8ec61d9e24cd67301613fc26ab54a495b4b75af5770d1259128aaeefa63')
+sha256sums=('58d2d6bafd221fdc07982ad0455fd168afc7fb642465d53b66b07328eab32868')
 
 build() {
     cd "$_pkgbasename-$pkgver"
diff --git a/extra/gupnp-av/PKGBUILD b/extra/gupnp-av/PKGBUILD
index 9b1a687e2..797999510 100644
--- a/extra/gupnp-av/PKGBUILD
+++ b/extra/gupnp-av/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 205057 2014-02-03 21:26:34Z heftig $
+# $Id: PKGBUILD 215380 2014-06-23 19:31:07Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Thijs Vermeir <thijsvermeir@gmail.com>
 # Contributor: Denis Zawada <deno@rootnode.net>
 
 pkgname=gupnp-av
-pkgver=0.12.5
+pkgver=0.12.6
 pkgrel=1
 pkgdesc="Library to ease handling and implementation of UPnP A/V profiles"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@ license=(LGPL)
 depends=(gupnp)
 makedepends=(gobject-introspection gtk-doc vala)
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('8375034ccc4a45e90923c26135517aab57a88f5757ce65a1b23378df4c60bff6')
+sha256sums=('e0553d60dd7c7277c65c02a68a270c4dcb9036a4c7075c902fc8111c6a5e6a44')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD
index 791789251..58f933952 100644
--- a/extra/inkscape/PKGBUILD
+++ b/extra/inkscape/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 215257 2014-06-17 19:24:43Z eric $
+# $Id: PKGBUILD 215353 2014-06-23 10:40:14Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 # Contributor: tobias <tobias@archlinux.org>
 
 pkgname=inkscape
 pkgver=0.48.4
-pkgrel=16
+pkgrel=17
 pkgdesc='Vector graphics editor using the SVG file format'
 url='http://inkscape.sourceforge.net/'
 license=('GPL' 'LGPL')
diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD
index 4a62bfb7b..bea5bcb38 100644
--- a/extra/samba/PKGBUILD
+++ b/extra/samba/PKGBUILD
@@ -10,11 +10,11 @@
 
 pkgbase=samba
 pkgname=('libwbclient' 'smbclient' 'samba')
-pkgver=4.1.8
+pkgver=4.1.9
 # We use the 'A' to fake out pacman's version comparators.  Samba chooses
 # to append 'a','b',etc to their subsequent releases, which pamcan
 # misconstrues as alpha, beta, etc.  Bad samba!
-_realver=4.1.8
+_realver=4.1.9
 pkgrel=1
 arch=(i686 x86_64)
 url="http://www.samba.org"
@@ -240,7 +240,7 @@ sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \
   # copy ldap example
   install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema
 }
-md5sums=('212b7568d44e7668a7dc8a45c5558764'
+md5sums=('f9efc506e08c680d2b79b13be28c959c'
          '5697da77590ec092cc8a883bae06093c'
          '96f82c38f3f540b53f3e5144900acf17'
          'ee4763a656cf00d92bfda31b6bb2c5cb'
diff --git a/extra/vte3/PKGBUILD b/extra/vte3/PKGBUILD
index 11e6d6eed..44545c792 100644
--- a/extra/vte3/PKGBUILD
+++ b/extra/vte3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 213504 2014-05-24 00:00:04Z heftig $
+# $Id: PKGBUILD 215396 2014-06-23 20:15:51Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=vte3
 pkgname=(vte3 vte-common)
-pkgver=0.36.2
+pkgver=0.36.3
 pkgrel=1
 pkgdesc="Virtual Terminal Emulator widget for use with GTK3"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ options=('!emptydirs')
 makedepends=('intltool' 'gobject-introspection' 'gtk3')
 url="http://www.gnome.org"
 source=(http://download.gnome.org/sources/vte/${pkgver::4}/vte-$pkgver.tar.xz)
-sha256sums=('f45eed3aed823068c7563345ea947be0e6ddb3dacd74646e6d7d26a921e04345')
+sha256sums=('54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c')
 
 build() {
   cd "vte-$pkgver"
diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD
index bcb4cdbe4..713829bdb 100644
--- a/extra/xterm/PKGBUILD
+++ b/extra/xterm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 212000 2014-05-04 08:39:18Z andyrtr $
+# $Id: PKGBUILD 215362 2014-06-23 17:04:03Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xterm
-pkgver=304
+pkgver=308
 pkgrel=1
 pkgdesc="X Terminal Emulator"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('custom')
 depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps' 'libutempter')
 source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz{,.asc}
         LICENSE)
-md5sums=('8a9460d848cf4ed244fcfc9b07d1c3d0'
+md5sums=('1ec76c1a79a70de4f82c24c527ef4626'
          'SKIP'
          '10ecc3f8ee91e3189863a172f68282d2')