[arch-commits] Commit in gnome-terminal (3 files)

[Jan de Groot]

    Date: Sunday, October 11, 2009 @ 16:41:13
  Author: jgc
Revision: 54962

Merge gnome-unstable

Modified:
  gnome-terminal/trunk/PKGBUILD
Deleted:
  gnome-terminal/gnome-unstable/
  gnome-terminal/trunk/terminal-dontping.patch

-------------------------+
 PKGBUILD                |   13 +++++--------
 terminal-dontping.patch |   29 -----------------------------
 2 files changed, 5 insertions(+), 37 deletions(-)

Modified: trunk/PKGBUILD
===================================================================
--- trunk/PKGBUILD	2009-10-11 20:39:53 UTC (rev 54961)
+++ trunk/PKGBUILD	2009-10-11 20:41:13 UTC (rev 54962)
@@ -2,25 +2,22 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-terminal
-pkgver=2.26.3.1
+pkgver=2.28.0
 pkgrel=1
 pkgdesc="The GNOME Terminal Emulator"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('gconf>=2.26.0-2' 'vte>=0.20.5' 'startup-notification>=0.10')
-makedepends=('pkgconfig' 'gnome-doc-utils>=0.16.0' 'intltool') 
+depends=('gconf>=2.27.0' 'vte>=0.21.7' 'startup-notification>=0.10')
+makedepends=('pkgconfig' 'gnome-doc-utils>=0.17.5' 'intltool') 
 options=('!emptydirs')
 url="http://www.gnome.org"
 groups=('gnome-extra')
 install=gnome-terminal.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.26/${pkgname}-${pkgver}.tar.bz2
-	terminal-dontping.patch)
-md5sums=('b6c6c0f5f3e061da7e56f3a04385bb7b'
-         '9ae26f8e6a9f0401889e8a0ba7e831d6')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.28/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('c3f1ce6248e47cac5f3c5c0a79a079d5c7756ba1c4867eb43e20e929087b4a5a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np0 -i "${srcdir}/terminal-dontping.patch" || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-scrollkeeper || return 1
   make || return 1

Deleted: trunk/terminal-dontping.patch
===================================================================
--- trunk/terminal-dontping.patch	2009-10-11 20:39:53 UTC (rev 54961)
+++ trunk/terminal-dontping.patch	2009-10-11 20:41:13 UTC (rev 54962)
@@ -1,29 +0,0 @@
---- src/terminal.c~	2009-04-17 18:30:45.000000000 +0200
-+++ src/terminal.c	2009-05-29 19:47:28.071360678 +0200
-@@ -234,9 +234,6 @@
-   return g_string_free (name, FALSE);
- }
- 
--/* Evil hack alert: this is exported from libgconf-2 but not in a public header */
--extern gboolean gconf_ping_daemon (void);
--         
- int
- main (int argc, char **argv)
- {
-@@ -444,16 +441,6 @@
-   g_free (argv_copy);
-   g_free (factory_name);
- 
--  /* If the gconf daemon isn't available (e.g. because there's no dbus
--   * session bus running), we'd crash later on. Tell the user about it
--   * now, and exit. See bug #561663.
--   */
--  if (!gconf_ping_daemon ())
--    {
--      g_printerr ("Failed to contact the GConf daemon; exiting.\n");
--      exit (1);
--    }
--
-   gtk_window_set_default_icon_name (GNOME_TERMINAL_ICON_NAME);
- 
-   gtk_about_dialog_set_url_hook (about_url_hook, NULL, NULL);