Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/dwdiff/PKGBUILD
	community/ejabberd/PKGBUILD
	community/gnome-settings-daemon-updates/PKGBUILD
	community/gpicview/PKGBUILD
	community/libgexiv2/PKGBUILD
	community/mapnik/PKGBUILD
	community/mplayer2/PKGBUILD
	community/open-vm-tools/PKGBUILD
	community/vdrift/PKGBUILD
	community/xboard/PKGBUILD
	core/openssh/PKGBUILD
	extra/boost/PKGBUILD
	extra/dconf/PKGBUILD
	extra/elfutils/PKGBUILD
	extra/gconf/PKGBUILD
	extra/gnome-control-center/PKGBUILD
	extra/gnome-disk-utility/PKGBUILD
	extra/gnome-menus/PKGBUILD
	extra/gnome-panel/PKGBUILD
	extra/gnome-power-manager/PKGBUILD
	extra/gnome-themes-standard/PKGBUILD
	extra/gobject-introspection/PKGBUILD
	extra/gtk3/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/icu/PKGBUILD
	extra/libgsf/PKGBUILD
	extra/libimobiledevice/PKGBUILD
	extra/libplist/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/mutter/PKGBUILD
	extra/pango/PKGBUILD
	extra/php/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/telepathy-kde-accounts-kcm/PKGBUILD
	extra/telepathy-kde-approver/PKGBUILD
	extra/telepathy-kde-auth-handler/PKGBUILD
	extra/telepathy-kde-contact-list/PKGBUILD
	extra/telepathy-kde-filetransfer-handler/PKGBUILD
	extra/telepathy-kde-integration-module/PKGBUILD
	extra/telepathy-kde-send-file/PKGBUILD
	extra/telepathy-kde-text-ui/PKGBUILD
	extra/totem-plparser/PKGBUILD
	extra/virtuoso/PKGBUILD
	extra/yelp/PKGBUILD
	libre/unarchiver/PKGBUILD
	multilib/lib32-gdk-pixbuf2/PKGBUILD
	multilib/lib32-glib2/PKGBUILD
	multilib/lib32-pango/PKGBUILD
	testing/binutils/PKGBUILD

1 files changed, 8 insertions, 24 deletions

diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD
index 0e965efba..8711dda85 100644
--- a/community/shotwell/PKGBUILD
+++ b/community/shotwell/PKGBUILD
@@ -1,49 +1,33 @@
-# $Id: PKGBUILD 58472 2011-11-12 22:05:25Z lcarlier $
+# $Id: PKGBUILD 69744 2012-04-23 09:08:15Z ibiru $
 # 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.11.6
+pkgver=0.12.2
 pkgrel=1
 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' 'dconf')
-makedepends=('intltool')
-# 'vala'
+depends=('libgee' 'libunique3' 'libwebkit3' 'libgexiv2' 'libraw' 'rest'
+	 'desktop-file-utils' 'dconf' 'hicolor-icon-theme')
+makedepends=('intltool' 'vala')
 install=shotwell.install
-source=("http://yorba.org/download/shotwell/0.11/shotwell-${pkgver}.tar.bz2"
-	"http://ftp.gnome.org/pub/gnome/sources/vala/0.12/vala-0.12.1.tar.bz2"
-	"fix-with-libraw-0.4.patch")
-md5sums=('bbbf2843eb98b6f0ef1dfcfb934e15cf'
-         'bf35262cc611de447147d01cbac33767'
-         '488787b6d2cbc7348bc88348b78b6005')
+source=("http://yorba.org/download/shotwell/0.12/shotwell-${pkgver}.tar.bz2")
+md5sums=('ce3a3204ca3c1dd451ac43e3b80c28d9')
 
 build() {
-  cd "${srcdir}/vala-0.12.1"
-  ./configure --prefix=$srcdir/vala --enable-vapigen
-  make
-  make install
-  export PATH=$srcdir/vala/bin:$PATH
-
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  patch -Np1 -i ../fix-with-libraw-0.4.patch
-
   ./configure --prefix=/usr \
-	--with-gconf-schema-file-dir=/usr/share/gconf/schemas \
-	--disable-schemas-install \
+	--disable-schemas-compile \
 	--disable-desktop-update \
 	--disable-icon-update
-
   make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-  rm -f $pkgdir/usr/share/glib-2.0/schemas/gschemas.compiled
 }