[arch-commits] Commit in gnome-terminal/trunk (PKGBUILD exitcode.patch)

[Ionut Biru]

    Date: Saturday, April 30, 2011 @ 11:31:28
  Author: ibiru
Revision: 121328

fix exit code. FS#21421
upstream didn't care to include this crucial bug in 3.0.1

Added:
  gnome-terminal/trunk/exitcode.patch
Modified:
  gnome-terminal/trunk/PKGBUILD

----------------+
 PKGBUILD       |    9 ++++++---
 exitcode.patch |   25 +++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-04-30 15:19:31 UTC (rev 121327)
+++ PKGBUILD	2011-04-30 15:31:28 UTC (rev 121328)
@@ -3,7 +3,7 @@
 
 pkgname=gnome-terminal
 pkgver=3.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="The GNOME Terminal Emulator"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -16,11 +16,14 @@
 url="http://www.gnome.org"
 groups=('gnome')
 install=gnome-terminal.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('388eda40663566cb785e2d92180e0b584c2c89acc3e7bcd30605601710fddc48')
+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 \
       --with-gtk=3.0

Added: exitcode.patch
===================================================================
--- exitcode.patch	                        (rev 0)
+++ exitcode.patch	2011-04-30 15:31:28 UTC (rev 121328)
@@ -0,0 +1,25 @@
+From 6eb49392fad8c76ade38fbd712509f0daa419a06 Mon Sep 17 00:00:00 2001
+From: Jan de Groot <jan at 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
+