[arch-commits] Commit in gthumb/trunk (PKGBUILD gthumb.install)

[Jan Steffens]

    Date: Monday, March 12, 2012 @ 19:00:13
  Author: heftig
Revision: 153398

2.90.1

Modified:
  gthumb/trunk/PKGBUILD
  gthumb/trunk/gthumb.install

----------------+
 PKGBUILD       |   42 +++++++++++++++++++++++++++---------------
 gthumb.install |   17 ++++++-----------
 2 files changed, 33 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-03-12 21:43:35 UTC (rev 153397)
+++ PKGBUILD	2012-03-12 23:00:13 UTC (rev 153398)
@@ -1,34 +1,46 @@
 # $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Jan de Groot <jgc at archlinux.org>
 # Contributor: Tobias Kieslich <tobias at justdreams.de>
 
 pkgname=gthumb
-pkgver=2.14.2
+pkgver=2.90.1
 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
+
+### FIXME: not the real tarball but a custom one made from git master, to fix build errors
+### hopefully gthumb will have another release before this moves out of gnome-unstable
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('5386e50e934c7f276584a6c47d0208f4756cf72e0dc6cff19eaf9d8a3ab53d7c')
+sha256sums=('1264a6c344015739b0f7eafba27fed1b8c0c35e87927c913216f899c3e107a5e')
 
 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
 }

Modified: gthumb.install
===================================================================
--- gthumb.install	2012-03-12 21:43:35 UTC (rev 153397)
+++ gthumb.install	2012-03-12 23:00:13 UTC (rev 153398)
@@ -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
 }
 
 pre_upgrade() {
-  pre_remove $1
+  if (( $(vercmp $2 2.90.1) < 0 )); then
+    gconfpkg --uninstall gthumb
+  fi
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
 post_remove() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post_install
 }