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

[Jan de Groot]

    Date: Sunday, April 27, 2008 @ 14:44:36
  Author: jgc
Revision: 1017

Merged revisions 2-1016 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/yelp/trunk

........
  r356 | aaron | 2008-04-18 22:56:27 +0000 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r995 | jgc | 2008-04-26 10:14:18 +0000 (Sat, 26 Apr 2008) | 2 lines
  
  upgpkg: yelp 2.22.1-1
      Remove beagle search, either it crashes or uses 100% CPU
........

Modified:
  yelp/repos/extra-i686/	(properties)
  yelp/repos/extra-i686/PKGBUILD
Deleted:
  yelp/repos/extra-i686/yelp-fix-for-beagle-0.3.0.patch

---------------------------------+
 PKGBUILD                        |   18 ++++++------------
 yelp-fix-for-beagle-0.3.0.patch |   22 ----------------------
 2 files changed, 6 insertions(+), 34 deletions(-)


Property changes on: yelp/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /yelp/trunk:1
   + /yelp/trunk:1-1016

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-04-27 18:36:43 UTC (rev 1016)
+++ extra-i686/PKGBUILD	2008-04-27 18:44:36 UTC (rev 1017)
@@ -2,30 +2,24 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=yelp
-pkgver=2.22.0
+pkgver=2.22.1
 pkgrel=1
 pkgdesc="A help browser for GNOME"
 arch=(i686 x86_64)
-depends=('xulrunner>=1.8.1.12' 'libgnomeui>=2.22.01' 'gnome-doc-utils>=0.12.2' 'startup-notification>=0.9' 'libxslt' 'libbeagle')
-makedepends=('intltool' 'pkgconfig' 'autoconf' 'libtool' 'gnome-common')
+depends=('xulrunner>=1.8.1.12' 'libgnomeui>=2.22.1' 'gnome-doc-utils>=0.12.2' 'startup-notification>=0.9' 'libxslt')
+makedepends=('perlxml' 'pkgconfig')
 groups=('gnome')
 license=('GPL')
 options=('!emptydirs')
 url="http://www.gnome.org"
 install=yelp.install
-source=(http://ftp.gnome.org/pub/gnome/sources/yelp/2.22/yelp-${pkgver}.tar.bz2
-	yelp-fix-for-beagle-0.3.0.patch)
-md5sums=('941e67796bbc332c1db3d63771ae2590'
-	 '3bcf1955ac39d08c2137c4dc8057c61f')
+source=(http://ftp.gnome.org/pub/gnome/sources/yelp/2.22/yelp-${pkgver}.tar.bz2)
+md5sums=('a292c6712bb820e6aa2ade84ebdc9609')
 
 build() {
   cd ${startdir}/src/yelp-${pkgver}
-  #fix for beagle-0.3.0, thanks momonga linux
-  patch -Np1 -i ${startdir}/yelp-fix-for-beagle-0.3.0.patch || return 1
-  libtoolize --force --copy || return 1
-  autoreconf || return 1
  ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var --enable-man --with-search=beagle || return 1
+              --localstatedir=/var --enable-man --with-search=basic || return 1
   make LDFLAGS+="-R /usr/lib/xulrunner" || return 1
   make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install || return 1
 

Deleted: extra-i686/yelp-fix-for-beagle-0.3.0.patch
===================================================================
--- extra-i686/yelp-fix-for-beagle-0.3.0.patch	2008-04-27 18:36:43 UTC (rev 1016)
+++ extra-i686/yelp-fix-for-beagle-0.3.0.patch	2008-04-27 18:44:36 UTC (rev 1017)
@@ -1,22 +0,0 @@
---- yelp-2.20.0/configure.in.old	2007-12-02 18:55:15.000000000 +0900
-+++ yelp-2.20.0/configure.in	2007-12-02 18:55:47.000000000 +0900
-@@ -133,7 +133,7 @@
- dnl beagle
- dnl ******
- 
--BEAGLE_MODULES="libbeagle-0.0 >= 0.2.4"
-+BEAGLE_MODULES="libbeagle-1.0 >= 0.3.0"
- 
- AC_ARG_WITH([search],
- 	[AC_HELP_STRING([--with-search=basic|beagle|auto],
---- yelp-2.20.0/src/yelp-search-parser.c.old	2007-12-02 20:05:27.000000000 +0900
-+++ yelp-2.20.0/src/yelp-search-parser.c	2007-12-02 20:06:03.000000000 +0900
-@@ -552,7 +552,7 @@
- 
- 	beagle_query_set_max_hits (query, 10000);
- 	beagle_query_add_text (query, parser->search_terms);
--	beagle_query_add_source (query, "documentation");
-+//	beagle_query_add_source (query, "documentation");
- 
- 	parser->hits = g_ptr_array_new ();
-