diff --git a/MozillaThunderbird.changes b/MozillaThunderbird.changes index de14d4e..c112453 100644 --- a/MozillaThunderbird.changes +++ b/MozillaThunderbird.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Thu Jan 17 17:56:04 CET 2008 - maw@suse.de + +- Add mozilla-maxpathlen.patch (#354150 and bmo #412610). + +------------------------------------------------------------------- +Tue Jan 15 20:36:54 CET 2008 - maw@suse.de + +- Merge changes from the build service (thanks, Wolfgang) +- Update to version 2.0.9.9 (MFSA 2007-29) +- Update enigmail to version 0.95.6 +- Add a -devel subpackage +- Various fixes to enable building with gcc 4.3. + ------------------------------------------------------------------- Tue Nov 13 17:50:35 CET 2007 - maw@suse.de diff --git a/MozillaThunderbird.spec b/MozillaThunderbird.spec index 42eab4a..b744eff 100644 --- a/MozillaThunderbird.spec +++ b/MozillaThunderbird.spec @@ -1,7 +1,7 @@ # -# spec file for package MozillaThunderbird (Version 2.0.0.6) +# spec file for package MozillaThunderbird (Version 2.0.0.9) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -13,8 +13,8 @@ Name: MozillaThunderbird BuildRequires: fdupes gcc-c++ libgnomeui-devel libidl-devel mozilla-nss-devel orbit-devel unzip update-desktop-files zip License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL) -Version: 2.0.0.6 -Release: 45 +Version: 2.0.0.9 +Release: 1 Summary: The Stand-Alone Mozilla Mail Component Url: http://www.mozilla.org/products/thunderbird/ Group: Productivity/Networking/Email/Clients @@ -25,15 +25,17 @@ Source3: mozilla.sh.in Source4: l10n-%{version}.tar.bz2 Source5: mailredirect-0.7.4.xpi Source6: suse-default-prefs.js -Source9: enigmail-0.95.3.tar.gz +Source9: enigmail-0.95.6.tar.gz Source11: enigmail.manifest Patch1: replytolist.patch Patch2: thunderbird-appname.patch +Patch3: mozilla-gcc4.3-fixes.patch Patch4: locale.patch Patch5: abuild.patch Patch6: nspr-prdtoa.patch Patch7: enig-shared.patch Patch8: gcc-undefined-ops.patch +Patch9: tb-develdirs.patch Patch10: mips-buildfix.diff Patch11: lightning.patch Patch12: misc.dif @@ -45,8 +47,9 @@ Patch22: cjk-postscript-fonts.dif Patch25: postscript.patch Patch26: cups-paper.patch Patch27: thunderbird-1.5.0.8-uninitalized-vars-232305.patch -Patch28: thunderbird-gcc4.3-fixes.patch +#Patch28: thunderbird-gcc4.3-fixes.patch Patch29: visibility.patch +Patch30: mozilla-maxpathlen.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: libstdc++ fileutils textutils /bin/sh %if %suse_version > 1000 @@ -74,7 +77,7 @@ Requires: mozilla-nspr >= %( echo `rpm -q --queryformat '%{VERSION}' mozil BuildRequires: mozilla-nss-devel %endif %define _unpackaged_files_terminate_build 0 -%define releasedate 2007080100 +%define releasedate 2007111400 %define progname thunderbird %define progdir %{_prefix}/%_lib/thunderbird %define my_provides /tmp/my-provides @@ -90,7 +93,7 @@ BuildRequires: mozilla-nss-devel %define localize 1 ### build options end %if %build_enigmail -Recommends: gpg +Requires: /usr/bin/gpg %if %suse_version > 1020 Requires: pinentry-dialog %endif @@ -120,6 +123,29 @@ of MozillaThunderbird. +Authors: +-------- + Mozilla Foundation + +%package devel +Summary: The Stand-Alone Mozilla Mail Component +Group: Productivity/Networking/Email/Clients +%if %has_system_nspr +Requires: mozilla-nspr-devel >= %( echo `rpm -q --queryformat '%{VERSION}' mozilla-nspr-devel`) +%endif +%if %has_system_nss +PreReq: mozilla-nss-devel +%endif +PreReq: %{name} = %{version} + +%description devel +Mozilla Thunderbird is a redesign of the Mozilla Mail component. It is +written using the XUL user interface language and designed to be +cross-platform. It is a stand-alone application instead of part of the +Mozilla application suite. + + + Authors: -------- Mozilla Foundation @@ -135,10 +161,12 @@ cd $RPM_BUILD_DIR cd $RPM_BUILD_DIR/mozilla %patch1 %patch2 +%patch3 %patch4 %patch5 %patch6 %patch8 +%patch9 %patch10 #%patch11 %patch12 @@ -150,7 +178,8 @@ cd $RPM_BUILD_DIR/mozilla %patch25 %patch26 %patch27 -p0 -%patch28 -p1 +# %patch28 -p1 +%patch30 -p1 %build export MOZ_BUILD_DATE=%{releasedate} @@ -158,16 +187,23 @@ export MOZILLA_OFFICIAL=1 export BUILD_OFFICIAL=1 export CFLAGS="$RPM_OPT_FLAGS -g -Os -fno-strict-aliasing" %if %suse_version > 1000 -export CFLAGS="$CFLAGS -fstack-protector" +export CFLAGS="$CFLAGS -fstack-protector -fwrapv" %endif %ifarch ppc64 export CFLAGS="$CFLAGS -mminimal-toc" %endif -# needed at the time for x86_64, s390, and s390x, in 10.3 at least. +# enigmail build fials with visibility enabled %if %suse_version > 1020 %ifarch x86_64 s390 s390x export ac_cv_visibility_hidden="no" %endif +# hopefully only temporary change for gcc 4.3 +%if %suse_version > 1030 +export ac_cv_visibility_hidden="no" +%endif +%endif +%ifarch ppc64 +export CFLAGS="$CFLAGS -mminimal-toc" %endif export CXXFLAGS="$CFLAGS" export MOZCONFIG=$RPM_BUILD_DIR/mozconfig @@ -181,7 +217,8 @@ ac_add_options --libdir=%{_libdir} ac_add_options --sysconfdir=%{_sysconfdir} ac_add_options --mandir=%{_mandir} ac_add_options --includedir=%{_includedir} -ac_add_options --enable-optimize="$CFLAGS" +# shouldn't be needed with exported CFLAGS +# ac_add_options --enable-optimize="$CFLAGS" ac_add_options --with-system-jpeg ac_add_options --with-system-png ac_add_options --with-system-zlib @@ -279,6 +316,24 @@ cat > $RPM_BUILD_ROOT%{progdir}/defaults/pref/all-l10n.js << EOF pref("general.useragent.locale", "chrome://global/locale/intl.properties"); EOF ########## +# DEVEL +# +mkdir -p $RPM_BUILD_ROOT%{_includedir}/thunderbird +mkdir -p $RPM_BUILD_ROOT%{_libdir}/thunderbird/bin/ +mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig/ +cp -rL dist/sdk/bin/ $RPM_BUILD_ROOT%{_libdir}/thunderbird/ +cp -rL dist/sdk/lib/*.a $RPM_BUILD_ROOT%{_libdir}/thunderbird/ +cp -rL dist/idl/* $RPM_BUILD_ROOT%{_includedir}/thunderbird/ +cp -rL dist/include/* $RPM_BUILD_ROOT%{_includedir}/thunderbird/ +cp -rL dist/bin/thunderbird-config $RPM_BUILD_ROOT%{_bindir}/ +install -m 755 $RPM_BUILD_DIR/mozilla/build/unix/thunderbird-*.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/ +find $RPM_BUILD_ROOT/%{_includedir}/thunderbird | grep '\.h$' | xargs chmod -x +chmod -x $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/*.pc +%if %has_system_nss +rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/thunderbird-nss.pc +ln -sf nss.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/thunderbird-nss.pc +%endif +########## # ADDONS # # install enigmail in extension dir @@ -603,35 +658,52 @@ exit 0 %files translations -f %{_tmppath}/translations.list %defattr(-,root,root) %endif + +%files devel +%defattr(-,root,root) +%{_libdir}/thunderbird/*.a +%{_libdir}/thunderbird/bin/ +%{_libdir}/pkgconfig/*.pc +%{_includedir}/thunderbird/ +%{_bindir}/thunderbird-config + %changelog -* Tue Nov 13 2007 - maw@suse.de +* Thu Jan 17 2008 maw@suse.de +- Add mozilla-maxpathlen.patch (#354150 and bmo #412610). +* Tue Jan 15 2008 maw@suse.de +- Merge changes from the build service (thanks, Wolfgang) +- Update to version 2.0.9.9 (MFSA 2007-29) +- Update enigmail to version 0.95.6 +- Add a -devel subpackage +- Various fixes to enable building with gcc 4.3. +* Tue Nov 13 2007 maw@suse.de - Add thunderbird-gcc4.3-fixes.patch - Add visibility.patch. -* Thu Sep 13 2007 - cthiel@suse.de +* Thu Sep 13 2007 cthiel@suse.de - recommend gpg instead of requireing a fixed path -* Wed Sep 12 2007 - maw@suse.de +* Wed Sep 12 2007 maw@suse.de - Added gpg/pinentry requirements (#309160). -* Tue Sep 04 2007 - maw@suse.de +* Tue Sep 04 2007 maw@suse.de - Don't run %%fdupes on directories where multiple partitions are liable to be mounted. -* Mon Sep 03 2007 - maw@suse.de +* Mon Sep 03 2007 maw@suse.de - Merge some changes from the build service (thanks, Wolfgang): + Provide locale info (#302288) + Update releasedate - Uncomment %%clean. -* Tue Aug 21 2007 - maw@suse.de +* Tue Aug 21 2007 maw@suse.de - Use %%fdupes. -* Tue Aug 21 2007 - maw@suse.de +* Tue Aug 21 2007 maw@suse.de - Merge updates from the build service: - Update to security release 2.0.0.6: * MFSA 2007-26 Privilege escalation through chrome-loaded about:blank windows * MFSA 2007-27 Unescaped URIs passed to external programs - Update enigmail to version 0.95.3. -* Wed Aug 15 2007 - maw@suse.de +* Wed Aug 15 2007 maw@suse.de - On x86_64, s390, and s390x, deactivate the hidden visibility support, thereby fixing the build. -* Wed Jul 25 2007 - maw@suse.de +* Wed Jul 25 2007 maw@suse.de - Security update to version 2.0.0.5 (#288115) - This new release has fixes for: MFSA 2007-18 @@ -652,62 +724,62 @@ exit 0 MFSA 2007-25 CVE-2007-3738 - Update to enigmail 0.95.2. -* Thu Jun 21 2007 - adrian@suse.de +* Thu Jun 21 2007 adrian@suse.de - fix changelog entry order -* Fri Jun 15 2007 - maw@suse.de +* Fri Jun 15 2007 maw@suse.de - Merge update to 2.0.0.4 from the build service (thanks, Wolfgang) - Remove some commented out stuff. -* Wed Jun 13 2007 - wr@rosenauer.org +* Wed Jun 13 2007 wr@rosenauer.org - update to maintenance release 2.0.0.4 - update enigmail to 0.95.1 - adopted patches: * fixed cups-paper.patch (copied from FF) * removed obsolete visibility.patch -* Tue Jun 12 2007 - maw@suse.de +* Tue Jun 12 2007 maw@suse.de - Merge chagnges from the build service (thanks, Wolfgang) - Now use l10n-%%{version}.tar.bz2 instead of l10n.tar.bz2 as before. -* Tue Jun 05 2007 - maw@suse.de +* Tue Jun 05 2007 maw@suse.de - Security update to version 1.5.0.12 (#271197). -* Tue Jun 05 2007 - sbrabec@suse.cz +* Tue Jun 05 2007 sbrabec@suse.cz - Removed invalid desktop category "Application" (#254654). -* Thu Apr 19 2007 - wr@rosenauer.org +* Thu Apr 19 2007 wr@rosenauer.org - update to final version 2.0.0.0 (http://www.mozilla.com/en-US/thunderbird/2.0.0.0/releasenotes/) - update enigmail to 0.95.0 -* Wed Apr 18 2007 - mfabian@suse.de +* Wed Apr 18 2007 mfabian@suse.de - add Japanese to the languages which get PANGO enabled in the start script to support the Japanese combining characters U+3099 U+309A (see bugzilla #262718 comment #29). -* Thu Apr 12 2007 - wr@rosenauer.org +* Thu Apr 12 2007 wr@rosenauer.org - update to 2.0.0.0rc1 - enabled translations package -* Fri Mar 30 2007 - wr@rosenauer.org +* Fri Mar 30 2007 wr@rosenauer.org - update to snapshot 2.0.0.0pre-20070329 - security update enigmail 0.94.3 (Bugtraq #22758) -* Fri Mar 30 2007 - meissner@suse.de +* Fri Mar 30 2007 meissner@suse.de - require unzip -* Tue Mar 13 2007 - wr@rosenauer.org +* Tue Mar 13 2007 wr@rosenauer.org - update to snapshot 2.0pre-20060312 - removed implicit NSS version dependency -* Thu Mar 08 2007 - meissner@suse.de +* Thu Mar 08 2007 meissner@suse.de - Upgraded to 1.5.0.10 security release. - Upgraded to enigmail 0.94.2. -* Thu Feb 15 2007 - wr@rosenauer.org +* Thu Feb 15 2007 wr@rosenauer.org - update to snapshot 2.0beta2-20060214 - fixed build on SLES9 -* Mon Feb 05 2007 - wr@rosenauer.org +* Mon Feb 05 2007 wr@rosenauer.org - fixed check in add-plugins.sh (#242237) -* Tue Jan 30 2007 - maw@suse.de +* Tue Jan 30 2007 maw@suse.de - Add thunderbird-1.5.0.8-uninitalized-vars-232305.patch (#232305). -* Thu Jan 18 2007 - maw@suse.de +* Thu Jan 18 2007 maw@suse.de - Add undefined-ops.patch, silencing some warnings. -* Thu Nov 09 2006 - jhargadon@suse.de +* Thu Nov 09 2006 jhargadon@suse.de - security update to version 1.5.0.8 -* Tue Sep 12 2006 - stark@suse.de +* Tue Sep 12 2006 stark@suse.de - security update to version 1.5.0.7 -* Mon Aug 14 2006 - stark@suse.de +* Mon Aug 14 2006 stark@suse.de - update enigmail to 0.94.1 * Added support for signing attachments with inline-PGP - update mailredirect to 0.7.4 @@ -715,76 +787,76 @@ exit 0 ReplyToListThunderbirdExtension (#199125, bmo #45715) - added mailnews.clobber_list_reply pref which switches "Reply All" to "Reply List" functionality if set -* Thu Jul 27 2006 - stark@suse.de +* Thu Jul 27 2006 stark@suse.de - security update to version 1.5.0.5 (#195043) - fixed overwrite confirmation for GTK filesaver (#179531) -* Wed Jun 07 2006 - stark@suse.de +* Wed Jun 07 2006 stark@suse.de - fixed up BuildRequires -* Fri Jun 02 2006 - mls@suse.de +* Fri Jun 02 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Fri Jun 02 2006 - stark@suse.de +* Fri Jun 02 2006 stark@suse.de - update to security/stability release 1.5.0.4 (#179011) (http://www.mozilla.org/projects/security/known-vulnerabilities.html#Thunderbird) -* Mon May 15 2006 - stark@suse.de +* Mon May 15 2006 stark@suse.de - update to version 1.5.0.2 - update mailredirect to 0.7.3 - save printer settings properly (#174082, bmo #324072) - improved postscript output (bmo #334485) - changed defaults for printer properties (#6534) - get available paper sizes from CUPS (#65482) -* Sat Mar 18 2006 - stark@suse.de +* Sat Mar 18 2006 stark@suse.de - translations package is suggested now by main package - yet another set of upstream fixes (#148876) -* Sun Mar 12 2006 - stark@suse.de +* Sun Mar 12 2006 stark@suse.de - added Khmer (km-*) to pango locales (#157397) - yet another set of upstream fixes (#148876) -* Sat Mar 04 2006 - stark@suse.de +* Sat Mar 04 2006 stark@suse.de - latest security fixes from upstream (#148876) - show multiple Reply-To addresses (bmo #106189) -* Fri Feb 24 2006 - stark@suse.de +* Fri Feb 24 2006 stark@suse.de - added GTK category to desktop-file - dumpstack.patch is in upstream patches now - get some more patches (#148876) -* Tue Feb 14 2006 - stark@suse.de +* Tue Feb 14 2006 stark@suse.de - applied set of security patches (#148876) -* Tue Feb 07 2006 - stark@suse.de +* Tue Feb 07 2006 stark@suse.de - fixed disabling of Pango (#148788) -* Thu Feb 02 2006 - stark@suse.de +* Thu Feb 02 2006 stark@suse.de - defined gssapi lib explicitely (#147670) -* Wed Feb 01 2006 - stark@suse.de +* Wed Feb 01 2006 stark@suse.de - removed additional CA certs from builtin NSS - make it possible to choose $HOME as download directory (#144894, bmo #300856) - cleaned up BuildRequires -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Mon Jan 23 2006 - stark@suse.de +* Mon Jan 23 2006 stark@suse.de - disable Pango if MOZ_ENABLE_PANGO is not set and no typical language which needs Pango is used (#143428) - preload libaoss for plugin sound (#117079) - fix to ignore X composite extension (#135373) -* Wed Jan 18 2006 - stark@suse.de +* Wed Jan 18 2006 stark@suse.de - added default (font) settings - tweak useragent - fixed DumpStackToFile() for glibc 2.4 -* Thu Jan 12 2006 - stark@suse.de +* Thu Jan 12 2006 stark@suse.de - update to 1.5 (20060111) - added sytem extensions patch - added XUL filechooser patch (MOZ_XUL_PICKER) - update enigmail to 0.94.0 - use -fstack-protector where available - use system NSS since CODE10 -* Wed Dec 28 2005 - stark@suse.de +* Wed Dec 28 2005 stark@suse.de - update to 1.5rc2 (20051227) -* Sun Dec 11 2005 - stark@suse.de +* Sun Dec 11 2005 stark@suse.de - update to 1.5 (20051211) - update enigmail to 0.93.2 -* Tue Nov 29 2005 - stark@suse.de +* Tue Nov 29 2005 stark@suse.de - update enigmail to 0.93.1 - added patch for GTK2 handling (#134831) -* Fri Nov 25 2005 - stark@suse.de +* Fri Nov 25 2005 stark@suse.de - update to 1.5 (20051124) -* Fri Oct 28 2005 - stark@suse.de +* Fri Oct 28 2005 stark@suse.de - update to latest 1.5 snapshot (20051027) - added patch to be able to reply to and forward rfc822 messages (bmo #204350) @@ -793,45 +865,45 @@ exit 0 process anymore) - added mailredirect extension - removed update functionality -* Mon Oct 10 2005 - stark@suse.de +* Mon Oct 10 2005 stark@suse.de - update to 1.5b2 (20051008) - preinstall Enigmail (version 0.93.0) as global extension - add all supported locales and use if installed -* Tue Oct 04 2005 - stark@suse.de +* Tue Oct 04 2005 stark@suse.de - update to 1.5b2 (20051003) (RPM version 1.4.1) - prerequire NSPR - prepared translations subpackage - fixed filelist - fixed build with new gcc -* Wed Sep 21 2005 - stark@suse.de +* Wed Sep 21 2005 stark@suse.de - update to 1.5b1 (20050920) - added spellchecker integration with myspell (add-plugins.sh) - removed aviary-install-global patch (not needed anymore, with new EM) - enabled pango font rendering (through cairo hopefully) - fixed GNOME gconf registration (#117851) -* Sat Aug 20 2005 - stark@suse.de +* Sat Aug 20 2005 stark@suse.de - workaround for linking with pangoxft and pangox (broken by gtk 2.8 update) (#105764) -* Thu Aug 18 2005 - stark@suse.de +* Thu Aug 18 2005 stark@suse.de - fixed Gdk-WARNING at startup (gtk.patch) - fixed regression in profile locking change (bmo #303633) - fixed crash with gtk 2.7 (bmo #300226, bnc #104586) -* Wed Aug 03 2005 - stark@suse.de +* Wed Aug 03 2005 stark@suse.de - fixed profile locking (bmo #151188) -* Fri Jul 29 2005 - stark@suse.de +* Fri Jul 29 2005 stark@suse.de - don't require and provide NSS libs (#98002) -* Fri Jul 22 2005 - stark@suse.de +* Fri Jul 22 2005 stark@suse.de - fixed printing patch -* Tue Jul 19 2005 - stark@suse.de +* Tue Jul 19 2005 stark@suse.de - added NSPR to PreReq - disable stripping in specfile -* Fri Jul 15 2005 - stark@suse.de +* Fri Jul 15 2005 stark@suse.de - update to 1.0.6 which restores API compatibility - fixed width calculation in Postscript module (bmo #290292) -* Thu Jul 14 2005 - stark@suse.de +* Thu Jul 14 2005 stark@suse.de - fixed filelist to include icon-file and startscript again -* Tue Jul 12 2005 - stark@suse.de +* Tue Jul 12 2005 stark@suse.de - fixed remote usage behaviour in start script (bnc #41903) - update to 1.0.5 security release - fixed quoting patch @@ -839,88 +911,88 @@ exit 0 - don't strip explicitely - use RPM_OPT_FLAGS for NSS component - fixed implicit declarations and uninitialized used variables -* Thu Apr 28 2005 - stark@suse.de +* Thu Apr 28 2005 stark@suse.de - updated to current 1.0 branch version - use static NSPR from other location -* Sat Apr 23 2005 - stark@suse.de +* Sat Apr 23 2005 stark@suse.de - activate usage of system NSPR for distributions after 9.3 - add patch to be able to use systen NSPR at all - extended desktop file -* Fri Apr 22 2005 - ro@suse.de +* Fri Apr 22 2005 ro@suse.de - apply mozilla-gcc4.patch -* Wed Mar 23 2005 - stark@suse.de +* Wed Mar 23 2005 stark@suse.de - update to 1.0.2 - use system NSPR on SUSE releases after 9.3 - made startscript PIS aware - set g-application-name correctly (bmo #281979) -* Mon Mar 07 2005 - stark@suse.de +* Mon Mar 07 2005 stark@suse.de - don't use gconfd in registration phase (#66381) -* Fri Feb 25 2005 - stark@suse.de +* Fri Feb 25 2005 stark@suse.de - update to version 1.0.1 -* Tue Feb 22 2005 - stark@suse.de +* Tue Feb 22 2005 stark@suse.de - added patch to create Postscript level 2 (instead of 3) (special thanks to Jungshik Shin) - disabled freetype explicitly to be able to use the above patch (freetype wasn't used anymore since some time anyway) -* Wed Feb 02 2005 - stark@suse.de +* Wed Feb 02 2005 stark@suse.de - added a JS crasher fix (bmc #268535) -* Sat Jan 22 2005 - stark@suse.de +* Sat Jan 22 2005 stark@suse.de - added some backported bugfixes -* Tue Dec 07 2004 - stark@suse.de +* Tue Dec 07 2004 stark@suse.de - update to 1.0 - fixed extra lines in replies (bmo #144998) - fixed build on s390/s390x -* Wed Nov 24 2004 - stark@suse.de +* Wed Nov 24 2004 stark@suse.de - update to 20041123 snapshot - inherit downloadFolder patch from Firefox -* Fri Nov 12 2004 - stark@suse.de +* Fri Nov 12 2004 stark@suse.de - fixed chrome filelist -* Thu Nov 04 2004 - stark@suse.de +* Thu Nov 04 2004 stark@suse.de - update to 0.9 - sync patch-set with firefox base - fixed neededforbuild to get GNOME functionalities -* Fri Sep 17 2004 - stark@suse.de +* Fri Sep 17 2004 stark@suse.de - added some missing fixes for official release - synced add-plugins.sh -* Sat Sep 11 2004 - stark@suse.de +* Sat Sep 11 2004 stark@suse.de - update to official 0.8 version (20040911) - fixed enigmail config -* Mon Sep 06 2004 - stark@suse.de +* Mon Sep 06 2004 stark@suse.de - fixed profile directory -* Fri Sep 03 2004 - stark@suse.de +* Fri Sep 03 2004 stark@suse.de - update to thunderbird 0.8 (20040903) - update enigmail to 0.86.0 and ipc to 1.0.8 (deactivated) -* Tue Aug 24 2004 - stark@suse.de +* Tue Aug 24 2004 stark@suse.de - update to thunderbird 0.7.3 - update enigmail to 0.85.0 and ipc to 1.0.7 -* Tue Jun 29 2004 - stark@suse.de +* Tue Jun 29 2004 stark@suse.de - update to thunderbird 0.7.1 - update enigmail to 0.84.1 -* Wed May 12 2004 - ro@suse.de +* Wed May 12 2004 ro@suse.de - add some missing return values -* Mon May 03 2004 - stark@suse.de +* Mon May 03 2004 stark@suse.de - update to Thunderbird 0.6 (based on 1.7rc1) - use official branding for release builds - added desktop-icon (#39139) -* Fri Apr 02 2004 - stark@suse.de +* Fri Apr 02 2004 stark@suse.de - removing relocation of TEMP directory (#34391) -* Fri Mar 26 2004 - uli@suse.de +* Fri Mar 26 2004 uli@suse.de - fixed hang during build on s390* (bug #35440) -* Sun Mar 07 2004 - ro@suse.de +* Sun Mar 07 2004 ro@suse.de - match function declaration in enigmail mimedummy.cpp -* Fri Mar 05 2004 - stark@suse.de +* Fri Mar 05 2004 stark@suse.de - more fixes for #35179 - added firefox as default handler for its protocols - update enigmail to 0.83.4 -* Wed Mar 03 2004 - stark@suse.de +* Wed Mar 03 2004 stark@suse.de - removed unused patches for GTK2 build -* Sun Feb 29 2004 - stark@suse.de +* Sun Feb 29 2004 stark@suse.de - improved start-script to interact with firefox and mozilla (#35179) -* Fri Feb 27 2004 - stark@suse.de +* Fri Feb 27 2004 stark@suse.de - update to 0.5 - spec-file cleanup -* Wed Oct 15 2003 - stark@suse.de +* Wed Oct 15 2003 stark@suse.de - update to 0.3 (sync with mozilla 1.5) -* Tue Jul 15 2003 - stark@suse.de +* Tue Jul 15 2003 stark@suse.de - initial package (snapshot 20030714) diff --git a/enigmail-0.95.3.tar.gz b/enigmail-0.95.3.tar.gz deleted file mode 100644 index 3e67287..0000000 --- a/enigmail-0.95.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6ee00ae7a897eb15836e5c6146d58ec5fae0b6239e3405214d974d4bf072333f -size 1111160 diff --git a/enigmail-0.95.6.tar.gz b/enigmail-0.95.6.tar.gz new file mode 100644 index 0000000..9517314 --- /dev/null +++ b/enigmail-0.95.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:08d77f64ae8f240530e1c448427725ac5baa6e7465dffd1fec8e52298862d5f9 +size 1183899 diff --git a/l10n-2.0.0.6.tar.bz2 b/l10n-2.0.0.6.tar.bz2 deleted file mode 100644 index 145aadc..0000000 --- a/l10n-2.0.0.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8aaa52809f679cd205a438be0b89c697e9159fddb1585885beab01cb4b126c78 -size 9852945 diff --git a/l10n-2.0.0.9.tar.bz2 b/l10n-2.0.0.9.tar.bz2 new file mode 100644 index 0000000..725125b --- /dev/null +++ b/l10n-2.0.0.9.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3995d0fb074995b5fb248629446ced79195b7ac1acca7f96d0554a22024281a3 +size 9038496 diff --git a/mozilla-gcc4.3-fixes.patch b/mozilla-gcc4.3-fixes.patch new file mode 100644 index 0000000..0f39dc3 --- /dev/null +++ b/mozilla-gcc4.3-fixes.patch @@ -0,0 +1,146 @@ +References: +https://bugzilla.mozilla.org/show_bug.cgi?id=403675 +https://bugzilla.mozilla.org/show_bug.cgi?id=386362 + +Index: modules/libpr0n/encoders/png/nsPNGEncoder.h +=================================================================== +RCS file: /cvsroot/mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.h,v +retrieving revision 1.1.18.1 +diff -u -p -6 -r1.1.18.1 nsPNGEncoder.h +--- modules/libpr0n/encoders/png/nsPNGEncoder.h 20 May 2006 17:20:49 -0000 1.1.18.1 ++++ modules/libpr0n/encoders/png/nsPNGEncoder.h 13 Nov 2007 22:07:36 -0000 +@@ -35,14 +35,16 @@ + * + * ***** END LICENSE BLOCK ***** */ + + #include "imgIEncoder.h" + #ifdef MOZILLA_1_8_BRANCH + #define imgIEncoder imgIEncoder_MOZILLA_1_8_BRANCH ++#ifndef NS_DECL_IMGIENCODER + #define NS_DECL_IMGIENCODER NS_DECL_IMGIENCODER_MOZILLA_1_8_BRANCH + #endif ++#endif + + #include + + #define NS_PNGENCODER_CID \ + { /* 38d1592e-b81e-432b-86f8-471878bbfe07 */ \ + 0x38d1592e, \ +@@ -60,12 +62,20 @@ public: + NS_DECL_ISUPPORTS + NS_DECL_IMGIENCODER + NS_DECL_NSIINPUTSTREAM + + nsPNGEncoder(); + ++ NS_IMETHOD InitFromData(const PRUint8* aData, ++ PRUint32 aLength, // (unused, req'd by JS) ++ PRUint32 aWidth, ++ PRUint32 aHeight, ++ PRUint32 aStride, ++ PRUint32 aInputFormat, ++ const nsAString& aOutputOptions); ++ + private: + ~nsPNGEncoder(); + + protected: + void ConvertHostARGBRow(const PRUint8* aSrc, PRUint8* aDest, + PRUint32 aPixelWidth, PRBool aUseTransparency); +Index: modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h +=================================================================== +RCS file: /cvsroot/mozilla/modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h,v +retrieving revision 1.1.14.1 +diff -u -p -6 -r1.1.14.1 nsJPEGEncoder.h +--- modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h 20 May 2006 17:20:48 -0000 1.1.14.1 ++++ modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h 13 Nov 2007 22:07:57 -0000 +@@ -36,14 +36,16 @@ + * + * ***** END LICENSE BLOCK ***** */ + + #include "imgIEncoder.h" + #ifdef MOZILLA_1_8_BRANCH + #define imgIEncoder imgIEncoder_MOZILLA_1_8_BRANCH ++#ifndef NS_DECL_IMGIENCODER + #define NS_DECL_IMGIENCODER NS_DECL_IMGIENCODER_MOZILLA_1_8_BRANCH + #endif ++#endif + + // needed for JPEG library + #include + + extern "C" { + #include "jpeglib.h" +@@ -66,12 +68,20 @@ public: + NS_DECL_ISUPPORTS + NS_DECL_IMGIENCODER + NS_DECL_NSIINPUTSTREAM + + nsJPEGEncoder(); + ++ NS_IMETHOD InitFromData(const PRUint8* aData, ++ PRUint32 aLength, // (unused, req'd by JS) ++ PRUint32 aWidth, ++ PRUint32 aHeight, ++ PRUint32 aStride, ++ PRUint32 aInputFormat, ++ const nsAString& aOutputOptions); ++ + private: + ~nsJPEGEncoder(); + + protected: + + void ConvertHostARGBRow(const PRUint8* aSrc, PRUint8* aDest, +Index: modules/libpr0n/public/imgIEncoder.idl +=================================================================== +RCS file: /cvsroot/mozilla/modules/libpr0n/public/imgIEncoder.idl,v +retrieving revision 1.1.10.3 +diff -u -p -r1.1.10.3 imgIEncoder.idl +--- modules/libpr0n/public/imgIEncoder.idl 20 May 2006 17:20:49 -0000 1.1.10.3 ++++ modules/libpr0n/public/imgIEncoder.idl 14 Nov 2007 10:41:40 -0000 +@@ -96,6 +96,6 @@ interface nsIFile; + [scriptable, uuid(CCC5B3AD-3E67-4e3d-97E1-B06B2E96FEF8)] + interface imgIEncoder : nsISupports + { +- void encodeClipboardImage(in nsIClipboardImage aClipboardImage, out nsIFile aImageFile); ++ /* void encodeClipboardImage(in nsIClipboardImage aClipboardImage, out nsIFile aImageFile); */ + }; + +Index: xpcom/obsolete/component/nsFileSpecImpl.h +=================================================================== +RCS file: /cvsroot/mozilla/xpcom/obsolete/component/nsFileSpecImpl.h,v +retrieving revision 1.3 +diff -u -p -6 -r1.3 nsFileSpecImpl.h +--- xpcom/obsolete/component/nsFileSpecImpl.h 18 Apr 2004 14:18:15 -0000 1.3 ++++ xpcom/obsolete/component/nsFileSpecImpl.h 14 Nov 2007 12:11:12 -0000 +@@ -40,13 +40,13 @@ + + #include "nscore.h" + #include "nsIFileSpec.h" + #include "nsFileSpec.h" + + //======================================================================================== +-class nsFileSpecImpl ++class NS_COM nsFileSpecImpl + //======================================================================================== + : public nsIFileSpec + { + + public: + +@@ -78,13 +78,13 @@ class nsFileSpecImpl + + private: + ~nsFileSpecImpl(); + }; // class nsFileSpecImpl + + //======================================================================================== +-class nsDirectoryIteratorImpl ++class NS_COM nsDirectoryIteratorImpl + //======================================================================================== + : public nsIDirectoryIterator + { + + public: + diff --git a/mozilla-maxpathlen.patch b/mozilla-maxpathlen.patch new file mode 100644 index 0000000..d425a6e --- /dev/null +++ b/mozilla-maxpathlen.patch @@ -0,0 +1,175 @@ +--- mozilla/toolkit/xre/nsAppRunner.h.old 2007-09-25 18:01:56.000000000 +0200 ++++ mozilla/toolkit/xre/nsAppRunner.h 2007-09-25 18:02:23.000000000 +0200 +@@ -48,7 +48,8 @@ + #elif defined(CCHMAXPATH) + #define MAXPATHLEN CCHMAXPATH + #else +-#define MAXPATHLEN 1024 ++#include ++#define MAXPATHLEN PATH_MAX + #endif + #endif + +diff -up mozilla/toolkit/mozapps/update/src/updater/updater.cpp.old mozilla/toolkit/mozapps/update/src/updater/updater.cpp +--- mozilla/toolkit/mozapps/update/src/updater/updater.cpp.old 2007-09-25 18:00:26.000000000 +0200 ++++ mozilla/toolkit/mozapps/update/src/updater/updater.cpp 2007-09-25 18:00:53.000000000 +0200 +@@ -107,7 +107,8 @@ void LaunchChild(int argc, char **argv); + # elif defined(CCHMAXPATH) + # define MAXPATHLEN CCHMAXPATH + # else +-# define MAXPATHLEN 1024 ++# include ++# define MAXPATHLEN PATH_MAX + # endif + #endif + +diff -up mozilla/xpcom/io/SpecialSystemDirectory.cpp.old mozilla/xpcom/io/SpecialSystemDirectory.cpp +--- mozilla/xpcom/io/SpecialSystemDirectory.cpp.old 2007-09-25 18:04:25.000000000 +0200 ++++ mozilla/xpcom/io/SpecialSystemDirectory.cpp 2007-09-25 18:04:48.000000000 +0200 +@@ -109,7 +109,8 @@ + #elif defined(CCHMAXPATH) + #define MAXPATHLEN CCHMAXPATH + #else +-#define MAXPATHLEN 1024 ++#include ++#define MAXPATHLEN PATH_MAX + #endif + #endif + +diff -up mozilla/xpcom/obsolete/nsFileSpecUnix.cpp.old mozilla/xpcom/obsolete/nsFileSpecUnix.cpp +--- mozilla/xpcom/obsolete/nsFileSpecUnix.cpp.old 2006-11-28 01:18:37.000000000 +0100 ++++ mozilla/xpcom/obsolete/nsFileSpecUnix.cpp 2007-09-25 18:05:49.000000000 +0200 +@@ -79,7 +79,8 @@ + #endif + + #ifndef MAXPATHLEN +-#define MAXPATHLEN 1024 /* Guessing this is okay. Works for SCO. */ ++#include ++#define MAXPATHLEN PATH_MAX /* Guessing this is okay. Works for SCO. */ + #endif + + #if defined(__QNX__) +diff -up mozilla/xpcom/build/nsXPCOMPrivate.h.old mozilla/xpcom/build/nsXPCOMPrivate.h +--- mozilla/xpcom/build/nsXPCOMPrivate.h.old 2007-09-25 18:02:58.000000000 +0200 ++++ mozilla/xpcom/build/nsXPCOMPrivate.h 2007-09-25 18:03:15.000000000 +0200 +@@ -252,7 +252,8 @@ NS_GetFrozenFunctions(XPCOMFunctions *en + #elif defined(CCHMAXPATH) + #define MAXPATHLEN CCHMAXPATH + #else +-#define MAXPATHLEN 1024 ++#include ++#define MAXPATHLEN PATH_MAX + #endif + #endif + +diff -up mozilla/dbm/include/mcom_db.h.old mozilla/dbm/include/mcom_db.h +--- mozilla/dbm/include/mcom_db.h.old 2007-09-25 17:57:09.000000000 +0200 ++++ mozilla/dbm/include/mcom_db.h 2007-09-25 17:57:49.000000000 +0200 +@@ -214,7 +214,8 @@ + #endif /* __DBINTERFACE_PRIVATE */ + + #ifdef SCO +-#define MAXPATHLEN 1024 ++#include ++#define MAXPATHLEN PATH_MAX + #endif + + #include +diff -up mozilla/js/src/jsfile.c.old mozilla/js/src/jsfile.c +--- mozilla/js/src/jsfile.c.old 2006-07-26 20:55:08.000000000 +0200 ++++ mozilla/js/src/jsfile.c 2007-09-25 18:22:52.000000000 +0200 +@@ -105,7 +105,8 @@ + #define utfstring "binary" + #define unicodestring "unicode" + +-#define MAX_PATH_LENGTH 1024 ++#include ++#define MAX_PATH_LENGTH PATH_MAX + #define MODE_SIZE 256 + #define NUMBER_SIZE 32 + #define MAX_LINE_LENGTH 256 +diff -up mozilla/xpcom/typelib/xpidl/xpidl_java.c.old mozilla/xpcom/typelib/xpidl/xpidl_java.c +--- mozilla/xpcom/typelib/xpidl/xpidl_java.c.old 2007-09-25 18:38:52.000000000 +0200 ++++ mozilla/xpcom/typelib/xpidl/xpidl_java.c 2007-09-25 18:39:17.000000000 +0200 +@@ -44,6 +44,7 @@ + #include "xpidl.h" + #include + #include ++#include + + #ifdef XP_WIN + #include +diff -up mozilla/widget/src/xremoteclient/XRemoteClient.cpp.old mozilla/widget/src/xremoteclient/XRemoteClient.cpp +--- mozilla/widget/src/xremoteclient/XRemoteClient.cpp.old 2007-09-25 18:14:08.000000000 +0200 ++++ mozilla/widget/src/xremoteclient/XRemoteClient.cpp 2007-09-25 18:36:55.000000000 +0200 +@@ -76,7 +76,8 @@ + #endif + + #ifndef MAX_PATH +-#define MAX_PATH 1024 ++#include ++#define MAX_PATH PATH_MAX + #endif + + #define ARRAY_LENGTH(array_) (sizeof(array_)/sizeof(array_[0])) +diff -up mozilla/modules/libreg/src/reg.c.old mozilla/modules/libreg/src/reg.c +--- mozilla/modules/libreg/src/reg.c.old 2007-09-25 18:25:02.000000000 +0200 ++++ mozilla/modules/libreg/src/reg.c 2007-09-25 18:27:46.000000000 +0200 +@@ -96,7 +96,8 @@ + #define MAX_PATH PATH_MAX + #elif defined(XP_UNIX) + #ifndef MAX_PATH +-#define MAX_PATH 1024 ++#include ++#define MAX_PATH PATH_MAX + #endif + #elif defined(XP_OS2) + #ifndef MAX_PATH +diff -up mozilla/config/pathsub.h.old mozilla/config/pathsub.h +--- mozilla/config/pathsub.h.old 2004-04-18 16:17:25.000000000 +0200 ++++ mozilla/config/pathsub.h 2007-09-25 18:48:13.000000000 +0200 +@@ -46,7 +46,7 @@ + #include + + #ifndef PATH_MAX +-#define PATH_MAX 1024 ++#error "PATH_MAX is not defined!" + #endif + + /* +diff -up mozilla/modules/libjar/nsZipArchive.cpp.old mozilla/modules/libjar/nsZipArchive.cpp +--- mozilla/modules/libjar/nsZipArchive.cpp.old 2006-09-13 20:32:37.000000000 +0200 ++++ mozilla/modules/libjar/nsZipArchive.cpp 2007-09-25 18:51:00.000000000 +0200 +@@ -121,7 +121,7 @@ char * strdup(const char *src) + # define S_IFLNK 0120000 + # endif + # ifndef PATH_MAX +-# define PATH_MAX 1024 ++# include + # endif + #endif /* XP_UNIX */ + +diff -up mozilla/nsprpub/config/pathsub.h.old mozilla/nsprpub/config/pathsub.h +--- mozilla/nsprpub/config/pathsub.h.old 2004-04-25 17:00:34.000000000 +0200 ++++ mozilla/nsprpub/config/pathsub.h 2007-09-25 18:57:51.000000000 +0200 +@@ -50,7 +50,7 @@ + #endif + + #ifndef PATH_MAX +-#define PATH_MAX 1024 ++#error "PATH_MAX is not defined!" + #endif + + /* +diff -up mozilla/security/coreconf/nsinstall/pathsub.h.old mozilla/security/coreconf/nsinstall/pathsub.h +--- mozilla/security/coreconf/nsinstall/pathsub.h.old 2004-04-25 17:02:18.000000000 +0200 ++++ mozilla/security/coreconf/nsinstall/pathsub.h 2007-09-25 19:00:35.000000000 +0200 +@@ -49,7 +49,7 @@ + #endif + + #ifndef PATH_MAX +-#define PATH_MAX 1024 ++#error "PATH_MAX is not defined!" + #endif + + /* diff --git a/tb-develdirs.patch b/tb-develdirs.patch new file mode 100644 index 0000000..d67119d --- /dev/null +++ b/tb-develdirs.patch @@ -0,0 +1,30 @@ +Index: config/autoconf.mk.in +=================================================================== +RCS file: /cvsroot/mozilla/config/autoconf.mk.in,v +retrieving revision 3.363.2.20 +diff -u -6 -r3.363.2.20 autoconf.mk.in +--- config/autoconf.mk.in 14 Sep 2006 18:07:03 -0000 3.363.2.20 ++++ config/autoconf.mk.in 3 Dec 2007 07:00:26 -0000 +@@ -54,19 +54,19 @@ + + MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@ + + prefix = @prefix@ + exec_prefix = @exec_prefix@ + bindir = @bindir@ +-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++includedir = @includedir@/$(MOZ_APP_NAME) + libdir = @libdir@ + datadir = @datadir@ + mandir = @mandir@ +-idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++idldir = @libdir@/$(MOZ_APP_NAME) + +-mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++mozappdir = $(libdir)/$(MOZ_APP_NAME) + mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION) + mrelibdir = $(mredir)/lib + + DIST = $(DEPTH)/dist + + MOZ_CHROME_FILE_FORMAT = @MOZ_CHROME_FILE_FORMAT@ diff --git a/thunderbird-2.0.0.6-source.tar.bz2 b/thunderbird-2.0.0.6-source.tar.bz2 deleted file mode 100644 index 223b04a..0000000 --- a/thunderbird-2.0.0.6-source.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1778e1c74e7a860ab7769a91408ae64ecc8ca2dc2714cc5882688a848d493230 -size 37705896 diff --git a/thunderbird-2.0.0.9-source.tar.bz2 b/thunderbird-2.0.0.9-source.tar.bz2 new file mode 100644 index 0000000..fa56ed6 --- /dev/null +++ b/thunderbird-2.0.0.9-source.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5e6f584b0757be842e7d28c59fe2bc3f9c38a28db4c464c222d31ee8d143fa36 +size 37757945 diff --git a/thunderbird-gcc4.3-fixes.patch b/thunderbird-gcc4.3-fixes.patch deleted file mode 100644 index 91dfb37..0000000 --- a/thunderbird-gcc4.3-fixes.patch +++ /dev/null @@ -1,137 +0,0 @@ -diff --git a/modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h b/modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h -index 8a63354..019d35d 100644 ---- a/modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h -+++ b/modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h -@@ -39,8 +39,10 @@ - #include "imgIEncoder.h" - #ifdef MOZILLA_1_8_BRANCH - #define imgIEncoder imgIEncoder_MOZILLA_1_8_BRANCH -+#ifndef NS_DECL_IMGIENCODER - #define NS_DECL_IMGIENCODER NS_DECL_IMGIENCODER_MOZILLA_1_8_BRANCH - #endif -+#endif - - // needed for JPEG library - #include -@@ -69,6 +71,14 @@ public: - - nsJPEGEncoder(); - -+ NS_IMETHOD InitFromData(const PRUint8* aData, -+ PRUint32 aLength, // (unused, req'd by JS) -+ PRUint32 aWidth, -+ PRUint32 aHeight, -+ PRUint32 aStride, -+ PRUint32 aInputFormat, -+ const nsAString& aOutputOptions); -+ - private: - ~nsJPEGEncoder(); - -diff --git a/modules/libpr0n/encoders/png/nsPNGEncoder.h b/modules/libpr0n/encoders/png/nsPNGEncoder.h -index ff85949..83766f1 100644 ---- a/modules/libpr0n/encoders/png/nsPNGEncoder.h -+++ b/modules/libpr0n/encoders/png/nsPNGEncoder.h -@@ -38,8 +38,10 @@ - #include "imgIEncoder.h" - #ifdef MOZILLA_1_8_BRANCH - #define imgIEncoder imgIEncoder_MOZILLA_1_8_BRANCH -+#ifndef NS_DECL_IMGIENCODER - #define NS_DECL_IMGIENCODER NS_DECL_IMGIENCODER_MOZILLA_1_8_BRANCH - #endif -+#endif - - #include - -@@ -63,6 +65,14 @@ public: - - nsPNGEncoder(); - -+ NS_IMETHOD InitFromData(const PRUint8* aData, -+ PRUint32 aLength, // (unused, req'd by JS) -+ PRUint32 aWidth, -+ PRUint32 aHeight, -+ PRUint32 aStride, -+ PRUint32 aInputFormat, -+ const nsAString& aOutputOptions); -+ - private: - ~nsPNGEncoder(); - -diff --git a/modules/libpr0n/public/imgIContainer.idl b/modules/libpr0n/public/imgIContainer.idl -index f975b16..4819158 100644 ---- a/modules/libpr0n/public/imgIContainer.idl -+++ b/modules/libpr0n/public/imgIContainer.idl -@@ -38,7 +38,7 @@ - * ***** END LICENSE BLOCK ***** */ - - #include "nsISupports.idl" --#include "gfxtypes.idl" -+#include - #include "gfxIFormats.idl" - - interface gfxIImageFrame; -diff --git a/modules/libpr0n/public/imgIEncoder.idl b/modules/libpr0n/public/imgIEncoder.idl -index 120b3bf..562bf42 100755 ---- a/modules/libpr0n/public/imgIEncoder.idl -+++ b/modules/libpr0n/public/imgIEncoder.idl -@@ -96,6 +96,6 @@ interface nsIFile; - [scriptable, uuid(CCC5B3AD-3E67-4e3d-97E1-B06B2E96FEF8)] - interface imgIEncoder : nsISupports - { -- void encodeClipboardImage(in nsIClipboardImage aClipboardImage, out nsIFile aImageFile); -+ /* void encodeClipboardImage(in nsIClipboardImage aClipboardImage, out nsIFile aImageFile); */ - }; - -diff --git a/xpcom/obsolete/component/nsFileSpecImpl.h b/xpcom/obsolete/component/nsFileSpecImpl.h -index 502e254..0e51950 100644 ---- a/xpcom/obsolete/component/nsFileSpecImpl.h -+++ b/xpcom/obsolete/component/nsFileSpecImpl.h -@@ -58,7 +58,7 @@ class nsFileSpecImpl - // COM Cruft - //---------------------- - -- static NS_METHOD Create(nsISupports* outer, const nsIID& aIID, void* *aIFileSpec); -+ /* static NS_METHOD Create(nsISupports* outer, const nsIID& aIID, void* *aIFileSpec); */ - - //---------------------- - // Implementation -@@ -104,7 +104,7 @@ public: - // COM Cruft - //---------------------- - -- static NS_METHOD Create(nsISupports* outer, const nsIID& aIID, void* *aIFileSpec); -+ /* static NS_METHOD Create(nsISupports* outer, const nsIID& aIID, void* *aIFileSpec); */ - - private: - ~nsDirectoryIteratorImpl(); -diff --git a/xpcom/obsolete/component/nsXPCOMObsolete.cpp b/xpcom/obsolete/component/nsXPCOMObsolete.cpp -index 9a71a91..03ac666 100644 ---- a/xpcom/obsolete/component/nsXPCOMObsolete.cpp -+++ b/xpcom/obsolete/component/nsXPCOMObsolete.cpp -@@ -48,8 +48,8 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsRegistry) - - static const nsModuleComponentInfo components[] = - { -- COMPONENT(FILESPEC, nsFileSpecImpl::Create), -- COMPONENT(DIRECTORYITERATOR, nsDirectoryIteratorImpl::Create), -+/* COMPONENT(FILESPEC, nsFileSpecImpl::Create), -+ COMPONENT(DIRECTORYITERATOR, nsDirectoryIteratorImpl::Create), */ - COMPONENT(REGISTRY, nsRegistryConstructor), - }; - -diff --git a/xpcom/obsolete/nsXPCOMObsolete.cpp b/xpcom/obsolete/nsXPCOMObsolete.cpp -index 45391c0..10b2060 100644 ---- a/xpcom/obsolete/nsXPCOMObsolete.cpp -+++ b/xpcom/obsolete/nsXPCOMObsolete.cpp -@@ -46,8 +46,8 @@ - - static const nsModuleComponentInfo components[] = - { -- COMPONENT(FILESPEC, nsFileSpecImpl::Create), -- COMPONENT(DIRECTORYITERATOR, nsDirectoryIteratorImpl::Create), -+ COMPONENT(FILESPEC, nsFileSpecImpl::Create), -+ COMPONENT(DIRECTORYITERATOR, nsDirectoryIteratorImpl::Create), - }; - - NS_IMPL_NSGETMODULE(xpcomObsoleteModule, components)