Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	multilib/q4wine/PKGBUILD

7 files changed, 60 insertions, 78 deletions

diff --git a/community/etl/PKGBUILD b/community/etl/PKGBUILD
index 56cacebcb..25aaf34b9 100644
--- a/community/etl/PKGBUILD
+++ b/community/etl/PKGBUILD
@@ -1,9 +1,7 @@
 # Contributor: Franco Iacomella <yaco@gnu.org>
 
 pkgname=etl
-_lpkgname=ETL
-_lpkgdl=synfig
-pkgver=0.04.13
+pkgver=0.04.14
 pkgrel=1
 pkgdesc="VoriaETL: C++ STL complementory multiplatform template library"
 arch=(i686 x86_64 'mips64el')
@@ -12,13 +10,17 @@ license=('GPL2')
 depends=()
 conflicts=('synfig-etl')
 replaces=('synfig-etl')
-source=(http://downloads.sourceforge.net/sourceforge/$_lpkgdl/$_lpkgname-$pkgver.tar.gz)
-md5sums=('d52253adeb219d2fa554cbd744dfff29')
+source=(http://arch.p5n.pp.ru/~sergej/dl/synfig-0.63.00.tar.gz)
+md5sums=('ea3633e9522ae89489519af351ba2443')
 
 build() {
-  cd $srcdir/$_lpkgname-$pkgver
-  
-  ./configure --prefix=/usr
-  make || return 1
+  cd $srcdir/synfig-fb5ba9c/ETL
+  [ -f configure ] || { libtoolize --ltdl --copy --force && autoreconf --install --force; }
+  [ -f Makefile ] || ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd $srcdir/synfig-fb5ba9c/ETL
   make DESTDIR=$pkgdir install
 }
diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD
index eb3f238e9..c15127506 100644
--- a/community/shotwell/PKGBUILD
+++ b/community/shotwell/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 48825 2011-06-06 11:53:22Z spupykin $
+# $Id: PKGBUILD 49345 2011-06-14 16:32:22Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
 
 pkgname=shotwell
 pkgver=0.10.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A digital photo organizer designed for the GNOME desktop environment"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://yorba.org/shotwell/"
 license=('LGPL2.1')
 depends=('gconf' 'libgee' 'libgphoto2' 'libunique' 'libwebkit' 'libgexiv2' 'libraw'
-	 'librsvg' 'json-glib' 'desktop-file-utils' 'gnome-vfs')
+	 'librsvg' 'json-glib' 'desktop-file-utils')
 makedepends=('intltool' 'vala')
 install=shotwell.install
 source=("http://yorba.org/download/shotwell/0.10/shotwell-${pkgver}.tar.bz2")
diff --git a/community/shuffle/PKGBUILD b/community/shuffle/PKGBUILD
index e62c9a8cd..d85a4b641 100644
--- a/community/shuffle/PKGBUILD
+++ b/community/shuffle/PKGBUILD
@@ -1,22 +1,30 @@
-# $Id: PKGBUILD 17671 2010-05-24 20:38:13Z spupykin $
+# $Id: PKGBUILD 49301 2011-06-14 09:58:19Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=shuffle
 pkgver=1.5
-pkgrel=2
+pkgrel=3
 pkgdesc="Shuffles lines of input."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.w3.org/People/Bos/Shuffle/"
 license=('custom')
 depends=(glibc)
 makedepends=('gcc')
-source=(http://www.w3.org/People/Bos/Shuffle/shuffle.c LICENSE)
+source=(http://www.w3.org/People/Bos/Shuffle/shuffle.c
+	http://www.w3.org/People/Bos/Shuffle/shuffle.1
+	LICENSE)
 md5sums=('d337c7e4db93489e3a30ffc8f89ec363'
+         'a352ff446a3c20f7b6390add7918f21d'
          '9dafa5ef909b8a6db992bb8819d3832a')
 
 build() {
   cd $srcdir
   gcc -o shuffle shuffle.c
+}
+
+package() {
+  cd $srcdir
   install -D -m 755 shuffle $pkgdir/usr/bin/shuffle
   install -D -m 644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+  install -D -m 644 shuffle.1 $pkgdir/usr/share/man/man1/shuffle.1
 }
diff --git a/community/synfig/PKGBUILD b/community/synfig/PKGBUILD
index ce68f15bb..5d1726816 100644
--- a/community/synfig/PKGBUILD
+++ b/community/synfig/PKGBUILD
@@ -1,28 +1,34 @@
-# $Id: PKGBUILD 36102 2010-12-27 10:40:57Z spupykin $
+# $Id: PKGBUILD 49350 2011-06-14 17:04:03Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Franco Iacomella <yaco@gnu.org>
 
 pkgname=synfig
-pkgver=0.62.02
-pkgrel=1
+pkgver=0.63.00
+pkgrel=2
 pkgdesc="Professional vector animation program (CLI renderer only)"
 arch=(i686 x86_64 'mips64el')
 url="http://synfig.org"
 license=('GPL2')
-depends=('libxml++' 'libsigc++2.0' 'etl' 'imagemagick' 'ffmpeg' 'fontconfig' 'libpng' 'libtiff' 'libdv' 'libmng')
+depends=('libxml++' 'libsigc++2.0' 'etl' 'imagemagick' 'ffmpeg' 'fontconfig' 'libpng'
+	 'libtiff' 'libdv' 'libmng')
 optdepends=('openexr' 'libsigc++')
 conflicts=('synfig-core')
 replaces=('synfig-core')
 options=(!libtool)
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
+source=(http://arch.p5n.pp.ru/~sergej/dl/$pkgname-$pkgver.tar.gz
 	build-fix.patch)
-md5sums=('e6af1aa9426cf629127d23edbd772f6d'
-         '0e983a00807c6c76c380f4f9918e6724')
+md5sums=('ea3633e9522ae89489519af351ba2443'
+         '2de5e74159a38e4b1788c20d4c4b6f68')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  [ $NOEXTRACT -eq 1 ] || patch -p1 <$srcdir/build-fix.patch
-  [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --sysconfdir=/etc --with-libavcodec --with-libdv
+  cd $srcdir/$pkgname-fb5ba9c/synfig-core
+  [ -f configure ] || { libtoolize --ltdl --copy --force && autoreconf --install --force; }
+  [ -f Makefile ] || ./configure --prefix=/usr --sysconfdir=/etc --with-libavcodec --with-libdv
+  patch -p1 <$srcdir/build-fix.patch
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-fb5ba9c/synfig-core
   make DESTDIR=$pkgdir install
 }
diff --git a/community/synfig/build-fix.patch b/community/synfig/build-fix.patch
index 802046dab..9124a517a 100644
--- a/community/synfig/build-fix.patch
+++ b/community/synfig/build-fix.patch
@@ -1,7 +1,7 @@
-diff -wbBur synfig-0.62.01/src/modules/mod_libavcodec/trgt_av.cpp synfig-0.62.01.my/src/modules/mod_libavcodec/trgt_av.cpp
---- synfig-0.62.01/src/modules/mod_libavcodec/trgt_av.cpp	2010-05-31 18:12:14.000000000 +0000
-+++ synfig-0.62.01.my/src/modules/mod_libavcodec/trgt_av.cpp	2010-06-03 15:56:04.000000000 +0000
-@@ -33,6 +33,10 @@
+diff -wbBur synfig-core/src/modules/mod_libavcodec/trgt_av.cpp synfig-core.my/src/modules/mod_libavcodec/trgt_av.cpp
+--- synfig-core/src/modules/mod_libavcodec/trgt_av.cpp	2011-06-05 13:04:07.000000000 +0400
++++ synfig-core.my/src/modules/mod_libavcodec/trgt_av.cpp	2011-06-14 14:32:49.000000000 +0400
+@@ -31,6 +31,10 @@
  #	include <config.h>
  #endif
  
@@ -12,7 +12,7 @@ diff -wbBur synfig-0.62.01/src/modules/mod_libavcodec/trgt_av.cpp synfig-0.62.01
  #include "trgt_av.h"
  
  extern "C"
-@@ -118,14 +122,14 @@
+@@ -116,14 +120,14 @@
      picture = avcodec_alloc_frame();
      if (!picture)
          return NULL;
@@ -29,9 +29,9 @@ diff -wbBur synfig-0.62.01/src/modules/mod_libavcodec/trgt_av.cpp synfig-0.62.01
      return picture;
  }
  
-diff -wbBur synfig-0.62.01/src/modules/mod_png/mptr_png.cpp synfig-0.62.01.my/src/modules/mod_png/mptr_png.cpp
---- synfig-0.62.01/src/modules/mod_png/mptr_png.cpp	2010-05-31 18:12:14.000000000 +0000
-+++ synfig-0.62.01.my/src/modules/mod_png/mptr_png.cpp	2010-06-03 15:43:39.000000000 +0000
+diff -wbBur synfig-core/src/modules/mod_png/mptr_png.cpp synfig-core.my/src/modules/mod_png/mptr_png.cpp
+--- synfig-core/src/modules/mod_png/mptr_png.cpp	2011-06-05 13:04:07.000000000 +0400
++++ synfig-core.my/src/modules/mod_png/mptr_png.cpp	2011-06-14 14:32:49.000000000 +0400
 @@ -309,7 +309,7 @@
  				float b=gamma().b_U8_to_F32((unsigned char)png_ptr->palette[row_pointers[y][x]].blue);
  				float a=1.0;
@@ -41,34 +41,3 @@ diff -wbBur synfig-0.62.01/src/modules/mod_png/mptr_png.cpp synfig-0.62.01.my/sr
  				surface_buffer[y][x]=Color(
  					r,
  					g,
-diff -wbBur synfig-0.62.01/src/synfig/canvas.cpp synfig-0.62.01.my/src/synfig/canvas.cpp
---- synfig-0.62.01/src/synfig/canvas.cpp	2010-05-31 18:12:14.000000000 +0000
-+++ synfig-0.62.01.my/src/synfig/canvas.cpp	2010-06-03 15:47:00.000000000 +0000
-@@ -716,7 +716,7 @@
- 	Layer::LooseHandle loose_layer(x);
- 
- 	add_connection(loose_layer,
--				   sigc::connection::connection(
-+				   sigc::connection(
- 					   x->signal_added_to_group().connect(
- 						   sigc::bind(
- 							   sigc::mem_fun(
-@@ -724,7 +724,7 @@
- 								   &Canvas::add_group_pair),
- 							   loose_layer))));
- 	add_connection(loose_layer,
--				   sigc::connection::connection(
-+				   sigc::connection(
- 					   x->signal_removed_from_group().connect(
- 						   sigc::bind(
- 							   sigc::mem_fun(
-diff -wbBur synfig-0.62.01/src/synfig/time.cpp synfig-0.62.01.my/src/synfig/time.cpp
---- synfig-0.62.01/src/synfig/time.cpp	2010-05-31 18:12:14.000000000 +0000
-+++ synfig-0.62.01.my/src/synfig/time.cpp	2010-06-03 15:43:39.000000000 +0000
-@@ -1,4 +1,6 @@
-+#include <stdio.h>
- /* === S Y N F I G ========================================================= */
-+#include <stdio.h>
- /*!	\file time.cpp
- **	\brief Template File
- **
diff --git a/community/synfigstudio/PKGBUILD b/community/synfigstudio/PKGBUILD
index f1e77c1eb..ed4723eeb 100644
--- a/community/synfigstudio/PKGBUILD
+++ b/community/synfigstudio/PKGBUILD
@@ -1,10 +1,9 @@
-# $Id: PKGBUILD 36099 2010-12-27 10:40:19Z spupykin $
+# $Id: PKGBUILD 49314 2011-06-14 10:52:04Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Franco Iacomella <yaco@gnu.org>
 
 pkgname=synfigstudio
-_lpkgname=synfig
-pkgver=0.62.02
+pkgver=0.63.00
 pkgrel=1
 pkgdesc="Professional vector animation program (GUI)"
 arch=(i686 x86_64 'mips64el')
@@ -12,21 +11,20 @@ url="http://synfig.org"
 license=('GPL2')
 depends=('gtkmm' 'synfig')
 install=synfigstudio.install
-source=(http://downloads.sourceforge.net/sourceforge/${_lpkgname}/$pkgname-$pkgver.tar.gz
-	images-makefile.patch)
-md5sums=('4b06f813e497072f01779f554e34c315'
-         'f5555c14b5e530f349dd222ff4499fee')
+source=(http://arch.p5n.pp.ru/~sergej/dl/synfig-$pkgver.tar.gz)
+md5sums=('ea3633e9522ae89489519af351ba2443')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr
-#  [ $NOEXTRACT -eq 1 ] || patch -Np0 -i ../images-makefile.patch
+  cd $srcdir/synfig-fb5ba9c/synfig-studio
+  [ -f configure ] || { libtoolize --ltdl --copy --force && autoreconf --install --force; }
+  [ -f Makefile ] || ./configure --prefix=/usr --sysconfdir=/etc --with-libavcodec --with-libdv
   sed -i 's#Gtk::IconSize::IconSize#Gtk::IconSize#' src/gui/dialogs/dialog_color.cpp
-
   make
-  make DESTDIR=$pkgdir install
+}
 
+package() {
+  cd $srcdir/synfig-fb5ba9c/synfig-studio
+  make DESTDIR=$pkgdir install
   rm -f $pkgdir/usr/share/pixmaps/$pkgname/*.mng
   install -m644 images/*.png -t $pkgdir/usr/share/pixmaps/$pkgname/
 }
diff --git a/community/synfigstudio/synfigstudio.install b/community/synfigstudio/synfigstudio.install
index b4ee8556f..b95cc069d 100644
--- a/community/synfigstudio/synfigstudio.install
+++ b/community/synfigstudio/synfigstudio.install
@@ -9,4 +9,3 @@ post_upgrade() {
 post_remove() {
   which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
 }
-