Sat Sep 15 00:03:54 UTC 2012

6 files changed, 51 insertions, 41 deletions

diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD
index ea67c706d..9b85d9dfe 100644
--- a/extra/calligra/PKGBUILD
+++ b/extra/calligra/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 165807 2012-08-30 18:32:15Z andrea $
+# $Id: PKGBUILD 166615 2012-09-13 08:59:14Z andrea $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
@@ -21,7 +21,7 @@ pkgname=('calligra-filters'
          'calligra-handbook'
          'calligra-braindump'
          'calligra-flow')
-pkgver=2.5.1
+pkgver=2.5.2
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.calligra-suite.org/'
@@ -32,7 +32,7 @@ makedepends=('cmake' 'automoc4' 'boost ' 'kdepimlibs' 'eigen2' 'kdeedu-marble'
              'openjpeg' 'kdegraphics-okular' 'pstoedit')
 groups=('calligra')
 source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('7bc75d770bfd7ffd5f70386c25970888')
+md5sums=('b4f1532d802a6c97fbcfa6a0467b7216')
 
 build() {
   mkdir build
@@ -199,7 +199,7 @@ package_calligra-krita() {
 
 package_calligra-sheets() {
   pkgdesc="Write spreadsheet documents"
-  depends=('calligra-templates' 'calligra-libs' 'gsl' 'kdebase-runtime' 'eigen2')
+  depends=('calligra-templates' 'calligra-libs' 'gsl' 'kdebase-runtime')
   optdepends=('calligra-filters: import/export filters'
               'calligra-plugins: extra calligra plugins'
               'calligra-tools: extra calligra tools')
diff --git a/extra/djvulibre/PKGBUILD b/extra/djvulibre/PKGBUILD
index 75cd92aef..572a6c552 100644
--- a/extra/djvulibre/PKGBUILD
+++ b/extra/djvulibre/PKGBUILD
@@ -1,41 +1,38 @@
-# $Id: PKGBUILD 148700 2012-02-05 11:47:29Z ibiru $
+# $Id: PKGBUILD 166638 2012-09-14 01:48:24Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: mgushee
 
 pkgname=djvulibre
-pkgver=3.5.24
-pkgrel=3
+pkgver=3.5.25.3
+_major=3.5.25
+pkgrel=1
 pkgdesc="Suite to create, manipulate and view DjVu ('déjà vu') documents"
-arch=("i686" "x86_64")
-license=('GPL')
-url="http://djvu.sourceforge.net/"
-depends=('gcc-libs' 'libtiff>=4.0.0' 'bash' 'hicolor-icon-theme')
-makedepends=('pkg-config')
+url='http://djvu.sourceforge.net/'
+arch=('i686' 'x86_64')
+license=('GPL2')
+options=('!libtool')
+makedepends=('librsvg')
+depends=('libtiff' 'hicolor-icon-theme')
+source=("http://downloads.sourceforge.net/project/djvu/DjVuLibre/${_major}/djvulibre-${pkgver}.tar.gz")
+sha1sums=('ad35056aabb1950f385360ff59520a82a6f779ec')
+
+conflicts=('libdjvu')
 provides=("libdjvu=${pkgver}")
 replaces=('libdjvu')
-conflicts=('libdjvu')
-optdepends=('djview4: Viewer application')
-options=('!libtool')
-install=djvulibre.install
-source=(http://downloads.sourceforge.net/djvu/${pkgname}-${pkgver}.tar.gz
-        git-fixes.patch)
-md5sums=('af83d27af5083198432a178d22b259c5'
-         'ff3798e383e9c3fae407455d8a51deec')
+
+install=install
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/git-fixes.patch"
-  ./configure --prefix=/usr --disable-desktopfiles
-  make
+	cd "${srcdir}/${pkgname}-${_major}"
+	./configure --prefix=/usr --disable-desktopfiles
+	make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  #Install icons for mime-types.
-  install -m755 -d ${pkgdir}/usr/share/icons/hicolor/{22x22,32x32,48x48,64x64}/mimetypes
-  for sz in 22 32 48 64; do
-    install -m644 desktopfiles/prebuilt-hi${sz}-djvu.png "${pkgdir}/usr/share/icons/hicolor/${sz}x${sz}/mimetypes/image-vnd.djvu.mime.png"
-  done
+	cd "${srcdir}/${pkgname}-${_major}"
+	make DESTDIR="${pkgdir}" install
+	for sz in 22 32 48 64; do
+		install -Dm644 desktopfiles/prebuilt-hi${sz}-djvu.png "${pkgdir}/usr/share/icons/hicolor/${sz}x${sz}/mimetypes/image-vnd.djvu.mime.png"
+	done
 }
diff --git a/extra/djvulibre/install b/extra/djvulibre/install
new file mode 100644
index 000000000..c25173d65
--- /dev/null
+++ b/extra/djvulibre/install
@@ -0,0 +1,13 @@
+post_install() {
+	if [[ -x usr/bin/gtk-update-icon-cache ]]; then	
+		gtk-update-icon-cache -q -f usr/share/icons/hicolor
+	fi
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD
index b39d3d841..046e975d4 100644
--- a/extra/feh/PKGBUILD
+++ b/extra/feh/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 165670 2012-08-28 15:59:06Z bisson $
+# $Id: PKGBUILD 166623 2012-09-13 11:39:21Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=feh
-pkgver=2.6
+pkgver=2.6.1
 pkgrel=1
 pkgdesc='Fast and light imlib2-based image viewer'
 url='http://feh.finalrewind.org/'
@@ -16,7 +16,7 @@ optdepends=('perl: feh-cam, webcam wrapper for feh'
             'imagemagick: support more file formats')
 makedepends=('libxt')
 source=("${url}${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('396d3507010a52e8a384fdbae452e291d5504971')
+sha1sums=('09f2c03b0fc6b9e37fb998e42e3f7626b9fdfbad')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index cebde2649..ff03a1326 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 166562 2012-09-11 07:22:15Z giovanni $
+# $Id: PKGBUILD 166619 2012-09-13 09:11:48Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2012.09.11
+pkgver=2012.09.12
 pkgrel=1
 pkgdesc="A set of C++ libraries for multimedia streaming"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('LGPL')
 url="http://live555.com/liveMedia"
 depends=('gcc-libs')
 source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('2ea74ee10caa15d79f0a2ea3681703f2')
+md5sums=('88ceec23abb1df597e333945e95120fd')
 
 build() {
   cd ${srcdir}/live
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index 8e4e6cd4e..fefd39393 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 165374 2012-08-16 20:54:57Z pierre $
+# $Id: PKGBUILD 166634 2012-09-13 22:05:22Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=php
@@ -21,7 +21,7 @@ pkgname=('php'
          'php-sqlite'
          'php-tidy'
          'php-xsl')
-pkgver=5.4.6
+pkgver=5.4.7
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('PHP')
@@ -33,7 +33,7 @@ makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx'
 source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
         'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch'
         'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles')
-md5sums=('c9aa0f4996d1b91ee9e45afcfaeb5d2e'
+md5sums=('9cd421f1cc8fa8e7f215e44a1b06199f'
          '0b0bc7a917fc592bdf11dcd3c5c255e9'
          'dec2cbaad64e3abf4f0ec70e1de4e8e9'
          '6d46667e00d65933ec0c958279c0a803'