[arch-commits] Commit in vinagre/trunk (PKGBUILD vinagre-ssh-connect.patch)

[Jan de Groot]

    Date: Monday, June 21, 2010 @ 09:25:51
  Author: jgc
Revision: 83403

upgpkg: vinagre 2.30.2-1
Update to 2.30.2

Modified:
  vinagre/trunk/PKGBUILD
Deleted:
  vinagre/trunk/vinagre-ssh-connect.patch

---------------------------+
 PKGBUILD                  |   14 ++++-----
 vinagre-ssh-connect.patch |   65 --------------------------------------------
 2 files changed, 7 insertions(+), 72 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-06-21 13:10:46 UTC (rev 83402)
+++ PKGBUILD	2010-06-21 13:25:51 UTC (rev 83403)
@@ -4,7 +4,7 @@
 # Contributor: lp76 <l.peduto at gmail.com>
 
 pkgname=vinagre
-pkgver=2.30.1
+pkgver=2.30.2
 pkgrel=1
 pkgdesc="A VNC Client for the GNOME Desktop"
 arch=('i686' 'x86_64')
@@ -12,21 +12,21 @@
 url="http://www.gnome.org/projects/vinagre/"
 install=vinagre.install
 depends=('libgnome-keyring>=2.30.1' 'gtk-vnc>=0.3.10' 'avahi>=0.6.25' 'desktop-file-utils' 'hicolor-icon-theme' 'telepathy-glib>=0.10.5')
-makedepends=('gnome-doc-utils>=0.19.5' 'intltool' 'gnome-panel>=2.30.0')
+makedepends=('gnome-doc-utils>=0.20.1' 'intltool' 'gnome-panel>=2.30.0')
 optdepends=('gnome-panel')
 groups=('gnome-extra')
 options=('!emptydirs' '!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/vinagre/2.30/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('cbe5bff8e6f7a81e46fde5b1d8a53a7dbdd66d13d998c24508cae08de657f2cf')
+sha256sums=('478b58ad9eb4a02fad45134bdddc29dc986d8c14e203a47b88aa7f3e6d1bf388')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --disable-scrollkeeper \
-      --libexecdir=/usr/lib/vinagre || return 1
-  make || return 1
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
+      --libexecdir=/usr/lib/vinagre
+  make
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
 
   install -d -m755 "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain vinagre ${pkgdir}/etc/gconf/schemas/*.schemas || return 1
+  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain vinagre ${pkgdir}/etc/gconf/schemas/*.schemas
   rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
 }

Deleted: vinagre-ssh-connect.patch
===================================================================
--- vinagre-ssh-connect.patch	2010-06-21 13:10:46 UTC (rev 83402)
+++ vinagre-ssh-connect.patch	2010-06-21 13:25:51 UTC (rev 83403)
@@ -1,65 +0,0 @@
-From 6b1c01f15e5a698fc5f7e8f62e230adab94618bb Mon Sep 17 00:00:00 2001
-From: Jonh Wendell <jwendell at gnome.org>
-Date: Wed, 14 Apr 2010 13:17:42 +0000
-Subject: Make ssh_vinagre_connect() symbol visible in .so.
-
-This fixes a crash when using SSH tunnel in VNC plugin.
-
-Closes Ubuntu #516847.
----
-diff --git a/vinagre/vinagre-main.c b/vinagre/vinagre-main.c
-index 4f6f3bf..b2d224b 100644
---- a/vinagre/vinagre-main.c
-+++ b/vinagre/vinagre-main.c
-@@ -40,6 +40,7 @@
- #include "vinagre-plugin-info.h"
- #include "vinagre-plugin-info-priv.h"
- #include "vinagre-debug.h"
-+#include "vinagre-ssh.h"
- 
- #ifdef HAVE_TELEPATHY
- #include "vinagre-tubes-manager.h"
-@@ -223,6 +224,9 @@ int main (int argc, char **argv) {
-    vinagre_tubes_manager = vinagre_tubes_manager_new (window);
- #endif
- 
-+  /* fake call, just to ensure this symbol will be present at vinagre.so */
-+  vinagre_ssh_connect (NULL, NULL, -1, NULL, NULL, NULL, NULL, NULL);
-+
-   gtk_main ();
- 
- #ifdef HAVE_TELEPATHY
-diff --git a/vinagre/vinagre-ssh.c b/vinagre/vinagre-ssh.c
-index e26c63f..0d59ed9 100644
---- a/vinagre/vinagre-ssh.c
-+++ b/vinagre/vinagre-ssh.c
-@@ -664,7 +664,8 @@ vinagre_ssh_connect (GtkWindow *parent,
-   GInputStream *is;
-   GDataInputStream *error_stream;
- 
--  g_return_val_if_fail (hostname != NULL, FALSE);
-+  if (!hostname)
-+    return FALSE;
- 
-   if (vendor == SSH_VENDOR_INVALID)
-     vendor = get_ssh_client_vendor ();
-diff --git a/vinagre/vinagre-utils.c b/vinagre/vinagre-utils.c
-index 03181f1..0b00045 100644
---- a/vinagre/vinagre-utils.c
-+++ b/vinagre/vinagre-utils.c
-@@ -607,13 +607,6 @@ vinagre_utils_ask_question (GtkWindow  *parent,
-   return TRUE;
- }
- 
--#include "vinagre-ssh.h"
--static void
--shit (void)
--{
--  vinagre_ssh_connect (NULL, NULL, -1, NULL, NULL, NULL, NULL, NULL);
--}
--
- typedef struct {
-   GtkWidget *uname, *pw, *button;
- } ControlOKButton;
---
-cgit v0.8.3.1