Tue Apr 23 01:16:16 PDT 2013

2 files changed, 23 insertions, 25 deletions

diff --git a/extra/gnome-terminal/PKGBUILD b/extra/gnome-terminal/PKGBUILD
index c25f8186b..d06de63cb 100644
--- a/extra/gnome-terminal/PKGBUILD
+++ b/extra/gnome-terminal/PKGBUILD
@@ -1,33 +1,35 @@
-# $Id: PKGBUILD 179947 2013-03-13 11:01:23Z jgc $
+# $Id: PKGBUILD 183404 2013-04-21 22:10:33Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-terminal
-pkgver=3.6.1
+pkgver=3.8.1
 pkgrel=1
 pkgdesc="The GNOME Terminal Emulator"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gconf' 'vte3' 'gsettings-desktop-schemas' 'libsm')
-makedepends=('gnome-doc-utils' 'intltool' 'gtk2' 'itstool' 'docbook-xsl')
-options=('!emptydirs')
+arch=(i686 x86_64)
+license=(GPL)
+depends=(vte3 gsettings-desktop-schemas libsm dconf)
+makedepends=(gnome-doc-utils intltool itstool docbook-xsl desktop-file-utils python2 gconf)
+optdepends=('gconf: settings migration when upgrading from older version')
+options=('!emptydirs' '!libtool')
 url="http://www.gnome.org"
 groups=('gnome')
 install=gnome-terminal.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('c6816f77eaae791dadeef89596df811e2fa353088241aa0613bb8e1af63304f6')
+sha256sums=('c49afab26973225f41ed35a9d5b5180d6207757e524056656146b30692f39fff')
 
 build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-scrollkeeper
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --libexecdir=/usr/lib/$pkgname --disable-static
   make
 }
 
-package() {
-  cd "$pkgname-$pkgver"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
 
-  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gnome-terminal "$pkgdir"/etc/gconf/schemas/*.schemas
-  rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 }
diff --git a/extra/gnome-terminal/gnome-terminal.install b/extra/gnome-terminal/gnome-terminal.install
index 1d8510f06..260d56cb2 100644
--- a/extra/gnome-terminal/gnome-terminal.install
+++ b/extra/gnome-terminal/gnome-terminal.install
@@ -1,17 +1,13 @@
-pkgname=gnome-terminal
-
 post_install() {
-  gconfpkg --install $pkgname
+  glib-compile-schemas /usr/share/glib-2.0/schemas
 }
 
 pre_upgrade() {
-  pre_remove $1
+  if [ -f /usr/share/gconf/schemas/gnome-terminal.schemas ]; then
+    gconfpkg --uninstall gnome-terminal
+  fi
 }
 
 post_upgrade() {
   post_install $1
 }
-
-pre_remove() {
-  gconfpkg --uninstall $pkgname
-}