2010-09-02 Brian Lu <[email protected]> gnome-2-30
authorhawklu
Thu, 02 Sep 2010 03:29:52 +0000
branchgnome-2-30
changeset 20071 82746b701ad8
parent 20070 894e7b9074ca
child 20072 2998399cec52
2010-09-02 Brian Lu <[email protected]> * base-specs/thunderbird.spec: * patches/thunderbird3-34-l10n-package.diff: Fix d.o.o 16060
ChangeLog
base-specs/thunderbird.spec
patches/thunderbird3-34-l10n-package.diff
--- a/ChangeLog	Wed Sep 01 01:12:19 2010 +0000
+++ b/ChangeLog	Thu Sep 02 03:29:52 2010 +0000
@@ -1,3 +1,9 @@
+2010-09-02  Brian Lu  <[email protected]>
+
+	* base-specs/thunderbird.spec:
+	* patches/thunderbird3-34-l10n-package.diff:
+	  Fix d.o.o 16060
+
 2010-09-01  Glynn Foster  <[email protected]>
 
 	* patches/gnome-panel-08-launch-menu-indiana.diff: Fix
--- a/base-specs/thunderbird.spec	Wed Sep 01 01:12:19 2010 +0000
+++ b/base-specs/thunderbird.spec	Thu Sep 02 03:29:52 2010 +0000
@@ -106,6 +106,9 @@
 # owner:hawklu date:2010-07-15 type:bug d.o.o 16490 
 Patch34: thunderbird3-35-compiler-workaround-3.diff
 
+# owner:hawklu date:2010-09-02 type:bug d.o.o 16060 
+Patch35: thunderbird3-34-l10n-package.diff
+
 URL:         http://www.sun.com/software/javadesktopsystem/
 
 BuildRoot:   %{_tmppath}/%{name}-%{tarball_version}-build
@@ -157,6 +160,7 @@
 %patch31 -p1
 %patch33 -p1
 %patch34 -p1
+%patch35 -p1
 
 %if %option_without_moz_nss_nspr
 %patch20 -p1
@@ -286,6 +290,8 @@
 /bin/rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Sep 02 2010 - [email protected]
+- Fix d.o.o 16060
 * Mon Aug 02 2010 - [email protected]
 - Bump to 3.1.1
 * Thu Jul 15 2010 - [email protected]
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/thunderbird3-34-l10n-package.diff	Thu Sep 02 03:29:52 2010 +0000
@@ -0,0 +1,13 @@
+--- mozilla/toolkit/xre/nsXREDirProvider.cpp.orig1	2010-07-13 10:52:13.780806962 +0800
++++ mozilla/toolkit/xre/nsXREDirProvider.cpp	2010-07-13 10:53:40.829437851 +0800
+@@ -725,6 +725,10 @@
+                       kAppendChromeManifests,
+                       manifests);
+ 
++    static const char *const kAppendNothing[] = { nsnull };
++    LoadDirsIntoArray(mExtensionDirectories,
++                      kAppendNothing,
++                      manifests);
+     rv = NS_NewArrayEnumerator(aResult, manifests);
+   }
+   else if (!strcmp(aProperty, NS_SKIN_MANIFESTS_FILE_LIST)) {