[arch-commits] CVS update of extra/gnome/nautilus (PKGBUILD beagle-0.3.0.patch)

[Varun Acharya]

    Date: Monday, December 3, 2007 @ 06:01:15
  Author: varun
    Path: /home/cvs-extra/extra/gnome/nautilus

   Added: beagle-0.3.0.patch (1.1)
Modified: PKGBUILD (1.41 -> 1.42)

patch for beagle-0.3.0 added


--------------------+
 PKGBUILD           |   13 +++++++++----
 beagle-0.3.0.patch |   35 +++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 4 deletions(-)


Index: extra/gnome/nautilus/PKGBUILD
diff -u extra/gnome/nautilus/PKGBUILD:1.41 extra/gnome/nautilus/PKGBUILD:1.42
--- extra/gnome/nautilus/PKGBUILD:1.41	Sun Dec  2 20:05:23 2007
+++ extra/gnome/nautilus/PKGBUILD	Mon Dec  3 06:01:14 2007
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD,v 1.41 2007/12/03 01:05:23 varun Exp $
+# $Id: PKGBUILD,v 1.42 2007/12/03 11:01:14 varun Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=nautilus
 pkgver=2.20.0
-pkgrel=2
+pkgrel=3
 pkgdesc="The GNOME shell and file manager"
 arch=(i686 x86_64)
 license=('GPL')
@@ -14,11 +14,16 @@
 replaces=('fontilus')
 options=('!libtool' '!emptydirs')
 install=nautilus.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.20/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('3856ec2ffeba786d12f8f6622e398c33')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.20/${pkgname}-${pkgver}.tar.bz2 \
+        beagle-0.3.0.patch)
+md5sums=('3856ec2ffeba786d12f8f6622e398c33' \
+         'dff10b37d6636f6338df6379edc535e6')
+
+         
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
+  patch -Np1 -i ${startdir}/beagle-0.3.0.patch
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --disable-static \
 	      --disable-update-mimedb
Index: extra/gnome/nautilus/beagle-0.3.0.patch
diff -u /dev/null extra/gnome/nautilus/beagle-0.3.0.patch:1.1
--- /dev/null	Mon Dec  3 06:01:15 2007
+++ extra/gnome/nautilus/beagle-0.3.0.patch	Mon Dec  3 06:01:14 2007
@@ -0,0 +1,35 @@
+--- nautilus-2.20.0/configure.in.old	2007-12-02 20:10:17.000000000 +0900
++++ nautilus-2.20.0/configure.in	2007-12-02 20:10:38.000000000 +0900
+@@ -300,7 +300,7 @@
+ AC_ARG_ENABLE(beagle, [  --disable-beagle     build without beagle support])
+ msg_beagle=no
+ if test "x$enable_beagle" != "xno"; then
+-	PKG_CHECK_MODULES(BEAGLE, libbeagle-0.0 >= beagle_minver, [
++	PKG_CHECK_MODULES(BEAGLE, libbeagle-1.0 >= beagle_minver, [
+ 		  	  AM_CONDITIONAL(HAVE_BEAGLE, true)
+ 			  AC_DEFINE(HAVE_BEAGLE, 1, [Define to enable beagle support])
+ 			  ]
+--- nautilus-2.20.0/libnautilus-private/nautilus-search-engine-beagle.c.old	2007-12-02 20:55:02.000000000 +0900
++++ nautilus-2.20.0/libnautilus-private/nautilus-search-engine-beagle.c	2007-12-02 20:56:33.000000000 +0900
+@@ -175,9 +175,6 @@
+ 	g_signal_connect (beagle->details->current_query,
+ 			  "error", G_CALLBACK (beagle_error), engine);
+ 
+-	/* We only want files */
+-	beagle_query_add_hit_type (beagle->details->current_query,
+-				   "File");
+ 	beagle_query_set_max_hits (beagle->details->current_query,
+ 				   1000);
+ 	
+@@ -186,11 +183,6 @@
+ 			       text);
+ 
+ 	mimetypes = nautilus_query_get_mime_types (beagle->details->query);
+-	for (l = mimetypes; l != NULL; l = l->next) {
+-		mimetype = l->data;
+-		beagle_query_add_mime_type (beagle->details->current_query,
+-					    mimetype);
+-	}
+ 
+ 	beagle->details->current_query_uri_prefix = nautilus_query_get_location (beagle->details->query);
+