[arch-commits] CVS update of extra/gnome/gnome-utils (PKGBUILD bgo497489.patch)

[Jan de Groot]

    Date: Wednesday, January 16, 2008 @ 17:10:23
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gnome-utils

   Added: bgo497489.patch (1.1)
Modified: PKGBUILD (1.30 -> 1.31)

upgpkg: gnome-utils 2.20.0.1-2
Fix FS#8904


-----------------+
 PKGBUILD        |   10 ++++++----
 bgo497489.patch |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 4 deletions(-)


Index: extra/gnome/gnome-utils/PKGBUILD
diff -u extra/gnome/gnome-utils/PKGBUILD:1.30 extra/gnome/gnome-utils/PKGBUILD:1.31
--- extra/gnome/gnome-utils/PKGBUILD:1.30	Sun Sep 23 09:33:10 2007
+++ extra/gnome/gnome-utils/PKGBUILD	Wed Jan 16 17:10:23 2008
@@ -1,23 +1,25 @@
-# $Id: PKGBUILD,v 1.30 2007/09/23 13:33:10 jgc Exp $
+# $Id: PKGBUILD,v 1.31 2008/01/16 22:10:23 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-utils
 pkgver=2.20.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Common utilities for GNOME"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('libgtop>=2.20.0' 'libgnomeprintui>=2.18.1' 'gnome-panel>=2.20.0')
+depends=('libgtop>=2.20.1' 'libgnomeprintui>=2.18.1' 'gnome-panel>=2.20.3')
 makedepends=('perlxml' 'gnome-doc-utils>=0.12.0' 'pkgconfig')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 groups=('gnome-extra')
 install=gnome-utils.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.20/${pkgname}-${pkgver}.tar.bz2)
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.20/${pkgname}-${pkgver}.tar.bz2
+	bgo497489.patch)
 md5sums=('2d4385df2fb566b437b283bd2ce70190')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
+  patch -Np1 -i ${startdir}/src/bgo497489.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
               --libexecdir=/usr/lib/gnome-utils \
               --localstatedir=/var --disable-static \
Index: extra/gnome/gnome-utils/bgo497489.patch
diff -u /dev/null extra/gnome/gnome-utils/bgo497489.patch:1.1
--- /dev/null	Wed Jan 16 17:10:23 2008
+++ extra/gnome/gnome-utils/bgo497489.patch	Wed Jan 16 17:10:23 2008
@@ -0,0 +1,54 @@
+diff -up gnome-utils-2.20.0.1/logview/log_repaint.c.versions gnome-utils-2.20.0.1/logview/log_repaint.c
+--- gnome-utils-2.20.0.1/logview/log_repaint.c.versions	2007-11-16 13:29:00.000000000 -0500
++++ gnome-utils-2.20.0.1/logview/log_repaint.c	2007-11-16 13:29:43.000000000 -0500
+@@ -226,6 +226,8 @@ logview_update_version_bar (LogviewWindo
+ 		else
+ 			recent = log;
+ 			
++		g_signal_handler_block (logview->version_selector, logview->version_changed_id);
++
+ 		for (i=5; i>-1; i--)
+ 			gtk_combo_box_remove_text (GTK_COMBO_BOX (logview->version_selector), i);
+ 
+@@ -241,6 +243,8 @@ logview_update_version_bar (LogviewWindo
+ 		gtk_combo_box_set_active (GTK_COMBO_BOX (logview->version_selector), 
+                                           log->current_version);
+ 
++		g_signal_handler_unblock (logview->version_selector, logview->version_changed_id);
++
+ 	} else {
+ 		gtk_widget_hide (logview->version_bar);
+ 	}
+diff -up gnome-utils-2.20.0.1/logview/logview.h.versions gnome-utils-2.20.0.1/logview/logview.h
+--- gnome-utils-2.20.0.1/logview/logview.h.versions	2007-11-16 13:27:55.000000000 -0500
++++ gnome-utils-2.20.0.1/logview/logview.h	2007-11-16 13:28:05.000000000 -0500
+@@ -55,6 +55,7 @@ struct _LogviewWindow {
+ 	Log *curlog;
+ 
+ 	int original_fontsize, fontsize;
++	gulong version_changed_id;
+ };
+ 
+ struct _LogviewWindowClass {
+diff -up gnome-utils-2.20.0.1/logview/logview.c.versions gnome-utils-2.20.0.1/logview/logview.c
+--- gnome-utils-2.20.0.1/logview/logview.c.versions	2007-11-16 13:28:13.000000000 -0500
++++ gnome-utils-2.20.0.1/logview/logview.c	2007-11-16 13:28:52.000000000 -0500
+@@ -432,6 +432,9 @@ logview_version_selector_changed (GtkCom
+ 
+     g_assert (LOGVIEW_IS_WINDOW (logview));
+ 
++	if (!log)
++		return;
++
+ 	selected = gtk_combo_box_get_active (version_selector);
+ 
+ 	if (selected == log->current_version)
+@@ -903,7 +906,7 @@ logview_init (LogviewWindow *logview)
+    logview->version_bar = gtk_hbox_new (FALSE, 0);
+    gtk_container_set_border_width (GTK_CONTAINER (logview->version_bar), 3);
+    logview->version_selector = gtk_combo_box_new_text ();
+-   g_signal_connect (G_OBJECT (logview->version_selector), "changed",
++   logview->version_changed_id = g_signal_connect (G_OBJECT (logview->version_selector), "changed",
+                      G_CALLBACK (logview_version_selector_changed), logview);
+    label = gtk_label_new (_("Version: "));
+