From 40f0b1c7106cc1fed13f14e80f083ecd69c416f5 Mon Sep 17 00:00:00 2001
From: root <root@rshg047.dnsready.net>
Date: Sun, 1 May 2011 22:33:26 +0000
Subject: Sun May  1 22:33:26 UTC 2011

---
 extra/gnome-terminal/PKGBUILD       | 27 +++++++++++++++++++--------
 extra/gnome-terminal/exitcode.patch | 25 +++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 8 deletions(-)
 create mode 100644 extra/gnome-terminal/exitcode.patch

(limited to 'extra/gnome-terminal')

diff --git a/extra/gnome-terminal/PKGBUILD b/extra/gnome-terminal/PKGBUILD
index 5a4700efd..a77e25b8b 100644
--- a/extra/gnome-terminal/PKGBUILD
+++ b/extra/gnome-terminal/PKGBUILD
@@ -1,26 +1,37 @@
-# $Id: PKGBUILD 99463 2010-11-14 19:45:28Z ibiru $
+# $Id: PKGBUILD 121328 2011-04-30 15:31:28Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-terminal
-pkgver=2.32.1
-pkgrel=1
+pkgver=3.0.1
+pkgrel=2
 pkgdesc="The GNOME Terminal Emulator"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('gconf>=2.32.0' 'vte>=0.26.2' 'libgnome-data' 'libsm')
-makedepends=('gnome-doc-utils>=0.20.1' 'intltool')
+depends=('gconf' 'vte3' 'gsettings-desktop-schemas' 'libsm')
+makedepends=('gnome-doc-utils' 'gtk2' 'intltool')
+#gtk2 is needed for gtk-builder-convert
+#https://bugzilla.gnome.org/show_bug.cgi?id=588945
+#https://bugzilla.gnome.org/show_bug.cgi?id=588732
 options=('!emptydirs')
 url="http://www.gnome.org"
 groups=('gnome')
 install=gnome-terminal.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.32/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('7f41e4b185a2cf65ff417b89e429fc3b625c5e3f042ee1763bda6490fa4676fb')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2
+        exitcode.patch)
+sha256sums=('388eda40663566cb785e2d92180e0b584c2c89acc3e7bcd30605601710fddc48'
+            '263030e9905329d8e651421b575a80c37e30733373378896c94d2c6d6e0ee056')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/exitcode.patch"
   ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-scrollkeeper
+      --localstatedir=/var --disable-scrollkeeper \
+      --with-gtk=3.0
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
diff --git a/extra/gnome-terminal/exitcode.patch b/extra/gnome-terminal/exitcode.patch
new file mode 100644
index 000000000..ded5e6dc0
--- /dev/null
+++ b/extra/gnome-terminal/exitcode.patch
@@ -0,0 +1,25 @@
+From 6eb49392fad8c76ade38fbd712509f0daa419a06 Mon Sep 17 00:00:00 2001
+From: Jan de Groot <jan@jgc.homeip.net>
+Date: Thu, 31 Mar 2011 12:27:37 +0200
+Subject: [PATCH] Initialize exit status with EXIT_SUCCESS instead of -1. When things go wrong, the exit status is set to something else anyways. Fixes bug #646317
+
+---
+ src/terminal.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/terminal.c b/src/terminal.c
+index 202b850..06de533 100644
+--- a/src/terminal.c
++++ b/src/terminal.c
+@@ -579,7 +579,7 @@ main (int argc, char **argv)
+     data = g_new (OwnData, 1);
+     data->factory_name = get_factory_name_for_display (display_name);
+     data->options = options;
+-    data->exit_code = -1;
++    data->exit_code = EXIT_SUCCESS;
+     data->argv = argv_copy;
+     data->argc = argc_copy;
+ 
+-- 
+1.7.4.2
+
-- 
cgit v1.2.3-54-g00ecf