1 |
loki_val 09/09/05 11:21:34 |
2 |
|
3 |
Added: beagle-0.3.9-firefox-3.5.patch |
4 |
Removed: beagle-0.2.7-crawltweek.patch |
5 |
beagle-0.2.18-mono-1.9.1.patch |
6 |
beagle-0.3.7-evo-sharp.patch |
7 |
Log: |
8 |
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. |
9 |
(Portage version: 2.2_rc40/cvs/Linux x86_64) |
10 |
|
11 |
Revision Changes Path |
12 |
1.1 app-misc/beagle/files/beagle-0.3.9-firefox-3.5.patch |
13 |
|
14 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/beagle/files/beagle-0.3.9-firefox-3.5.patch?rev=1.1&view=markup |
15 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/beagle/files/beagle-0.3.9-firefox-3.5.patch?rev=1.1&content-type=text/plain |
16 |
|
17 |
Index: beagle-0.3.9-firefox-3.5.patch |
18 |
=================================================================== |
19 |
Fix bug 283740 |
20 |
Backport of: |
21 |
From a56102700eb77cc6563b99b68acdc699a6716e73 Mon Sep 17 00:00:00 2001 |
22 |
From: Tao Fei <Filia.Tao@×××××.com> |
23 |
Date: Fri, 03 Jul 2009 11:20:56 +0000 |
24 |
Subject: fix name confilct bug in beaglePrefs.js (for firefox 3.5) |
25 |
|
26 |
remove some debug msg (break in firefox 3.5) |
27 |
update zh-cn locale for beagle search history sidebar |
28 |
update max firfox version to 3.5.* |
29 |
update version number to 1.1.2 |
30 |
|
31 |
From upstream git. |
32 |
Link: http://git.gnome.org/cgit/beagle/commit/?id=a56102700eb77cc6563b99b68acdc699a6716e73 |
33 |
|
34 |
diff -NrU5 beagle-0.3.9.orig/firefox-extension/chrome/content/beaglePrefs.js beagle-0.3.9/firefox-extension/chrome/content/beaglePrefs.js |
35 |
--- beagle-0.3.9.orig/firefox-extension/chrome/content/beaglePrefs.js 2009-09-05 12:28:10.000000000 +0200 |
36 |
+++ beagle-0.3.9/firefox-extension/chrome/content/beaglePrefs.js 2009-09-05 12:29:07.000000000 +0200 |
37 |
@@ -2,11 +2,11 @@ |
38 |
* Beagle Extension: Index webpages you visit using the Beagle Indexing Engine. |
39 |
* An Extension for the Firefox Browser. |
40 |
*/ |
41 |
|
42 |
// Initiate a new preference instance. |
43 |
-var gPrefService = Components.classes['@mozilla.org/preferences-service;1'].getService(Components.interfaces.nsIPrefBranch); |
44 |
+_prefService = Components.classes['@mozilla.org/preferences-service;1'].getService(Components.interfaces.nsIPrefBranch); |
45 |
|
46 |
var beaglePref = { |
47 |
|
48 |
//some constant |
49 |
RULE_INCLUDE : 1, |
50 |
@@ -29,18 +29,18 @@ |
51 |
|
52 |
|
53 |
//functions used to get/set pref |
54 |
func_factory:{ |
55 |
'get':{ |
56 |
- 'bool': Function.bind(gPrefService.getBoolPref,gPrefService), |
57 |
- 'int': Function.bind(gPrefService.getIntPref,gPrefService), |
58 |
- 'string' : Function.bind(gPrefService.getCharPref,gPrefService) |
59 |
+ 'bool': Function.bind(_prefService.getBoolPref,_prefService), |
60 |
+ 'int': Function.bind(_prefService.getIntPref,_prefService), |
61 |
+ 'string' : Function.bind(_prefService.getCharPref,_prefService) |
62 |
}, |
63 |
'set':{ |
64 |
- 'bool': Function.bind(gPrefService.setBoolPref,gPrefService), |
65 |
- 'int' : Function.bind(gPrefService.setIntPref,gPrefService), |
66 |
- 'string' : Function.bind(gPrefService.setCharPref,gPrefService) |
67 |
+ 'bool': Function.bind(_prefService.setBoolPref,_prefService), |
68 |
+ 'int' : Function.bind(_prefService.setIntPref,_prefService), |
69 |
+ 'string' : Function.bind(_prefService.setCharPref,_prefService) |
70 |
} |
71 |
}, |
72 |
|
73 |
prefObject : {}, |
74 |
|
75 |
@@ -318,8 +318,8 @@ |
76 |
} |
77 |
catch(ex){ |
78 |
log("first run import error"); |
79 |
log(ex); |
80 |
} |
81 |
- }, |
82 |
+ } |
83 |
} |
84 |
|
85 |
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 |
86 |
--- beagle-0.3.9.orig/firefox-extension/chrome/content/jslib/io/dir.js 2009-09-05 12:28:10.000000000 +0200 |
87 |
+++ beagle-0.3.9/firefox-extension/chrome/content/jslib/io/dir.js 2009-09-05 12:29:07.000000000 +0200 |
88 |
@@ -219,11 +219,11 @@ |
89 |
" readDir(aDirPath);\n"; |
90 |
|
91 |
return help; |
92 |
}); |
93 |
|
94 |
-jslibDebug('*** load: '+JS_DIR_FILE+' OK'); |
95 |
+//jslibDebug('*** load: '+JS_DIR_FILE+' OK'); |
96 |
|
97 |
} else { |
98 |
dump("JSLIB library not loaded:\n" + |
99 |
" \tTo load use: chrome://jslib/content/jslib.js\n" + |
100 |
" \tThen: include(jslib_dir);\n\n"); |
101 |
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 |
102 |
--- beagle-0.3.9.orig/firefox-extension/chrome/content/jslib/io/dirUtils.js 2009-09-05 12:28:10.000000000 +0200 |
103 |
+++ beagle-0.3.9/firefox-extension/chrome/content/jslib/io/dirUtils.js 2009-09-05 12:29:07.000000000 +0200 |
104 |
@@ -171,11 +171,11 @@ |
105 |
return help; |
106 |
} |
107 |
|
108 |
}; //END CLASS |
109 |
|
110 |
-jslibDebug('*** load: '+JS_DIRUTILS_FILE+' OK'); |
111 |
+//jslibDebug('*** load: '+JS_DIRUTILS_FILE+' OK'); |
112 |
|
113 |
} // END BLOCK JS_LIB_LOADED CHECK |
114 |
|
115 |
else { |
116 |
dump("JSLIB library not loaded:\n" + |
117 |
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 |
118 |
--- beagle-0.3.9.orig/firefox-extension/chrome/content/jslib/io/file.js 2009-09-05 12:28:10.000000000 +0200 |
119 |
+++ beagle-0.3.9/firefox-extension/chrome/content/jslib/io/file.js 2009-09-05 12:29:07.000000000 +0200 |
120 |
@@ -756,11 +756,11 @@ |
121 |
" help;\n"; |
122 |
|
123 |
return help; |
124 |
}) |
125 |
|
126 |
-jslibDebug('*** load: '+JS_FILE_FILE+' OK'); |
127 |
+//jslibDebug('*** load: '+JS_FILE_FILE+' OK'); |
128 |
|
129 |
} // END BLOCK JS_LIB_LOADED CHECK |
130 |
|
131 |
// If jslib base library is not loaded, dump this error. |
132 |
else |
133 |
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 |
134 |
--- beagle-0.3.9.orig/firefox-extension/chrome/content/jslib/io/fileUtils.js 2009-09-05 12:28:10.000000000 +0200 |
135 |
+++ beagle-0.3.9/firefox-extension/chrome/content/jslib/io/fileUtils.js 2009-09-05 12:29:07.000000000 +0200 |
136 |
@@ -582,11 +582,11 @@ |
137 |
return help; |
138 |
} |
139 |
|
140 |
}; |
141 |
|
142 |
-jslibDebug('*** load: '+JS_FILEUTILS_FILE+' OK'); |
143 |
+//jslibDebug('*** load: '+JS_FILEUTILS_FILE+' OK'); |
144 |
|
145 |
} // END BLOCK JS_LIB_LOADED CHECK |
146 |
|
147 |
// If jslib base library is not loaded, dump this error. |
148 |
else |
149 |
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 |
150 |
--- beagle-0.3.9.orig/firefox-extension/chrome/locale/zh-CN/beagle.dtd 2009-09-05 12:28:10.000000000 +0200 |
151 |
+++ beagle-0.3.9/firefox-extension/chrome/locale/zh-CN/beagle.dtd 2009-09-05 12:29:07.000000000 +0200 |
152 |
@@ -29,11 +29,13 @@ |
153 |
<!ENTITY beagle.run.never.index.label "从不索引这个站点"> |
154 |
<!ENTITY beagle.run.preferences.label "选项"> |
155 |
<!ENTITY beagle.run.context.menu.label "Beagle"> |
156 |
<!ENTITY beagle.run.index.link.label "索引链接"> |
157 |
<!ENTITY beagle.run.index.image.label "索引图片"> |
158 |
- |
159 |
<!ENTITY beagle.index.link.start.label "开始"> |
160 |
<!ENTITY beagle.index.link.stop.label "停止"> |
161 |
|
162 |
<!ENTITY beagle.bookmark.index.modified.label "索引更改过的书签"> |
163 |
|
164 |
+<!ENTITY beagle.sidebar.title "Beagle 搜索历史侧边栏"> |
165 |
+<!ENTITY beagle.sidebar.commandkey "B"> |
166 |
+<!ENTITY beagle.sidebar.modifierskey "shift 键"> |
167 |
diff -NrU5 beagle-0.3.9.orig/firefox-extension/install.rdf.in beagle-0.3.9/firefox-extension/install.rdf.in |
168 |
--- beagle-0.3.9.orig/firefox-extension/install.rdf.in 2009-09-05 12:28:10.000000000 +0200 |
169 |
+++ beagle-0.3.9/firefox-extension/install.rdf.in 2009-09-05 12:29:50.000000000 +0200 |
170 |
@@ -21,11 +21,11 @@ |
171 |
|
172 |
<em:targetApplication> |
173 |
<Description> |
174 |
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> |
175 |
<em:minVersion>0.8</em:minVersion> |
176 |
- <em:maxVersion>3.0.*</em:maxVersion> |
177 |
+ <em:maxVersion>3.5.*</em:maxVersion> |
178 |
</Description> |
179 |
</em:targetApplication> |
180 |
|
181 |
</Description> |
182 |
|
183 |
diff -NrU5 beagle-0.3.9.orig/firefox-extension/Makefile.am beagle-0.3.9/firefox-extension/Makefile.am |
184 |
--- beagle-0.3.9.orig/firefox-extension/Makefile.am 2009-09-05 12:28:10.000000000 +0200 |
185 |
+++ beagle-0.3.9/firefox-extension/Makefile.am 2009-09-05 12:29:07.000000000 +0200 |
186 |
@@ -1,8 +1,8 @@ |
187 |
|
188 |
PROJECT = beagle |
189 |
-VERSION = 1.1.0 |
190 |
+VERSION = 1.1.2 |
191 |
|
192 |
INSTALL_RDF = install.rdf |
193 |
INSTALL_RDF_IN = $(INSTALL_RDF).in |
194 |
VERSION_SED = sed -e "s|\@VERSION\@|$(VERSION)|g" |