Backport patch from upstream to fix bug 283740, problems with firefox extension and >=firefox-3.5 in 0.3.9-r2. Restrict 0.3.9-r1 to older versions of firefox. Clean out old patches.

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

4 files changed, 177 insertions, 150 deletions

diff --git a/app-misc/beagle/files/beagle-0.2.18-mono-1.9.1.patch b/app-misc/beagle/files/beagle-0.2.18-mono-1.9.1.patch
deleted file mode 100644
index d38532538bbd..000000000000
--- a/app-misc/beagle/files/beagle-0.2.18-mono-1.9.1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru beagle-0.2.18~/search/UIManager.cs beagle-0.2.18/search/UIManager.cs
---- beagle-0.2.18~/search/UIManager.cs	2008-06-29 15:14:28.000000000 +0200
-+++ beagle-0.2.18/search/UIManager.cs	2008-06-29 15:15:00.000000000 +0200
-@@ -394,7 +394,7 @@
- 			if (ScopeChanged == null)
- 				return;
- 
--			ScopeType scope = (ScopeType) System.Enum.Parse (typeof (ScopeType), ((Action) obj).Name);
-+			ScopeType scope = (ScopeType) System.Enum.Parse (typeof (ScopeType), ((Gtk.Action) obj).Name);
- 			
- 			ScopeChanged (scope, ((ToggleAction) obj).Active);
- 		}
diff --git a/app-misc/beagle/files/beagle-0.2.7-crawltweek.patch b/app-misc/beagle/files/beagle-0.2.7-crawltweek.patch
deleted file mode 100644
index 2a081a0bd7b0..000000000000
--- a/app-misc/beagle/files/beagle-0.2.7-crawltweek.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- tools/crawl-rules/crawl-applications.orig	2006-06-20 02:48:47.966755392 +0100
-+++ tools/crawl-rules/crawl-applications	2006-06-20 02:49:26.025969512 +0100
-@@ -2,7 +2,7 @@
- 
- CRAWL_INDEX_NAME="applications"
- 
--CRAWL_PATHS="/usr/share/applications /usr/local/share/applications /opt/gnome/share/applications /opt/kde3/share/applications"
-+CRAWL_PATHS="/usr/share/applications /usr/local/share/applications /opt/gnome/share/applications /opt/kde3/share/applications /usr/kde/*/share/applications"
- 
- CRAWL_RECURSIVE="yes"
- 
---- tools/crawl-rules/crawl-documentation.orig	2006-06-20 02:49:41.780574448 +0100
-+++ tools/crawl-rules/crawl-documentation	2006-06-20 02:50:29.751281792 +0100
-@@ -2,7 +2,7 @@
- 
- CRAWL_INDEX_NAME="documentation"
- 
--CRAWL_PATHS="/usr/share/doc /usr/local/share/doc /opt/kde3/share/doc /opt/gnome/share/gnome/help /usr/share/gnome/help /opt/gnome/share/gtk-doc/html /usr/share/gtk-doc/html /usr/share/gnome/html"
-+CRAWL_PATHS="/usr/share/doc /usr/local/share/doc /opt/kde3/share/doc /opt/gnome/share/gnome/help /usr/share/gnome/help /opt/gnome/share/gtk-doc/html /usr/share/gtk-doc/html /usr/share/gnome/html /usr/kde/*/share/doc"
- 
- CRAWL_ALLOW_PATTERNS="*.xml,*.html,*.docbook"
- 
diff --git a/app-misc/beagle/files/beagle-0.3.7-evo-sharp.patch b/app-misc/beagle/files/beagle-0.3.7-evo-sharp.patch
deleted file mode 100644
index db5c87aada3e..000000000000
--- a/app-misc/beagle/files/beagle-0.3.7-evo-sharp.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-diff -ru beagle-0.3.7~/beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs beagle-0.3.7/beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs
---- beagle-0.3.7~/beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs	2008-06-07 16:23:11.000000000 +0200
-+++ beagle-0.3.7/beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs	2008-06-07 16:28:57.000000000 +0200
-@@ -36,7 +36,7 @@
- using Beagle.Util;
- using Beagle.Daemon;
- 
--using Camel = Beagle.Util.Camel;
-+using B_U_Camel = Beagle.Util.Camel;
- 
- namespace Beagle.Daemon.EvolutionMailQueryable {
- 
-@@ -309,7 +309,7 @@
- 			}
- 		}
- 
--		private static bool CheckFlags (uint flags, Camel.CamelFlags test)
-+		private static bool CheckFlags (uint flags, B_U_Camel.CamelFlags test)
- 		{
- 			return (flags & (uint) test) == (uint) test;
- 		}
-@@ -317,7 +317,7 @@
- 		private Indexable GMimeMessageToIndexable (string uid, GMime.Message message, uint flags)
- 		{
- 			// Don't index messages flagged as junk
--			if (CheckFlags (flags, Camel.CamelFlags.Junk))
-+			if (CheckFlags (flags, B_U_Camel.CamelFlags.Junk))
- 				return null;
- 
- 			System.Uri uri = EvolutionMailQueryable.EmailUri (this.account_name, this.folder_name, uid);
-@@ -362,22 +362,22 @@
- 			flag_prop.IsMutable = true;
- 			indexable.AddProperty (flag_prop);
- 
--			if (CheckFlags (flags, Camel.CamelFlags.Answered))
-+			if (CheckFlags (flags, B_U_Camel.CamelFlags.Answered))
- 				indexable.AddProperty (Property.NewFlag ("fixme:isAnswered"));
- 
--			if (CheckFlags (flags, Camel.CamelFlags.Deleted))
-+			if (CheckFlags (flags, B_U_Camel.CamelFlags.Deleted))
- 				indexable.AddProperty (Property.NewFlag ("fixme:isDeleted"));
- 
--			if (CheckFlags (flags, Camel.CamelFlags.Draft))
-+			if (CheckFlags (flags, B_U_Camel.CamelFlags.Draft))
- 				indexable.AddProperty (Property.NewFlag ("fixme:isDraft"));
- 
--			if (CheckFlags (flags, Camel.CamelFlags.Flagged))
-+			if (CheckFlags (flags, B_U_Camel.CamelFlags.Flagged))
- 				indexable.AddProperty (Property.NewFlag ("fixme:isFlagged"));
- 
--			if (CheckFlags (flags, Camel.CamelFlags.Seen))
-+			if (CheckFlags (flags, B_U_Camel.CamelFlags.Seen))
- 				indexable.AddProperty (Property.NewFlag ("fixme:isSeen"));
- 
--			if (CheckFlags (flags, Camel.CamelFlags.AnsweredAll))
-+			if (CheckFlags (flags, B_U_Camel.CamelFlags.AnsweredAll))
- 				indexable.AddProperty (Property.NewFlag ("fixme:isAnsweredAll"));
- 
- 			indexable.SetBinaryStream (message.Stream);
-@@ -427,7 +427,7 @@
- 		private FileInfo summary_info;
- 		private string imap_name;
- 		private ImapBackendType backend_type;
--		private Camel.Summary summary;
-+		private B_U_Camel.Summary summary;
- 		private IEnumerator summary_enumerator;
- 		private EvolutionSummaryTracker tracker;
- 		private DateTime start_crawl_time;
-@@ -593,9 +593,9 @@
- 			if (this.summary == null) {
- 				try {
- 					if (this.backend_type == ImapBackendType.Imap)
--						this.summary = Camel.Summary.LoadImapSummary (this.summary_info.FullName);
-+						this.summary = B_U_Camel.Summary.LoadImapSummary (this.summary_info.FullName);
- 					else
--						this.summary = Camel.Summary.LoadImap4Summary (this.summary_info.FullName);
-+						this.summary = B_U_Camel.Summary.LoadImap4Summary (this.summary_info.FullName);
- 				} catch (Exception e) {
- 					Logger.Log.Warn (e, "Unable to index {0}:", this.folder_name);
- 					this.queryable.RemoveGenerator (this);
-@@ -660,7 +660,7 @@
- 				return indexable;
- 			}
- 
--			Camel.MessageInfo mi = (Camel.MessageInfo) this.summary_enumerator.Current;
-+			B_U_Camel.MessageInfo mi = (B_U_Camel.MessageInfo) this.summary_enumerator.Current;
- 
- 			++this.count;
- 
-@@ -717,12 +717,12 @@
- 			return indexable;
- 		}
- 
--		private Uri CamelMessageUri (Camel.MessageInfo message_info)
-+		private Uri CamelMessageUri (B_U_Camel.MessageInfo message_info)
- 		{
- 			return EvolutionMailQueryable.EmailUri (this.account_name, this.folder_name, message_info.uid);
- 		}
- 
--		private Indexable CamelMessageToIndexable (Camel.MessageInfo messageInfo, string msg_file)
-+		private Indexable CamelMessageToIndexable (B_U_Camel.MessageInfo messageInfo, string msg_file)
- 		{
- 			// Don't index messages flagged as junk
- 			if (messageInfo.IsJunk)
-Only in beagle-0.3.7/beagled/EvolutionMailQueryable: EvolutionMailIndexableGenerator.cs.orig
-diff -ru beagle-0.3.7~/beagled/EvolutionMailQueryable/EvolutionMailQueryable.cs beagle-0.3.7/beagled/EvolutionMailQueryable/EvolutionMailQueryable.cs
---- beagle-0.3.7~/beagled/EvolutionMailQueryable/EvolutionMailQueryable.cs	2008-06-07 16:23:11.000000000 +0200
-+++ beagle-0.3.7/beagled/EvolutionMailQueryable/EvolutionMailQueryable.cs	2008-06-07 16:25:36.000000000 +0200
-@@ -31,7 +31,6 @@
- using System.Threading;
- 
- using Beagle.Util;
--using Camel = Beagle.Util.Camel;
- 
- namespace Beagle.Daemon.EvolutionMailQueryable {
- 
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
new file mode 100644
index 000000000000..9302ed535c47
--- /dev/null
+++ b/app-misc/beagle/files/beagle-0.3.9-firefox-3.5.patch
@@ -0,0 +1,177 @@
+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"
+