Tue Sep 13 23:14:39 UTC 2011

author: root <root@rshg054.dnsready.net> 2011-09-13 23:14:39 +0000
committer: root <root@rshg054.dnsready.net> 2011-09-13 23:14:39 +0000
commit: a712dc92423a31a4d3ab34fe660df550feebf442 (patch)
tree: ad93851f4343f00cec2f901e4839da01a8b77efe /extra
parent: b3a841a1f66eff75be29fba090b83ce4322d4721 (diff)
28 files changed, 528 insertions, 197 deletions
diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD
index 96798a34d..cb61420ae 100644
--- a/extra/akonadi/PKGBUILD
+++ b/extra/akonadi/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 132788 2011-07-26 07:38:52Z andrea $
+# $Id: PKGBUILD 137927 2011-09-12 16:08:18Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=akonadi
 pkgver=1.6.0
-pkgrel=2
+pkgrel=3
 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
 arch=('i686' 'x86_64')
 url='http://pim.kde.org/akonadi'
@@ -12,10 +12,16 @@ license=('LGPL')
 depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost')
 install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('16bc40e022d06f287f18c71faaeb2e42')
+source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2"
+        'fix-slow-kde-logout.patch')
+md5sums=('16bc40e022d06f287f18c71faaeb2e42'
+         'cdf0c3bd5741303e4f98ea435c39f09d')
 
 build() {
+  # Already fixed upstream
+  cd "${srcdir}"/${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}"/fix-slow-kde-logout.patch
+
   cd "${srcdir}"
   mkdir build
   cd build
diff --git a/extra/akonadi/fix-slow-kde-logout.patch b/extra/akonadi/fix-slow-kde-logout.patch
new file mode 100644
index 000000000..49228ef8b
--- /dev/null
+++ b/extra/akonadi/fix-slow-kde-logout.patch
@@ -0,0 +1,64 @@
+commit c8e45b10c32679bf070af5b7ad9a22b91eb9a02c
+Author: Sergio Martins <iamsergio@gmail.com>
+Date:   Mon Sep 12 13:48:33 2011 +0100
+
+    Fix crash on agent_launcher exit.
+    
+    Don't unload plugins here. They will be unloaded on application exit,
+    so it's redundant.
+    
+    Seems they are being unloaded too early, before QThreadStorage
+    cleanup occurs:
+    
+    ==18802== Invalid read of size 8
+    ==18802==    at 0x53178AE: QThreadStorage<QFontCache*>::deleteData(void*) (in
+    /data/installation/qt/qt-4.7/lib/libQtGui.so.4.7.1)
+    ==18802==    by 0x5E8F8CF: QThreadStorageData::set(void*)
+    (qthreadstorage.cpp:165)
+    ==18802==    by 0x5317940: void
+    qThreadStorage_setLocalData<QFontCache>(QThreadStorageData&, QFontCache**)
+    (qthreadstorage.h:92)
+    ==18802==    by 0x53165BA:
+    QThreadStorage<QFontCache*>::setLocalData(QFontCache*) (qthreadstorage.h:148)
+    ==18802==    by 0x531407A: QFontCache::cleanup() (qfont.cpp:2632)
+    ==18802==    by 0x5406536: QFont::cleanup() (qfont_x11.cpp:182)
+    ==18802==    by 0x5104E35: qt_cleanup() (qapplication_x11.cpp:2647)
+    ==18802==    by 0x50603B2: QApplication::~QApplication()
+    (qapplication.cpp:1172)
+    ==18802==    by 0x41B1F6: main (agentlauncher.cpp:28)
+    ==18802==  Address 0x11a090b0 is not stack'd, malloc'd or (recently) free'd
+    
+    CCBUG: 261788
+
+diff --git a/agentserver/agentpluginloader.cpp b/agentserver/agentpluginloader.cpp
+index 2d62d3b..456a124 100644
+--- a/agentserver/agentpluginloader.cpp
++++ b/agentserver/agentpluginloader.cpp
+@@ -25,13 +25,8 @@ using namespace Akonadi;
+ 
+ AgentPluginLoader::~AgentPluginLoader()
+ {
+-  QHash<QString, QPluginLoader*>::iterator it = m_pluginLoaders.begin();
+-  while ( it != m_pluginLoaders.end() ) {
+-    it.value()->unload();
+-    ++it;
+-  }
+-
+   qDeleteAll( m_pluginLoaders );
++  m_pluginLoaders.clear();
+ }
+ 
+ QPluginLoader *AgentPluginLoader::load( const QString &pluginName )
+diff --git a/agentserver/agentpluginloader.h b/agentserver/agentpluginloader.h
+index 77f5de9..c8c815f 100644
+--- a/agentserver/agentpluginloader.h
++++ b/agentserver/agentpluginloader.h
+@@ -26,7 +26,7 @@ class AgentPluginLoader
+ {
+   public:
+     /**
+-      Unloads and deletes all instantiated QPluginLoaders.
++      Deletes all instantiated QPluginLoaders.
+      */
+     ~AgentPluginLoader();
+ 
diff --git a/extra/bc/PKGBUILD b/extra/bc/PKGBUILD
index 7c7337580..96ab3239b 100644
--- a/extra/bc/PKGBUILD
+++ b/extra/bc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 58245 2009-11-06 14:34:42Z eric $
+# $Id: PKGBUILD 137896 2011-09-12 10:03:30Z pierre $
 # Maintainer: dorphell <dorphell@archlinux.org>
 
 pkgname=bc
 pkgver=1.06
-pkgrel=7
+pkgrel=8
 pkgdesc="An arbitrary precision calculator language"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/bc/"
@@ -12,20 +12,25 @@ depends=('readline')
 replaces=('bc-readline')
 conflicts=('bc-readline')
 install=bc.install
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz
-	build-fix.patch bc-1.06-info-dir-entry.patch)
-md5sums=('d44b5dddebd8a7a7309aea6c36fda117' 'fc7ecbd9e55ef04c6d3a495692626116'\
+source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        'build-fix.patch' 'bc-1.06-info-dir-entry.patch')
+md5sums=('d44b5dddebd8a7a7309aea6c36fda117'
+         'fc7ecbd9e55ef04c6d3a495692626116'
          'b6fe9869830aca0d34badf810fe0cfb3')
-sha1sums=('c8f258a7355b40a485007c40865480349c157292' '3af67c59e2232b9329ff0c1cf49d1a8a1cf87cd7'\
-         'c15c2a301ba80cf4d3c03a6e164f4e57fa86e4a2')
 
 build() {
-  CFLAGS="$CFLAGS -O3"
+  export CFLAGS="${CFLAGS/-O?/-O3}"
+
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/build-fix.patch" || return 1
-  patch -p1 -i "${srcdir}/bc-1.06-info-dir-entry.patch" || return 1
+  patch -p1 -i "${srcdir}/build-fix.patch"
+  patch -p1 -i "${srcdir}/bc-1.06-info-dir-entry.patch"
+
   ./configure --prefix=/usr --mandir=/usr/share/man \
-    --infodir=/usr/share/info --with-readline || return 1
-  make LEX="flex -I" || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+    --infodir=/usr/share/info --with-readline
+  make LEX="flex -I"
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/cdrdao/PKGBUILD b/extra/cdrdao/PKGBUILD
index 4474dce28..3ef570fbe 100644
--- a/extra/cdrdao/PKGBUILD
+++ b/extra/cdrdao/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 102363 2010-12-07 13:51:12Z jgc $
+# $Id: PKGBUILD 137917 2011-09-12 12:45:56Z pierre $
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
@@ -6,15 +6,15 @@
 pkgbase=('cdrdao')
 pkgname=('cdrdao' 'gcdmaster')
 pkgver=1.2.3
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://cdrdao.sourceforge.net/"
 makedepends=('gcc-libs' 'lame' 'libmad' 'libvorbis' 'libao' 'libgnomeuimm')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-        cdrdao-1.2.3-autoconf-update.patch
-        cdrdao-1.2.3-k3b.patch
-        cdrdao-1.2.3-stat.patch)
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+        'cdrdao-1.2.3-autoconf-update.patch'
+        'cdrdao-1.2.3-k3b.patch'
+        'cdrdao-1.2.3-stat.patch')
 md5sums=('8d15ba6280bb7ba2f4d6be31d28b3c0c'
          '8e53dfc174f7c0882194caa05e68b85e'
          '696f6ca01e1eeb9b6a5be88e535d9398'
@@ -22,16 +22,16 @@ md5sums=('8d15ba6280bb7ba2f4d6be31d28b3c0c'
 
 build() {
 	cd "${srcdir}/${pkgbase}-${pkgver}"
-  
+
 	patch -Np1 -i "${srcdir}/cdrdao-1.2.3-autoconf-update.patch"
 	patch -Np1 -i "${srcdir}/cdrdao-1.2.3-k3b.patch"
-  patch -Np1 -i "${srcdir}/cdrdao-1.2.3-stat.patch"
-  
+	patch -Np1 -i "${srcdir}/cdrdao-1.2.3-stat.patch"
+
 	./configure --prefix=/usr \
-	   --mandir=/usr/share/man \
-	   --sysconfdir=/etc \
-	   --with-xdao --with-lame \
-	   --with-ogg-support --with-mp3-support
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc \
+		--with-xdao --with-lame \
+		--with-ogg-support --with-mp3-support
 	make
 }
 
@@ -54,6 +54,6 @@ package_gcdmaster() {
 	cd "${srcdir}/${pkgbase}-${pkgver}"
 	make -C xdao GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
 
-  mv "${pkgdir}/etc/gconf" "${pkgdir}/usr/share/"
-  rmdir "${pkgdir}/etc"
+	mv "${pkgdir}/etc/gconf" "${pkgdir}/usr/share/"
+	rmdir "${pkgdir}/etc"
 }
diff --git a/extra/di/PKGBUILD b/extra/di/PKGBUILD
index e9922cee3..d0437cfc7 100644
--- a/extra/di/PKGBUILD
+++ b/extra/di/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 107485 2011-01-26 04:42:16Z eric $
+# $Id: PKGBUILD 137944 2011-09-12 21:48:44Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=di
-pkgver=4.27
+pkgver=4.28
 pkgrel=1
 pkgdesc="A disk information utility, displaying everything (and more) that your df command does"
 arch=('i686' 'x86_64')
@@ -11,8 +11,8 @@ license=('ZLIB')
 depends=('glibc')
 options=('!makeflags')
 source=(http://www.gentoo.com/di/${pkgname}-${pkgver}.tar.gz)
-md5sums=('b1a7ee87b83d72c273558a5ec815bfc3')
-sha1sums=('a079258f2a6d1861c0a42761864d3113b384da97')
+md5sums=('8f56121562ac3ca05b48c0827ec0d48d')
+sha1sums=('b65c7fa10d8d319107a26036daaa95803b3ecb1e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/glhack/PKGBUILD b/extra/glhack/PKGBUILD
index 27ef966e4..5c073c3b0 100644
--- a/extra/glhack/PKGBUILD
+++ b/extra/glhack/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 63897 2010-01-19 01:01:11Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor : Markus Meissner <markus@meissna.de>
+# $Id: PKGBUILD 137858 2011-09-12 05:04:42Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=glhack
 pkgver=1.2
-pkgrel=4
+pkgrel=5
 pkgdesc="A port of Nethack, a single player dungeon exploration game in 2D"
 arch=('i686' 'x86_64')
 url="http://glhack.sourceforge.net/"
 license=('custom')
-depends=('sdl' 'libpng' 'mesa')
+depends=('sdl' 'libpng' 'libgl')
+makedepends=('mesa')
 options=('!makeflags')
 install=glhack.install
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
@@ -19,16 +19,20 @@ sha1sums=('7dc46e6bd4a3c2ec10ab4d314acfbb30cefc6eae')
 build(){
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  sed -i 's|/usr/lib/games|/usr/share|' include/config.h || return 1
-  sed -i 's|/var/lib/games/glhack|/var/games/glhack|' include/unixconf.h || return 1
-  sed -i -e 's|PREFIX	 = /usr|PREFIX	 = $(DESTDIR)/usr|' Makefile || return 1
-  sed -i -e 's|VARDIR   = /var/lib/games/glhack|VARDIR   = $(DESTDIR)/var/games/glhack|' Makefile || return 1
-  sed -i -e 's|/usr/man/man6|$(DESTDIR)/usr/share/man/man6|' doc/Makefile || return 1
-  sed -i -e 's|GAMEDIR  = $(PREFIX)/lib/games/$(GAME)|GAMEDIR  = $(PREFIX)/share/$(GAME)|' Makefile || return 1
+  sed -i 's|/usr/lib/games|/usr/share|' include/config.h
+  sed -i 's|/var/lib/games/glhack|/var/games/glhack|' include/unixconf.h
+  sed -i -e 's|PREFIX	 = /usr|PREFIX	 = $(DESTDIR)/usr|' Makefile
+  sed -i -e 's|VARDIR   = /var/lib/games/glhack|VARDIR   = $(DESTDIR)/var/games/glhack|' Makefile
+  sed -i -e 's|/usr/man/man6|$(DESTDIR)/usr/share/man/man6|' doc/Makefile
+  sed -i -e 's|GAMEDIR  = $(PREFIX)/lib/games/$(GAME)|GAMEDIR  = $(PREFIX)/share/$(GAME)|' Makefile
 
-  make   || return 1
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   install -d "${pkgdir}"/usr/share/man/man{5,6}
-  make DESTDIR="$pkgdir" install || return 1
+  make DESTDIR="$pkgdir" install
   install -D -m644 dat/license "${pkgdir}/usr/share/licenses/${pkgname}/license"
 
 # Renaming man pages which conflicts with nethack
diff --git a/extra/gtk/PKGBUILD b/extra/gtk/PKGBUILD
index 4895b5942..30fc520a8 100644
--- a/extra/gtk/PKGBUILD
+++ b/extra/gtk/PKGBUILD
@@ -1,10 +1,9 @@
-# $Id: PKGBUILD 62736 2010-01-11 15:31:11Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
+# $Id: PKGBUILD 137905 2011-09-12 10:53:48Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=gtk
 pkgver=1.2.10
-pkgrel=10
+pkgrel=11
 pkgdesc="The GTK+ toolkit"
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
@@ -13,9 +12,10 @@ depends=('libxi' 'glib' 'sh')
 makedepends=('libxt')
 options=('!libtool')
 install=gtk.install
-source=(ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-$pkgver.tar.gz aclocal-fixes.patch)
-md5sums=('4d5cb2fc7fb7830e4af9747a36bfce20' 'c59d4906602d99a7468f7334b6fc3b4e')
-sha1sums=('a5adcb909257da01ae4d4761e1d41081d06e4d7c' 'b034e33efb85d27f3f3fb082c404e3b6ea79259f')
+source=("ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-${pkgver}.tar.gz"
+        'aclocal-fixes.patch')
+md5sums=('4d5cb2fc7fb7830e4af9747a36bfce20'
+         'c59d4906602d99a7468f7334b6fc3b4e')
 
 build() {
   cd "${srcdir}/gtk+-${pkgver}"
@@ -24,10 +24,15 @@ build() {
     ln -s /usr/share/libtool/config/config.guess config.guess
     ln -s /usr/share/libtool/config/config.sub config.sub
   fi
-  patch -Np0 -i "${srcdir}/aclocal-fixes.patch" || return 1
+  patch -Np0 -i "${srcdir}/aclocal-fixes.patch"
+
   ./configure --prefix=/usr --sysconfdir=/etc \
     --mandir=/usr/share/man --infodir=/usr/share/info \
-    --with-xinput=xfree || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+    --with-xinput=xfree
+  make
+}
+
+package() {
+  cd "${srcdir}/gtk+-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/gtk/gtk.install b/extra/gtk/gtk.install
index 3c48904fd..8758bebc3 100644
--- a/extra/gtk/gtk.install
+++ b/extra/gtk/gtk.install
@@ -1,4 +1,4 @@
-infodir=/usr/share/info
+infodir=usr/share/info
 filelist=(gdk.info.gz gtk.info.gz)
 
 post_install() {
diff --git a/extra/kdebindings-smokeqt/PKGBUILD b/extra/kdebindings-smokeqt/PKGBUILD
index 5c9c178a4..3a20803c5 100644
--- a/extra/kdebindings-smokeqt/PKGBUILD
+++ b/extra/kdebindings-smokeqt/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 137365 2011-09-07 17:16:37Z andrea $
+# $Id: PKGBUILD 137928 2011-09-12 16:11:31Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-smokeqt
 pkgver=4.7.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Language independent library for Qt bindings"
 url="http://kde.org/"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
-depends=('kdebase-runtime' 'qimageblitz' 'qscintilla')
-makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
+depends=('kdebase-runtime' 'qimageblitz' 'qscintilla' 'kdebindings-smokegen')
+makedepends=('cmake' 'automoc4')
 conflicts=('kdebindings-smoke')
 source=("http://download.kde.org/stable/${pkgver}/src/smokeqt-${pkgver}.tar.bz2")
 sha1sums=('7f6074c552a3e9a72ebbbc1683786d7cb479871a')
diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD
index 03ce95ca9..ec77e5271 100644
--- a/extra/kdelibs/PKGBUILD
+++ b/extra/kdelibs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 137354 2011-09-07 17:12:53Z andrea $
+# $Id: PKGBUILD 137929 2011-09-12 16:31:20Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdelibs
 pkgver=4.7.1
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -19,20 +19,25 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl'
 replaces=('kdelibs-experimental')
 install='kdelibs.install'
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
-        'kde-applications-menu.patch' 'archlinux-menu.patch')
+        'kde-applications-menu.patch' 'archlinux-menu.patch'
+        'fix-kdirwatch-with-linux3.patch')
 sha1sums=('661cc56f199b7250bd825cc0e85ff442b85171e2'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
-          '63a850ab4196b9d06934f2b4a13acd9f7739bc67')
+          '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
+          '54e6cbd7a8c4f9df947f18692512ca618c824c43')
 
 build() {
-       cd ${srcdir}/${pkgname}-${pkgver}
+       cd "${srcdir}"/${pkgname}-${pkgver}
 
        # avoid file conflict with gnome-menu
-       patch -p1 -i $srcdir/kde-applications-menu.patch
+       patch -p1 -i "${srcdir}"/kde-applications-menu.patch
        # add Archlinux menu entry
-       patch -p1 -i $srcdir/archlinux-menu.patch
+       patch -p1 -i "${srcdir}"/archlinux-menu.patch
 
-       cd ${srcdir}
+       # Already fixed upstream
+       patch -p1 -i "${srcdir}"/fix-kdirwatch-with-linux3.patch
+
+       cd "${srcdir}"
        mkdir build
        cd build
        cmake ../${pkgname}-${pkgver} \
@@ -48,11 +53,11 @@ build() {
 }
 
 package() {
-       cd $srcdir/build
-       make DESTDIR=$pkgdir install
+       cd "${srcdir}"/build
+       make DESTDIR="${pkgdir}" install
 
        # cert bundle seems to be hardcoded
        # link it to the one from ca-certificates
-       rm -f $pkgdir/usr/share/apps/kssl/ca-bundle.crt
-       ln -sf /etc/ssl/certs/ca-certificates.crt $pkgdir/usr/share/apps/kssl/ca-bundle.crt
+       rm -f "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
+       ln -sf /etc/ssl/certs/ca-certificates.crt "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
 }
diff --git a/extra/kdelibs/fix-kdirwatch-with-linux3.patch b/extra/kdelibs/fix-kdirwatch-with-linux3.patch
new file mode 100644
index 000000000..6685d9cc4
--- /dev/null
+++ b/extra/kdelibs/fix-kdirwatch-with-linux3.patch
@@ -0,0 +1,56 @@
+From: Alex Fiestas <afiestas@kde.org>
+Date: Fri, 09 Sep 2011 16:54:23 +0000
+Subject: Fix KDirWatch when using Kernel 3.0
+X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&amp;a=commitdiff&amp;h=7df5a79fb9f09e4a4a80cd541cc478b5fa6df00f
+---
+Fix KDirWatch when using Kernel 3.0
+
+To know INotify is available in the kernel we are checking for a
+kernel newer than 2.6.14, that's all allright but the problem is
+that the Kernel version format has changed  and now we can't be sure
+that it is going to be formed by 3 numbers.
+Basically we where checking for:
+
+%d.%d.%d and now it can be %d.%d as it is with 3.0
+
+This patch what does is check if the kernel is 2.6, if it is then
+it proceed with the version checking.
+
+CCMAIL: dfaure@kde.org
+---
+
+
+--- a/kdecore/io/kdirwatch.cpp
++++ b/kdecore/io/kdirwatch.cpp
+@@ -210,16 +210,24 @@ KDirWatchPrivate::KDirWatchPrivate()
+   {
+     struct utsname uts;
+     int major, minor, patch;
+-    if (uname(&uts) < 0)
+-      supports_inotify = false; // *shrug*
+-    else if (sscanf(uts.release, "%d.%d.%d", &major, &minor, &patch) != 3)
+-      supports_inotify = false; // *shrug*
+-    else if( major * 1000000 + minor * 1000 + patch < 2006014 ) { // <2.6.14
+-      kDebug(7001) << "Can't use INotify, Linux kernel too old";
++    if (uname(&uts) < 0) {
+       supports_inotify = false;
++      kDebug(7001) << "Unable to get uname";
++    } else if (sscanf(uts.release, "%d.%d", &major, &minor) != 2) {
++      supports_inotify = false;
++      kDebug(7001) << "The version is malformed: " << uts.release;
++    } else if(major == 2 && minor == 6) { // If it is 2.6 check further...
++      if (sscanf(uts.release, "%d.%d.%d", &major, &minor, &patch) != 3) {
++        supports_inotify = false;
++        kDebug() << "Detected 2.6 kernel but can't know more: " << uts.release;
++      } else if (major * 1000000 + minor * 1000 + patch < 2006014 ){
++        supports_inotify = false;
++        kDebug(7001) << "Can't use INotify, Linux kernel too old " << uts.release;
++      }
+     }
+   }
+ 
++  kDebug() << "INotify available: " << supports_inotify;
+   if ( supports_inotify ) {
+     availableMethods << "INotify";
+     fcntl(m_inotify_fd, F_SETFD, FD_CLOEXEC);
+
diff --git a/extra/libcddb/PKGBUILD b/extra/libcddb/PKGBUILD
index 1c9ae521e..51b3b7d02 100644
--- a/extra/libcddb/PKGBUILD
+++ b/extra/libcddb/PKGBUILD
@@ -1,22 +1,26 @@
-# $Id: PKGBUILD 78167 2010-04-20 00:31:41Z dgriffiths $
+# $Id: PKGBUILD 137919 2011-09-12 12:54:52Z pierre $
 # Maintainer: Hugo Doria <hugo@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 
 pkgname=libcddb
 pkgver=1.3.2
-pkgrel=2
-pkgdesc="Library that implements the different protocols (CDDBP, HTTP, SMTP) to access data on a CDDB server (e.g. http://freedb.org)."
+pkgrel=3
 arch=('i686' 'x86_64')
+pkgdesc="Library that implements the different protocols (CDDBP, HTTP, SMTP) to access data on a CDDB server (e.g. http://freedb.org)."
+url="http://sourceforge.net/projects/libcddb/"
 license=('LGPL')
 options=('!libtool')
 depends=('glibc')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-url="http://sourceforge.net/projects/libcddb/"
+source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('8bb4a6f542197e8e9648ae597cd6bc8a')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr
-  make || return 1
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
 }
diff --git a/extra/libdc1394/PKGBUILD b/extra/libdc1394/PKGBUILD
index 226839e11..aaba1b8d3 100644
--- a/extra/libdc1394/PKGBUILD
+++ b/extra/libdc1394/PKGBUILD
@@ -1,20 +1,32 @@
-# $Id: PKGBUILD 119241 2011-04-11 13:01:37Z jgc $
+# $Id: PKGBUILD 137888 2011-09-12 08:33:12Z andrea $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libdc1394
 pkgver=2.1.3
-pkgrel=1
+pkgrel=2
 pkgdesc="High level programming interface to control IEEE 1394 based cameras"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('LGPL')
 url="http://sourceforge.net/projects/libdc1394/"
-depends=('libraw1394>=2.0.5' 'libusb')
-options=(!libtool !emptydirs)
-source=(http://downloads.sourceforge.net/sourceforge/libdc1394/${pkgname}-${pkgver}.tar.gz)
-md5sums=('d8b2cbfae1b329fdeaa638da80427334')
+depends=('libraw1394>=2.0.7' 'libusb')
+options=('!libtool' '!emptydirs')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        'rename-usb_init.patch'
+        'videodev-compile-fix.patch')
+md5sums=('d8b2cbfae1b329fdeaa638da80427334'
+         'bc7a4146b4d2d688305d0d42c4111941'
+         '9dd11c96241b14073c3a7dd7e270fb7a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # FS#25652
+  patch -p2 -i "${srcdir}"/rename-usb_init.patch
+  # Fix build when linux/video.h exists
+  patch -p2 -i "${srcdir}"/videodev-compile-fix.patch
+
+  
+  autoreconf -i
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/libdc1394/rename-usb_init.patch b/extra/libdc1394/rename-usb_init.patch
new file mode 100644
index 000000000..44e1a5de3
--- /dev/null
+++ b/extra/libdc1394/rename-usb_init.patch
@@ -0,0 +1,53 @@
+From 13b85d2d23548682b617ddc1196f5560a27998bd Mon Sep 17 00:00:00 2001
+From: Damien Douxchamps <ddsf@douxchamps.net>
+Date: Sun, 21 Aug 2011 16:03:22 +0900
+Subject: [PATCH] fix usb_init function name conflict
+
+---
+ libdc1394/dc1394/control.c     |    2 +-
+ libdc1394/dc1394/internal.h    |    2 +-
+ libdc1394/dc1394/usb/control.c |    2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/libdc1394/dc1394/control.c b/libdc1394/dc1394/control.c
+index c62e0e2..f250f6a 100644
+--- a/libdc1394/dc1394/control.c
++++ b/libdc1394/dc1394/control.c
+@@ -1955,7 +1955,7 @@ dc1394_new (void)
+     windows_init (d);
+ #endif
+ #ifdef HAVE_LIBUSB
+-    usb_init (d);
++    dc1394_usb_init (d);
+ #endif
+ 
+     int i;
+diff --git a/libdc1394/dc1394/internal.h b/libdc1394/dc1394/internal.h
+index b4d295a..c59e5d3 100644
+--- a/libdc1394/dc1394/internal.h
++++ b/libdc1394/dc1394/internal.h
+@@ -74,7 +74,7 @@ void juju_init(dc1394_t *d);
+ void linux_init(dc1394_t *d);
+ void macosx_init(dc1394_t *d);
+ void windows_init(dc1394_t *d);
+-void usb_init(dc1394_t *d);
++void dc1394_usb_init(dc1394_t *d);
+ 
+ void register_platform (dc1394_t * d, const platform_dispatch_t * dispatch,
+         const char * name);
+diff --git a/libdc1394/dc1394/usb/control.c b/libdc1394/dc1394/usb/control.c
+index 6509452..19a21a6 100644
+--- a/libdc1394/dc1394/usb/control.c
++++ b/libdc1394/dc1394/usb/control.c
+@@ -378,7 +378,7 @@ usb_dispatch = {
+ };
+ 
+ void
+-usb_init(dc1394_t * d)
++dc1394_usb_init(dc1394_t * d)
+ {
+     register_platform (d, &usb_dispatch, "usb");
+ }
+-- 
+1.7.4.1
+
diff --git a/extra/libdc1394/videodev-compile-fix.patch b/extra/libdc1394/videodev-compile-fix.patch
new file mode 100644
index 000000000..8f234b152
--- /dev/null
+++ b/extra/libdc1394/videodev-compile-fix.patch
@@ -0,0 +1,41 @@
+From 2ee7e7f98dd6225b40d5cd570c240504be7bc86a Mon Sep 17 00:00:00 2001
+From: David Moore <david.moore@gmail.com>
+Date: Sun, 27 Mar 2011 22:48:15 -0700
+Subject: [PATCH] Conditionally compile dc1394_vloopback only when linux/videodev.h exists
+
+---
+ libdc1394/configure.in         |    3 +++
+ libdc1394/examples/Makefile.am |    2 ++
+ 2 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/libdc1394/configure.in b/libdc1394/configure.in
+index 69babab..bdddc9b 100644
+--- a/libdc1394/configure.in
++++ b/libdc1394/configure.in
+@@ -75,6 +75,9 @@ AM_CONDITIONAL(HAVE_WINDOWS, test x$have_windows = xtrue)
+ AM_CONDITIONAL(HAVE_LIBRAW1394, test x$libraw1394 = xtrue)
+ AM_CONDITIONAL(HAVE_LIBUSB, test "x$LIBUSB_LIBS" != "x")
+ 
++AC_CHECK_HEADER([linux/videodev.h], [have_videodev=true])
++AM_CONDITIONAL(HAVE_VIDEODEV, test x$have_videodev = xtrue)
++
+ AC_ARG_ENABLE([examples], [AS_HELP_STRING([--disable-examples], [don't build example programs])], [build_examples=$enableval], [build_examples=true])
+ 
+ AM_CONDITIONAL(MAKE_EXAMPLES, test x$build_examples = xtrue)
+diff --git a/libdc1394/examples/Makefile.am b/libdc1394/examples/Makefile.am
+index fcebf18..035612e 100644
+--- a/libdc1394/examples/Makefile.am
++++ b/libdc1394/examples/Makefile.am
+@@ -8,7 +8,9 @@ A = grab_gray_image grab_partial_image grab_color_image \
+ B = dc1394_reset_bus
+ 
+ if HAVE_LINUX
++if HAVE_VIDEODEV
+ B += dc1394_vloopback
++endif
+ if HAVE_XV
+ A += dc1394_multiview
+ endif
+-- 
+1.7.4.1
+
diff --git a/extra/libmng/PKGBUILD b/extra/libmng/PKGBUILD
index 660771863..913603045 100644
--- a/extra/libmng/PKGBUILD
+++ b/extra/libmng/PKGBUILD
@@ -1,25 +1,29 @@
-# $Id: PKGBUILD 63248 2010-01-16 20:44:09Z jgc $
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer: judd <jvinet@zeroflux.org>
+# $Id: PKGBUILD 137860 2011-09-12 05:28:13Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+
 pkgname=libmng
 pkgver=1.0.10
-pkgrel=3
+pkgrel=4
 pkgdesc="A collection of routines used to create and manipulate MNG format graphics files"
 arch=('i686' 'x86_64')
 url="http://www.libmng.com/"
 license=('custom')
-depends=('zlib' 'libjpeg>=8')
-options=(!libtool)
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('a464ae7d679781beebdf7440d144b7bd')
+depends=('zlib' 'libjpeg')
+options=('!libtool')
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('eaf1476a3bb29f6190bca660e6abef16')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ln -s makefiles/configure.in .
   ln -s makefiles/Makefile.am .
   autoreconf --force --install
   ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
-  install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/libmp4v2/PKGBUILD b/extra/libmp4v2/PKGBUILD
index 9182dd229..79601b0be 100644
--- a/extra/libmp4v2/PKGBUILD
+++ b/extra/libmp4v2/PKGBUILD
@@ -1,28 +1,29 @@
-# $Id: PKGBUILD 71330 2010-03-06 18:41:25Z andrea $
+# $Id: PKGBUILD 137907 2011-09-12 11:57:06Z pierre $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libmp4v2
 pkgver=1.9.1
-pkgrel=1
+pkgrel=2
 pkgdesc="MPEG-4 library"
 arch=('i686' 'x86_64')
 license=('MPL')
 url="http://code.google.com/p/mp4v2/"
+depends=('gcc-libs')
 options=('!libtool')
-source=(http://mp4v2.googlecode.com/files/mp4v2-${pkgver}.tar.bz2)
+source=("http://mp4v2.googlecode.com/files/mp4v2-${pkgver}.tar.bz2")
 md5sums=('986701929ef15b03155ac4fb16444797')
 
 build() {
   cd ${srcdir}/mp4v2-${pkgver}
 
-  ./configure --prefix=/usr || return 1
-  make || return 1
+  ./configure --prefix=/usr
+  make
 }
 
 package() {
   cd ${srcdir}/mp4v2-${pkgver}
-  make DESTDIR=${pkgdir} install || return 1
-  make DESTDIR=${pkgdir} install-man || return 1
-}
-\ No newline at end of file
+  make DESTDIR=${pkgdir} install
+  make DESTDIR=${pkgdir} install-man
+}
diff --git a/extra/libtheora/PKGBUILD b/extra/libtheora/PKGBUILD
index 4b26007aa..89cdaecb7 100644
--- a/extra/libtheora/PKGBUILD
+++ b/extra/libtheora/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 57637 2009-11-01 07:48:03Z eric $
+# $Id: PKGBUILD 137894 2011-09-12 09:56:42Z pierre $
 # Maintainer: Tom Killian <tom@archlinux.org>
 # Committer: dorphell <dorphell@archlinux.org>
 
 pkgname=libtheora
 pkgver=1.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="An open video codec developed by the Xiph.org"
 arch=('i686' 'x86_64')
 url="http://www.xiph.org"
@@ -12,16 +12,20 @@ license=('BSD')
 depends=('libogg')
 makedepends=('libvorbis')
 options=('!libtool')
-source=(http://downloads.xiph.org/releases/theora/libtheora-${pkgver}.tar.bz2)
+source=("http://downloads.xiph.org/releases/theora/libtheora-${pkgver}.tar.bz2")
 md5sums=('292ab65cedd5021d6b7ddd117e07cd8e')
 sha1sums=('8dcaa8e61cd86eb1244467c0b64b9ddac04ae262')
 
 build() {
   cd "${srcdir}/libtheora-${pkgver}"
-  ./configure --prefix=/usr --enable-shared --disable-static || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  
+  ./configure --prefix=/usr --enable-shared --disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}/libtheora-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 LICENSE COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
+  install -m644 LICENSE COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
 }
diff --git a/extra/lua/PKGBUILD b/extra/lua/PKGBUILD
index 9b30c5bf9..6a6274b99 100644
--- a/extra/lua/PKGBUILD
+++ b/extra/lua/PKGBUILD
@@ -1,32 +1,41 @@
-# $Id: PKGBUILD 86292 2010-07-28 06:43:46Z juergen $
+# $Id: PKGBUILD 137921 2011-09-12 13:07:25Z pierre $
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=lua 
 pkgver=5.1.4
-pkgrel=6
+pkgrel=7
 pkgdesc="A powerful light-weight programming language designed for extending applications." 
 arch=('i686' 'x86_64')
-url="http://www.lua.org/" 
-depends=('readline' 'ncurses') 
+url="http://www.lua.org/"
+depends=('readline')
 license=('MIT')
-options=('!makeflags')
-source=(http://www.lua.org/ftp/${pkgname}-${pkgver}.tar.gz http://www.lua.org/ftp/patch-lua-5.1.4-2 lua-arch.patch lua-5.1-cflags.diff)
-md5sums=('d0870f2de55d59c1c8419f36e8fac150' '1239310e0c4a581c7831e596f95cc6cd'\
-         '6c5953f63904bf20a0183cdab05b80de' '249582bf1fd861ccf492d2c35a9fe732')
+options=('!makeflags' '!emptydirs')
+source=("http://www.lua.org/ftp/${pkgname}-${pkgver}.tar.gz"
+        'http://www.lua.org/ftp/patch-lua-5.1.4-2'
+        'lua-arch.patch'
+        'lua-5.1-cflags.diff')
+md5sums=('d0870f2de55d59c1c8419f36e8fac150'
+         '1239310e0c4a581c7831e596f95cc6cd'
+         '6c5953f63904bf20a0183cdab05b80de'
+         '249582bf1fd861ccf492d2c35a9fe732')
 
 build() { 
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -p1 -i "${srcdir}/lua-arch.patch"
   patch -i ${srcdir}/patch-lua-5.1.4-2 -d src
+  [ "$CARCH" == "x86_64" ] && patch -Np1 -i ../lua-5.1-cflags.diff
+  [ "$CARCH" == "x86_64" ] && export CFLAGS="$CFLAGS -fPIC"
+  make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1" LUA_SO=liblua.so \
+    INSTALL_TOP="${pkgdir}/usr" INSTALL_MAN="${pkgdir}/usr/share/man/man1" \
+    linux
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  [ "$CARCH" == "x86_64" ] && patch -Np1 -i ../lua-5.1-cflags.diff
-  [ "$CARCH" == "x86_64" ] && export CFLAGS="$CFLAGS -fPIC"
-  make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1" LUA_SO=liblua.so  INSTALL_TOP="${pkgdir}/usr" INSTALL_MAN="${pkgdir}/usr/share/man/man1" \
-    linux install  || return 1
+  make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1" LUA_SO=liblua.so \
+    INSTALL_TOP="${pkgdir}/usr" INSTALL_MAN="${pkgdir}/usr/share/man/man1" \
+    install
   install -D -m 644 etc/lua.pc "${pkgdir}/usr/lib/pkgconfig/lua.pc"
   install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/COPYRIGHT"
 
diff --git a/extra/mt-st/PKGBUILD b/extra/mt-st/PKGBUILD
index 17ef58f94..a0963606f 100644
--- a/extra/mt-st/PKGBUILD
+++ b/extra/mt-st/PKGBUILD
@@ -1,23 +1,26 @@
-# $Id: PKGBUILD 53023 2009-09-25 05:09:23Z paul $
-# Maintainer: dorphell <dorphell@archlinux.org>
+# $Id: PKGBUILD 137900 2011-09-12 10:12:39Z allan $
+# Maintainer:
+# Contributer: dorphell <dorphell@archlinux.org>
+
 pkgname=mt-st
 pkgver=1.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Linux SCSI tape driver aware magnetic tape control"
-arch=(i686 x86_64)
-url="ftp://ftp.ibiblio.org/pub/linux/system/backup/"
-depends=('glibc')
 arch=('i686' 'x86_64')
+url="ftp://ftp.ibiblio.org/pub/linux/system/backup/"
 license=('GPL2')
+depends=('glibc')
 source=(ftp://ftp.ibiblio.org/pub/linux/system/backup/$pkgname-$pkgver.tar.gz)
 md5sums=('fdd5f5ec673c9f630a102ceff7612774')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver || return 1
-
-  make || return 1
+  cd $srcdir/$pkgname-$pkgver
+  make
+}
 
-  mkdir -p $startdir/pkg/{sbin,bin,usr/share/man/man1,usr/share/man/man8} || return 1
-  make SBINDIR=$startdir/pkg/sbin BINDIR=$startdir/pkg/bin \
-    MANDIR=$startdir/pkg/usr/share/man install || return 1
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  install -dm755 $pkgdir/{sbin,bin,usr/share/man/man1,usr/share/man/man8}
+  make SBINDIR=$pkgdir/sbin BINDIR=$pkgdir/bin \
+    MANDIR=$pkgdir/usr/share/man install
 }
diff --git a/extra/mtx/PKGBUILD b/extra/mtx/PKGBUILD
index 7451c78db..4b014ac72 100644
--- a/extra/mtx/PKGBUILD
+++ b/extra/mtx/PKGBUILD
@@ -1,23 +1,27 @@
-# $Id: PKGBUILD 53028 2009-09-25 05:20:59Z paul $
-# Maintainer: dorphell <dorphell@archlinux.org>
-# Committer: Judd Vinet <jvinet@zeroflux.org>
+# $Id: PKGBUILD 137902 2011-09-12 10:18:06Z allan $
+# Maintainer:
+# Contributer: Judd Vinet <jvinet@zeroflux.org>
+
 pkgname=mtx
 pkgver=1.3.12
-pkgrel=1
+pkgrel=2
 pkgdesc="Send robot commands to tape changer"
 arch=('i686' 'x86_64')
 url="http://mtx.opensource-sw.net/"
 license=('GPL2')
 depends=('glibc')
 source=(http://downloads.sourceforge.net/mtx/${pkgname}-${pkgver}.tar.gz)
+md5sums=('ce8f0e44671fb0c7d9ec30bb0bfa8b5c')
 
 build() {
-  cd $startdir/src/${pkgname}-${pkgver} || return 1
+  cd $srcdir/${pkgname}-${pkgver}
   sed -i 's/static const unsigned char scsi_command_size/const unsigned char scsi_command_size/' \
-    sg_err.c || return 1
-  ./configure --prefix='/usr' --datadir='/usr/share' || return 1
-  make || return 1
-  mkdir $startdir/pkg/usr || return 1
-  make prefix=$startdir/pkg/usr install || return 1
+    sg_err.c
+  ./configure --prefix='/usr' --datadir='/usr/share'
+  make
+}
+
+package() {
+  cd $srcdir/${pkgname}-${pkgver}
+  make prefix=$pkgdir/usr install
 }
-md5sums=('ce8f0e44671fb0c7d9ec30bb0bfa8b5c')
diff --git a/extra/ogle/PKGBUILD b/extra/ogle/PKGBUILD
index 9d9b19c50..240daa30b 100644
--- a/extra/ogle/PKGBUILD
+++ b/extra/ogle/PKGBUILD
@@ -1,39 +1,44 @@
-# $Id: PKGBUILD 63949 2010-01-19 05:22:55Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
+# $Id: PKGBUILD 137878 2011-09-12 06:26:48Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=ogle
 pkgver=0.9.2
-pkgrel=12
+pkgrel=13
 pkgdesc="A simple DVD player for Linux"
 arch=('i686' 'x86_64')
 url="http://www.dtek.chalmers.se/groups/dvd/"
 license=('GPL')
-depends=('libxml2' 'libdvdread' 'libjpeg' 'libmad' 'libxinerama' 'libxv'
-         'alsa-lib' 'a52dec' 'libsm' 'libxxf86vm')
+depends=('sh' 'libxml2' 'libdvdread' 'libjpeg' 'libmad' 'libxinerama' 'libxv'
+         'alsa-lib' 'a52dec' 'libxxf86vm')
 options=('!libtool')
-source=(http://www.dtek.chalmers.se/groups/dvd/dist/${pkgname}-${pkgver}.tar.gz
-        xvideofix.patch
-	gcc34alsafix.patch
-	gcc4.patch
-	dvdread-4.1.3.patch)
+# http://www.dtek.chalmers.se/groups/dvd/dist/${pkgname}-${pkgver}.tar.gz
+source=(ftp://ftp.archlinux.org/other/ogle/${pkgname}-${pkgver}.tar.gz \
+        xvideofix.patch	gcc34alsafix.patch gcc4.patch dvdread-4.1.3.patch \
+        ogle-vuln-scripts-makefile.patch)
 md5sums=('a76a9892bdb807a4bcf859d15a91f0f9'
          '57f1cf36eed82c56f24e9c0fc25ce2b3'
          '4ebc822b252fade6b53c5ceb5be45bf5'
          'd08cff87c5ec41a7eebc0d2384835688'
-         '597906c64ff7f5185de8430fdae3107d')
+         '597906c64ff7f5185de8430fdae3107d'
+         'd052b01f293c61d399fdd0ac2abb1cf4')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np0 -i "${srcdir}/dvdread-4.1.3.patch" || return 1
-  patch -Np1 -i ../xvideofix.patch || return 1
-  patch -Np1 -i ../gcc34alsafix.patch || return 1
-  patch -Np1 -i ../gcc4.patch || return 1
+  patch -p0 -i "${srcdir}/dvdread-4.1.3.patch"
+  patch -p1 -i "${srcdir}/xvideofix.patch"
+  patch -p1 -i "${srcdir}/gcc34alsafix.patch"
+  patch -p1 -i "${srcdir}/gcc4.patch"
+  patch -p0 -i "${srcdir}/ogle-vuln-scripts-makefile.patch"
+
    # fix alsa detection - stolen from their cvs
-  sed -i 's|^.*MINOR\=\=5.*$|#if SND_LIB_MAJOR==0 && SND_LIB_MINOR<6|' configure || return 1
-  sed -i 's|__diga_end:|\0;|' libogleao/alsa_audio.c || return 1
-  ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --with-x || return 1
-  make || return 1
+  sed -i 's|^.*MINOR\=\=5.*$|#if SND_LIB_MAJOR==0 && SND_LIB_MINOR<6|' configure
+  sed -i 's|__diga_end:|\0;|' libogleao/alsa_audio.c
+  ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --with-x
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   export LIBRARY_PATH="${pkgdir}/usr/lib/ogle"
-  make DESTDIR="${pkgdir}" install || return 1
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/ogle/ogle-vuln-scripts-makefile.patch b/extra/ogle/ogle-vuln-scripts-makefile.patch
new file mode 100644
index 000000000..f25964378
--- /dev/null
+++ b/extra/ogle/ogle-vuln-scripts-makefile.patch
@@ -0,0 +1,36 @@
+This patch inhibits the installation of debug scripts vulnerable to a symlink
+attack, see bug 245921 for reference.
+
+--- scripts/Makefile.in.orig	2009-04-04 18:13:33.000000000 +0200
++++ scripts/Makefile.in	2009-04-04 18:15:46.000000000 +0200
+@@ -133,10 +133,10 @@
+ subdir = scripts
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_CLEAN_FILES = ogle
+-SCRIPTS = $(bin_SCRIPTS) $(dist_pkglib_SCRIPTS)
++SCRIPTS = $(bin_SCRIPTS)
+ 
+ DIST_SOURCES =
+-DIST_COMMON = $(dist_pkglib_SCRIPTS) Makefile.am Makefile.in ogle.in
++DIST_COMMON = Makefile.am Makefile.in ogle.in
+ all: all-am
+ 
+ .SUFFIXES:
+@@ -279,7 +279,7 @@
+ 
+ install-data-am:
+ 
+-install-exec-am: install-binSCRIPTS install-dist_pkglibSCRIPTS
++install-exec-am: install-binSCRIPTS
+ 
+ install-info: install-info-am
+ 
+@@ -295,7 +295,7 @@
+ 
+ mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+ 
+-uninstall-am: uninstall-binSCRIPTS uninstall-dist_pkglibSCRIPTS \
++uninstall-am: uninstall-binSCRIPTS \
+ 	uninstall-info-am
+ 
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
diff --git a/extra/python-urwid/PKGBUILD b/extra/python-urwid/PKGBUILD
index c91d5675d..c15be07c8 100644
--- a/extra/python-urwid/PKGBUILD
+++ b/extra/python-urwid/PKGBUILD
@@ -4,15 +4,15 @@
 # Maintainer: Douglas Soares de Andrade <dsandrade@gmail.com>
 
 pkgname=python-urwid
-pkgver=0.9.9.1
-pkgrel=2
+pkgver=0.9.9.2
+pkgrel=1
 pkgdesc="Urwid is a curses-based user interface library."
 license=('GPL')
 arch=('i686' 'x86_64')
 depends=('python2')
 url="http://excess.org/urwid/"
 source=(http://excess.org/urwid/urwid-$pkgver.tar.gz)
-md5sums=('4722cdf898f711dcae1121aa80920152')
+md5sums=('e58b86a983fe5474a07749501748b728')
 
 build() {
   cd $startdir/src/urwid-$pkgver
diff --git a/extra/sdl_net/PKGBUILD b/extra/sdl_net/PKGBUILD
index b26327678..2e6f3862f 100644
--- a/extra/sdl_net/PKGBUILD
+++ b/extra/sdl_net/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 51822 2009-09-12 07:01:31Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
+# $Id: PKGBUILD 137890 2011-09-12 09:39:20Z allan $
+# Maintainer:
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=sdl_net
 pkgver=1.2.7
-pkgrel=3
+pkgrel=4
 pkgdesc="A small sample cross-platform networking library"
 arch=('i686' 'x86_64')
 url="http://www.libsdl.org/projects/SDL_net/"
@@ -18,6 +18,10 @@ md5sums=('6bd4662d1423810f3140d4da21b6d912')
 build() {
   cd ${srcdir}/SDL_net-${pkgver}
   ./configure --prefix=/usr
-  make || return 1
+  make
+}
+
+package() {
+  cd ${srcdir}/SDL_net-${pkgver}
   make DESTDIR=${pkgdir} install
 }
diff --git a/extra/taglib-extras/PKGBUILD b/extra/taglib-extras/PKGBUILD
index 3becb51f9..23080ec64 100644
--- a/extra/taglib-extras/PKGBUILD
+++ b/extra/taglib-extras/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 52970 2009-09-23 20:36:32Z giovanni $
+# $Id: PKGBUILD 137892 2011-09-12 09:45:56Z allan $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=taglib-extras
 pkgver=1.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Additional taglib plugins for KDE"
-arch=("i686" "x86_64")
+arch=('i686' 'x86_64')
 url="http://developer.kde.org/~wheeler/taglib.html"
 license=('LGPL')
 depends=('taglib>=1.6')
@@ -14,12 +14,15 @@ source=(http://www.kollide.net/~jefferai/${pkgname}-${pkgver}.tar.gz)
 md5sums=('e973ca609b18e2c03c147ff9fd9e6eb8')
 
 build() {
-  cd $srcdir
-  mkdir build
-  cd build
+  mkdir $srcdir/build
+  cd $srcdir/build
   cmake ../$pkgname-$pkgver \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_SKIP_RPATH=ON || return 1
-  make || return 1
+    -DCMAKE_SKIP_RPATH=ON
+  make
+}
+
+package() {
+  cd $srcdir/build
   make DESTDIR=$pkgdir install
 }
diff --git a/extra/xaos/PKGBUILD b/extra/xaos/PKGBUILD
index 4f958385b..3d3a5b31b 100644
--- a/extra/xaos/PKGBUILD
+++ b/extra/xaos/PKGBUILD
@@ -1,10 +1,9 @@
-# $Id: PKGBUILD 67322 2010-02-06 10:00:38Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
+# $Id: PKGBUILD 137880 2011-09-12 06:35:34Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xaos
 pkgver=3.5
-pkgrel=3
+pkgrel=4
 pkgdesc="A fast portable real-time interactive fractal zoomer"
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/xaos/"
@@ -18,7 +17,11 @@ sha1sums=('6d16a58187fba7276e6bd0547cc2fd6bb073b801')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --with-gsl --with-aa-driver || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  ./configure --prefix=/usr --with-gsl --with-aa-driver
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/xaos/xaos.install b/extra/xaos/xaos.install
index 1de05a018..afee50a72 100644
--- a/extra/xaos/xaos.install
+++ b/extra/xaos/xaos.install
@@ -1,4 +1,4 @@
-infodir=/usr/share/info
+infodir=usr/share/info
 filelist=(xaos.info.gz)
 
 post_install() {
author	root <root@rshg054.dnsready.net>	2011-09-13 23:14:39 +0000
committer	root <root@rshg054.dnsready.net>	2011-09-13 23:14:39 +0000
commit	a712dc92423a31a4d3ab34fe660df550feebf442 (patch)
tree	ad93851f4343f00cec2f901e4839da01a8b77efe /extra
parent	b3a841a1f66eff75be29fba090b83ce4322d4721 (diff)