[arch-commits] Commit in gnome-terminal/repos (6 files)
Ionut Biru
ibiru at archlinux.org
Sat Oct 1 18:58:33 UTC 2011
Date: Saturday, October 1, 2011 @ 14:58:33
Author: ibiru
Revision: 139325
db-move: moved gnome-terminal from [testing] to [extra] (i686)
Added:
gnome-terminal/repos/extra-i686/PKGBUILD
(from rev 139207, gnome-terminal/repos/testing-i686/PKGBUILD)
gnome-terminal/repos/extra-i686/gnome-terminal.install
(from rev 139207, gnome-terminal/repos/testing-i686/gnome-terminal.install)
Deleted:
gnome-terminal/repos/extra-i686/PKGBUILD
gnome-terminal/repos/extra-i686/exitcode.patch
gnome-terminal/repos/extra-i686/gnome-terminal.install
gnome-terminal/repos/testing-i686/
------------------------+
PKGBUILD | 73 +++++++++++++++++++++--------------------------
exitcode.patch | 25 ----------------
gnome-terminal.install | 34 ++++++++++-----------
3 files changed, 50 insertions(+), 82 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2011-10-01 18:58:30 UTC (rev 139324)
+++ extra-i686/PKGBUILD 2011-10-01 18:58:33 UTC (rev 139325)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=gnome-terminal
-pkgver=3.0.1
-pkgrel=2
-pkgdesc="The GNOME Terminal Emulator"
-arch=('i686' 'x86_64')
-license=('GPL')
-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}/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
- 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 gnome-terminal ${pkgdir}/etc/gconf/schemas/*.schemas
- rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
Copied: gnome-terminal/repos/extra-i686/PKGBUILD (from rev 139207, gnome-terminal/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-10-01 18:58:33 UTC (rev 139325)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=gnome-terminal
+pkgver=3.2.0
+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')
+options=('!emptydirs')
+url="http://www.gnome.org"
+groups=('gnome')
+install=gnome-terminal.install
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('42ca48cff087de770d4783b19653794e82285334144b30557948f852521299b1')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --disable-scrollkeeper
+ 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 gnome-terminal ${pkgdir}/etc/gconf/schemas/*.schemas
+ rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+}
Deleted: extra-i686/exitcode.patch
===================================================================
--- extra-i686/exitcode.patch 2011-10-01 18:58:30 UTC (rev 139324)
+++ extra-i686/exitcode.patch 2011-10-01 18:58:33 UTC (rev 139325)
@@ -1,25 +0,0 @@
-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
-
Deleted: extra-i686/gnome-terminal.install
===================================================================
--- extra-i686/gnome-terminal.install 2011-10-01 18:58:30 UTC (rev 139324)
+++ extra-i686/gnome-terminal.install 2011-10-01 18:58:33 UTC (rev 139325)
@@ -1,17 +0,0 @@
-pkgname=gnome-terminal
-
-post_install() {
- usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
- pre_remove $1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- usr/sbin/gconfpkg --uninstall ${pkgname}
-}
Copied: gnome-terminal/repos/extra-i686/gnome-terminal.install (from rev 139207, gnome-terminal/repos/testing-i686/gnome-terminal.install)
===================================================================
--- extra-i686/gnome-terminal.install (rev 0)
+++ extra-i686/gnome-terminal.install 2011-10-01 18:58:33 UTC (rev 139325)
@@ -0,0 +1,17 @@
+pkgname=gnome-terminal
+
+post_install() {
+ usr/sbin/gconfpkg --install ${pkgname}
+}
+
+pre_upgrade() {
+ pre_remove $1
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ usr/sbin/gconfpkg --uninstall ${pkgname}
+}
More information about the arch-commits
mailing list