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

Conflicts:
	community/clucene/PKGBUILD
	community/cuyo/PKGBUILD
	community/pinot/PKGBUILD
	extra/fontforge/PKGBUILD
	extra/gtkimageview/PKGBUILD
	extra/mkvtoolnix/PKGBUILD
	multilib-testing/lib32-glibc/PKGBUILD
	staging/qt/PKGBUILD
	testing/glibc/PKGBUILD

4 files changed, 31 insertions, 41 deletions

diff --git a/community/cuyo/PKGBUILD b/community/cuyo/PKGBUILD
index b1d1a20fa..868d99392 100644
--- a/community/cuyo/PKGBUILD
+++ b/community/cuyo/PKGBUILD
@@ -1,28 +1,33 @@
-# $Id: PKGBUILD 5434 2009-11-08 13:15:53Z jlichtblau $
+# $Id: PKGBUILD 60801 2011-12-18 13:21:49Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 
 pkgname=cuyo
-pkgver=2.1.1
-pkgrel=4
-pkgdesc="Tetris-style puzzle game for up to two players with a twist."
+pkgver=2.1.2
+pkgrel=1
+pkgdesc="Tetris-style puzzle game for up to two players with a twist"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.karimmi.de/cuyo/"
 license=('GPL')
-depends=('sdl' 'sdl_mixer' 'sdl_image' 'xdg-utils')
+depends=('desktop-file-utils' 'hicolor-icon-theme' 'sdl' 'sdl_mixer' 'sdl_image' 'xdg-utils')
 makedepends=('patch')
 install=$pkgname.install
-source=(http://download.savannah.gnu.org/releases/cuyo/$pkgname-2.~-1.1.tar.gz \
+changelog=$pkgname.changelog
+source=(http://download.savannah.gnu.org/releases/$pkgname/$pkgname-2.~-1.2.tar.gz \
         $pkgname.diff)
-
-md5sums=('1629b257311c6c55cf657f0fa92dbd92'
-         '923c88e894cfd9c77d75f21b448ee6cf')
+sha256sums=('3fb44af4e6f8d205d11d44b5a96ffa4a11eab5a4fa86897463c0c6ca0658adb0'
+            'dd81909594072f030571f2afc39cc69838eed26304d2d89949ac1c2c850dcafe')
 
 build() {
-  cd ${srcdir}/$pkgname-2.~-1.1
+  cd ${srcdir}/$pkgname-2.~-1.2
 
-  patch -Np1 -i ${srcdir}/$pkgname.diff || return 1
+  patch -Np0 -i ${srcdir}/$pkgname.diff
 
   ./configure --prefix=/usr
-  make || return 1
+  make
+}
+
+package() {
+  cd ${srcdir}/$pkgname-2.~-1.2
+
   make DESTDIR=${pkgdir} install
 }
diff --git a/community/cuyo/cuyo.changelog b/community/cuyo/cuyo.changelog
new file mode 100644
index 000000000..2212ac481
--- /dev/null
+++ b/community/cuyo/cuyo.changelog
@@ -0,0 +1,5 @@
+2011-12-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* cuyo 2.1.2-1
+
+2009-11-16 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* Update to minor release 2.1.1-4
diff --git a/community/cuyo/cuyo.diff b/community/cuyo/cuyo.diff
index 3011623d3..3da3b1c64 100644
--- a/community/cuyo/cuyo.diff
+++ b/community/cuyo/cuyo.diff
@@ -1,32 +1,11 @@
-diff -ruN cuyo-2.~-1.1-orig/icons/cuyo.desktop cuyo-2.~-1.1/icons/cuyo.desktop
---- cuyo-2.~-1.1-orig/icons/cuyo.desktop	2007-12-20 18:22:32.000000000 +0100
-+++ cuyo-2.~-1.1/icons/cuyo.desktop	2009-11-08 14:08:56.000000000 +0100
-@@ -1,11 +1,13 @@
- [Desktop Entry]
-+Type=Application
- Name=Cuyo
-+GenericName=Cuyo
- Icon=cuyo
--Type=Application
-+Exec=cuyo
-+StartupNotify=true
- Terminal=false
--MimeType=application/x-executable
-+MimeType=application/x-executable;
+--- icons/cuyo.desktop	2011-12-18 13:48:54.000000000 +0100
++++ icons/cuyo.desktop	2011-12-18 13:48:54.000000000 +0100
+@@ -7,4 +7,4 @@
  Categories=Game;BlocksGame;
 -Encoding=UTF-8
- Comment=A tetris like game with many levels
+ Comment=Play a tetris like game with many levels
 +Comment[cs]=Hra podobná tetrisu s mnoha úrovněmi
- Comment[de]=Ein Tetris-artiges Spiel mit vielen Leveln
--Exec=cuyo
-diff -ruN cuyo-2.~-1.1-orig/src/stringzeug.h cuyo-2.~-1.1/src/stringzeug.h
---- cuyo-2.~-1.1-orig/src/stringzeug.h	2006-07-03 19:26:23.000000000 +0200
-+++ cuyo-2.~-1.1/src/stringzeug.h	2009-11-08 14:08:56.000000000 +0100
-@@ -19,6 +19,7 @@
- #define STRINGZEUG_H
- 
- #include <config.h>
-+#include <cstdarg>
- #include <string>
- 
- 
+ Comment[de]=Ein Tetris-artiges Spiel mit vielen Leveln spielen
+@@ -12,2 +12 @@
+ GenericName=Tetris like game
+- 
diff --git a/community/cuyo/cuyo.install b/community/cuyo/cuyo.install
index b711352cb..4c0972beb 100644
--- a/community/cuyo/cuyo.install
+++ b/community/cuyo/cuyo.install
@@ -1,5 +1,6 @@
 post_install() {
   which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
+  update-desktop-database -q
 }
 
 post_upgrade() {