[arch-commits] Commit in gnome-utils/repos (3 files)

[Jan de Groot]

    Date: Sunday, October 11, 2009 @ 16:48:05
  Author: jgc
Revision: 54973

Merged revisions 54972 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/gnome-utils/trunk

........
  r54972 | jgc | 2009-10-11 22:46:13 +0200 (Sun, 11 Oct 2009) | 1 line
  
  Merge gnome-unstable
........

Modified:
  gnome-utils/repos/extra-x86_64/	(properties)
  gnome-utils/repos/extra-x86_64/PKGBUILD
Deleted:
  gnome-utils/repos/extra-x86_64/bgo497489.patch

-----------------+
 PKGBUILD        |   18 +++++++++---------
 bgo497489.patch |   54 ------------------------------------------------------
 2 files changed, 9 insertions(+), 63 deletions(-)


Property changes on: gnome-utils/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /gnome-utils/trunk:1-30910
   + /gnome-utils/trunk:1-54972

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-10-11 20:46:13 UTC (rev 54972)
+++ extra-x86_64/PKGBUILD	2009-10-11 20:48:05 UTC (rev 54973)
@@ -2,26 +2,26 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-utils
-pkgver=2.26.0
+pkgver=2.28.0
 pkgrel=1
 pkgdesc="Common utilities for GNOME"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('libgtop>=2.26.0' 'gnome-panel>=2.26.0')
-makedepends=('gnome-doc-utils>=0.16.0' 'pkgconfig' 'intltool')
+depends=('libgtop>=2.28.0' 'gnome-panel>=2.27.92' 'libcanberra>=0.14')
+makedepends=('gnome-doc-utils>=0.17.4' 'pkgconfig' 'intltool')
 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.26/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('667400cfb9bee954028024ac3cf91a09')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.28/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('40c99392e6c06ff31d735c41cf285f02b7b8c0419f1954c533b7da900e7b9752')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-              --libexecdir=/usr/lib/gnome-utils \
-              --localstatedir=/var --disable-static \
-              --enable-hal --disable-scrollkeeper || return 1
+    ./configure --prefix=/usr --sysconfdir=/etc \
+        --libexecdir=/usr/lib/gnome-utils \
+        --localstatedir=/var --disable-static \
+        --disable-scrollkeeper || return 1
   make || return 1
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
 

Deleted: extra-x86_64/bgo497489.patch
===================================================================
--- extra-x86_64/bgo497489.patch	2009-10-11 20:46:13 UTC (rev 54972)
+++ extra-x86_64/bgo497489.patch	2009-10-11 20:48:05 UTC (rev 54973)
@@ -1,54 +0,0 @@
-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: "));
-