rpms/beagle/F-11 beagle-0.3.8-fx35.patch, 1.1, 1.2 beagle.spec, 1.167, 1.168
drago01
drago01 at fedoraproject.org
Fri Jul 3 16:44:50 UTC 2009
- Previous message (by thread): rpms/beagle/devel beagle-0.3.8-fx35.patch, 1.1, 1.2 beagle.spec, 1.166, 1.167
- Next message (by thread): rpms/xfce4-clipman-plugin/F-11 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 xfce4-clipman-plugin.spec, 1.21, 1.22
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: drago01
Update of /cvs/pkgs/rpms/beagle/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1374
Modified Files:
beagle-0.3.8-fx35.patch beagle.spec
Log Message:
Backport upstream fixes to finally fix (RH #477639)
beagle-0.3.8-fx35.patch:
Index: beagle-0.3.8-fx35.patch
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/F-11/beagle-0.3.8-fx35.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- beagle-0.3.8-fx35.patch 22 May 2009 15:28:54 -0000 1.1
+++ beagle-0.3.8-fx35.patch 3 Jul 2009 16:44:50 -0000 1.2
@@ -1,6 +1,111 @@
-diff -upNr beagle-0.3.8.orign/firefox-extension/install.rdf beagle-0.3.8/firefox-extension/install.rdf
---- beagle-0.3.8.orign/firefox-extension/install.rdf 2008-06-12 18:11:12.000000000 +0200
-+++ beagle-0.3.8/firefox-extension/install.rdf 2008-12-26 11:42:34.000000000 +0100
+diff -upNr beagle-0.3.9.orign/firefox-extension/chrome/content/beaglePrefs.js beagle-0.3.9/firefox-extension/chrome/content/beaglePrefs.js
+--- beagle-0.3.9.orign/firefox-extension/chrome/content/beaglePrefs.js 2007-11-27 02:49:59.000000000 +0100
++++ beagle-0.3.9/firefox-extension/chrome/content/beaglePrefs.js 2009-07-03 18:35:19.421096000 +0200
+@@ -4,7 +4,7 @@
+ */
+
+ // 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 = {
+
+@@ -31,14 +31,14 @@ var beaglePref = {
+ //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)
+ }
+ },
+
+@@ -320,6 +320,6 @@ var beaglePref = {
+ log("first run import error");
+ log(ex);
+ }
+- },
++ }
+ }
+
+diff -upNr beagle-0.3.9.orign/firefox-extension/chrome/content/jslib/io/dir.js beagle-0.3.9/firefox-extension/chrome/content/jslib/io/dir.js
+--- beagle-0.3.9.orign/firefox-extension/chrome/content/jslib/io/dir.js 2007-11-27 02:49:58.000000000 +0100
++++ beagle-0.3.9/firefox-extension/chrome/content/jslib/io/dir.js 2009-07-03 18:35:19.422096000 +0200
+@@ -221,7 +221,7 @@ function() {
+ return help;
+ });
+
+-jslibDebug('*** load: '+JS_DIR_FILE+' OK');
++//jslibDebug('*** load: '+JS_DIR_FILE+' OK');
+
+ } else {
+ dump("JSLIB library not loaded:\n" +
+diff -upNr beagle-0.3.9.orign/firefox-extension/chrome/content/jslib/io/dirUtils.js beagle-0.3.9/firefox-extension/chrome/content/jslib/io/dirUtils.js
+--- beagle-0.3.9.orign/firefox-extension/chrome/content/jslib/io/dirUtils.js 2007-11-27 02:49:58.000000000 +0100
++++ beagle-0.3.9/firefox-extension/chrome/content/jslib/io/dirUtils.js 2009-07-03 18:35:19.422096000 +0200
+@@ -173,7 +173,7 @@ get help() {
+
+ }; //END CLASS
+
+-jslibDebug('*** load: '+JS_DIRUTILS_FILE+' OK');
++//jslibDebug('*** load: '+JS_DIRUTILS_FILE+' OK');
+
+ } // END BLOCK JS_LIB_LOADED CHECK
+
+diff -upNr beagle-0.3.9.orign/firefox-extension/chrome/content/jslib/io/file.js beagle-0.3.9/firefox-extension/chrome/content/jslib/io/file.js
+--- beagle-0.3.9.orign/firefox-extension/chrome/content/jslib/io/file.js 2007-11-27 02:49:58.000000000 +0100
++++ beagle-0.3.9/firefox-extension/chrome/content/jslib/io/file.js 2009-07-03 18:35:19.422096000 +0200
+@@ -758,7 +758,7 @@ function ()
+ return help;
+ })
+
+-jslibDebug('*** load: '+JS_FILE_FILE+' OK');
++//jslibDebug('*** load: '+JS_FILE_FILE+' OK');
+
+ } // END BLOCK JS_LIB_LOADED CHECK
+
+diff -upNr beagle-0.3.9.orign/firefox-extension/chrome/content/jslib/io/fileUtils.js beagle-0.3.9/firefox-extension/chrome/content/jslib/io/fileUtils.js
+--- beagle-0.3.9.orign/firefox-extension/chrome/content/jslib/io/fileUtils.js 2007-11-27 02:49:58.000000000 +0100
++++ beagle-0.3.9/firefox-extension/chrome/content/jslib/io/fileUtils.js 2009-07-03 18:35:19.422096000 +0200
+@@ -584,7 +584,7 @@
+
+ };
+
+-jslibDebug('*** load: '+JS_FILEUTILS_FILE+' OK');
++//jslibDebug('*** load: '+JS_FILEUTILS_FILE+' OK');
+
+ } // END BLOCK JS_LIB_LOADED CHECK
+
+diff -upNr beagle-0.3.9.orign/firefox-extension/chrome/locale/zh-CN/beagle.dtd beagle-0.3.9/firefox-extension/chrome/locale/zh-CN/beagle.dtd
+--- beagle-0.3.9.orign/firefox-extension/chrome/locale/zh-CN/beagle.dtd 2007-11-27 02:49:58.000000000 +0100
++++ beagle-0.3.9/firefox-extension/chrome/locale/zh-CN/beagle.dtd 2009-07-03 18:35:19.424096000 +0200
+@@ -31,9 +31,11 @@
+ <!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 -upNr beagle-0.3.9.orign/firefox-extension/install.rdf beagle-0.3.9/firefox-extension/install.rdf
+--- beagle-0.3.9.orign/firefox-extension/install.rdf 2008-07-19 13:47:16.000000000 +0200
++++ beagle-0.3.9/firefox-extension/install.rdf 2009-07-03 18:36:24.456098274 +0200
@@ -23,7 +23,7 @@
<Description>
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
@@ -10,9 +115,9 @@ diff -upNr beagle-0.3.8.orign/firefox-ex
</Description>
</em:targetApplication>
-diff -upNr beagle-0.3.8.orign/firefox-extension/install.rdf.in beagle-0.3.8/firefox-extension/install.rdf.in
---- beagle-0.3.8.orign/firefox-extension/install.rdf.in 2008-04-08 18:55:28.000000000 +0200
-+++ beagle-0.3.8/firefox-extension/install.rdf.in 2008-12-26 11:42:40.000000000 +0100
+diff -upNr beagle-0.3.9.orign/firefox-extension/install.rdf.in beagle-0.3.9/firefox-extension/install.rdf.in
+--- beagle-0.3.9.orign/firefox-extension/install.rdf.in 2008-04-08 18:55:28.000000000 +0200
++++ beagle-0.3.9/firefox-extension/install.rdf.in 2009-07-03 18:35:19.424096000 +0200
@@ -23,7 +23,7 @@
<Description>
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
Index: beagle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beagle/F-11/beagle.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -p -r1.167 -r1.168
--- beagle.spec 31 May 2009 23:44:51 -0000 1.167
+++ beagle.spec 3 Jul 2009 16:44:50 -0000 1.168
@@ -69,7 +69,7 @@ Patch10: beagle-0.3.9-libgnome-desktop-s
Patch11: beagle-0.3.9-openfix.patch
# Mono is not available on these arches
-ExcludeArch: s390 s390x sparc64
+ExcludeArch: s390 s390x sparc64 ppc64
BuildRequires: xulrunner-devel
@@ -354,8 +354,8 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/beagle*.pc
%changelog
-* Fri May 29 2009 Xavier Lamien <laxathom at fedoraproject.org> - 0.3.9-8
-- Build arch ppc64.
+* Fri Jul 03 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.3.9-8
+- Backport upstream fixes to finally fix (RH #477639)
* Fri May 22 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.3.9-7
- Fix firefox extension (RH #477639)
- Previous message (by thread): rpms/beagle/devel beagle-0.3.8-fx35.patch, 1.1, 1.2 beagle.spec, 1.166, 1.167
- Next message (by thread): rpms/xfce4-clipman-plugin/F-11 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 xfce4-clipman-plugin.spec, 1.21, 1.22
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list