Wed Apr 25 00:01:35 UTC 2012

2 files changed, 32 insertions, 28 deletions

diff --git a/extra/gthumb/PKGBUILD b/extra/gthumb/PKGBUILD
index 09a83f3f8..3739518d0 100644
--- a/extra/gthumb/PKGBUILD
+++ b/extra/gthumb/PKGBUILD
@@ -1,34 +1,43 @@
-# $Id: PKGBUILD 148766 2012-02-05 11:49:40Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 157098 2012-04-23 20:32:20Z ibiru $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=gthumb
-pkgver=2.14.2
+pkgver=3.0.0
 pkgrel=1
 pkgdesc="Image browser and viewer for the GNOME Desktop"
 arch=(i686 x86_64)
 license=('GPL')
-url="http://gthumb.sourceforge.net/"
-depends=('desktop-file-utils' 'libunique' 'gconf' 'exiv2' 'libsoup-gnome' 'clutter-gtk2' 'hicolor-icon-theme')
-makedepends=('intltool' 'gnome-doc-utils' 'libsm' 'gstreamer0.10-base')
-optdepends=('gstreamer0.10-base: video support')
+url="http://live.gnome.org/gthumb"
+depends=('desktop-file-utils' 'hicolor-icon-theme' 'dconf' 'librsvg' 'clutter-gtk'
+         'gstreamer0.10-base')
+makedepends=('intltool' 'gnome-doc-utils' 'libchamplain' 'libopenraw' 'exiv2' 'libsoup-gnome'
+             'brasero' 'librsvg' 'libopenraw' 'liboauth')
+optdepends=('libopenraw: read RAW files'
+            'exiv2: metadata support'
+            'libchamplain: map viewer'
+            'brasero: burn discs'
+            'libsoup-gnome: web albums'
+            'liboauth: web albums')
 options=('!libtool' '!emptydirs')
 install=gthumb.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('5386e50e934c7f276584a6c47d0208f4756cf72e0dc6cff19eaf9d8a3ab53d7c')
+sha256sums=('5b6116a69897ee9aeba8db3d1ac800e9a62308738367533268acea40519f58b4')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
+  
   ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
+      --localstatedir=/var --disable-static \
+      --enable-libchamplain --enable-libopenraw
+  
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
-
-  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gthumb "$pkgdir"/etc/gconf/schemas/*.schemas
-  rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 }
diff --git a/extra/gthumb/gthumb.install b/extra/gthumb/gthumb.install
index 6046ebb6f..9d4e7822f 100644
--- a/extra/gthumb/gthumb.install
+++ b/extra/gthumb/gthumb.install
@@ -1,24 +1,19 @@
-pkgname=gthumb
-
 post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
+  glib-compile-schemas /usr/share/glib-2.0/schemas
   update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
 }
 
 pre_upgrade() {
-  pre_remove $1
+  if (( $(vercmp $2 2.90.1) < 0 )); then
+    gconfpkg --uninstall gthumb
+  fi
 }
 
 post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
+  post_install
 }
 
 post_remove() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post_install
 }