diff options
author | Pacho Ramos <pacho@gentoo.org> | 2010-10-07 08:22:40 +0000 |
---|---|---|
committer | Pacho Ramos <pacho@gentoo.org> | 2010-10-07 08:22:40 +0000 |
commit | 0929b8214dfe66f129ddbd01f46fab52883af8fe (patch) | |
tree | 459318dcfaa4c9c4e11261535046d3cc654b23ac /app-misc/beagle | |
parent | Recover ChangeLog that was broken in revision 1.117. (diff) | |
download | historical-0929b8214dfe66f129ddbd01f46fab52883af8fe.tar.gz historical-0929b8214dfe66f129ddbd01f46fab52883af8fe.tar.bz2 historical-0929b8214dfe66f129ddbd01f46fab52883af8fe.zip |
Remove old.
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
Diffstat (limited to 'app-misc/beagle')
-rw-r--r-- | app-misc/beagle/ChangeLog | 5 | ||||
-rw-r--r-- | app-misc/beagle/Manifest | 14 | ||||
-rw-r--r-- | app-misc/beagle/beagle-0.3.9-r2.ebuild | 193 | ||||
-rw-r--r-- | app-misc/beagle/files/beagle-0.3.9-firefox-3.5.patch | 177 | ||||
-rw-r--r-- | app-misc/beagle/files/beagle-0.3.9-sqlite.patch | 93 | ||||
-rw-r--r-- | app-misc/beagle/files/beagle-log-level-warn.patch | 45 | ||||
-rw-r--r-- | app-misc/beagle/metadata.xml | 3 |
7 files changed, 10 insertions, 520 deletions
diff --git a/app-misc/beagle/ChangeLog b/app-misc/beagle/ChangeLog index 967cfa93a9fd..8e35c67dab39 100644 --- a/app-misc/beagle/ChangeLog +++ b/app-misc/beagle/ChangeLog @@ -3,6 +3,11 @@ # $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/ChangeLog,v 1.118 # 2010/09/13 04:26:28 josejx Exp $ + 07 Oct 2010; Pacho Ramos <pacho@gentoo.org> -beagle-0.3.9-r2.ebuild, + -files/beagle-0.3.9-firefox-3.5.patch, -files/beagle-0.3.9-sqlite.patch, + -files/beagle-log-level-warn.patch, metadata.xml: + Remove old. + 13 Sep 2010; Joseph Jezak <josejx@gentoo.org> beagle-0.3.9-r3.ebuild: Marked ppc stable for bug #324723. diff --git a/app-misc/beagle/Manifest b/app-misc/beagle/Manifest index 096928b721b6..355098259e54 100644 --- a/app-misc/beagle/Manifest +++ b/app-misc/beagle/Manifest @@ -1,25 +1,21 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX beagle-0.3.9-firefox-3.5.patch 7426 RMD160 aa674eb63cf320d5500e243659ac1196594ebe06 SHA1 fe1ba593e445ef4b29671800e78c694982e9b112 SHA256 2091b5519bef802124bd37387501270a688a715c1f06f382c9ed825eee86d4ba AUX beagle-0.3.9-firefox-3.6.patch 7426 RMD160 a2d5679c722cbb904ec9b635f7edb8462a6dab20 SHA1 dbec7eab223fa48fbbf265006cd2c5cc7ca2e3c2 SHA256 7017f2d73e99b572dc49e4fd8002910aa7e8f8d7bd2f9b40722d20f0c08baf9e AUX beagle-0.3.9-gmime24.patch 22487 RMD160 3e570097c629f708b9fe106c92132521b9483b9d SHA1 e2c356817d6fc61d0f32f1f9bfbe4e7744891fc2 SHA256 010109ebc1661e90068e6edadb6faa3b45baac465c5661829f3bfc166950a478 AUX beagle-0.3.9-grow-shrink.patch 9509 RMD160 634b3b8531f7c2a65ad851b6722fb715a38d006c SHA1 16d17c5207b05316e19fed596fa04a89cf153eae SHA256 7719d14f824aaa1aca6346b822d4321e8981db473c61a4908f7bbbed4303a9ba AUX beagle-0.3.9-mono2.6.patch 2082 RMD160 8bf9c71213b26856c5760a4befb225f06e610b65 SHA1 95da286a2a483fbea4ef91df51ac1d04a2b710d7 SHA256 e7996db9bcfe0ba79fe618a499885c0d07b36ce681e2bb593a122827c7f63981 AUX beagle-0.3.9-openfix.patch 605 RMD160 18b457cec66adf9b11aea6ffcca6d20e6ea813a5 SHA1 f9bbaf11e3d6b2dc49d55cdee54312de5a96cb85 SHA256 c30eb85aed8ba7b1d5f7726703e5fce90570514df8283f891f7c7447d1daa3eb -AUX beagle-0.3.9-sqlite.patch 2749 RMD160 0815f0e79981e10673e2f1a7451143f93598d88a SHA1 9999254ee26a04a2a9fa33ba09bf04e2e6ea7428 SHA256 bbb7245c42fa0be2bccb762463bda1f7daf1663f0e6460eb1038cf7f05316feb AUX beagle-0.3.9-update-tileindex.patch 722 RMD160 00a50f6b87552fcba645f6d336024e75f9d73bb7 SHA1 0b3f3977058f89f59692d655033ab66fd0561e81 SHA256 0fce90205644d010fd329c1ffb6d3c52a84ff5289e01670e0377082df7b4e966 -AUX beagle-log-level-warn.patch 2014 RMD160 444a772662d0cf1e2b32865c87ad8308c36537c2 SHA1 7b4abc9699922c3d681b3283ca9dc2dfe0710e88 SHA256 1f8664518210dfd54ea0e229cff30cc7e41dd0651ad5ed5f608afecb49afc48e AUX crawl-portage 295 RMD160 979f70ae6172ffbbba21fcf8ab22964d10bf6b1a SHA1 6c8da69912829a6dd8f1bdcacc3d59acb31a9f63 SHA256 14b8423c0590ce9bc8b43ee75b7c51c02ec46031d89baeee8c0100bdc6adb31b DIST beagle-0.3.9.tar.bz2 1895453 RMD160 f8e26ceeea50e33b04837e1d22f1a6f18fa84c1a SHA1 5fdba6ffd4a210076a954cc22f5b940705b71a6e SHA256 4252710247809df393f318450a391298fa57a3ad7b6043962734997035caf488 -EBUILD beagle-0.3.9-r2.ebuild 5765 RMD160 fee291bf1b8fdd415a2ff8476d17ac8238f3d69c SHA1 dc1a8a2bee973d497bc76233e03db24467d25fdf SHA256 d62b41c17690a42ceb74a191f1d369ead1d6758cced73bd2dd0529ca72ed13e3 EBUILD beagle-0.3.9-r3.ebuild 5802 RMD160 190c55b7717cd5a0ed91f49523e564dc39ff7e92 SHA1 16417b3c6eea21563e0c37e3bdfcb219ee7da541 SHA256 66aba45ff9fe1ab31775943a55d9a3c41e6cde1086d8ed553352f3e559849128 -MISC ChangeLog 20372 RMD160 fc99e284c58fe10e4542fdbda6d0c6deed438fd3 SHA1 1d5e433dbe25d93d7575d9fa92c99b4c3df56503 SHA256 0e0c8ae8c62351f91142ecf0dcbd1656e565ae8a47b634c232b33f6011acf388 -MISC metadata.xml 2512 RMD160 29e5762b199f22fb61d3fe6d253fc178d3f539dd SHA1 ca06a47949eb1d3b0f5b17d91f43e73b08454e32 SHA256 e210dd957e9278915a733fc6e035ccc041c364cba4c862a3ace26080240e5a05 +MISC ChangeLog 20585 RMD160 aad924439448fd997c2597f5d774dd3742627a47 SHA1 5b306983ba5b7cbb3c9d50113da47cdb845fa40d SHA256 f2cde7678468fba61ed8a089afc3bbd8c88a72e69f4b071d1335a36101ec2e9f +MISC metadata.xml 2338 RMD160 d2b362d854f48f950d99010537cd9978f02cf983 SHA1 213aa5501dbce6c8806d6c83fbcb80ac2d6023b8 SHA256 1e026522c9fbb32db4e60cd60da0cd73745d2f8b7d07aee889e787b9b688e42d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) -iEYEARECAAYFAkytgkMACgkQCaWpQKGI+9QVaQCfaS0Gw2k/5mxFYjBpbHi1SzrZ -yuQAn2trRaSRkJz6ykCjQzjRKXJSVS3Y -=25jj +iEYEARECAAYFAkytg1cACgkQCaWpQKGI+9Q/1QCdHPJs4pNz/2/8HFwIMo13PqJZ +DOoAn0f3fp5S8VDs2WsJ64n8TLyvu8bP +=XKLy -----END PGP SIGNATURE----- diff --git a/app-misc/beagle/beagle-0.3.9-r2.ebuild b/app-misc/beagle/beagle-0.3.9-r2.ebuild deleted file mode 100644 index 9ac78716c259..000000000000 --- a/app-misc/beagle/beagle-0.3.9-r2.ebuild +++ /dev/null @@ -1,193 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/beagle/beagle-0.3.9-r2.ebuild,v 1.9 2010/07/25 19:19:25 nirbheek Exp $ - -EAPI=2 - -inherit base gnome.org eutils mono mozextension autotools - -DESCRIPTION="Search tool that ransacks your personal information space to find whatever you're looking for" -HOMEPAGE="http://www.beagle-project.org/" -LICENSE="MIT Apache-1.1" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="avahi chm debug doc epiphany eds firefox +galago gtk +pdf +inotify +ole thunderbird +google +xscreensaver" - -#See bug 248331 for blocker reason. -RDEPEND="!!sci-libs/beagle - >=dev-lang/mono-1.9 - >=app-shells/bash-3.2 - app-arch/zip - >=dev-db/sqlite-3.3.1 - >=dev-dotnet/dbus-sharp-0.6.0 - >=dev-dotnet/dbus-glib-sharp-0.4.1 - >=dev-dotnet/taglib-sharp-2.0 - gtk? ( - x11-libs/libX11 - >=gnome-base/librsvg-2.22.0 - sys-devel/gettext - >=dev-dotnet/gtk-sharp-2.12.6 - >=dev-dotnet/gconf-sharp-2.24.0 - >=dev-dotnet/glade-sharp-2.12.6 - >=dev-dotnet/gnome-sharp-2.24.0 - >=dev-dotnet/gnomevfs-sharp-2.24.0 - dev-libs/gmime:0[mono] - x11-misc/xdg-utils - >=x11-libs/gtk+-2.14.0 - >=dev-libs/atk-1.22.0 - ) - eds? ( - >=dev-dotnet/evolution-sharp-0.18.1 - >=dev-dotnet/gconf-sharp-2.24.0 - >=dev-dotnet/glib-sharp-2.12.6 - dev-libs/gmime:0[mono] - ) - ole? ( - >=app-text/wv-1.2.3 - >=dev-dotnet/gsf-sharp-0.8.1 - >=app-office/gnumeric-1.4.3-r3 - ) - - x11-misc/shared-mime-info - >=dev-dotnet/glib-sharp-2.12.6 - dev-libs/gmime:0[mono] - chm? ( dev-libs/chmlib ) - pdf? ( >=app-text/poppler-0.12.3-r3[utils] ) - galago? ( >=dev-dotnet/galago-sharp-0.5.0 ) - thunderbird? ( - || ( - >=mail-client/thunderbird-1.5 - >=mail-client/thunderbird-bin-1.5 - ) - ) - firefox? ( - || ( - >=www-client/firefox-1.5 - >=www-client/firefox-bin-1.5 - ) - ) - epiphany? ( - >=www-client/epiphany-extensions-2.16[python] - >=dev-libs/libbeagle-0.3.9[python] - ) - xscreensaver? ( x11-libs/libXScrnSaver ) - >=dev-libs/libbeagle-0.3.9 - avahi? ( >=net-dns/avahi-0.6.10[mono] )" - -DEPEND="${RDEPEND} - doc? ( >=virtual/monodoc-1.2.4 ) - dev-util/pkgconfig - xscreensaver? ( x11-proto/scrnsaverproto ) - >=dev-util/intltool-0.35" - -pkg_setup() { - enewgroup beagleindex - enewuser beagleindex -1 -1 /var/lib/cache/beagle beagleindex - if use thunderbird - then - if ! use inotify - then - eerror "You have enabled the thunderbird use flag. This use-flag depends on the inotify use-flag." - eerror "Please enable the inotify use-flag also." - eerror "See http://bugs.gentoo.org/263781 for more information." - die "Please enable the inotify use-flag." - fi - fi -} - -src_prepare() { - - #Fix upstream bug, Gentoo bug #306313 - epatch "${FILESDIR}"/${P}-sqlite.patch - - #Fix bug 248703 - sed -i -e 's:VALID_EPIPHANY_VERSIONS=":VALID_EPIPHANY_VERSIONS="2.26 2.25 2.24 :' \ - configure.in || die "epiphany sed failed" - - #Fix bugs.gnome.org/556243 - sed -i -e "s:libgnome-desktop-2.so.2:libgnome-desktop-2.so:" \ - search/Beagle.Search.exe.config || die "gnome-desktop sed failed" - #Fix bug 283740 - epatch "${FILESDIR}/${P}-firefox-3.5.patch" - eautoreconf -} - -src_configure() { - econf --disable-static \ - --disable-dependency-tracking \ - $(use_enable debug xml-dump) \ - $(use_enable doc docs) \ - $(use_enable epiphany epiphany-extension) \ - $(use_enable thunderbird) \ - $(use_enable eds evolution) \ - $(use_enable gtk gui) \ - $(use_enable ole gsf-sharp wv1) \ - $(use_enable xscreensaver xss) \ - $(use_enable inotify) \ - $(use_enable avahi) \ - $(use_enable google googlebackends) -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed." - - dodoc AUTHORS NEWS README || die "dodoc failed" - - declare MOZILLA_FIVE_HOME - if use firefox; then - xpi_unpack "${S}"/firefox-extension/beagle.xpi \ - || die "Unable to find Beagle Firefox Extension" - mv "${WORKDIR}"/beagle "${WORKDIR}"/firefox-beagle - - if has_version '>=www-client/firefox-1.5'; then - MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-firefox" - xpi_install "${WORKDIR}"/firefox-beagle \ - || die "xpi install for firefox failed!" - fi - if has_version '>=www-client/firefox-bin-1.5'; then - MOZILLA_FIVE_HOME="/opt/firefox" - xpi_install "${WORKDIR}"/firefox-beagle \ - || die "xpi install for firefox-bin failed!" - fi - fi - - if use thunderbird; then - xpi_unpack "${S}"/thunderbird-extension/beagle.xpi \ - || die "Unable to find Beagle Thunderbird Extension" - mv "${WORKDIR}"/beagle "${WORKDIR}"/thunderbird-beagle - - if has_version '>=mail-client/thunderbird-1.5'; then - MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-thunderbird" - xpi_install "${WORKDIR}"/thunderbird-beagle \ - || die "xpi install for thunderbird failed!" - fi - if has_version '>=mail-client/thunderbird-bin-1.5'; then - MOZILLA_FIVE_HOME="/opt/thunderbird" - xpi_install "${WORKDIR}"/thunderbird-beagle \ - || die "xpi install for thunderbird-bin failed!" - fi - fi - - sed -i -e 's/CRAWL_ENABLED="yes"/CRAWL_ENABLED="no"/' \ - "${D}"/etc/beagle/crawl-rules/crawl-* - - insinto /etc/beagle/crawl-rules - doins "${FILESDIR}/crawl-portage" - - keepdir "/usr/$(get_libdir)/beagle/Backends" - diropts -o beagleindex -g beagleindex - keepdir "/var/lib/cache/beagle/indexes" -} - -pkg_postinst() { - elog "If available, Beagle greatly benefits from using certain operating" - elog "system features such as Extended Attributes and inotify." - elog - elog "If you want static queryables such as the portage tree and system" - elog "documentation you will need to edit the /etc/beagle/crawl-* files" - elog "and change CRAWL_ENABLE from 'no' to 'yes'." - elog - elog "For more info on how to create the optimal beagle environment, and" - elog "basic usage info, see the Gentoo page of the Beagle website:" - elog "http://www.beagle-project.org/Gentoo_Installation" -} diff --git a/app-misc/beagle/files/beagle-0.3.9-firefox-3.5.patch b/app-misc/beagle/files/beagle-0.3.9-firefox-3.5.patch deleted file mode 100644 index 9302ed535c47..000000000000 --- a/app-misc/beagle/files/beagle-0.3.9-firefox-3.5.patch +++ /dev/null @@ -1,177 +0,0 @@ -Fix bug 283740 -Backport of: -From a56102700eb77cc6563b99b68acdc699a6716e73 Mon Sep 17 00:00:00 2001 -From: Tao Fei <Filia.Tao@gmail.com> -Date: Fri, 03 Jul 2009 11:20:56 +0000 -Subject: fix name confilct bug in beaglePrefs.js (for firefox 3.5) - -remove some debug msg (break in firefox 3.5) -update zh-cn locale for beagle search history sidebar -update max firfox version to 3.5.* -update version number to 1.1.2 - -From upstream git. -Link: http://git.gnome.org/cgit/beagle/commit/?id=a56102700eb77cc6563b99b68acdc699a6716e73 - -diff -NrU5 beagle-0.3.9.orig/firefox-extension/chrome/content/beaglePrefs.js beagle-0.3.9/firefox-extension/chrome/content/beaglePrefs.js ---- beagle-0.3.9.orig/firefox-extension/chrome/content/beaglePrefs.js 2009-09-05 12:28:10.000000000 +0200 -+++ beagle-0.3.9/firefox-extension/chrome/content/beaglePrefs.js 2009-09-05 12:29:07.000000000 +0200 -@@ -2,11 +2,11 @@ - * Beagle Extension: Index webpages you visit using the Beagle Indexing Engine. - * An Extension for the Firefox Browser. - */ - - // Initiate a new preference instance. --var gPrefService = Components.classes['@mozilla.org/preferences-service;1'].getService(Components.interfaces.nsIPrefBranch); -+_prefService = Components.classes['@mozilla.org/preferences-service;1'].getService(Components.interfaces.nsIPrefBranch); - - var beaglePref = { - - //some constant - RULE_INCLUDE : 1, -@@ -29,18 +29,18 @@ - - - //functions used to get/set pref - func_factory:{ - 'get':{ -- 'bool': Function.bind(gPrefService.getBoolPref,gPrefService), -- 'int': Function.bind(gPrefService.getIntPref,gPrefService), -- 'string' : Function.bind(gPrefService.getCharPref,gPrefService) -+ 'bool': Function.bind(_prefService.getBoolPref,_prefService), -+ 'int': Function.bind(_prefService.getIntPref,_prefService), -+ 'string' : Function.bind(_prefService.getCharPref,_prefService) - }, - 'set':{ -- 'bool': Function.bind(gPrefService.setBoolPref,gPrefService), -- 'int' : Function.bind(gPrefService.setIntPref,gPrefService), -- 'string' : Function.bind(gPrefService.setCharPref,gPrefService) -+ 'bool': Function.bind(_prefService.setBoolPref,_prefService), -+ 'int' : Function.bind(_prefService.setIntPref,_prefService), -+ 'string' : Function.bind(_prefService.setCharPref,_prefService) - } - }, - - prefObject : {}, - -@@ -318,8 +318,8 @@ - } - catch(ex){ - log("first run import error"); - log(ex); - } -- }, -+ } - } - -diff -NrU5 beagle-0.3.9.orig/firefox-extension/chrome/content/jslib/io/dir.js beagle-0.3.9/firefox-extension/chrome/content/jslib/io/dir.js ---- beagle-0.3.9.orig/firefox-extension/chrome/content/jslib/io/dir.js 2009-09-05 12:28:10.000000000 +0200 -+++ beagle-0.3.9/firefox-extension/chrome/content/jslib/io/dir.js 2009-09-05 12:29:07.000000000 +0200 -@@ -219,11 +219,11 @@ - " readDir(aDirPath);\n"; - - return help; - }); - --jslibDebug('*** load: '+JS_DIR_FILE+' OK'); -+//jslibDebug('*** load: '+JS_DIR_FILE+' OK'); - - } else { - dump("JSLIB library not loaded:\n" + - " \tTo load use: chrome://jslib/content/jslib.js\n" + - " \tThen: include(jslib_dir);\n\n"); -diff -NrU5 beagle-0.3.9.orig/firefox-extension/chrome/content/jslib/io/dirUtils.js beagle-0.3.9/firefox-extension/chrome/content/jslib/io/dirUtils.js ---- beagle-0.3.9.orig/firefox-extension/chrome/content/jslib/io/dirUtils.js 2009-09-05 12:28:10.000000000 +0200 -+++ beagle-0.3.9/firefox-extension/chrome/content/jslib/io/dirUtils.js 2009-09-05 12:29:07.000000000 +0200 -@@ -171,11 +171,11 @@ - return help; - } - - }; //END CLASS - --jslibDebug('*** load: '+JS_DIRUTILS_FILE+' OK'); -+//jslibDebug('*** load: '+JS_DIRUTILS_FILE+' OK'); - - } // END BLOCK JS_LIB_LOADED CHECK - - else { - dump("JSLIB library not loaded:\n" + -diff -NrU5 beagle-0.3.9.orig/firefox-extension/chrome/content/jslib/io/file.js beagle-0.3.9/firefox-extension/chrome/content/jslib/io/file.js ---- beagle-0.3.9.orig/firefox-extension/chrome/content/jslib/io/file.js 2009-09-05 12:28:10.000000000 +0200 -+++ beagle-0.3.9/firefox-extension/chrome/content/jslib/io/file.js 2009-09-05 12:29:07.000000000 +0200 -@@ -756,11 +756,11 @@ - " help;\n"; - - return help; - }) - --jslibDebug('*** load: '+JS_FILE_FILE+' OK'); -+//jslibDebug('*** load: '+JS_FILE_FILE+' OK'); - - } // END BLOCK JS_LIB_LOADED CHECK - - // If jslib base library is not loaded, dump this error. - else -diff -NrU5 beagle-0.3.9.orig/firefox-extension/chrome/content/jslib/io/fileUtils.js beagle-0.3.9/firefox-extension/chrome/content/jslib/io/fileUtils.js ---- beagle-0.3.9.orig/firefox-extension/chrome/content/jslib/io/fileUtils.js 2009-09-05 12:28:10.000000000 +0200 -+++ beagle-0.3.9/firefox-extension/chrome/content/jslib/io/fileUtils.js 2009-09-05 12:29:07.000000000 +0200 -@@ -582,11 +582,11 @@ - return help; - } - - }; - --jslibDebug('*** load: '+JS_FILEUTILS_FILE+' OK'); -+//jslibDebug('*** load: '+JS_FILEUTILS_FILE+' OK'); - - } // END BLOCK JS_LIB_LOADED CHECK - - // If jslib base library is not loaded, dump this error. - else -diff -NrU5 beagle-0.3.9.orig/firefox-extension/chrome/locale/zh-CN/beagle.dtd beagle-0.3.9/firefox-extension/chrome/locale/zh-CN/beagle.dtd ---- beagle-0.3.9.orig/firefox-extension/chrome/locale/zh-CN/beagle.dtd 2009-09-05 12:28:10.000000000 +0200 -+++ beagle-0.3.9/firefox-extension/chrome/locale/zh-CN/beagle.dtd 2009-09-05 12:29:07.000000000 +0200 -@@ -29,11 +29,13 @@ - <!ENTITY beagle.run.never.index.label "从不索引这个站点"> - <!ENTITY beagle.run.preferences.label "选项"> - <!ENTITY beagle.run.context.menu.label "Beagle"> - <!ENTITY beagle.run.index.link.label "索引链接"> - <!ENTITY beagle.run.index.image.label "索引图片"> -- - <!ENTITY beagle.index.link.start.label "开始"> - <!ENTITY beagle.index.link.stop.label "停止"> - - <!ENTITY beagle.bookmark.index.modified.label "索引更改过的书签"> - -+<!ENTITY beagle.sidebar.title "Beagle 搜索历史侧边栏"> -+<!ENTITY beagle.sidebar.commandkey "B"> -+<!ENTITY beagle.sidebar.modifierskey "shift 键"> -diff -NrU5 beagle-0.3.9.orig/firefox-extension/install.rdf.in beagle-0.3.9/firefox-extension/install.rdf.in ---- beagle-0.3.9.orig/firefox-extension/install.rdf.in 2009-09-05 12:28:10.000000000 +0200 -+++ beagle-0.3.9/firefox-extension/install.rdf.in 2009-09-05 12:29:50.000000000 +0200 -@@ -21,11 +21,11 @@ -
- <em:targetApplication>
- <Description>
- <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
- <em:minVersion>0.8</em:minVersion>
-- <em:maxVersion>3.0.*</em:maxVersion>
-+ <em:maxVersion>3.5.*</em:maxVersion>
- </Description>
- </em:targetApplication>
-
- </Description>
-
-diff -NrU5 beagle-0.3.9.orig/firefox-extension/Makefile.am beagle-0.3.9/firefox-extension/Makefile.am ---- beagle-0.3.9.orig/firefox-extension/Makefile.am 2009-09-05 12:28:10.000000000 +0200 -+++ beagle-0.3.9/firefox-extension/Makefile.am 2009-09-05 12:29:07.000000000 +0200 -@@ -1,8 +1,8 @@ - - PROJECT = beagle --VERSION = 1.1.0 -+VERSION = 1.1.2 - - INSTALL_RDF = install.rdf - INSTALL_RDF_IN = $(INSTALL_RDF).in - VERSION_SED = sed -e "s|\@VERSION\@|$(VERSION)|g" - diff --git a/app-misc/beagle/files/beagle-0.3.9-sqlite.patch b/app-misc/beagle/files/beagle-0.3.9-sqlite.patch deleted file mode 100644 index 251b5517752f..000000000000 --- a/app-misc/beagle/files/beagle-0.3.9-sqlite.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 59f63233908b8ccee70251f698351014546d5765 Mon Sep 17 00:00:00 2001 -From: Gabriel Burt <gabriel.burt@gmail.com> -Date: Thu, 07 Jan 2010 01:08:34 +0000 -Subject: Update to build against Mono.Data.Sqlite 2.x - ---- -diff --git a/beagle/Util/FSpotTools.cs b/beagle/Util/FSpotTools.cs -index 9470a0a..82f7752 100644 ---- a/beagle/Util/FSpotTools.cs -+++ b/beagle/Util/FSpotTools.cs -@@ -85,8 +85,12 @@ namespace Beagle.Util { - while (reader == null) { - try { - reader = command.ExecuteReader (); -- } catch (SqliteBusyException) { -- Thread.Sleep (50); -+ } catch (SqliteException e) { -+ if (e.ErrorCode == SQLiteErrorCode.Busy) { -+ Thread.Sleep (50); -+ } else { -+ throw; -+ } - } - } - reader.Close (); -diff --git a/beagle/beagled/SqliteUtils.cs b/beagle/beagled/SqliteUtils.cs -index f4be4c6..f747db5 100644 ---- a/beagle/beagled/SqliteUtils.cs -+++ b/beagle/beagled/SqliteUtils.cs -@@ -55,8 +55,13 @@ namespace Beagle.Util { - try { - ret = command.ExecuteNonQuery (); - break; -- } catch (SqliteBusyException ex) { -- Thread.Sleep (50); -+ } catch (SqliteException ex) { -+ if (ex.ErrorCode == SQLiteErrorCode.Busy) { -+ Thread.Sleep (50); -+ } else { -+ Log.Error (ex, "SQL that caused the exception: {0}", command_text); -+ throw; -+ } - } catch (Exception e) { - Log.Error (e, "SQL that caused the exception: {0}", command_text); - throw; -@@ -79,8 +84,13 @@ namespace Beagle.Util { - try { - ret = command.ExecuteNonQuery (); - break; -- } catch (SqliteBusyException ex) { -- Thread.Sleep (50); -+ } catch (SqliteException ex) { -+ if (ex.ErrorCode == SQLiteErrorCode.Busy) { -+ Thread.Sleep (50); -+ } else { -+ Log.Error (ex, "SQL that caused the exception: {0}", command.CommandText); -+ throw; -+ } - } catch (Exception e) { - Log.Error ( e, "SQL that caused the exception: {0}", command.CommandText); - throw; -@@ -96,8 +106,12 @@ namespace Beagle.Util { - while (reader == null) { - try { - reader = command.ExecuteReader (); -- } catch (SqliteBusyException ex) { -- Thread.Sleep (50); -+ } catch (SqliteException ex) { -+ if (ex.ErrorCode == SQLiteErrorCode.Busy) { -+ Thread.Sleep (50); -+ } else { -+ throw; -+ } - } - } - return reader; -@@ -108,8 +122,12 @@ namespace Beagle.Util { - while (true) { - try { - return reader.Read (); -- } catch (SqliteBusyException ex) { -- Thread.Sleep (50); -+ } catch (SqliteException ex) { -+ if (ex.ErrorCode == SQLiteErrorCode.Busy) { -+ Thread.Sleep (50); -+ } else { -+ throw; -+ } - } - } - } --- -cgit v0.8.3.1 diff --git a/app-misc/beagle/files/beagle-log-level-warn.patch b/app-misc/beagle/files/beagle-log-level-warn.patch deleted file mode 100644 index cbd9d1e52eed..000000000000 --- a/app-misc/beagle/files/beagle-log-level-warn.patch +++ /dev/null @@ -1,45 +0,0 @@ -Index: beagled/BeagleDaemon.cs -=================================================================== -RCS file: /cvs/gnome/beagle/beagled/BeagleDaemon.cs,v -retrieving revision 1.109 -diff -u -p -u -r1.109 BeagleDaemon.cs ---- beagled/BeagleDaemon.cs 8 Mar 2006 21:01:50 -0000 1.109 -+++ beagled/BeagleDaemon.cs 17 Mar 2006 18:27:58 -0000 -@@ -371,10 +371,7 @@ namespace Beagle.Daemon { - - Log.Initialize (PathFinder.LogDir, - "Beagle", -- // FIXME: We always turn on full debugging output! We are still -- // debugging this code, after all... -- //arg_debug ? LogLevel.Debug : LogLevel.Warn, -- LogLevel.Debug, -+ arg_debug ? LogLevel.Debug : LogLevel.Warn, - arg_fg); - - Logger.Log.Info ("Starting Beagle Daemon (version {0})", ExternalStringsHack.Version); -Index: beagled/IndexHelper/IndexHelper.cs -=================================================================== -RCS file: /cvs/gnome/beagle/beagled/IndexHelper/IndexHelper.cs,v -retrieving revision 1.24 -diff -u -p -u -r1.24 IndexHelper.cs ---- beagled/IndexHelper/IndexHelper.cs 8 Feb 2006 18:19:49 -0000 1.24 -+++ beagled/IndexHelper/IndexHelper.cs 4 Apr 2006 20:08:28 -0000 -@@ -61,16 +61,13 @@ namespace Beagle.IndexHelper { - bool run_by_hand = (Environment.GetEnvironmentVariable ("BEAGLE_RUN_HELPER_BY_HAND") != null); - bool log_in_fg = (Environment.GetEnvironmentVariable ("BEAGLE_LOG_IN_THE_FOREGROUND_PLEASE") != null); - -- // FIXME: We always turn on full debugging output! We are still -- // debugging this code, after all... -- //bool debug = (Environment.GetEnvironmentVariable ("BEAGLE_DEBUG_FLAG_IS_SET") != null); -+ bool debug = (Environment.GetEnvironmentVariable ("BEAGLE_DEBUG_FLAG_IS_SET") != null); - - last_activity = DateTime.Now; - - Log.Initialize (PathFinder.LogDir, - "IndexHelper", -- //debug ? LogLevel.Debug : LogLevel.Warn, -- LogLevel.Debug, -+ debug ? LogLevel.Debug : LogLevel.Warn, - run_by_hand || log_in_fg); - - Application.InitCheck ("IndexHelper", ref args); diff --git a/app-misc/beagle/metadata.xml b/app-misc/beagle/metadata.xml index b263af5cb87b..a8f8a1c8c7ff 100644 --- a/app-misc/beagle/metadata.xml +++ b/app-misc/beagle/metadata.xml @@ -15,9 +15,6 @@ <pkg>mail-client/evolution</pkg> stored in <pkg>gnome-extra/evolution-data-server</pkg>. The information is accessed using <pkg>dev-dotnet/evolution-sharp</pkg>.</flag> - <flag name='epiphany'>Compiles and installs the extension for either - <pkg>www-client/epiphany</pkg>. This extension helps Beagle index the - websites you visit.</flag> <flag name='firefox'>Compiles and installs the extension for either <pkg>www-client/firefox</pkg> or <pkg>www-client/firefox-bin</pkg>. This extension helps |