Tue Jul 31 00:02:29 UTC 2012

26 files changed, 793 insertions, 11 deletions

diff --git a/testing/bzflag/PKGBUILD b/testing/bzflag/PKGBUILD
new file mode 100644
index 000000000..e1eb83023
--- /dev/null
+++ b/testing/bzflag/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 164278 2012-07-29 21:07:44Z eric $
+# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
+# Contributor: Kevin Piche <kevin@archlinux.org>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+
+pkgname=bzflag
+pkgver=2.4.0
+pkgrel=4
+pkgdesc='Multiplayer 3D tank battle game'
+url='http://bzflag.org/'
+license=('LGPL')
+options=('!libtool')
+arch=('i686' 'x86_64')
+depends=('curl' 'glew' 'mesa' 'sdl')
+source=("http://downloads.sourceforge.net/project/bzflag/bzflag%20source/${pkgver}/bzflag-${pkgver}.tar.bz2")
+sha1sums=('af469d63af7143479176ea0ac91ce2eaa6e4561f')
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	./configure --prefix=/usr
+	make
+
+	cd misc
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	make DESTDIR="${pkgdir}" install
+
+	install -Dm644 misc/bzflag.desktop "${pkgdir}"/usr/share/applications/bzflag.desktop
+	install -Dm644 data/bzflag-48x48.png "${pkgdir}"/usr/share/pixmaps/bzflag-48x48.png
+}
diff --git a/testing/calligra/PKGBUILD b/testing/calligra/PKGBUILD
index 4d285c763..29fd88892 100644
--- a/testing/calligra/PKGBUILD
+++ b/testing/calligra/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 162291 2012-06-24 19:24:34Z foutrelis $
+# $Id: PKGBUILD 164279 2012-07-29 21:08:11Z eric $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
@@ -22,7 +22,7 @@ pkgname=('calligra-filters'
          'calligra-handbook'
          'calligra-braindump'
          'calligra-flow')
-pkgver=2.4.2
+pkgver=2.4.3
 pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.calligra-suite.org/'
@@ -31,10 +31,10 @@ makedepends=('cmake' 'automoc4' 'boost ' 'eigen2'
              'kdepimlibs' 'libpqxx' 'freetds' 'xbase'
              'kdegraphics-okular' 'gsl' 'kdeedu-marble'
              'libwpd' 'libwpg' 'pstoedit' 'glew'
-             'fftw' 'opengtl' 'lcms2' 'libkdcraw' 'wv2')
+             'fftw' 'opengtl' 'lcms2' 'libkdcraw')
 groups=('calligra')
 source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('31b0c44ad4ee27017580c7c2fc8e87a9')
+md5sums=('469d639f17e3d6a186baabd899147e39')
 
 build() {
   cd "${srcdir}"
@@ -254,7 +254,7 @@ package_calligra-braindump() {
 
 package_calligra-flow() {
   pkgdesc="Flowchart & Diagram Editing"
-  depends=('calligra-libs' 'kdebase-runtime')
+  depends=('calligra-words' 'kdebase-runtime')
   conflicts=('calligra-flow-doc')
   replaces=('calligra-flow-doc')
   install=calligra-flow.install
diff --git a/testing/enblend-enfuse/PKGBUILD b/testing/enblend-enfuse/PKGBUILD
new file mode 100644
index 000000000..51fd36e14
--- /dev/null
+++ b/testing/enblend-enfuse/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 164280 2012-07-29 21:08:21Z eric $
+# Maintainer: tobias <tobias@archlinux.org>
+# Contributor: Dominik Ryba <domryba@post.pl>
+
+pkgname=enblend-enfuse
+pkgver=4.0
+pkgrel=6
+pkgdesc="Intelligent blend tool for overlapping picture"
+arch=("i686" "x86_64")
+license=('GPL')
+url="http://enblend.sourceforge.net"
+depends=('openexr' 'glew' 'libxmi' 'freeglut' 'lcms' 'libpng' 'boost-libs')
+makedepends=('boost')
+replaces=('enblend')
+conflicts=('enblend')
+provides=('enblend')
+install=${pkgname}.install
+source=(http://downloads.sourceforge.net/sourceforge/enblend/${pkgname}-${pkgver}.tar.gz{,.asc} \
+        libpng-1.4.patch enblend-4.0-libpng15.patch)
+sha1sums=('34c3a5ce11c6ef0ef520d8a15a3cb6a94a567033'
+          'aac6364b29b0a9d6c61c3db0982f52ce1579e934'
+          'eae6cf48ea082865130302d0b4d1ca0b884a563b'
+          '71e961d90be842eafe9d473d8d70b04b29077036')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}-753b534c819d"
+  sed -i 's/info.arith_code = TRUE/info.arith_code = FALSE/' src/vigra_impex/jpeg.cxx
+  patch -p1 -i ../libpng-1.4.patch
+  patch -p0 -i ../enblend-4.0-libpng15.patch
+  LIBS="-lboost_system" ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}-753b534c819d"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 doc/enblend.info "${pkgdir}/usr/share/info/enblend.info"
+  install -D -m644 doc/enfuse.info "${pkgdir}/usr/share/info/enfuse.info"
+}
diff --git a/testing/enblend-enfuse/enblend-4.0-libpng15.patch b/testing/enblend-enfuse/enblend-4.0-libpng15.patch
new file mode 100644
index 000000000..d4465ccad
--- /dev/null
+++ b/testing/enblend-enfuse/enblend-4.0-libpng15.patch
@@ -0,0 +1,220 @@
+--- src/vigra_impex/png.cxx
++++ src/vigra_impex/png.cxx
+@@ -81,7 +81,7 @@
+ static void PngError( png_structp png_ptr, png_const_charp error_msg )
+ {
+     png_error_message = std::string(error_msg);
+-    longjmp( png_ptr->jmpbuf, 1 );
++    longjmp( png_jmpbuf( png_ptr ), 1 );
+ }
+ 
+ // called on non-fatal errors
+@@ -213,7 +213,7 @@
+         vigra_postcondition( png != 0, "could not create the read struct." );
+ 
+         // create info struct
+-        if (setjmp(png->jmpbuf)) {
++        if (setjmp(png_jmpbuf( png ))) {
+             png_destroy_read_struct( &png, &info, NULL );
+             vigra_postcondition( false, png_error_message.insert(0, "error in png_create_info_struct(): ").c_str() );
+         }
+@@ -221,14 +221,14 @@
+         vigra_postcondition( info != 0, "could not create the info struct." );
+ 
+         // init png i/o
+-        if (setjmp(png->jmpbuf)) {
++        if (setjmp(png_jmpbuf( png ))) {
+             png_destroy_read_struct( &png, &info, NULL );
+             vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() );
+         }
+         png_init_io( png, file.get() );
+ 
+         // specify that the signature was already read
+-        if (setjmp(png->jmpbuf)) {
++        if (setjmp(png_jmpbuf( png ))) {
+             png_destroy_read_struct( &png, &info, NULL );
+             vigra_postcondition( false, png_error_message.insert(0, "error in png_set_sig_bytes(): ").c_str() );
+         }
+@@ -244,13 +244,13 @@
+     void PngDecoderImpl::init()
+     {
+         // read all chunks up to the image data
+-        if (setjmp(png->jmpbuf))
++        if (setjmp(png_jmpbuf( png )))
+             vigra_postcondition( false, png_error_message.insert(0, "error in png_read_info(): ").c_str() );
+         png_read_info( png, info );
+ 
+         // pull over the header fields
+         int interlace_method, compression_method, filter_method;
+-        if (setjmp(png->jmpbuf))
++        if (setjmp(png_jmpbuf( png )))
+             vigra_postcondition( false, png_error_message.insert(0, "error in png_get_IHDR(): ").c_str() );
+         png_get_IHDR( png, info, &width, &height, &bit_depth, &color_type,
+                       &interlace_method, &compression_method, &filter_method );
+@@ -264,7 +264,7 @@
+ 
+         // transform palette to rgb
+         if ( color_type == PNG_COLOR_TYPE_PALETTE) {
+-            if (setjmp(png->jmpbuf))
++            if (setjmp(png_jmpbuf( png )))
+                 vigra_postcondition( false, png_error_message.insert(0, "error in png_palette_to_rgb(): ").c_str() );
+             png_set_palette_to_rgb(png);
+             color_type = PNG_COLOR_TYPE_RGB;
+@@ -273,7 +273,7 @@
+ 
+         // expand gray values to at least one byte size
+         if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
+-            if (setjmp(png->jmpbuf))
++            if (setjmp(png_jmpbuf( png )))
+                 vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
+             png_set_expand_gray_1_2_4_to_8(png);
+             bit_depth = 8;
+@@ -283,7 +283,7 @@
+ #if 0
+         // strip alpha channel
+         if ( color_type & PNG_COLOR_MASK_ALPHA ) {
+-            if (setjmp(png->jmpbuf))
++            if (setjmp(png_jmpbuf( png )))
+                 vigra_postcondition( false, png_error_message.insert(0, "error in png_set_strip_alpha(): ").c_str() );
+             png_set_strip_alpha(png);
+             color_type ^= PNG_COLOR_MASK_ALPHA;
+@@ -323,12 +323,12 @@
+ 
+         // read icc profile
+ #if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED)
+-        char * dummyName;
++        png_charpp dummyName;
+         int dummyCompType;
+-        char * profilePtr;
++        png_bytepp profilePtr;
+         png_uint_32 profileLen;
+-        if (info->valid & PNG_INFO_iCCP) {
+-            png_get_iCCP(png, info, &dummyName, &dummyCompType, &profilePtr, &profileLen) ;
++        if (png_get_valid(png, info, PNG_INFO_iCCP)) {
++            png_get_iCCP(png, info, dummyName, &dummyCompType, profilePtr, &profileLen) ;
+             iccProfilePtr = (unsigned char *) profilePtr;
+             iccProfileLength = profileLen;
+         }
+@@ -340,7 +340,7 @@
+         // image gamma
+         double image_gamma = 0.45455;
+         if ( png_get_valid( png, info, PNG_INFO_gAMA ) ) {
+-            if (setjmp(png->jmpbuf))
++            if (setjmp(png_jmpbuf( png )))
+                 vigra_postcondition( false, png_error_message.insert(0, "error in png_get_gAMA(): ").c_str() );
+             png_get_gAMA( png, info, &image_gamma );
+         }
+@@ -349,26 +349,26 @@
+         double screen_gamma = 2.2;
+ 
+         // set gamma correction
+-        if (setjmp(png->jmpbuf))
++        if (setjmp(png_jmpbuf( png )))
+             vigra_postcondition( false, png_error_message.insert(0, "error in png_set_gamma(): ").c_str() );
+         png_set_gamma( png, screen_gamma, image_gamma );
+ #endif
+ 
+         // interlace handling, get number of read passes needed
+-        if (setjmp(png->jmpbuf))
++        if (setjmp(png_jmpbuf( png )))
+             vigra_postcondition( false,png_error_message.insert(0, "error in png_set_interlace_handling(): ").c_str());
+         n_interlace_passes = png_set_interlace_handling(png);
+ 
+         // update png library state to reflect any changes that were made
+-        if (setjmp(png->jmpbuf))
++        if (setjmp(png_jmpbuf( png )))
+             vigra_postcondition( false, png_error_message.insert(0, "error in png_read_update_info(): ").c_str() );
+         png_read_update_info( png, info );
+ 
+-        if (setjmp(png->jmpbuf))
++        if (setjmp(png_jmpbuf( png )))
+             vigra_postcondition( false,png_error_message.insert(0, "error in png_get_channels(): ").c_str());
+         n_channels = png_get_channels(png, info);
+ 
+-        if (setjmp(png->jmpbuf))
++        if (setjmp(png_jmpbuf( png )))
+             vigra_postcondition( false,png_error_message.insert(0, "error in png_get_rowbytes(): ").c_str());
+         rowsize = png_get_rowbytes(png, info);
+ 
+@@ -379,7 +379,7 @@
+     void PngDecoderImpl::nextScanline()
+     {
+         for (int i=0; i < n_interlace_passes; i++) {
+-        if (setjmp(png->jmpbuf))
++        if (setjmp(png_jmpbuf( png )))
+                 vigra_postcondition( false,png_error_message.insert(0, "error in png_read_row(): ").c_str());
+             png_read_row(png, row_data.begin(), NULL);
+         }
+@@ -545,7 +545,7 @@
+         vigra_postcondition( png != 0, "could not create the write struct." );
+ 
+         // create info struct
+-        if (setjmp(png->jmpbuf)) {
++        if (setjmp(png_jmpbuf( png ))) {
+             png_destroy_write_struct( &png, &info );
+             vigra_postcondition( false, png_error_message.insert(0, "error in png_info_struct(): ").c_str() );
+         }
+@@ -556,7 +556,7 @@
+         }
+ 
+         // init png i/o
+-        if (setjmp(png->jmpbuf)) {
++        if (setjmp(png_jmpbuf( png ))) {
+             png_destroy_write_struct( &png, &info );
+             vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() );
+         }
+@@ -571,7 +571,7 @@
+     void PngEncoderImpl::finalize()
+     {
+         // write the IHDR
+-        if (setjmp(png->jmpbuf))
++        if (setjmp(png_jmpbuf( png )))
+             vigra_postcondition( false, png_error_message.insert(0, "error in png_set_IHDR(): ").c_str() );
+         png_set_IHDR( png, info, width, height, bit_depth, color_type,
+                       PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
+@@ -579,7 +579,7 @@
+ 
+         // set resolution
+         if (x_resolution > 0 && y_resolution > 0) {
+-            if (setjmp(png->jmpbuf))
++            if (setjmp(png_jmpbuf( png )))
+                 vigra_postcondition( false, png_error_message.insert(0, "error in png_set_pHYs(): ").c_str() );
+             png_set_pHYs(png, info, (png_uint_32) (x_resolution / 0.0254 + 0.5),
+                          (png_uint_32) (y_resolution / 0.0254 + 0.5),
+@@ -588,7 +588,7 @@
+ 
+         // set offset
+         if (position.x > 0 && position.y > 0) {
+-            if (setjmp(png->jmpbuf))
++            if (setjmp(png_jmpbuf( png )))
+                 vigra_postcondition( false, png_error_message.insert(0, "error in png_set_oFFs(): ").c_str() );
+             png_set_oFFs(png, info, position.x, position.y, PNG_OFFSET_PIXEL);
+         }
+@@ -597,12 +597,12 @@
+         // set icc profile
+         if (iccProfile.size() > 0) {
+             png_set_iCCP(png, info, "icc", 0,
+-                         (char *)iccProfile.begin(), iccProfile.size());
++                         iccProfile.begin(), iccProfile.size());
+         }
+ #endif
+ 
+         // write the info struct
+-        if (setjmp(png->jmpbuf))
++        if (setjmp(png_jmpbuf( png )))
+             vigra_postcondition( false, png_error_message.insert(0, "error in png_write_info(): ").c_str() );
+         png_write_info( png, info );
+ 
+@@ -634,10 +634,10 @@
+         }
+ 
+         // write the whole image
+-        if (setjmp(png->jmpbuf))
++        if (setjmp(png_jmpbuf( png )))
+             vigra_postcondition( false, png_error_message.insert(0, "error in png_write_image(): ").c_str() );
+         png_write_image( png, row_pointers.begin() );
+-        if (setjmp(png->jmpbuf))
++        if (setjmp(png_jmpbuf( png )))
+             vigra_postcondition( false, png_error_message.insert(0, "error in png_write_end(): ").c_str() );
+         png_write_end(png, info);
+     }
diff --git a/testing/enblend-enfuse/enblend-enfuse.install b/testing/enblend-enfuse/enblend-enfuse.install
new file mode 100644
index 000000000..24ea28a4e
--- /dev/null
+++ b/testing/enblend-enfuse/enblend-enfuse.install
@@ -0,0 +1,22 @@
+infodir=usr/share/info
+filelist=(enblend.info enfuse.info)
+
+post_install() {
+  [[ -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
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/enblend-enfuse/libpng-1.4.patch b/testing/enblend-enfuse/libpng-1.4.patch
new file mode 100644
index 000000000..3bf852b58
--- /dev/null
+++ b/testing/enblend-enfuse/libpng-1.4.patch
@@ -0,0 +1,14 @@
+diff -Naur enblend-enfuse-3.2-orig/src/vigra_impex/png.cxx enblend-enfuse-3.2/src/vigra_impex/png.cxx
+--- enblend-enfuse-3.2-orig/src/vigra_impex/png.cxx	2010-01-19 22:09:36.000000000 -0500
++++ enblend-enfuse-3.2/src/vigra_impex/png.cxx	2010-01-19 22:13:43.000000000 -0500
+@@ -275,8 +275,8 @@
+         // expand gray values to at least one byte size
+         if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
+             if (setjmp(png->jmpbuf))
+-                vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str());
+-            png_set_gray_1_2_4_to_8(png);
++                vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
++            png_set_expand_gray_1_2_4_to_8(png);
+             bit_depth = 8;
+         }
+ 
diff --git a/testing/glew/PKGBUILD b/testing/glew/PKGBUILD
new file mode 100644
index 000000000..fb56bab67
--- /dev/null
+++ b/testing/glew/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 164281 2012-07-29 21:08:24Z eric $
+# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
+# Contributor: SleepyDog
+
+pkgname=glew
+pkgver=1.8.0
+pkgrel=1
+pkgdesc="The OpenGL Extension Wrangler Library"
+arch=('i686' 'x86_64')
+url="http://glew.sourceforge.net"
+license=('BSD' 'MIT' 'GPL')
+depends=('libxmu' 'libxi' 'mesa')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz)
+sha1sums=('641c6bb3f924ec786e1e6cf2b1b230f594e0f0e4')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i 's|lib64|lib|' config/Makefile.linux
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make GLEW_DEST="${pkgdir}/usr" install.all
+  install -D -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
+  rm "${pkgdir}"/usr/lib/{libGLEW,libGLEWmx}.a
+  chmod 0755 "${pkgdir}"/usr/lib/libGLEW*.so.${pkgver}
+}
diff --git a/testing/gtkpod/PKGBUILD b/testing/gtkpod/PKGBUILD
new file mode 100644
index 000000000..2317110ed
--- /dev/null
+++ b/testing/gtkpod/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 164294 2012-07-29 23:15:49Z tomegun $
+# Contributor: Kevin Piche <kevin@archlinux.org>
+# Contributor: Aaron Griffin <aaron@archlinux.org>
+
+pkgname=gtkpod
+pkgver=2.1.2
+pkgrel=2
+pkgdesc="A platform independent GUI for Apple's iPod using GTK3"
+arch=('i686' 'x86_64')
+url="http://gtkpod.sourceforge.net"
+license=('GPL')
+depends=('anjuta' 'curl' 'flac' 'libid3tag' 'libgpod' 'awk')
+makedepends=('flex' 'intltool' 'libvorbis' 'faad2')
+optdepends=('libmp4v2: MP4/h264 support'
+            'vorbis-tools: OGG support'
+	    'libvorbis: OGG support'
+            'id3v2: mp3 conversion support'
+            'faad2: m4a conversion support')
+install=gtkpod.install
+options=('!libtool')
+source=("http://downloads.sourceforge.net/gtkpod/${pkgname}-${pkgver}.tar.gz")
+md5sums=('88fef3f947cbb7ae6b714080733a3b6b')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i 's#python#python2#' scripts/sync-palm-jppy.py
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/testing/gtkpod/gtkpod.install b/testing/gtkpod/gtkpod.install
new file mode 100644
index 000000000..c5d357a38
--- /dev/null
+++ b/testing/gtkpod/gtkpod.install
@@ -0,0 +1,12 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  glib-compile-schemas usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
diff --git a/testing/gvfs/PKGBUILD b/testing/gvfs/PKGBUILD
new file mode 100644
index 000000000..ab9d29025
--- /dev/null
+++ b/testing/gvfs/PKGBUILD
@@ -0,0 +1,112 @@
+# $Id: PKGBUILD 164298 2012-07-29 23:16:11Z tomegun $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgbase=gvfs
+pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp')
+pkgver=1.12.3
+pkgrel=3
+arch=('i686' 'x86_64')
+license=('LGPL')
+makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio' 'libgphoto2' 'libimobiledevice' 'libsoup-gnome' 'smbclient' 'udisks2')
+url="http://www.gnome.org"
+options=(!libtool)
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)   
+sha256sums=('38f69ec92083f86a51e7814e98d2861151f16dfb3abe4b3b39488408e12fd9c2')
+
+build() {
+  cd "$pkgbase-$pkgver"
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-static \
+      --libexecdir=/usr/lib/gvfs \
+      --with-bash-completion-dir=/usr/share/bash-completion/completions
+  make
+}
+
+package_gvfs() {
+  pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio"
+  depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio' 'libsoup-gnome' 'udisks2')
+  optdepends=('gvfs-afc: AFC (mobile devices) support'
+              'gvfs-smb: SMB/CIFS (Windows client) support'
+              'gvfs-gphoto2: gphoto2 (PTP camera/MTP media player) support'
+              'gvfs-obexftp: ObexFTP (bluetooth) support'
+              'gvfs-afp: Apple Filing Protocol (AFP) support')
+  install=gvfs.install
+
+  cd "$pkgbase-$pkgver"
+  sed -e 's/^am__append_4/#am__append_4/' \
+      -e 's/^am__append_5/#am__append_5/' \
+      -i monitor/Makefile
+  make DESTDIR="$pkgdir" install
+
+  cd "$pkgdir"
+  rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}
+  rm usr/share/gvfs/mounts/{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}.mount
+  rm usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml
+  rm usr/share/GConf/gsettings/gvfs-smb.convert
+}
+
+package_gvfs-smb() {
+  pkgdesc="SMB/CIFS (Windows client) backend for gvfs"
+  depends=("gvfs=$pkgver" 'smbclient' 'libgnome-keyring')
+  install=gvfs-smb.install
+
+  cd "$pkgbase-$pkgver/daemon"
+  install -m755 -d "$pkgdir/usr/lib/gvfs"
+  install -m755 -d "$pkgdir/usr/share/gvfs/mounts"
+
+  install -m755 .libs/gvfsd-smb{,-browse} "$pkgdir/usr/lib/gvfs/"
+  install -m644 smb{,-browse}.mount "$pkgdir/usr/share/gvfs/mounts/"
+
+  install -Dm644 org.gnome.system.smb.gschema.xml \
+    "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml"
+  install -Dm644 gvfs-smb.convert \
+    "$pkgdir/usr/share/GConf/gsettings/gvfs-smb.convert"
+}
+
+package_gvfs-afc() {
+  pkgdesc="AFC (mobile devices) backend for gvfs"
+  depends=("gvfs=$pkgver" 'libimobiledevice')
+  install=gvfs-module.install
+
+  cd "$pkgbase-$pkgver/daemon"
+  install -D .libs/gvfsd-afc "$pkgdir/usr/lib/gvfs/gvfsd-afc"
+  install -Dm644 afc.mount "$pkgdir/usr/share/gvfs/mounts/afc.mount"
+
+  cd "$srcdir/$pkgbase-$pkgver/monitor/afc"
+  make DESTDIR="$pkgdir" install
+}
+
+package_gvfs-gphoto2() {
+  pkgdesc="gphoto2 (PTP camera/MTP media player) backend for gvfs"
+  depends=("gvfs=$pkgver" 'dbus-core' 'libgphoto2' 'udev')
+  install=gvfs-module.install
+
+  cd "$pkgbase-$pkgver/daemon"
+  install -D .libs/gvfsd-gphoto2 "$pkgdir/usr/lib/gvfs/gvfsd-gphoto2"
+  install -Dm644 gphoto2.mount "$pkgdir/usr/share/gvfs/mounts/gphoto2.mount"
+
+  cd "$srcdir/$pkgbase-$pkgver/monitor/gphoto2"
+  make DESTDIR="$pkgdir" install
+}
+
+package_gvfs-obexftp() {
+  pkgdesc="ObexFTP (bluetooth) backend for gvfs"
+  depends=("gvfs=$pkgver" 'dbus-glib' 'bluez' 'obex-data-server')
+  install=gvfs-module.install
+
+  cd "$pkgbase-$pkgver/daemon"
+  install -D .libs/gvfsd-obexftp "$pkgdir/usr/lib/gvfs/gvfsd-obexftp"
+  install -Dm644 obexftp.mount "$pkgdir/usr/share/gvfs/mounts/obexftp.mount"
+}
+
+package_gvfs-afp() {
+  pkgdesc="Apple Filing Protocol (AFP) backend for gvfs"
+  depends=("gvfs=$pkgver")
+  install=gvfs-module.install
+  install -m755 -d "$pkgdir/usr/lib/gvfs"
+  install -m755 -d "$pkgdir/usr/share/gvfs/mounts"
+
+  cd "$pkgbase-$pkgver/daemon"
+  install -m755 .libs/gvfsd-afp{,-browse} "$pkgdir/usr/lib/gvfs/"
+  install -m644 afp{,-browse}.mount "$pkgdir/usr/share/gvfs/mounts/"
+}
diff --git a/testing/gvfs/gvfs-module.install b/testing/gvfs/gvfs-module.install
new file mode 100644
index 000000000..09d1f11ec
--- /dev/null
+++ b/testing/gvfs/gvfs-module.install
@@ -0,0 +1,7 @@
+post_install() {
+  killall -USR1 gvfsd >&/dev/null || :
+}
+
+post_upgrade() {
+  post_install
+}
diff --git a/testing/gvfs/gvfs-smb.install b/testing/gvfs/gvfs-smb.install
new file mode 100644
index 000000000..da6a2ab6d
--- /dev/null
+++ b/testing/gvfs/gvfs-smb.install
@@ -0,0 +1,12 @@
+post_install() {
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+  killall -USR1 gvfsd >&/dev/null || :
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+}
diff --git a/testing/gvfs/gvfs.install b/testing/gvfs/gvfs.install
new file mode 100644
index 000000000..3482d99e3
--- /dev/null
+++ b/testing/gvfs/gvfs.install
@@ -0,0 +1,14 @@
+post_install() {
+  gio-querymodules /usr/lib/gio/modules
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+  killall -USR1 gvfsd >&/dev/null || :
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  gio-querymodules /usr/lib/gio/modules
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+}
diff --git a/testing/hugin/PKGBUILD b/testing/hugin/PKGBUILD
index 4968503cc..355cc8c26 100644
--- a/testing/hugin/PKGBUILD
+++ b/testing/hugin/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 163546 2012-07-15 13:16:50Z ibiru $
+# $Id: PKGBUILD 164282 2012-07-29 21:08:31Z eric $
 # Maintainer: Tobias Kieslich <tobias@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Dominik Ryba <domryba@post.pl>
 
 pkgname=hugin
 pkgver=2011.4.0
-pkgrel=3
+pkgrel=4
 pkgdesc="A frontend to the panorama-tools"
 arch=('i686' 'x86_64')
 url="http://hugin.sourceforge.net/"
diff --git a/testing/kdeplasma-applets-networkmanagement/PKGBUILD b/testing/kdeplasma-applets-networkmanagement/PKGBUILD
index 3d3ad47bd..c21b8db89 100644
--- a/testing/kdeplasma-applets-networkmanagement/PKGBUILD
+++ b/testing/kdeplasma-applets-networkmanagement/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=kdeplasma-applets-networkmanagement
 epoch=1
-pkgver=0.9.0.3
+pkgver=0.9.0.4
 pkgrel=1
 pkgdesc="KDE control panel and widget network connections"
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ optdepends=('mobile-broadband-provider-info: Database of mobile broadband servic
             'openconnect: Cisco AnyConnect compatible VPN client')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/networkmanagement/${pkgver}/src/networkmanagement-${pkgver}.tar.bz2")
-sha256sums=('d8ad2dd89521dbe21e17131ef24bd7d792e90a150e15f0fbdab1bfa4a46e00f7')
+sha256sums=('520d0592171ce1aa1c54916f408e7f2d1e016da0acefc725f7170b67a292e256')
 
 build() {
   cd "${srcdir}"
diff --git a/testing/libgpod/PKGBUILD b/testing/libgpod/PKGBUILD
new file mode 100644
index 000000000..b646e99cc
--- /dev/null
+++ b/testing/libgpod/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 164295 2012-07-29 23:15:52Z tomegun $
+# Maintainer: Daniel Isenmann <daniel@archlinux.org>
+# Contributor: William Rea <sillywilly@gmail.com>
+
+pkgname=libgpod
+pkgver=0.8.2
+pkgrel=6
+pkgdesc="A shared library to access the contents of an iPod"
+arch=(i686 x86_64)
+license=('LGPL')
+depends=('gdk-pixbuf2' 'mutagen' 'sg3_utils' 'libimobiledevice' 'libplist')
+makedepends=('intltool' 'swig' 'docbook-xsl' 'pygobject2-devel' 'gtk-sharp-2')
+optdepends=('gtk-sharp-2: Mono bindings'
+            'python2-gobject2: python bindings')
+url="http://www.gtkpod.org/libgpod/"
+source=(http://downloads.sourceforge.net/sourceforge/gtkpod/${pkgname}-${pkgver}.tar.bz2)
+options=('!libtool' '!emptydirs')
+md5sums=('ff0fd875fa08f2a6a49dec57ce3367ab')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --with-udev-dir=/usr/lib/udev \
+      --enable-udev --with-python=/usr/bin/python2
+  make PREFIX=/usr
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make PREFIX=/usr DESTDIR="${pkgdir}" install
+}
+
diff --git a/testing/libimobiledevice/PKGBUILD b/testing/libimobiledevice/PKGBUILD
new file mode 100644
index 000000000..2d9547c84
--- /dev/null
+++ b/testing/libimobiledevice/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 164283 2012-07-29 21:08:37Z eric $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Gabriel Martinez < reitaka at gmail dot com >
+
+pkgname=libimobiledevice
+pkgver=1.1.4
+pkgrel=1
+pkgdesc="Is a software library that talks the protocols to support iPhone and iPod Touch devices on Linux"
+url="http://libimobiledevice.org/"
+arch=('i686' 'x86_64')
+license=('GPL2' 'LGPL2.1')
+depends=('usbmuxd' 'gnutls' 'libgcrypt')
+options=('!libtool')
+source=(http://libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2)
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+md5sums=('3f28cbc6a2e30d34685049c0abde5183')
diff --git a/testing/libimobiledevice/swig-version-check.patch b/testing/libimobiledevice/swig-version-check.patch
new file mode 100644
index 000000000..c56b095db
--- /dev/null
+++ b/testing/libimobiledevice/swig-version-check.patch
@@ -0,0 +1,14 @@
+diff -Nur libimobiledevice-1.0.3.old/configure libimobiledevice-1.0.3/configure
+--- libimobiledevice-1.0.3.old/configure	2010-10-04 07:38:37.000000000 -0700
++++ libimobiledevice-1.0.3/configure	2010-10-08 05:43:05.466686656 -0700
+@@ -3477,9 +3477,7 @@
+                         if test -z "$available_patch" ; then
+                                 available_patch=0
+                         fi
+-                        if test $available_major -ne $required_major \
+-                                -o $available_minor -ne $required_minor \
+-                                -o $available_patch -lt $required_patch ; then
++                        if test $available_major -lt $required_major ; then
+                                 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SWIG version >= 1.3.21 is required.  You have $swig_version.  You should look at http://www.swig.org" >&5
+ $as_echo "$as_me: WARNING: SWIG version >= 1.3.21 is required.  You have $swig_version.  You should look at http://www.swig.org" >&2;}
+                                 SWIG=false
diff --git a/testing/libxrandr/PKGBUILD b/testing/libxrandr/PKGBUILD
new file mode 100644
index 000000000..ccddaba57
--- /dev/null
+++ b/testing/libxrandr/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 164269 2012-07-29 11:06:35Z andyrtr $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Contributor: Alexander Baldeck <alexander@archlinux.org>
+
+pkgname=libxrandr
+pkgver=1.4.0
+pkgrel=1
+pkgdesc="X11 RandR extension library"
+arch=('i686' 'x86_64')
+license=('custom')
+url="http://xorg.freedesktop.org/"
+depends=('libxext' 'libxrender' 'randrproto>=1.4.0')
+makedepends=('xorg-util-macros')
+options=('!libtool')
+source=(${url}/releases/individual/lib/libXrandr-${pkgver}.tar.bz2)
+sha256sums=('033ad0ac2f012afb05268660f6d78705c85f84689f92fa7b47ce12959b15f5c3')
+
+build() {
+  cd "${srcdir}/libXrandr-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc
+  make
+}
+
+package() {
+  cd "${srcdir}/libXrandr-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
diff --git a/testing/rhythmbox/PKGBUILD b/testing/rhythmbox/PKGBUILD
new file mode 100644
index 000000000..bd2a3a62e
--- /dev/null
+++ b/testing/rhythmbox/PKGBUILD
@@ -0,0 +1,41 @@
+# $Id: PKGBUILD 164297 2012-07-29 23:16:02Z tomegun $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Giovanni Scafora <giovanni@archlinux.org>
+
+pkgname=rhythmbox
+pkgver=2.97
+pkgrel=2
+pkgdesc="An iTunes-like music playback and management application"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.rhythmbox.org"
+depends=('clutter' 'clutter-gtk' 'clutter-gst' 'dconf' 'desktop-file-utils' 'grilo'
+         'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'gvfs-afc' 'json-glib'
+         'libdmapsharing' 'libgpod' 'libmtp' 'libmusicbrainz4' 'libnotify' 'libpeas' 'libwebkit3'
+         'lirc-utils' 'media-player-info' 'mx' 'python2-gobject' 'python2-mako' 'totem-plparser'
+         'tdb' 'libdiscid')
+makedepends=('gnome-doc-utils' 'intltool' 'brasero' 'gobject-introspection' 'vala')
+optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs'
+            'gstreamer0.10-bad-plugins: Extra media codecs'
+            'gstreamer0.10-ffmpeg: Extra media codecs'
+            'brasero: cd burning')
+options=('!libtool' '!emptydirs')
+install=rhythmbox.install
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz)
+sha256sums=('b52567cf45bf13c0452593da7f907920bd4cf31916ca8dcd15d555336b4947e4')
+
+build() {
+  cd "$pkgname-$pkgver"
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
+      --libexecdir=/usr/lib/rhythmbox \
+      --localstatedir=/var --disable-static \
+      --enable-daap --enable-python --enable-musicbrainz \
+      --with-mdns=avahi --disable-scrollkeeper
+  make
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+}
diff --git a/testing/rhythmbox/rhythmbox.install b/testing/rhythmbox/rhythmbox.install
new file mode 100644
index 000000000..e02ee2c16
--- /dev/null
+++ b/testing/rhythmbox/rhythmbox.install
@@ -0,0 +1,13 @@
+post_install() {
+    glib-compile-schemas /usr/share/glib-2.0/schemas
+    update-desktop-database -q
+    gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/testing/upower/PKGBUILD b/testing/upower/PKGBUILD
index 06cf88c0a..b3642550e 100644
--- a/testing/upower/PKGBUILD
+++ b/testing/upower/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 162916 2012-07-03 23:39:56Z tomegun $
+# $Id: PKGBUILD 164296 2012-07-29 23:15:56Z tomegun $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=upower
 pkgver=0.9.17
-pkgrel=1
+pkgrel=2
 pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics"
 arch=('i686' 'x86_64')
 url="http://upower.freedesktop.org"
diff --git a/testing/usbmuxd/85-usbmuxd.rules b/testing/usbmuxd/85-usbmuxd.rules
new file mode 100644
index 000000000..ec9f72501
--- /dev/null
+++ b/testing/usbmuxd/85-usbmuxd.rules
@@ -0,0 +1,9 @@
+# usbmuxd ("Apple Mobile Device" muxer listening on /var/run/usbmuxd)
+
+# Forces iDevices to the last USB configuration and runs usbmuxd
+TEST=="/sys/fs/cgroup/systemd", ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", OWNER="usbmux", TAG+="systemd", ENV{SYSTEMD_WANTS}="usbmuxd.service", GOTO="usbmuxd_systemd_end"
+ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", OWNER="usbmux", RUN+="/usr/sbin/usbmuxd -u -U usbmux"
+LABEL="usbmuxd_systemd_end"
+
+# Exit usbmuxd when the last device is removed
+ACTION=="remove", SUBSYSTEM=="usb", ENV{PRODUCT}=="5ac/12[9a][0-9a-f]/*", ENV{INTERFACE}=="255/*", RUN+="/usr/sbin/usbmuxd -x"
diff --git a/testing/usbmuxd/PKGBUILD b/testing/usbmuxd/PKGBUILD
new file mode 100644
index 000000000..6385ba910
--- /dev/null
+++ b/testing/usbmuxd/PKGBUILD
@@ -0,0 +1,42 @@
+# $Id: PKGBUILD 164299 2012-07-29 23:16:20Z tomegun $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Gabriel Martinez < reitaka at gmail dot com >
+
+pkgname=usbmuxd
+pkgver=1.0.8
+pkgrel=1
+pkgdesc="USB Multiplex Daemon"
+url="http://marcansoft.com/blog/iphonelinux/usbmuxd/"
+arch=('i686' 'x86_64')
+license=('GPL2' 'GPL3' 'LGPL2.1')
+depends=('libusb' 'libplist')
+makedepends=('cmake')
+install=usbmuxd.install
+source=("http://cgit.sukimashita.com/${pkgname}.git/snapshot/${pkgname}-${pkgver}.tar.bz2"
+	'usbmuxd.service'
+	'85-usbmuxd.rules')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  echo "${pkgver}" > version.tag
+  mkdir build
+  cd build
+  cmake ../ -DCMAKE_INSTALL_PREFIX:PATH=/usr -DLIB_SUFFIX=""
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}/build"
+  make DESTDIR="${pkgdir}" install
+
+  # fix udev dir being hardcoded
+  mv "${pkgdir}/lib/udev" "${pkgdir}/usr/lib/"
+  rmdir "${pkgdir}/lib"
+  # install systemd service file
+  install -D -m644 ${srcdir}/usbmuxd.service ${pkgdir}/usr/lib/systemd/system/usbmuxd.service
+  # use udev rule that works with systemd
+  install -m644 ${srcdir}/85-usbmuxd.rules ${pkgdir}/usr/lib/udev/rules.d/
+}
+md5sums=('87fd27773a84e97ac6e2dc28b08d682e'
+         'dae0660f972510a6483992b5b81e1b5a'
+         'dc4b2893651149eccbf7b2c8467cd288')
diff --git a/testing/usbmuxd/usbmuxd.install b/testing/usbmuxd/usbmuxd.install
new file mode 100644
index 000000000..1a4859674
--- /dev/null
+++ b/testing/usbmuxd/usbmuxd.install
@@ -0,0 +1,19 @@
+post_install() {
+    groupadd -g 140 usbmux &>/dev/null
+    useradd -c 'usbmux user' -u 140 -g usbmux -d / -s /sbin/nologin usbmux &>/dev/null
+    passwd -l usbmux &>/dev/null
+}
+
+post_upgrade() {
+    getent group usbmux >/dev/null 2>&1 || groupadd -g 140 usbmux &>/dev/null
+    getent passwd usbmux >/dev/null 2>&1 || useradd -c 'usbmux user' -u 140 -g usbmux -d / -s /sbin/nologin usbmux &>/dev/null
+}
+
+post_remove() {
+    if getent passwd usbmux >/dev/null 2>&1; then
+        userdel usbmux
+    fi
+    if getent group usbmux >/dev/null 2>&1; then
+        groupdel usbmux
+    fi
+}
diff --git a/testing/usbmuxd/usbmuxd.service b/testing/usbmuxd/usbmuxd.service
new file mode 100644
index 000000000..fbebf65b9
--- /dev/null
+++ b/testing/usbmuxd/usbmuxd.service
@@ -0,0 +1,5 @@
+[Unit]
+Description=iOS USB Muxer
+
+[Service]
+ExecStart=/usr/sbin/usbmuxd -u -f -U usbmux