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

Conflicts:
	extra/desktop-file-utils/PKGBUILD
	extra/libgphoto2/PKGBUILD
	multilib-testing/lib32-glibc/PKGBUILD
	testing/glibc/PKGBUILD

11 files changed, 88 insertions, 58 deletions

diff --git a/extra/desktop-file-utils/PKGBUILD b/extra/desktop-file-utils/PKGBUILD
index 11d431a9c..09105e4f7 100644
--- a/extra/desktop-file-utils/PKGBUILD
+++ b/extra/desktop-file-utils/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 108960 2011-02-05 09:46:18Z andyrtr $
+# $Id: PKGBUILD 145704 2011-12-28 10:22:56Z jgc $
 # Maintainer: Alexander Fehr <pizzapunk gmail com>
 
 pkgname=desktop-file-utils
-pkgver=0.18
-pkgrel=1.1
+pkgver=0.19
+pkgrel=1
 pkgdesc="Command line utilities for working with desktop entries"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/desktop-file-utils"
 license=('GPL')
 depends=('glib2')
-source=(http://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-${pkgver}.tar.bz2)
-md5sums=('d966b743eb394650f98d5dd56b9aece1')
+source=(http://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-${pkgver}.tar.xz)
+md5sums=('cbb2427593b7f6d36e52e9d221fce82f')
 
 build() {
   cd "${srcdir}/desktop-file-utils-${pkgver}"
@@ -22,4 +22,3 @@ package() {
   cd "${srcdir}/desktop-file-utils-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
-
diff --git a/extra/gob2/PKGBUILD b/extra/gob2/PKGBUILD
index aedce43a2..c9c90548b 100644
--- a/extra/gob2/PKGBUILD
+++ b/extra/gob2/PKGBUILD
@@ -1,21 +1,25 @@
-# $Id: PKGBUILD 79820 2010-05-08 10:48:54Z jgc $
+# $Id: PKGBUILD 145709 2011-12-28 14:25:19Z jgc $
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Maintainer: Kevin Piche <kevin@archlinux.org>
 
 pkgname=gob2
-pkgver=2.0.17
+pkgver=2.0.18
 pkgrel=1
 pkgdesc="GTK Object Builder (GOB) is a simple preprocessor for easily creating GTK objects"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
 depends=('glib2')
 url="http://www.5z.com/jirka/gob.html"
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.0/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('e9f52fff7ada88a36da1d412f8b2b57b44cc0527e545cf2f5d873c002c0da7f4')
+source=(http://ftp.5z.com/pub/gob/${pkgname}-${pkgver}.tar.xz)
+md5sums=('cd08248762962aec88100ddaaff4f9e0')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/gphoto2/PKGBUILD b/extra/gphoto2/PKGBUILD
index 88de2bc72..08b389fa0 100644
--- a/extra/gphoto2/PKGBUILD
+++ b/extra/gphoto2/PKGBUILD
@@ -1,21 +1,25 @@
-# $Id: PKGBUILD 97700 2010-11-01 13:01:49Z ibiru $
+# $Id: PKGBUILD 145713 2011-12-28 15:08:15Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Eduardo Romero <eduardo@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 pkgname=gphoto2
-pkgver=2.4.10
+pkgver=2.4.11
 pkgrel=1
 pkgdesc="A digital camera download and access program."
 arch=(i686 x86_64 'mips64el')
 url="http://www.gphoto.org"
 license=('GPL' 'LGPL')
-depends=('libgphoto2>=2.4.10' 'popt' 'aalib' 'readline>=6.1')
+depends=('libgphoto2>=2.4.11' 'popt' 'aalib' 'readline')
 source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('3c86c9824b9bfc57a52be5f84ad205f7')
+md5sums=('2635075f702b40eb2e95a80658bd4773')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/hwloc/PKGBUILD b/extra/hwloc/PKGBUILD
index b24becb80..673bbdffa 100644
--- a/extra/hwloc/PKGBUILD
+++ b/extra/hwloc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 143086 2011-11-22 17:32:42Z stephane $
+# $Id: PKGBUILD 145717 2011-12-28 15:42:53Z stephane $
 # Maintainer : Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Sylvain HENRY <hsyl20@yahoo.fr>
 # Contributor: Hervé YVIQUEL <elldekaa@gmail.com>
 
 pkgname=hwloc
-pkgver=1.3
+pkgver=1.3.1
 pkgrel=1
 pkgdesc="Portable Hardware Locality is a portable abstraction of hierarchical architectures"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ makedepends=('pkg-config')
 optdepends=('cairo: Graphical output' 'libxml2: XML export')
 options=('!libtool' '!docs')
 source=(http://www.open-mpi.org/software/hwloc/v1.3/downloads/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('4d4de0f48f8b9a1eaf75d55bc93e0e624f6194eb')
+sha1sums=('1051c937c3d2a4c98922903f313a1fa021bb35ba')
 
 build() {
    cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libgphoto2/PKGBUILD b/extra/libgphoto2/PKGBUILD
index e4516607c..729d51907 100644
--- a/extra/libgphoto2/PKGBUILD
+++ b/extra/libgphoto2/PKGBUILD
@@ -1,37 +1,35 @@
-# $Id: PKGBUILD 101286 2010-11-28 17:59:39Z ibiru $
+# $Id: PKGBUILD 145711 2011-12-28 14:52:22Z jgc $
 # Maintainer: Eduardo Romero <eduardo@archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=libgphoto2
-pkgver=2.4.10.1
-pkgrel=2.1
+pkgver=2.4.11
+pkgrel=1
 pkgdesc="The core library of gphoto2, designed to allow access to digital camera by external programs."
 arch=(i686 x86_64 'mips64el')
 url="http://www.gphoto.org"
 license=(LGPL)
-depends=('libexif>=0.6.19' 'libjpeg>=8' 'gd' 'libtool>=2.4' 'libusb-compat')
+depends=('libexif' 'libjpeg>=8' 'gd' 'libltdl' 'libusb-compat')
 install=libgphoto2.install
 options=('libtool')
 source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.gz)
-md5sums=('8bf2bd1e267909203ec1e7f6ea3f83a0')
+md5sums=('a2230c31e320acb7ececd90bc02fe515')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   udevscriptdir=/lib/udev ./configure --prefix=/usr --with-drivers=all --disable-static --disable-rpath
-  LD_PRELOAD="" make
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
   rm -f ${pkgdir}/usr/lib/libgphoto2/${pkgver}/*.a
 
-  install -m755 -d "${pkgdir}/usr/share/hal/fdi/information/20thirdparty"
   install -m755 -d "${pkgdir}/lib/udev/rules.d"
   LD_LIBRARY_PATH="${pkgdir}/usr/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" \
   CAMLIBS="${pkgdir}/usr/lib/libgphoto2/${pkgver}" \
-      "${pkgdir}/usr/lib/libgphoto2/print-camera-list" hal-fdi > \
-      "${pkgdir}/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi"
-
-  LD_LIBRARY_PATH="${pkgdir}/usr/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" \
-  CAMLIBS="${pkgdir}/usr/lib/libgphoto2/${pkgver}" \
       "${pkgdir}/usr/lib/libgphoto2/print-camera-list" udev-rules version 136 group camera mode 0660 > \
       "${pkgdir}/lib/udev/rules.d/40-gphoto.rules"
 
diff --git a/extra/minicom/PKGBUILD b/extra/minicom/PKGBUILD
index 0ce9aabe5..bd0e7d0aa 100644
--- a/extra/minicom/PKGBUILD
+++ b/extra/minicom/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 144449 2011-12-05 22:54:28Z giovanni $
+# $Id: PKGBUILD 145702 2011-12-28 10:18:27Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Denis Tikhomirov <dvtikhomirov@gmail.com>
 
 pkgname=minicom
-pkgver=2.5
-pkgrel=3
+pkgver=2.6
+pkgrel=1
 pkgdesc="A serial communication program"
 arch=('i686'  'x86_64' 'mips64el')
 url="http://alioth.debian.org/projects/minicom/"
@@ -14,8 +14,8 @@ license=('GPL')
 depends=('bash' 'ncurses')
 optdepends=('lrzsz: for xmodem, ymodem and zmodem file transfer protocols')
 backup=('etc/minirc.dfl')
-source=("http://alioth.debian.org/frs/download.php/3487/${pkgname}-${pkgver}.tar.gz")
-md5sums=('a5117d4d21e2c9e825edb586ee2fe8d2')
+source=("http://alioth.debian.org/frs/download.php/3689/${pkgname}-${pkgver}.tar.gz")
+md5sums=('74088234773b9beb0a1fc2bfcc2cc5cc')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD
index 7a8d322d5..b08a21be8 100644
--- a/extra/nss/PKGBUILD
+++ b/extra/nss/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 145236 2011-12-19 19:17:54Z jgc $
+# $Id: PKGBUILD 145700 2011-12-28 10:05:27Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=nss
 pkgver=3.13.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Mozilla Network Security Services"
 arch=(i686 x86_64 'mips64el')
 url="http://www.mozilla.org/projects/security/pki/nss/"
@@ -14,12 +14,14 @@ makedepends=('perl')
 replaces=('nss-nspr')
 options=('!strip')
 source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_WITH_CKBI_1_88_RTM/src/${pkgname}-${pkgver}.with.ckbi.1.88.tar.gz
+        bug702090.patch
         nss-no-rpath.patch
         nss.pc.in
         nss-config.in
         add_spi+cacert_ca_certs.patch
         ssl-renegotiate-transitional.patch)
 sha1sums=('ebc0258c8d1a3c2fe80941bd991b766552464fc6'
+          '057dd510ba567d344e705062436a786beb5592b6'
           'c8fcdb153af9d39689243119adb475905a657284'
           'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd'
           'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c'
@@ -28,6 +30,7 @@ sha1sums=('ebc0258c8d1a3c2fe80941bd991b766552464fc6'
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}/mozilla"
+  patch -Np2 -i "${srcdir}/bug702090.patch"
   # Adds the SPI Inc. and CAcert.org CA certificates - patch from Debian, modified to apply on certdata.txt only
   patch -Np2 -i "${srcdir}/add_spi+cacert_ca_certs.patch"
   # Adds transitional SSL renegotiate support - patch from Debian
diff --git a/extra/nss/bug702090.patch b/extra/nss/bug702090.patch
new file mode 100644
index 000000000..e25148554
--- /dev/null
+++ b/extra/nss/bug702090.patch
@@ -0,0 +1,20 @@
+--- ./mozilla/security/nss/lib/util/pkcs11n.h.orig	2011-09-14 10:21:10.000000000 +0900
++++ ./mozilla/security/nss/lib/util/pkcs11n.h	2011-11-19 00:45:01.131860104 +0900
+@@ -346,7 +346,7 @@
+  * labels have never been accurate to what was really implemented.
+  * The new labels correctly reflect what the values effectively mean.
+  */
+-#if __GNUC__ > 3
++#if defined(__GNUC__) && (__GNUC__ > 3)
+ /* make GCC warn when we use these #defines */
+ /*
+  *  This is really painful because GCC doesn't allow us to mark random
+@@ -362,7 +362,7 @@
+  *  cast the resulting value to the deprecated type in the #define, thus
+  *  producting the warning when the #define is used.
+  */
+-#if (__GNUC__  == 4) && (__GNUC_MINOR < 5)
++#if (__GNUC__  == 4) && (__GNUC_MINOR__ < 5)
+ /* The mac doesn't like the friendlier deprecate messages. I'm assuming this
+  * is a gcc version issue rather than mac or ppc specific */
+ typedef CK_TRUST __CKT_NSS_UNTRUSTED __attribute__((deprecated));
diff --git a/extra/openconnect/PKGBUILD b/extra/openconnect/PKGBUILD
index c27dbcd5e..4b9bbf1f2 100644
--- a/extra/openconnect/PKGBUILD
+++ b/extra/openconnect/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 142902 2011-11-17 19:06:36Z ibiru $
+# $Id: PKGBUILD 145723 2011-12-28 18:31:54Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=openconnect
-pkgver=3.14
+pkgver=3.15
 pkgrel=1
 epoch=1
 pkgdesc="Open client for Cisco AnyConnect VPN"
@@ -13,7 +13,7 @@ depends=('libxml2' 'openssl' 'libproxy')
 makedepends=('intltool')
 options=('!libtool' '!emptydirs')
 source=(ftp://ftp.infradead.org/pub/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('c7e73dfa58c7c49683c93800a3506a0f')
+md5sums=('94245f4bac42a288100becab0b4ca29a')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/smplayer/PKGBUILD b/extra/smplayer/PKGBUILD
index c0c7fe001..3cc1ea230 100644
--- a/extra/smplayer/PKGBUILD
+++ b/extra/smplayer/PKGBUILD
@@ -1,35 +1,25 @@
-# $Id: PKGBUILD 98594 2010-11-11 17:27:01Z ibiru $
+# $Id: PKGBUILD 145719 2011-12-28 18:26:36Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 # Contributor: shamrok <szamrok@gmail.com>
 
 pkgname=smplayer
-pkgver=0.6.9
-pkgrel=3
+pkgver=0.6.10
+pkgrel=1
 pkgdesc="A complete front-end for MPlayer"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://smplayer.sourceforge.net/"
 license=('GPL')
-depends=('qt>=4.7.1' 'mplayer')
+depends=('qt' 'mplayer')
+install=smplayer.install
 source=(http://downloads.sourceforge.net/sourceforge/smplayer/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('dfe874b386509de5df78537489f95004')
+md5sums=('9f5ee3319bebc0ed5efe636cf7f0efad')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  # remove broken translation
-  sed -i "s|translations/smplayer_gl.ts|#translations/smplayer_gl.ts|" src/smplayer.pro
-
   make PREFIX=/usr
   make PREFIX=${pkgdir}/usr install
-
-  install -dm755 ${pkgdir}/usr/share/pixmaps
-  ln -s /usr/share/icons/hicolor/64x64/apps/smplayer.png \
-        ${pkgdir}/usr/share/pixmaps/
-
-  sed -i 's|Exec=smplayer %U|Exec=smplayer %F|' ${pkgdir}/usr/share/applications/smplayer.desktop
-  sed -i 's|Exec=smplayer -add-to-playlist %U|Exec=smplayer -add-to-playlist %F|' \
-  	${pkgdir}/usr/share/applications/smplayer_enqueue.desktop
 }
 
diff --git a/extra/smplayer/smplayer.install b/extra/smplayer/smplayer.install
new file mode 100644
index 000000000..6481cee07
--- /dev/null
+++ b/extra/smplayer/smplayer.install
@@ -0,0 +1,12 @@
+post_install() {
+     xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+     update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}