rpms/thunderbird/FC-5 thunderbird-1.5-profile-migrator.patch, NONE, 1.1 sources, 1.18, 1.19 thunderbird.spec, 1.74, 1.75
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Dec 20 22:17:56 UTC 2006
Author: caillon
Update of /cvs/dist/rpms/thunderbird/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv13996
Modified Files:
sources thunderbird.spec
Added Files:
thunderbird-1.5-profile-migrator.patch
Log Message:
* Tue Dec 19 2006 Matthias Clasen <mclasen at redhat.com> 1.5.0.9-2
- Add a Requires: launchmail (#219884)
* Tue Dec 19 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.9-1
- Update to 1.5.0.9
- Take firefox's pango fixes
- Don't offer to import...nothing.
thunderbird-1.5-profile-migrator.patch:
nsProfileMigrator.cpp | 49 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 40 insertions(+), 9 deletions(-)
--- NEW FILE thunderbird-1.5-profile-migrator.patch ---
Index: mozilla/mail/components/migration/src/nsProfileMigrator.cpp
===================================================================
RCS file: /cvsroot/mozilla/mail/components/migration/src/nsProfileMigrator.cpp,v
retrieving revision 1.9
diff -pu -r1.9 mozilla/mail/components/migration/src/nsProfileMigrator.cpp
--- mozilla/mail/components/migration/src/nsProfileMigrator.cpp
+++ mozilla/mail/components/migration/src/nsProfileMigrator.cpp
@@ -131,24 +131,55 @@ nsProfileMigrator::GetDefaultMailMigrato
// if we are being forced to migrate to a particular migration type, then create an instance of that migrator
// and return it.
+ NS_NAMED_LITERAL_CSTRING(migratorPrefix,
+ NS_MAILPROFILEMIGRATOR_CONTRACTID_PREFIX);
+ nsCAutoString migratorID;
if (forceMigrationType.get())
{
PRBool exists = PR_FALSE;
- nsCAutoString migratorID (NS_MAILPROFILEMIGRATOR_CONTRACTID_PREFIX);
+ migratorID = migratorPrefix;
migratorID.Append(forceMigrationType);
mailMigrator = do_CreateInstance(migratorID.get());
-
- if (mailMigrator)
+ if (!mailMigrator)
+ return NS_ERROR_NOT_AVAILABLE;
+
+ mailMigrator->GetSourceExists(&exists);
+ /* trying to force migration on a source which doesn't
+ * have any profiles.
+ */
+ if (!exists)
+ return NS_ERROR_NOT_AVAILABLE;
+ aKey = forceMigrationType;
+ return NS_OK;
+ }
+
+ #define MAX_SOURCE_LENGTH 10
+ const char sources[][MAX_SOURCE_LENGTH] = {
+ "seamonkey",
+ "oexpress",
+ "outlook",
+ "dogbert",
+ "eudora",
+ 0
+ };
+ for (PRUint32 i = 0; sources[i]; ++i)
+ {
+ migratorID = migratorPrefix;
+ migratorID.Append(sources[i]);
+ mailMigrator = do_CreateInstance(migratorID.get());
+ if (!mailMigrator)
+ continue;
+
+ PRBool exists = PR_FALSE;
+ mailMigrator->GetSourceExists(&exists);
+ if (exists)
{
- mailMigrator->GetSourceExists(&exists);
- if (exists)
- aKey = forceMigrationType;
- else
- rv = NS_ERROR_FAILURE; // trying to force migration on a source which does not have any profiles
+ mailMigrator = nsnull;
+ return NS_OK;
}
}
- return rv;
+ return NS_ERROR_NOT_AVAILABLE;
}
NS_IMETHODIMP
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/FC-5/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources 7 Nov 2006 21:30:32 -0000 1.18
+++ sources 20 Dec 2006 22:17:54 -0000 1.19
@@ -1,2 +1,2 @@
-345edba9f68c49d3e8b28eaf93210722 thunderbird-langpacks-1.5.0.8-20061105.tar.bz2
-7b60aa806e4ea1e4708b3982adef7eae thunderbird-1.5.0.8-source.tar.bz2
+bb74629a8d99a6653c5ab978cf9c6227 thunderbird-1.5.0.9-source.tar.bz2
+f38fb250f9c6946912af14930c2cc8e3 thunderbird-langpacks-1.5.0.9-20061215.tar.bz2
Index: thunderbird.spec
===================================================================
RCS file: /cvs/dist/rpms/thunderbird/FC-5/thunderbird.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- thunderbird.spec 7 Nov 2006 21:30:32 -0000 1.74
+++ thunderbird.spec 20 Dec 2006 22:17:54 -0000 1.75
@@ -7,8 +7,8 @@
Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird
-Version: 1.5.0.8
-Release: 1%{?dist}
+Version: 1.5.0.9
+Release: 2%{?dist}
Epoch: 0
URL: http://www.mozilla.org/projects/thunderbird/
License: MPL
@@ -19,7 +19,7 @@
%define tarball thunderbird-1.5rc1-source.tar.bz2
%endif
Source0: %{tarball}
-Source1: thunderbird-langpacks-%{version}-20061105.tar.bz2
+Source1: thunderbird-langpacks-%{version}-20061215.tar.bz2
Source10: thunderbird-mozconfig
Source11: thunderbird-mozconfig-branded
Source12: thunderbird-redhat-default-prefs.js
@@ -32,7 +32,7 @@
# Build patches
Patch2: firefox-1.0-prdtoa.patch
Patch4: firefox-1.5-with-system-nss.patch
-Patch5: firefox-1.1-visibility.patch
+Patch5: thunderbird-1.5-visibility.patch
Patch6: firefox-1.1-nss-system-nspr.patch
Patch10: thunderbird-0.7.3-psfonts.patch
@@ -53,13 +53,26 @@
Patch84: firefox-1.5-pango-printing.patch
# Other
-Patch101: thunderbird-1.5-download-dir.patch
Patch102: firefox-1.5-theme-change.patch
+Patch103: thunderbird-1.5-profile-migrator.patch
+
+%if %{official_branding}
+# Required by Mozilla Corporation
+
+
+%else
+# Not yet approved by Mozillla Corporation
+
+
+%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: nspr >= %{nspr_version}
Requires: nss >= %{nss_version}
+%if 0%{?rhel} >= 5
+Requires: launchmail
+%endif
BuildRequires: cairo-devel >= %{cairo_version}
BuildRequires: libpng-devel, libjpeg-devel, gtk2-devel
BuildRequires: zlib-devel, gzip, zip, unzip
@@ -74,7 +87,7 @@
Requires: desktop-file-utils >= %{desktop_file_utils_version}
Obsoletes: MozillaThunderbird
-%define tbdir %{_libdir}/thunderbird-%{version}
+%define mozappdir %{_libdir}/thunderbird-%{version}
AutoProv: 0
%define _use_internal_dependency_generator 0
@@ -90,13 +103,7 @@
%patch2 -p0
%patch4 -p1
-
-# Pragma visibility is broken on most platforms for some reason.
-# It works on i386 so leave it alone there. Disable elsewhere.
-# See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20297
-%ifnarch i386
-%patch5 -p0
-%endif
+#%patch5 -p1 -b .visibility
%patch6 -p1
%patch10 -p1 -b .psfonts
@@ -105,13 +112,34 @@
%patch25 -p0
%patch40 -p1
%patch42 -p0
-%patch81 -p1
-%patch82 -p1
-%patch83 -p1
-%patch84 -p0
-%patch101 -p0 -b .download-dir
+# font system fixes
+%patch81 -p1 -b .nopangoxft
+%patch82 -p1 -b .pango-mathml
+%patch83 -p1 -b .pango-cursor-position
+%patch84 -p1 -b .pango-printing
+pushd gfx/src/ps
+ # This sort of sucks, but it works for now.
+ ln -s ../gtk/nsFontMetricsPango.h .
+ ln -s ../gtk/nsFontMetricsPango.cpp .
+ ln -s ../gtk/mozilla-decoder.h .
+ ln -s ../gtk/mozilla-decoder.cpp .
+popd
+
+
%patch102 -p0 -b .theme-change
+%patch103 -p1 -b .profile-migrator
+
+%if %{official_branding}
+# Required by Mozilla Corporation
+
+
+%else
+# Not yet approved by Mozillla Corporation
+
+
+%endif
+
%{__rm} -f .mozconfig
%{__cp} %{SOURCE10} .mozconfig
@@ -122,12 +150,24 @@
#===============================================================================
%build
-export RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed 's/-O2/-Os/')
-export CFLAGS="$RPM_OPT_FLAGS"
-export CXXFLAGS="$CFLAGS"
-export BUILD_OFFICIAL=1
-export MOZILLA_OFFICIAL=1
-time make -f client.mk build_all
+
+# Build with -Os as it helps the browser; also, don't override mozilla's warning
+# level; they use -Wall but disable a few warnings that show up _everywhere_
+MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %{__sed} -e 's/-O2/-Os/' -e 's/-Wall//')
+
+export RPM_OPT_FLAGS=$MOZ_OPT_FLAGS
+export PREFIX='%{_prefix}'
+export LIBDIR='%{_libdir}'
+
+%ifarch ppc ppc64 s390 s390x
+%define moz_make_flags -j1
+%else
+%define moz_make_flags %{?_smp_mflags}
+%endif
+
+export LDFLAGS="-Wl,-rpath,%{mozappdir}"
+export MAKE="gmake %{moz_make_flags}"
+make -f client.mk build
#===============================================================================
@@ -141,7 +181,7 @@
%{__mkdir_p} $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_datadir}/applications}
%{__tar} -C $RPM_BUILD_ROOT%{_libdir}/ -xzf dist/%{name}-*linux*.tar.gz
-%{__mv} $RPM_BUILD_ROOT%{_libdir}/%{name} $RPM_BUILD_ROOT%{tbdir}
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/%{name} $RPM_BUILD_ROOT%{mozappdir}
%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/%{name}-*linux*.tar
@@ -159,25 +199,37 @@
$RPM_BUILD_ROOT%{_bindir}/thunderbird
%{__chmod} 755 $RPM_BUILD_ROOT/%{_bindir}/thunderbird
-install -m755 %{SOURCE30} $RPM_BUILD_ROOT/%{tbdir}/open-browser.sh
-perl -pi -e 's|LIBDIR|%{_libdir}|g' $RPM_BUILD_ROOT/%{tbdir}/open-browser.sh
+install -m755 %{SOURCE30} $RPM_BUILD_ROOT/%{mozappdir}/open-browser.sh
+perl -pi -e 's|LIBDIR|%{_libdir}|g' $RPM_BUILD_ROOT/%{mozappdir}/open-browser.sh
%{__cat} %{SOURCE12} | %{__sed} -e 's,THUNDERBIRD_RPM_VR,%{version}-%{release},g' \
- -e 's,COMMAND,%{tbdir}/open-browser.sh,g' > \
+ -e 's,COMMAND,%{mozappdir}/open-browser.sh,g' > \
$RPM_BUILD_ROOT/rh-default-prefs
-%{__cp} $RPM_BUILD_ROOT/rh-default-prefs $RPM_BUILD_ROOT/%{tbdir}/greprefs/all-redhat.js
-%{__cp} $RPM_BUILD_ROOT/rh-default-prefs $RPM_BUILD_ROOT/%{tbdir}/defaults/pref/all-redhat.js
+%{__cp} $RPM_BUILD_ROOT/rh-default-prefs $RPM_BUILD_ROOT/%{mozappdir}/greprefs/all-redhat.js
+%{__cp} $RPM_BUILD_ROOT/rh-default-prefs $RPM_BUILD_ROOT/%{mozappdir}/defaults/pref/all-redhat.js
%{__rm} $RPM_BUILD_ROOT/rh-default-prefs
+%{__rm} -f $RPM_BUILD_ROOT%{mozappdir}/thunderbird-config
+
+cd $RPM_BUILD_ROOT%{mozappdir}/chrome
+find . -name "*" -type d -maxdepth 1 -exec %{__rm} -rf {} \;
+cd -
+
+%{__mkdir_p} $RPM_BUILD_ROOT%{mozappdir}/chrome/icons/default/
+%{__cp} other-licenses/branding/%{name}/default.xpm \
+ $RPM_BUILD_ROOT%{mozappdir}/chrome/icons/default/
+%{__cp} other-licenses/branding/%{name}/default.xpm \
+ $RPM_BUILD_ROOT%{mozappdir}/icons/
+
# own mozilla plugin dir (#135050)
%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins
# Install langpacks
-%{__mkdir_p} $RPM_BUILD_ROOT%{tbdir}/extensions
+%{__mkdir_p} $RPM_BUILD_ROOT%{mozappdir}/extensions
%{__tar} xjf %{SOURCE1}
for langpack in `ls thunderbird-langpacks/*.xpi`; do
language=`basename $langpack .xpi`
- extensiondir=$RPM_BUILD_ROOT%{tbdir}/extensions/langpack-$language at thunderbird.mozilla.org
+ extensiondir=$RPM_BUILD_ROOT%{mozappdir}/extensions/langpack-$language at thunderbird.mozilla.org
%{__mkdir_p} $extensiondir
unzip $langpack -d $extensiondir
find $extensiondir -type f | xargs chmod 644
@@ -196,12 +248,6 @@
%{__rm} -rf thunderbird-langpacks
-%{__rm} -f $RPM_BUILD_ROOT%{tbdir}/thunderbird-config
-
-cd $RPM_BUILD_ROOT%{tbdir}/chrome
-find . -name "*" -type d -maxdepth 1 -exec %{__rm} -rf {} \;
-cd -
-
%clean
%{__rm} -rf $RPM_BUILD_ROOT
@@ -217,30 +263,74 @@
%attr(755,root,root) %{_bindir}/thunderbird
%attr(644,root,root) %{_datadir}/applications/mozilla-thunderbird.desktop
%attr(644,root,root) %{_datadir}/pixmaps/thunderbird.png
-%{tbdir}
+%{mozappdir}
#===============================================================================
%changelog
+* Tue Dec 19 2006 Matthias Clasen <mclasen at redhat.com> 1.5.0.9-2
+- Add a Requires: launchmail (#219884)
+
+* Tue Dec 19 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.9-1
+- Update to 1.5.0.9
+- Take firefox's pango fixes
+- Don't offer to import...nothing.
+
* Tue Nov 7 2006 Christopher Aillon <caillon at redhat.com> 1.5.0.8-1
- Update to 1.5.0.8
- Allow choosing of download directory
- Take the user to the correct directory from the Download Manager.
- Patch to add support for printing via pango from Behdad.
-- Sync up default invisible character with GTK+
+
+* Sun Oct 8 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.7-4
+- Default to use of system colors
+
+* Wed Oct 4 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.7-3
+- Bring the invisible character to parity with GTK+
+
+* Wed Sep 27 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.7-2
+- Fix crash when changing gtk key theme
+- Prevent UI freezes while changing GNOME theme
+- Remove verbiage about pango; no longer required by upstream.
* Wed Sep 13 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.7-1
- Update to 1.5.0.7
-* Tue Aug 08 2006 Kai Engert <kengert at redhat.com> - 1.5.0.5-1.1
+* Thu Sep 7 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.5-8
+- Shuffle order of the install phase around
+
+* Thu Sep 7 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.5-7
+- Let there be art for Alt+Tab again
+- s/tbdir/mozappdir/g
+
+* Wed Sep 6 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.5-6
+- Fix for cursor position in editor widgets by tagoh and behdad (#198759)
+
+* Tue Sep 5 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.5-5
+- Update nopangoxft.patch
+- Fix rendering of MathML thanks to Behdad Esfahbod.
+- Update start page text to reflect the MathML fixes.
+- Enable pango by default on all locales
+- Build using -rpath
+- Re-enable GCC visibility
+
+* Thu Aug 3 2006 Kai Engert <kengert at redhat.com> - 1.5.0.5-4
+- Fix a build failure in mailnews mime code.
+
+* Tue Aug 1 2006 Matthias Clasen <mclasen at redhat.com> - 1.5.0.5-3
+- Rebuild
+
+* Thu Jul 27 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.5-2
- Update to 1.5.0.5
-- Use dist tag
-* Mon Jun 12 2006 Kai Engert <kengert at redhat.com> - 1.5.0.4-1.1.fc5
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.5.0.4-2.1
+- rebuild
+
+* Mon Jun 12 2006 Kai Engert <kengert at redhat.com> - 1.5.0.4-2
- Update to 1.5.0.4
- Fix desktop-file-utils requires
-* Wed Apr 19 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.2-1.1.fc5
+* Wed Apr 19 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.2-2
- Update to 1.5.0.2
* Thu Mar 16 2006 Christopher Aillon <caillon at redhat.com> - 1.5-7
More information about the fedora-cvs-commits
mailing list