[arch-commits] CVS update of extra/gnome/nautilus (12_list-view_expand.patch PKGBUILD)

[Jan de Groot]

    Date: Thursday, May 31, 2007 @ 07:47:17
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/nautilus

   Added: 12_list-view_expand.patch (1.1)
Modified: PKGBUILD (1.35 -> 1.36)

upgpkg: nautilus 2.18.1-2
Add patch from debian to fix column resizing behaviour


---------------------------+
 12_list-view_expand.patch |   32 ++++++++++++++++++++++++++++++++
 PKGBUILD                  |   12 +++++++-----
 2 files changed, 39 insertions(+), 5 deletions(-)


Index: extra/gnome/nautilus/12_list-view_expand.patch
diff -u /dev/null extra/gnome/nautilus/12_list-view_expand.patch:1.1
--- /dev/null	Thu May 31 07:47:16 2007
+++ extra/gnome/nautilus/12_list-view_expand.patch	Thu May 31 07:47:16 2007
@@ -0,0 +1,32 @@
+Index: nautilus-2.18.1/src/file-manager/fm-list-view.c
+===================================================================
+--- nautilus-2.18.1.orig/src/file-manager/fm-list-view.c	2007-04-10 14:05:29.000000000 +0200
++++ nautilus-2.18.1/src/file-manager/fm-list-view.c	2007-05-16 00:46:09.805874250 +0200
+@@ -1337,7 +1337,7 @@
+ 
+ 	for (l = nautilus_columns; l != NULL; l = l->next) {
+ 		NautilusColumn *nautilus_column;
+-		int column_num;		
++		int column_num, font_size;
+ 		char *name;
+ 		char *label;
+ 		float xalign;
+@@ -1360,6 +1360,9 @@
+ 			view->details->pixbuf_cell = (GtkCellRendererPixbuf *)cell;
+ 			
+ 			view->details->file_name_column = gtk_tree_view_column_new ();
++			gtk_tree_view_column_set_expand (view->details->file_name_column, TRUE);
++			font_size = PANGO_PIXELS (pango_font_description_get_size (GTK_WIDGET(view)->style->font_desc));
++			gtk_tree_view_column_set_min_width (view->details->file_name_column, 16*font_size);
+ 			g_object_ref (view->details->file_name_column);
+ 			gtk_object_sink (GTK_OBJECT (view->details->file_name_column));
+ 			view->details->file_name_column_num = column_num;
+@@ -1384,7 +1387,7 @@
+ 			cell = gtk_cell_renderer_text_new ();
+                         g_object_set (cell,
+                                       "ellipsize", PANGO_ELLIPSIZE_END,
+-                                      "width-chars", 32,
++                                      "ellipsize-set", TRUE,
+                                       NULL);
+ 			view->details->file_name_cell = (GtkCellRendererText *)cell;
+ 			g_signal_connect (cell, "edited", G_CALLBACK (cell_renderer_edited), view);
Index: extra/gnome/nautilus/PKGBUILD
diff -u extra/gnome/nautilus/PKGBUILD:1.35 extra/gnome/nautilus/PKGBUILD:1.36
--- extra/gnome/nautilus/PKGBUILD:1.35	Sun Apr 22 11:09:46 2007
+++ extra/gnome/nautilus/PKGBUILD	Thu May 31 07:47:17 2007
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD,v 1.35 2007/04/22 15:09:46 jgc Exp $
+# $Id: PKGBUILD,v 1.36 2007/05/31 11:47:17 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=nautilus
 pkgver=2.18.1
-pkgrel=1
+pkgrel=2
 pkgdesc="The GNOME shell and file manager"
 arch=(i686 x86_64)
 license=('GPL')
@@ -12,13 +12,15 @@
 url="http://www.gnome.org"
 groups=('gnome')
 replaces=('fontilus')
-options=('nolibtool')
+options=('!libtool')
 install=nautilus.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.18/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('e4718f37080b7d98cd5707e617d43ae6')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.18/${pkgname}-${pkgver}.tar.bz2
+	12_list-view_expand.patch)
+md5sums=('e4718f37080b7d98cd5707e617d43ae6' 'db774f1f95852ff3ed044d0eb65609fb')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
+  patch -Np1 -i ${startdir}/src/12_list-view_expand.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --disable-static \
 	      --disable-update-mimedb