From e4a6998c27f29db9c70d8d1beb4054a8afca089172be4ca434c12ed4c0404cd5 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Tue, 29 Sep 2009 18:26:51 +0000 Subject: [PATCH 1/8] fixed SMTP AUTH error in CS locale OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaThunderbird?expand=0&rev=57 --- MozillaThunderbird.changes | 5 +++++ MozillaThunderbird.spec | 11 ++++++++--- thunderbird-cs-smtpauth.patch | 9 +++++++++ 3 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 thunderbird-cs-smtpauth.patch diff --git a/MozillaThunderbird.changes b/MozillaThunderbird.changes index 73445bb..8342c32 100644 --- a/MozillaThunderbird.changes +++ b/MozillaThunderbird.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 29 14:03:51 CEST 2009 - wr@rosenauer.org + +- fixed CS locale to allow SMTP AUTH sending of mails (bnc#542809) + ------------------------------------------------------------------- Tue Sep 15 17:58:56 CEST 2009 - wr@rosenauer.org diff --git a/MozillaThunderbird.spec b/MozillaThunderbird.spec index 400971d..b7a3aa3 100644 --- a/MozillaThunderbird.spec +++ b/MozillaThunderbird.spec @@ -45,6 +45,7 @@ Source7: find-external-requires.sh Source8: MozillaThunderbird-rpmlintrc Source9: enigmail-20090813.tar.bz2 Source10: create-tar.sh +Patch1: thunderbird-cs-smtpauth.patch Patch2: thunderbird-appname.patch Patch4: mozilla-gtkfilepicker-buttonorder.patch Patch5: tb-develdirs.patch @@ -125,7 +126,7 @@ Software Development Kit to build plugins/extensions against Thunderbird. %package lightning Version: 0.9 Release: 1 -License: GPL v2 or later ; LGPL v2.1 or later ; MPL +License: GPL v2 or later ; LGPL v2.1 or later ; MPL 1.1 or later Summary: Calendaring extension for Thunderbird Group: Productivity/Networking/Email/Clients PreReq: %{name} = %{mainversion} @@ -137,8 +138,8 @@ This package contains the Lightning calendar extension for Mozilla Thunderbird. %package -n enigmail Version: 0.96.99 -Release: 2 -License: GPL v2 or later ; MPL +Release: 1 +License: GPL v2 or later ; MPL 1.1 Summary: OpenPGP addon for Thunderbird and SeaMonkey Group: Productivity/Networking/Email/Clients Url: http://enigmail.mozdev.org @@ -175,6 +176,10 @@ popd %patch5 %patch11 %patch12 -p1 +# l10n patches +pushd ../l10n +%patch1 +popd %build export SUSE_ASNEEDED=0 diff --git a/thunderbird-cs-smtpauth.patch b/thunderbird-cs-smtpauth.patch new file mode 100644 index 0000000..5609140 --- /dev/null +++ b/thunderbird-cs-smtpauth.patch @@ -0,0 +1,9 @@ +--- cs/mail/chrome/messenger/messengercompose/composeMsgs.properties.orig 2009-09-29 13:35:48.000000000 +0200 ++++ cs/mail/chrome/messenger/messengercompose/composeMsgs.properties 2009-09-29 13:36:19.000000000 +0200 +@@ -347,5 +347,5 @@ + ## LOCALIZATION NOTE(smtpEnterPasswordPromptWithUsername): Do not translate the + ## words %1$S and %2$S. Place the word %1$S where the host name should appear, + ## and %2$S where the user name should appear. +-smtpEnterPasswordPromptWithUsername=Zadejte heslo k účtu %S na %1$S: ++smtpEnterPasswordPromptWithUsername=Zadejte heslo k účtu %2$S na %1$S: + smtpEnterPasswordPromptTitle=SMTP server vyžaduje heslo From 66473e5bc14ebd11c49a2e4ee518f46b9895b5be0597a2486d25c62f9b3b72fb Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Wed, 7 Oct 2009 19:41:49 +0000 Subject: [PATCH 2/8] fixed startup-notification (bnc#518603) OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaThunderbird?expand=0&rev=58 --- MozillaThunderbird.changes | 6 ++++ MozillaThunderbird.spec | 2 ++ mozilla-startup-notification.patch | 58 ++++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+) create mode 100644 mozilla-startup-notification.patch diff --git a/MozillaThunderbird.changes b/MozillaThunderbird.changes index 8342c32..cab40a9 100644 --- a/MozillaThunderbird.changes +++ b/MozillaThunderbird.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 7 21:41:15 CEST 2009 - wr@rosenauer.org + +- fixed startup-notification (bnc#518603) + (mozilla-startup-notification.patch) + ------------------------------------------------------------------- Tue Sep 29 14:03:51 CEST 2009 - wr@rosenauer.org diff --git a/MozillaThunderbird.spec b/MozillaThunderbird.spec index b7a3aa3..ec8c33e 100644 --- a/MozillaThunderbird.spec +++ b/MozillaThunderbird.spec @@ -47,6 +47,7 @@ Source9: enigmail-20090813.tar.bz2 Source10: create-tar.sh Patch1: thunderbird-cs-smtpauth.patch Patch2: thunderbird-appname.patch +Patch3: mozilla-startup-notification.patch Patch4: mozilla-gtkfilepicker-buttonorder.patch Patch5: tb-develdirs.patch Patch7: mozilla-path_len.patch @@ -164,6 +165,7 @@ popd %endif # xulrunner patches pushd mozilla +%patch3 -p1 %patch4 -p1 %patch7 -p1 %patch9 -p1 diff --git a/mozilla-startup-notification.patch b/mozilla-startup-notification.patch new file mode 100644 index 0000000..b9316bf --- /dev/null +++ b/mozilla-startup-notification.patch @@ -0,0 +1,58 @@ +From: Lubos Lunak +Subject: Firefox 3.5 broken startup notification +References: +http://bugzilla.novell.com/show_bug.cgi?id=518603 +https://bugzilla.mozilla.org/show_bug.cgi?id=416053 + + +diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp +--- a/toolkit/xre/nsAppRunner.cpp ++++ b/toolkit/xre/nsAppRunner.cpp +@@ -3168,23 +3168,16 @@ XRE_main(int argc, char* argv[], const n + } + dirProvider.DoStartup(); + + PRBool shuttingDown = PR_FALSE; + appStartup->GetShuttingDown(&shuttingDown); + + nsCOMPtr cmdLine; + +-#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_WIDGET_GTK2) +- nsRefPtr toolkit = GetGTKToolkit(); +- if (toolkit && !desktopStartupID.IsEmpty()) { +- toolkit->SetDesktopStartupID(desktopStartupID); +- } +-#endif +- + nsCOMPtr workingDir; + rv = NS_GetSpecialDirectory(NS_OS_CURRENT_WORKING_DIR, getter_AddRefs(workingDir)); + NS_ENSURE_SUCCESS(rv, 1); + + if (!shuttingDown) { + cmdLine = do_CreateInstance("@mozilla.org/toolkit/command-line;1"); + NS_ENSURE_TRUE(cmdLine, 1); + +@@ -3200,16 +3193,23 @@ XRE_main(int argc, char* argv[], const n + chromeObserver->Observe(cmdLine, "command-line-startup", nsnull); + } + + NS_TIMELINE_ENTER("appStartup->CreateHiddenWindow"); + rv = appStartup->CreateHiddenWindow(); + NS_TIMELINE_LEAVE("appStartup->CreateHiddenWindow"); + NS_ENSURE_SUCCESS(rv, 1); + ++#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_WIDGET_GTK2) ++ nsRefPtr toolkit = GetGTKToolkit(); ++ if (toolkit && !desktopStartupID.IsEmpty()) { ++ toolkit->SetDesktopStartupID(desktopStartupID); ++ } ++#endif ++ + // Extension Compatibility Checking and Startup + if (gAppData->flags & NS_XRE_ENABLE_EXTENSION_MANAGER) { + nsCOMPtr em(do_GetService("@mozilla.org/extensions/manager;1")); + NS_ENSURE_TRUE(em, 1); + + ar = CheckArg("install-global-extension", PR_TRUE); + if (ar == ARG_BAD) { + PR_fprintf(PR_STDERR, "Error: argument -install-global-extension is invalid when argument -osint is specified\n"); From 9d2cc19a8b07c6ab98c5dabc7c8eda56ee752b9faed0c20dfdbb7c3dbbc0a439 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Thu, 8 Oct 2009 08:46:04 +0000 Subject: [PATCH 3/8] OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaThunderbird?expand=0&rev=62 --- MozillaThunderbird.changes | 6 ---- MozillaThunderbird.spec | 6 ++-- mozilla-startup-notification.patch | 58 ------------------------------ 3 files changed, 2 insertions(+), 68 deletions(-) delete mode 100644 mozilla-startup-notification.patch diff --git a/MozillaThunderbird.changes b/MozillaThunderbird.changes index cab40a9..8342c32 100644 --- a/MozillaThunderbird.changes +++ b/MozillaThunderbird.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Wed Oct 7 21:41:15 CEST 2009 - wr@rosenauer.org - -- fixed startup-notification (bnc#518603) - (mozilla-startup-notification.patch) - ------------------------------------------------------------------- Tue Sep 29 14:03:51 CEST 2009 - wr@rosenauer.org diff --git a/MozillaThunderbird.spec b/MozillaThunderbird.spec index ec8c33e..5daa5a1 100644 --- a/MozillaThunderbird.spec +++ b/MozillaThunderbird.spec @@ -30,7 +30,7 @@ BuildRequires: nss-shared-helper-devel License: GPL v2 or later ; LGPL v2.1 or later ; MPL 1.1 or later %define mainversion 3.0b4 Version: %{mainversion} -Release: 1 +Release: 2 Summary: The Stand-Alone Mozilla Mail Component Url: http://www.mozilla.org/products/thunderbird/ Group: Productivity/Networking/Email/Clients @@ -47,7 +47,6 @@ Source9: enigmail-20090813.tar.bz2 Source10: create-tar.sh Patch1: thunderbird-cs-smtpauth.patch Patch2: thunderbird-appname.patch -Patch3: mozilla-startup-notification.patch Patch4: mozilla-gtkfilepicker-buttonorder.patch Patch5: tb-develdirs.patch Patch7: mozilla-path_len.patch @@ -139,7 +138,7 @@ This package contains the Lightning calendar extension for Mozilla Thunderbird. %package -n enigmail Version: 0.96.99 -Release: 1 +Release: 3 License: GPL v2 or later ; MPL 1.1 Summary: OpenPGP addon for Thunderbird and SeaMonkey Group: Productivity/Networking/Email/Clients @@ -165,7 +164,6 @@ popd %endif # xulrunner patches pushd mozilla -%patch3 -p1 %patch4 -p1 %patch7 -p1 %patch9 -p1 diff --git a/mozilla-startup-notification.patch b/mozilla-startup-notification.patch deleted file mode 100644 index b9316bf..0000000 --- a/mozilla-startup-notification.patch +++ /dev/null @@ -1,58 +0,0 @@ -From: Lubos Lunak -Subject: Firefox 3.5 broken startup notification -References: -http://bugzilla.novell.com/show_bug.cgi?id=518603 -https://bugzilla.mozilla.org/show_bug.cgi?id=416053 - - -diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp ---- a/toolkit/xre/nsAppRunner.cpp -+++ b/toolkit/xre/nsAppRunner.cpp -@@ -3168,23 +3168,16 @@ XRE_main(int argc, char* argv[], const n - } - dirProvider.DoStartup(); - - PRBool shuttingDown = PR_FALSE; - appStartup->GetShuttingDown(&shuttingDown); - - nsCOMPtr cmdLine; - --#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_WIDGET_GTK2) -- nsRefPtr toolkit = GetGTKToolkit(); -- if (toolkit && !desktopStartupID.IsEmpty()) { -- toolkit->SetDesktopStartupID(desktopStartupID); -- } --#endif -- - nsCOMPtr workingDir; - rv = NS_GetSpecialDirectory(NS_OS_CURRENT_WORKING_DIR, getter_AddRefs(workingDir)); - NS_ENSURE_SUCCESS(rv, 1); - - if (!shuttingDown) { - cmdLine = do_CreateInstance("@mozilla.org/toolkit/command-line;1"); - NS_ENSURE_TRUE(cmdLine, 1); - -@@ -3200,16 +3193,23 @@ XRE_main(int argc, char* argv[], const n - chromeObserver->Observe(cmdLine, "command-line-startup", nsnull); - } - - NS_TIMELINE_ENTER("appStartup->CreateHiddenWindow"); - rv = appStartup->CreateHiddenWindow(); - NS_TIMELINE_LEAVE("appStartup->CreateHiddenWindow"); - NS_ENSURE_SUCCESS(rv, 1); - -+#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_WIDGET_GTK2) -+ nsRefPtr toolkit = GetGTKToolkit(); -+ if (toolkit && !desktopStartupID.IsEmpty()) { -+ toolkit->SetDesktopStartupID(desktopStartupID); -+ } -+#endif -+ - // Extension Compatibility Checking and Startup - if (gAppData->flags & NS_XRE_ENABLE_EXTENSION_MANAGER) { - nsCOMPtr em(do_GetService("@mozilla.org/extensions/manager;1")); - NS_ENSURE_TRUE(em, 1); - - ar = CheckArg("install-global-extension", PR_TRUE); - if (ar == ARG_BAD) { - PR_fprintf(PR_STDERR, "Error: argument -install-global-extension is invalid when argument -osint is specified\n"); From ae82d6cb359867cfd490ca4adf3fa73e22dbeb292fbc1024643158e56180af7d Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Thu, 8 Oct 2009 08:47:46 +0000 Subject: [PATCH 4/8] fixed startup-notification OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaThunderbird?expand=0&rev=63 --- MozillaThunderbird.changes | 6 ++++ MozillaThunderbird.spec | 2 ++ mozilla-startup-notification.patch | 58 ++++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+) create mode 100644 mozilla-startup-notification.patch diff --git a/MozillaThunderbird.changes b/MozillaThunderbird.changes index 8342c32..cab40a9 100644 --- a/MozillaThunderbird.changes +++ b/MozillaThunderbird.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 7 21:41:15 CEST 2009 - wr@rosenauer.org + +- fixed startup-notification (bnc#518603) + (mozilla-startup-notification.patch) + ------------------------------------------------------------------- Tue Sep 29 14:03:51 CEST 2009 - wr@rosenauer.org diff --git a/MozillaThunderbird.spec b/MozillaThunderbird.spec index 5daa5a1..cc93b0c 100644 --- a/MozillaThunderbird.spec +++ b/MozillaThunderbird.spec @@ -47,6 +47,7 @@ Source9: enigmail-20090813.tar.bz2 Source10: create-tar.sh Patch1: thunderbird-cs-smtpauth.patch Patch2: thunderbird-appname.patch +Patch3: mozilla-startup-notification.patch Patch4: mozilla-gtkfilepicker-buttonorder.patch Patch5: tb-develdirs.patch Patch7: mozilla-path_len.patch @@ -164,6 +165,7 @@ popd %endif # xulrunner patches pushd mozilla +%patch3 -p1 %patch4 -p1 %patch7 -p1 %patch9 -p1 diff --git a/mozilla-startup-notification.patch b/mozilla-startup-notification.patch new file mode 100644 index 0000000..b9316bf --- /dev/null +++ b/mozilla-startup-notification.patch @@ -0,0 +1,58 @@ +From: Lubos Lunak +Subject: Firefox 3.5 broken startup notification +References: +http://bugzilla.novell.com/show_bug.cgi?id=518603 +https://bugzilla.mozilla.org/show_bug.cgi?id=416053 + + +diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp +--- a/toolkit/xre/nsAppRunner.cpp ++++ b/toolkit/xre/nsAppRunner.cpp +@@ -3168,23 +3168,16 @@ XRE_main(int argc, char* argv[], const n + } + dirProvider.DoStartup(); + + PRBool shuttingDown = PR_FALSE; + appStartup->GetShuttingDown(&shuttingDown); + + nsCOMPtr cmdLine; + +-#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_WIDGET_GTK2) +- nsRefPtr toolkit = GetGTKToolkit(); +- if (toolkit && !desktopStartupID.IsEmpty()) { +- toolkit->SetDesktopStartupID(desktopStartupID); +- } +-#endif +- + nsCOMPtr workingDir; + rv = NS_GetSpecialDirectory(NS_OS_CURRENT_WORKING_DIR, getter_AddRefs(workingDir)); + NS_ENSURE_SUCCESS(rv, 1); + + if (!shuttingDown) { + cmdLine = do_CreateInstance("@mozilla.org/toolkit/command-line;1"); + NS_ENSURE_TRUE(cmdLine, 1); + +@@ -3200,16 +3193,23 @@ XRE_main(int argc, char* argv[], const n + chromeObserver->Observe(cmdLine, "command-line-startup", nsnull); + } + + NS_TIMELINE_ENTER("appStartup->CreateHiddenWindow"); + rv = appStartup->CreateHiddenWindow(); + NS_TIMELINE_LEAVE("appStartup->CreateHiddenWindow"); + NS_ENSURE_SUCCESS(rv, 1); + ++#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_WIDGET_GTK2) ++ nsRefPtr toolkit = GetGTKToolkit(); ++ if (toolkit && !desktopStartupID.IsEmpty()) { ++ toolkit->SetDesktopStartupID(desktopStartupID); ++ } ++#endif ++ + // Extension Compatibility Checking and Startup + if (gAppData->flags & NS_XRE_ENABLE_EXTENSION_MANAGER) { + nsCOMPtr em(do_GetService("@mozilla.org/extensions/manager;1")); + NS_ENSURE_TRUE(em, 1); + + ar = CheckArg("install-global-extension", PR_TRUE); + if (ar == ARG_BAD) { + PR_fprintf(PR_STDERR, "Error: argument -install-global-extension is invalid when argument -osint is specified\n"); From 17c29ecfdb9619ce893b6ce8f178a57956f2e2d2d9a6516544b6d6a28178ab93 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 23 Oct 2009 13:36:41 +0000 Subject: [PATCH 5/8] checked in OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaThunderbird?expand=0&rev=64 --- MozillaThunderbird.changes | 6 ---- MozillaThunderbird.spec | 2 -- mozilla-startup-notification.patch | 58 ------------------------------ 3 files changed, 66 deletions(-) delete mode 100644 mozilla-startup-notification.patch diff --git a/MozillaThunderbird.changes b/MozillaThunderbird.changes index cab40a9..8342c32 100644 --- a/MozillaThunderbird.changes +++ b/MozillaThunderbird.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Wed Oct 7 21:41:15 CEST 2009 - wr@rosenauer.org - -- fixed startup-notification (bnc#518603) - (mozilla-startup-notification.patch) - ------------------------------------------------------------------- Tue Sep 29 14:03:51 CEST 2009 - wr@rosenauer.org diff --git a/MozillaThunderbird.spec b/MozillaThunderbird.spec index cc93b0c..5daa5a1 100644 --- a/MozillaThunderbird.spec +++ b/MozillaThunderbird.spec @@ -47,7 +47,6 @@ Source9: enigmail-20090813.tar.bz2 Source10: create-tar.sh Patch1: thunderbird-cs-smtpauth.patch Patch2: thunderbird-appname.patch -Patch3: mozilla-startup-notification.patch Patch4: mozilla-gtkfilepicker-buttonorder.patch Patch5: tb-develdirs.patch Patch7: mozilla-path_len.patch @@ -165,7 +164,6 @@ popd %endif # xulrunner patches pushd mozilla -%patch3 -p1 %patch4 -p1 %patch7 -p1 %patch9 -p1 diff --git a/mozilla-startup-notification.patch b/mozilla-startup-notification.patch deleted file mode 100644 index b9316bf..0000000 --- a/mozilla-startup-notification.patch +++ /dev/null @@ -1,58 +0,0 @@ -From: Lubos Lunak -Subject: Firefox 3.5 broken startup notification -References: -http://bugzilla.novell.com/show_bug.cgi?id=518603 -https://bugzilla.mozilla.org/show_bug.cgi?id=416053 - - -diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp ---- a/toolkit/xre/nsAppRunner.cpp -+++ b/toolkit/xre/nsAppRunner.cpp -@@ -3168,23 +3168,16 @@ XRE_main(int argc, char* argv[], const n - } - dirProvider.DoStartup(); - - PRBool shuttingDown = PR_FALSE; - appStartup->GetShuttingDown(&shuttingDown); - - nsCOMPtr cmdLine; - --#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_WIDGET_GTK2) -- nsRefPtr toolkit = GetGTKToolkit(); -- if (toolkit && !desktopStartupID.IsEmpty()) { -- toolkit->SetDesktopStartupID(desktopStartupID); -- } --#endif -- - nsCOMPtr workingDir; - rv = NS_GetSpecialDirectory(NS_OS_CURRENT_WORKING_DIR, getter_AddRefs(workingDir)); - NS_ENSURE_SUCCESS(rv, 1); - - if (!shuttingDown) { - cmdLine = do_CreateInstance("@mozilla.org/toolkit/command-line;1"); - NS_ENSURE_TRUE(cmdLine, 1); - -@@ -3200,16 +3193,23 @@ XRE_main(int argc, char* argv[], const n - chromeObserver->Observe(cmdLine, "command-line-startup", nsnull); - } - - NS_TIMELINE_ENTER("appStartup->CreateHiddenWindow"); - rv = appStartup->CreateHiddenWindow(); - NS_TIMELINE_LEAVE("appStartup->CreateHiddenWindow"); - NS_ENSURE_SUCCESS(rv, 1); - -+#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_WIDGET_GTK2) -+ nsRefPtr toolkit = GetGTKToolkit(); -+ if (toolkit && !desktopStartupID.IsEmpty()) { -+ toolkit->SetDesktopStartupID(desktopStartupID); -+ } -+#endif -+ - // Extension Compatibility Checking and Startup - if (gAppData->flags & NS_XRE_ENABLE_EXTENSION_MANAGER) { - nsCOMPtr em(do_GetService("@mozilla.org/extensions/manager;1")); - NS_ENSURE_TRUE(em, 1); - - ar = CheckArg("install-global-extension", PR_TRUE); - if (ar == ARG_BAD) { - PR_fprintf(PR_STDERR, "Error: argument -install-global-extension is invalid when argument -osint is specified\n"); From 5ab03b2eea4a3732d264eacedb0655d428a0f7193bd1db03397435a481247bf2 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Tue, 8 Dec 2009 10:23:17 +0000 Subject: [PATCH 6/8] remove obsolete patch OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaThunderbird?expand=0&rev=65 --- MozillaThunderbird.changes | 17 +++++ MozillaThunderbird.spec | 60 +++++++--------- create-tar.sh | 17 +++-- enigmail-1.0.0.tar.bz2 | 3 + enigmail-20090813.tar.bz2 | 3 - l10n-3.0.0.tar.bz2 | 3 + l10n-3.0b4.tar.bz2 | 3 - mozilla-clipboard.patch | 110 +++++++++++++++++++++++++++++ mozilla-startup-notification.patch | 58 +++++++++++++++ suse-default-prefs.js | 1 - thunderbird-3.0.0-source.tar.bz2 | 3 + thunderbird-3.0b4-source.tar.bz2 | 3 - thunderbird-cs-smtpauth.patch | 9 --- thunderbird-no-update.patch | 28 -------- thunderbird-shared-nss-db.patch | 65 ++++++++++------- 15 files changed, 272 insertions(+), 111 deletions(-) create mode 100644 enigmail-1.0.0.tar.bz2 delete mode 100644 enigmail-20090813.tar.bz2 create mode 100644 l10n-3.0.0.tar.bz2 delete mode 100644 l10n-3.0b4.tar.bz2 create mode 100644 mozilla-clipboard.patch create mode 100644 mozilla-startup-notification.patch create mode 100644 thunderbird-3.0.0-source.tar.bz2 delete mode 100644 thunderbird-3.0b4-source.tar.bz2 delete mode 100644 thunderbird-cs-smtpauth.patch delete mode 100644 thunderbird-no-update.patch diff --git a/MozillaThunderbird.changes b/MozillaThunderbird.changes index 8342c32..9844d25 100644 --- a/MozillaThunderbird.changes +++ b/MozillaThunderbird.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Dec 7 10:04:05 CET 2009 - wr@rosenauer.org + +- update to 3.0 (bnc#559819) +- update enigmail to final version 1.0.0 +- use --disable-updater and removed obsolete UI patch and + pref changes +- use internal cairo up to 11.1 (Gecko now requires at least 1.8.8) +- added mozilla-clipboard.patch fixing a common crash (bmo#495392) +- removed upstreamed patch thunderbird-cs-smtpauth.patch + +------------------------------------------------------------------- +Wed Oct 7 21:41:15 CEST 2009 - wr@rosenauer.org + +- fixed startup-notification (bnc#518603) + (mozilla-startup-notification.patch) + ------------------------------------------------------------------- Tue Sep 29 14:03:51 CEST 2009 - wr@rosenauer.org diff --git a/MozillaThunderbird.spec b/MozillaThunderbird.spec index 5daa5a1..8bc90e5 100644 --- a/MozillaThunderbird.spec +++ b/MozillaThunderbird.spec @@ -1,5 +1,5 @@ # -# spec file for package MozillaThunderbird (Version 3.0b4) +# spec file for package MozillaThunderbird (Version 3.0.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 Wolfgang Rosenauer @@ -27,10 +27,11 @@ BuildRequires: hunspell-devel %if %suse_version > 1100 BuildRequires: nss-shared-helper-devel %endif -License: GPL v2 or later ; LGPL v2.1 or later ; MPL 1.1 or later -%define mainversion 3.0b4 +License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ +%define mainversion 3.0.0 Version: %{mainversion} -Release: 2 +Release: 5 +%define releasedate 2009113000 Summary: The Stand-Alone Mozilla Mail Component Url: http://www.mozilla.org/products/thunderbird/ Group: Productivity/Networking/Email/Clients @@ -43,23 +44,24 @@ Source4: l10n-%{version}.tar.bz2 Source6: suse-default-prefs.js Source7: find-external-requires.sh Source8: MozillaThunderbird-rpmlintrc -Source9: enigmail-20090813.tar.bz2 +Source9: enigmail-1.0.0.tar.bz2 Source10: create-tar.sh -Patch1: thunderbird-cs-smtpauth.patch +Patch1: mozilla-clipboard.patch Patch2: thunderbird-appname.patch +Patch3: mozilla-startup-notification.patch Patch4: mozilla-gtkfilepicker-buttonorder.patch Patch5: tb-develdirs.patch Patch7: mozilla-path_len.patch +Patch8: mozilla-helper-app.patch Patch9: mozilla-shared-nss-db.patch Patch10: mozilla-system-hunspell.patch.bz2 Patch11: thunderbird-shared-nss-db.patch -Patch12: thunderbird-no-update.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: coreutils fileutils textutils /bin/sh ### build options %define build_enigmail 1 %define has_system_cairo 0 -%if %suse_version > 1100 +%if %suse_version > 1110 %define has_system_cairo 1 %endif %define localize 1 @@ -71,7 +73,6 @@ PreReq: coreutils fileutils textutils /bin/sh %global __find_provides %provfind Requires: mozilla-nspr >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr) Requires: mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss) -%define releasedate 2009091500 %define progname thunderbird %define progdir %{_prefix}/%_lib/thunderbird %define libgssapi libgssapi_krb5.so.2 @@ -84,9 +85,9 @@ Mozilla application suite. %package translations-common -License: GPL v2 or later ; LGPL v2.1 or later ; MPL 1.1 or later +License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ Summary: Common translations for MozillaThunderbird -Provides: locale(%{name}:ar;ca;cs;de;en_GB;es_AR;es_ES;fi;fr;hu;it;ja;ko;nb_NO;nl;pl;pt_BR;pt_PT;ru;sv_SE;zh_CN) +Provides: locale(%{name}:ar;ca;cs;de;en_GB;es_AR;es_ES;fi;fr;hu;it;ja;ko;nb_NO;nl;pl;pt_BR;pt_PT;ru;sv_SE;zh_CN;zh_TW) Group: System/Localization PreReq: %{name} = %{mainversion} Obsoletes: %{name}-translations < %{version}-%{release} @@ -97,9 +98,9 @@ of MozillaThunderbird. %package translations-other -License: GPL v2 or later ; LGPL v2.1 or later ; MPL 1.1 or later +License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ Summary: Extra translations for MozillaThunderbird -Provides: locale(%{name}:af;be;bn_BD;el;et;eu;fy_NL;ga_IE;gl;id;is;lt;nn_NO;pa_IN;ro;si;sk;sq;ta_LK;tr;uk;vi) +Provides: locale(%{name}:af;be;bg;bn_BD;el;et;eu;fy_NL;ga_IE;gl;he;id;is;ka;lt;nn_NO;pa_IN;ro;si;sk;sq;sr;ta_LK;tr;uk;vi) Group: System/Localization PreReq: %{name} = %{mainversion} Obsoletes: %{name}-translations < %{version}-%{release} @@ -110,7 +111,7 @@ of MozillaThunderbird. %package devel -License: GPL v2 or later ; LGPL v2.1 or later ; MPL 1.1 or later +License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ Summary: Mozilla Thunderbird SDK Group: Development/Libraries/Other Requires: mozilla-nspr-devel >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr-devel) @@ -122,11 +123,10 @@ Software Development Kit to build plugins/extensions against Thunderbird. %if %lightning - %package lightning Version: 0.9 Release: 1 -License: GPL v2 or later ; LGPL v2.1 or later ; MPL 1.1 or later +License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ Summary: Calendaring extension for Thunderbird Group: Productivity/Networking/Email/Clients PreReq: %{name} = %{mainversion} @@ -134,12 +134,12 @@ PreReq: %{name} = %{mainversion} %description lightning This package contains the Lightning calendar extension for Mozilla Thunderbird. %endif -%if %build_enigmail +%if %build_enigmail %package -n enigmail -Version: 0.96.99 -Release: 3 -License: GPL v2 or later ; MPL 1.1 +Version: 1.0.0 +Release: 1 +License: GPLv2+ ; MPLv1.1+ Summary: OpenPGP addon for Thunderbird and SeaMonkey Group: Productivity/Networking/Email/Clients Url: http://enigmail.mozdev.org @@ -164,7 +164,10 @@ popd %endif # xulrunner patches pushd mozilla +%patch1 -p1 +%patch3 -p1 %patch4 -p1 +%patch8 -p1 %patch7 -p1 %patch9 -p1 pushd extensions @@ -175,11 +178,6 @@ popd %patch2 %patch5 %patch11 -%patch12 -p1 -# l10n patches -pushd ../l10n -%patch1 -popd %build export SUSE_ASNEEDED=0 @@ -216,6 +214,7 @@ ac_add_options --with-system-nss ac_add_options --with-system-jpeg ac_add_options --with-system-zlib ac_add_options --with-l10n-base=../l10n +ac_add_options --disable-updater #ac_add_options --with-system-png # no apng support %if %lightning ac_add_options --enable-extensions=default,lightning @@ -239,7 +238,7 @@ make -f client.mk build # ### enigmail build %if %build_enigmail -mv $RPM_BUILD_DIR/enigmail/src $RPM_BUILD_DIR/thunderbird/mailnews/extensions/enigmail +cp -r $RPM_BUILD_DIR/enigmail $RPM_BUILD_DIR/thunderbird/mailnews/extensions/ (cd $RPM_BUILD_DIR/thunderbird/mailnews/extensions/enigmail; ./makemake -r; make; make xpi) %endif @@ -350,7 +349,6 @@ rm -f $RPM_BUILD_ROOT%{progdir}/enigmail*.xpi # # remove spurious executable bits find $RPM_BUILD_ROOT/usr/include/%{progname} -type f -exec chmod a-x {} \; -#find $RPM_BUILD_ROOT%{_libdir}/pkgconfig/* -type f -exec chmod a-x {} \; find $RPM_BUILD_ROOT%{_libdir}/%{progname} -name "*.js" | xargs chmod a-x # for size in 16 22 24 32 48 256; do @@ -359,7 +357,6 @@ for size in 16 22 24 32 48 256; do done %suse_update_desktop_file %{name} Network Email GTK # excluded files -# excluded files rm -f $RPM_BUILD_ROOT%{progdir}/thunderbird rm -f $RPM_BUILD_ROOT%{progdir}/removed-files rm -f $RPM_BUILD_ROOT%{progdir}/updater @@ -417,9 +414,7 @@ exit 0 %dir %{progdir} %{progdir}/application.ini %{progdir}/res/ -%{progdir}/icons/ %{progdir}/dependentlibs.list -%{progdir}/LICENSE.txt %{progdir}/README.txt %{progdir}/libldap60.so %{progdir}/libprldap60.so @@ -429,7 +424,6 @@ exit 0 %{progdir}/libmozjs.so %{progdir}/libxpcom_core.so %{progdir}/libxpcom.so -%{progdir}/license.html %{progdir}/mozilla-xremote-client %{progdir}/platform.ini %{progdir}/run-mozilla.sh @@ -472,14 +466,14 @@ exit 0 %{_libdir}/%{progname}/xpt_link #%{_libdir}/pkgconfig/*.pc %{_includedir}/%{progname}/ -%if %lightning +%if %lightning %files lightning %defattr(-,root,root) %{progdir}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103} %endif -%if %build_enigmail +%if %build_enigmail %files -n enigmail %defattr(-,root,root) %dir %{_libdir}/mozilla diff --git a/create-tar.sh b/create-tar.sh index a05094b..9ba131c 100644 --- a/create-tar.sh +++ b/create-tar.sh @@ -1,16 +1,19 @@ #!/bin/bash -RELEASE_TAG="THUNDERBIRD_3_0b4_RELEASE" -VERSION="3.0b4" -echo "cloning comm-central..." -hg clone http://hg.mozilla.org/comm-central thunderbird +BRANCH="releases/comm-1.9.1" # comm-central +RELEASE_TAG="THUNDERBIRD_3_0rc2_RELEASE" +VERSION="3.0.0" + +echo "cloning $BRANCH..." +hg clone http://hg.mozilla.org/$BRANCH thunderbird pushd thunderbird -#hg update -r $RELEASE_TAG +hg update -r $RELEASE_TAG echo "running client.py..." -python client.py checkout --skip-chatzilla --skip-venkman --comm-rev=$RELEASE_TAG --mozilla-rev=$RELEASE_TAG +[ "$RELEASE_TAG" == "default" ] || _extra="--comm-rev=$RELEASE_TAG --mozilla-rev=$RELEASE_TAG" +python client.py checkout --skip-chatzilla --skip-venkman $_extra popd -echo "creating archivei..." +echo "creating archive..." tar cjf thunderbird-$VERSION-source.tar.bz2 --exclude=.hgtags --exclude=.hgignore --exclude=.hg --exclude=CVS thunderbird # l10n diff --git a/enigmail-1.0.0.tar.bz2 b/enigmail-1.0.0.tar.bz2 new file mode 100644 index 0000000..b22296c --- /dev/null +++ b/enigmail-1.0.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c55b6f008f0a24d5e783d845f6d3534e1279757afcc41ca5c26a9802576ec100 +size 838623 diff --git a/enigmail-20090813.tar.bz2 b/enigmail-20090813.tar.bz2 deleted file mode 100644 index 15f3e3e..0000000 --- a/enigmail-20090813.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8620d4d69826726b0c98d82e58ef76a9f5f3b72eb408e740a6d89447430ff885 -size 789423 diff --git a/l10n-3.0.0.tar.bz2 b/l10n-3.0.0.tar.bz2 new file mode 100644 index 0000000..de391b6 --- /dev/null +++ b/l10n-3.0.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1d629c015dc62c47efa22f2d5780889f3fd15dee2ebdda6f063988336bc5acd4 +size 19183180 diff --git a/l10n-3.0b4.tar.bz2 b/l10n-3.0b4.tar.bz2 deleted file mode 100644 index 7995d5a..0000000 --- a/l10n-3.0b4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ae866c27789391b89a4e483ead93d3f9899497680c424c5251ee7c43352cbf32 -size 15400735 diff --git a/mozilla-clipboard.patch b/mozilla-clipboard.patch new file mode 100644 index 0000000..c0d662d --- /dev/null +++ b/mozilla-clipboard.patch @@ -0,0 +1,110 @@ +From: Martin Stránský +Subject: Fix crash in clipboard handling +References: +https://bugzilla.mozilla.org/show_bug.cgi?id=495392 + + +diff --git a/widget/src/gtk2/nsClipboard.cpp b/widget/src/gtk2/nsClipboard.cpp +--- a/widget/src/gtk2/nsClipboard.cpp ++++ b/widget/src/gtk2/nsClipboard.cpp +@@ -440,21 +440,21 @@ nsClipboard::HasDataMatchingFlavors(cons + if (!strcmp(aFlavorList[i], kUnicodeMime) && + gtk_selection_data_targets_include_text(selection_data)) { + *_retval = PR_TRUE; + break; + } + + for (PRInt32 j = 0; j < n_targets; j++) { + gchar *atom_name = gdk_atom_name(targets[j]); +- if (!strcmp(atom_name, aFlavorList[i])) ++ if (!g_strcmp0(atom_name, aFlavorList[i])) + *_retval = PR_TRUE; + + // X clipboard wants image/jpeg, not image/jpg +- if (!strcmp(aFlavorList[i], kJPEGImageMime) && !strcmp(atom_name, "image/jpeg")) ++ if (!g_strcmp0(aFlavorList[i], kJPEGImageMime) && !g_strcmp0(atom_name, "image/jpeg")) + *_retval = PR_TRUE; + + g_free(atom_name); + + if (*_retval) + break; + } + } +diff --git a/widget/src/gtk2/nsDragService.cpp b/widget/src/gtk2/nsDragService.cpp +--- a/widget/src/gtk2/nsDragService.cpp ++++ b/widget/src/gtk2/nsDragService.cpp +@@ -796,46 +796,43 @@ nsDragService::IsDataFlavorSupported(con + GList *tmp; + for (tmp = mTargetDragContext->targets; tmp; tmp = tmp->next) { + /* Bug 331198 */ + GdkAtom atom = GDK_POINTER_TO_ATOM(tmp->data); + gchar *name = NULL; + name = gdk_atom_name(atom); + PR_LOG(sDragLm, PR_LOG_DEBUG, + ("checking %s against %s\n", name, aDataFlavor)); +- if (name && (strcmp(name, aDataFlavor) == 0)) { ++ if (g_strcmp0(name, aDataFlavor) == 0) { + PR_LOG(sDragLm, PR_LOG_DEBUG, ("good!\n")); + *_retval = PR_TRUE; + } + // check for automatic text/uri-list -> text/x-moz-url mapping + if (*_retval == PR_FALSE && +- name && +- (strcmp(name, gTextUriListType) == 0) && +- (strcmp(aDataFlavor, kURLMime) == 0)) { ++ (g_strcmp0(name, gTextUriListType) == 0) && ++ (g_strcmp0(aDataFlavor, kURLMime) == 0)) { + PR_LOG(sDragLm, PR_LOG_DEBUG, + ("good! ( it's text/uri-list and \ + we're checking against text/x-moz-url )\n")); + *_retval = PR_TRUE; + } + // check for automatic _NETSCAPE_URL -> text/x-moz-url mapping + if (*_retval == PR_FALSE && +- name && +- (strcmp(name, gMozUrlType) == 0) && +- (strcmp(aDataFlavor, kURLMime) == 0)) { ++ (g_strcmp0(name, gMozUrlType) == 0) && ++ (g_strcmp0(aDataFlavor, kURLMime) == 0)) { + PR_LOG(sDragLm, PR_LOG_DEBUG, + ("good! ( it's _NETSCAPE_URL and \ + we're checking against text/x-moz-url )\n")); + *_retval = PR_TRUE; + } + // check for auto text/plain -> text/unicode mapping + if (*_retval == PR_FALSE && +- name && +- (strcmp(name, kTextMime) == 0) && +- ((strcmp(aDataFlavor, kUnicodeMime) == 0) || +- (strcmp(aDataFlavor, kFileMime) == 0))) { ++ (g_strcmp0(name, kTextMime) == 0) && ++ ((g_strcmp0(aDataFlavor, kUnicodeMime) == 0) || ++ (g_strcmp0(aDataFlavor, kFileMime) == 0))) { + PR_LOG(sDragLm, PR_LOG_DEBUG, + ("good! ( it's text plain and we're checking \ + against text/unicode or application/x-moz-file)\n")); + *_retval = PR_TRUE; + } + g_free(name); + } + return NS_OK; +@@ -946,17 +943,17 @@ nsDragService::IsTargetContextList(void) + + // walk the list of context targets and see if one of them is a list + // of items. + for (tmp = mTargetDragContext->targets; tmp; tmp = tmp->next) { + /* Bug 331198 */ + GdkAtom atom = GDK_POINTER_TO_ATOM(tmp->data); + gchar *name = NULL; + name = gdk_atom_name(atom); +- if (strcmp(name, gMimeListType) == 0) ++ if (g_strcmp0(name, gMimeListType) == 0) + retval = PR_TRUE; + g_free(name); + if (retval) + break; + } + return retval; + } + diff --git a/mozilla-startup-notification.patch b/mozilla-startup-notification.patch new file mode 100644 index 0000000..b9316bf --- /dev/null +++ b/mozilla-startup-notification.patch @@ -0,0 +1,58 @@ +From: Lubos Lunak +Subject: Firefox 3.5 broken startup notification +References: +http://bugzilla.novell.com/show_bug.cgi?id=518603 +https://bugzilla.mozilla.org/show_bug.cgi?id=416053 + + +diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp +--- a/toolkit/xre/nsAppRunner.cpp ++++ b/toolkit/xre/nsAppRunner.cpp +@@ -3168,23 +3168,16 @@ XRE_main(int argc, char* argv[], const n + } + dirProvider.DoStartup(); + + PRBool shuttingDown = PR_FALSE; + appStartup->GetShuttingDown(&shuttingDown); + + nsCOMPtr cmdLine; + +-#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_WIDGET_GTK2) +- nsRefPtr toolkit = GetGTKToolkit(); +- if (toolkit && !desktopStartupID.IsEmpty()) { +- toolkit->SetDesktopStartupID(desktopStartupID); +- } +-#endif +- + nsCOMPtr workingDir; + rv = NS_GetSpecialDirectory(NS_OS_CURRENT_WORKING_DIR, getter_AddRefs(workingDir)); + NS_ENSURE_SUCCESS(rv, 1); + + if (!shuttingDown) { + cmdLine = do_CreateInstance("@mozilla.org/toolkit/command-line;1"); + NS_ENSURE_TRUE(cmdLine, 1); + +@@ -3200,16 +3193,23 @@ XRE_main(int argc, char* argv[], const n + chromeObserver->Observe(cmdLine, "command-line-startup", nsnull); + } + + NS_TIMELINE_ENTER("appStartup->CreateHiddenWindow"); + rv = appStartup->CreateHiddenWindow(); + NS_TIMELINE_LEAVE("appStartup->CreateHiddenWindow"); + NS_ENSURE_SUCCESS(rv, 1); + ++#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_WIDGET_GTK2) ++ nsRefPtr toolkit = GetGTKToolkit(); ++ if (toolkit && !desktopStartupID.IsEmpty()) { ++ toolkit->SetDesktopStartupID(desktopStartupID); ++ } ++#endif ++ + // Extension Compatibility Checking and Startup + if (gAppData->flags & NS_XRE_ENABLE_EXTENSION_MANAGER) { + nsCOMPtr em(do_GetService("@mozilla.org/extensions/manager;1")); + NS_ENSURE_TRUE(em, 1); + + ar = CheckArg("install-global-extension", PR_TRUE); + if (ar == ARG_BAD) { + PR_fprintf(PR_STDERR, "Error: argument -install-global-extension is invalid when argument -osint is specified\n"); diff --git a/suse-default-prefs.js b/suse-default-prefs.js index 0709e71..d8ce9b0 100644 --- a/suse-default-prefs.js +++ b/suse-default-prefs.js @@ -1,6 +1,5 @@ pref("general.useragent.vendor", "SUSE"); pref("general.useragent.vendorSub", "RPM_VERSION"); -pref("app.update.enabled", false); pref("font.default", "sans-serif"); pref("font.default.x-western", "sans-serif"); pref("font.name.monospace.x-western", "monospace"); diff --git a/thunderbird-3.0.0-source.tar.bz2 b/thunderbird-3.0.0-source.tar.bz2 new file mode 100644 index 0000000..39a07c5 --- /dev/null +++ b/thunderbird-3.0.0-source.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce0811dc48058a453fd4d4c647a2fa2029c592b564d12b46806f0f3ab3dcf408 +size 60186501 diff --git a/thunderbird-3.0b4-source.tar.bz2 b/thunderbird-3.0b4-source.tar.bz2 deleted file mode 100644 index 631a41a..0000000 --- a/thunderbird-3.0b4-source.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:33d28a2847e1b5673c50f8bf63ccf123c96b39dfcbd442dd9966edd952f99f6e -size 59231572 diff --git a/thunderbird-cs-smtpauth.patch b/thunderbird-cs-smtpauth.patch deleted file mode 100644 index 5609140..0000000 --- a/thunderbird-cs-smtpauth.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- cs/mail/chrome/messenger/messengercompose/composeMsgs.properties.orig 2009-09-29 13:35:48.000000000 +0200 -+++ cs/mail/chrome/messenger/messengercompose/composeMsgs.properties 2009-09-29 13:36:19.000000000 +0200 -@@ -347,5 +347,5 @@ - ## LOCALIZATION NOTE(smtpEnterPasswordPromptWithUsername): Do not translate the - ## words %1$S and %2$S. Place the word %1$S where the host name should appear, - ## and %2$S where the user name should appear. --smtpEnterPasswordPromptWithUsername=Zadejte heslo k účtu %S na %1$S: -+smtpEnterPasswordPromptWithUsername=Zadejte heslo k účtu %2$S na %1$S: - smtpEnterPasswordPromptTitle=SMTP server vyžaduje heslo diff --git a/thunderbird-no-update.patch b/thunderbird-no-update.patch deleted file mode 100644 index ac787d3..0000000 --- a/thunderbird-no-update.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/mail/base/content/utilityOverlay.js b/mail/base/content/utilityOverlay.js ---- a/mail/base/content/utilityOverlay.js -+++ b/mail/base/content/utilityOverlay.js -@@ -237,7 +237,13 @@ function buildHelpMenu() - // administrator or if we cannot update for some other reason. - var checkForUpdates = document.getElementById("checkForUpdates"); - var canUpdate = updates.canUpdate; -+ var prefs = Components.classes["@mozilla.org/preferences-service;1"] -+ .getService(Components.interfaces.nsIPrefBranch); -+ var updateEnabled = prefs.getBoolPref("app.update.enabled", true); - checkForUpdates.setAttribute("disabled", !canUpdate); -+ checkForUpdates.setAttribute("hidden", !canUpdate || !updateEnabled); -+ var updateSeparator = document.getElementById("menu_HelpAfterUpdatesSeparator"); -+ updateSeparator.setAttribute("hidden", !canUpdate || !updateEnabled); - if (!canUpdate) - return; - -diff --git a/mail/components/preferences/advanced.js b/mail/components/preferences/advanced.js ---- a/mail/components/preferences/advanced.js -+++ b/mail/components/preferences/advanced.js -@@ -238,6 +238,7 @@ var gAdvancedPane = { - var enableAppUpdate = document.getElementById("enableAppUpdate"); - - enableAppUpdate.disabled = !aus.canUpdate || enabledPref.locked; -+ enableAppUpdate.hidden = !aus.canUpdate || !enabledPref.value; - }, - - updateAutoItems: function () diff --git a/thunderbird-shared-nss-db.patch b/thunderbird-shared-nss-db.patch index c6468ea..33d953e 100644 --- a/thunderbird-shared-nss-db.patch +++ b/thunderbird-shared-nss-db.patch @@ -1,26 +1,21 @@ ---- mail/app/Makefile.in.orig 2009-02-26 11:02:11.000000000 +0100 -+++ mail/app/Makefile.in 2009-02-26 11:04:00.000000000 +0100 -@@ -129,6 +129,7 @@ - $(EXTRA_DSO_LIBS) \ - $(APP_XPCOM_LIBS) \ - $(NSPR_LIBS) \ -+ $(NSSHELPER_LIBS) \ - $(TK_LIBS) \ - $(NULL) +From: Hans Petter Jansson + Wolfgang Rosenauer +Subject: use libnsssharedhelper if available at compile time + (can be disabled by exporting MOZ_XRE_NO_NSSHELPER=1) +References: + + +diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in +--- a/config/autoconf.mk.in ++++ config/autoconf.mk.in +@@ -478,16 +478,20 @@ MOZ_XIE_LIBS = @MOZ_XIE_LIBS@ + XT_LIBS = @XT_LIBS@ -Index: config/autoconf.mk.in -=================================================================== -RCS file: /cvsroot/mozilla/config/autoconf.mk.in,v -retrieving revision 3.464 -diff -u -p -6 -r3.464 autoconf.mk.in ---- config/autoconf.mk.in 18 Sep 2008 22:00:51 -0000 3.464 -+++ config/autoconf.mk.in 19 Nov 2008 10:12:46 -0000 -@@ -532,12 +532,16 @@ GLIB_CFLAGS = @GLIB_CFLAGS@ + MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@ + + GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@ - LIBIDL_CFLAGS = @LIBIDL_CFLAGS@ - LIBIDL_LIBS = @LIBIDL_LIBS@ - STATIC_LIBIDL = @STATIC_LIBIDL@ +MOZ_ENABLE_NSSHELPER = @MOZ_ENABLE_NSSHELPER@ +NSSHELPER_CFLAGS = @NSSHELPER_CFLAGS@ @@ -32,9 +27,17 @@ diff -u -p -6 -r3.464 autoconf.mk.in LIBS_PATH = @LIBS_PATH@ MOZ_AUTO_DEPS = @MOZ_AUTO_DEPS@ ---- configure.in.orig 2009-05-11 19:50:11.000000000 +0200 -+++ configure.in 2009-05-11 19:49:35.000000000 +0200 -@@ -7028,6 +7028,22 @@ QCMS_LIBS='$(DEPTH)/mozilla/gfx/qcms/$(L + COMPILER_DEPEND = @COMPILER_DEPEND@ + MDDEPDIR := @MDDEPDIR@ +diff --git a/configure.in b/configure.in +--- a/configure.in ++++ configure.in +@@ -6979,16 +6979,31 @@ AC_SUBST(MOZ_CAIRO_LIBS) + + dnl qcms + dnl ======================================================== + + QCMS_LIBS='$(DEPTH)/mozilla/gfx/qcms/$(LIB_PREFIX)mozqcms.$(LIB_SUFFIX)' AC_SUBST(QCMS_LIBS) dnl ======================================================== @@ -52,8 +55,22 @@ diff -u -p -6 -r3.464 autoconf.mk.in +AC_SUBST(NSSHELPER_CFLAGS) +AC_SUBST(NSSHELPER_LIBS) + -+ +dnl ======================================================== dnl disable xul dnl ======================================================== MOZ_ARG_DISABLE_BOOL(xul, + [ --disable-xul Disable XUL], + MOZ_XUL= ) + if test "$MOZ_XUL"; then + AC_DEFINE(MOZ_XUL) + fi +--- mail/app/Makefile.in.orig 2009-02-26 11:02:11.000000000 +0100 ++++ mail/app/Makefile.in 2009-02-26 11:04:00.000000000 +0100 +@@ -129,6 +129,7 @@ + $(EXTRA_DSO_LIBS) \ + $(APP_XPCOM_LIBS) \ + $(NSPR_LIBS) \ ++ $(NSSHELPER_LIBS) \ + $(TK_LIBS) \ + $(NULL) + From 6c6fa3e39b191e6652107c7282080aceae4a2fa3cde98d3a59db9b1500f97322 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 8 Dec 2009 12:41:24 +0000 Subject: [PATCH 7/8] checked in OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaThunderbird?expand=0&rev=66 --- MozillaThunderbird.changes | 11 --- MozillaThunderbird.spec | 58 ++++++++------- create-tar.sh | 17 ++--- enigmail-1.0.0.tar.bz2 | 3 - enigmail-20090813.tar.bz2 | 3 + l10n-3.0.0.tar.bz2 | 3 - l10n-3.0b4.tar.bz2 | 3 + mozilla-clipboard.patch | 110 ---------------------------- mozilla-helper-app.patch | 118 ------------------------------- suse-default-prefs.js | 1 + thunderbird-3.0.0-source.tar.bz2 | 3 - thunderbird-3.0b4-source.tar.bz2 | 3 + thunderbird-cs-smtpauth.patch | 9 +++ thunderbird-no-update.patch | 28 ++++++++ thunderbird-shared-nss-db.patch | 65 +++++++---------- 15 files changed, 111 insertions(+), 324 deletions(-) delete mode 100644 enigmail-1.0.0.tar.bz2 create mode 100644 enigmail-20090813.tar.bz2 delete mode 100644 l10n-3.0.0.tar.bz2 create mode 100644 l10n-3.0b4.tar.bz2 delete mode 100644 mozilla-clipboard.patch delete mode 100644 mozilla-helper-app.patch delete mode 100644 thunderbird-3.0.0-source.tar.bz2 create mode 100644 thunderbird-3.0b4-source.tar.bz2 create mode 100644 thunderbird-cs-smtpauth.patch create mode 100644 thunderbird-no-update.patch diff --git a/MozillaThunderbird.changes b/MozillaThunderbird.changes index 9844d25..cab40a9 100644 --- a/MozillaThunderbird.changes +++ b/MozillaThunderbird.changes @@ -1,14 +1,3 @@ -------------------------------------------------------------------- -Mon Dec 7 10:04:05 CET 2009 - wr@rosenauer.org - -- update to 3.0 (bnc#559819) -- update enigmail to final version 1.0.0 -- use --disable-updater and removed obsolete UI patch and - pref changes -- use internal cairo up to 11.1 (Gecko now requires at least 1.8.8) -- added mozilla-clipboard.patch fixing a common crash (bmo#495392) -- removed upstreamed patch thunderbird-cs-smtpauth.patch - ------------------------------------------------------------------- Wed Oct 7 21:41:15 CEST 2009 - wr@rosenauer.org diff --git a/MozillaThunderbird.spec b/MozillaThunderbird.spec index 8bc90e5..ee2047e 100644 --- a/MozillaThunderbird.spec +++ b/MozillaThunderbird.spec @@ -1,5 +1,5 @@ # -# spec file for package MozillaThunderbird (Version 3.0.0) +# spec file for package MozillaThunderbird (Version 3.0b4) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 Wolfgang Rosenauer @@ -27,11 +27,10 @@ BuildRequires: hunspell-devel %if %suse_version > 1100 BuildRequires: nss-shared-helper-devel %endif -License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ -%define mainversion 3.0.0 +License: GPL v2 or later ; LGPL v2.1 or later ; MPL 1.1 or later +%define mainversion 3.0b4 Version: %{mainversion} -Release: 5 -%define releasedate 2009113000 +Release: 3 Summary: The Stand-Alone Mozilla Mail Component Url: http://www.mozilla.org/products/thunderbird/ Group: Productivity/Networking/Email/Clients @@ -44,24 +43,24 @@ Source4: l10n-%{version}.tar.bz2 Source6: suse-default-prefs.js Source7: find-external-requires.sh Source8: MozillaThunderbird-rpmlintrc -Source9: enigmail-1.0.0.tar.bz2 +Source9: enigmail-20090813.tar.bz2 Source10: create-tar.sh -Patch1: mozilla-clipboard.patch +Patch1: thunderbird-cs-smtpauth.patch Patch2: thunderbird-appname.patch Patch3: mozilla-startup-notification.patch Patch4: mozilla-gtkfilepicker-buttonorder.patch Patch5: tb-develdirs.patch Patch7: mozilla-path_len.patch -Patch8: mozilla-helper-app.patch Patch9: mozilla-shared-nss-db.patch Patch10: mozilla-system-hunspell.patch.bz2 Patch11: thunderbird-shared-nss-db.patch +Patch12: thunderbird-no-update.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: coreutils fileutils textutils /bin/sh ### build options %define build_enigmail 1 %define has_system_cairo 0 -%if %suse_version > 1110 +%if %suse_version > 1100 %define has_system_cairo 1 %endif %define localize 1 @@ -73,6 +72,7 @@ PreReq: coreutils fileutils textutils /bin/sh %global __find_provides %provfind Requires: mozilla-nspr >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr) Requires: mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss) +%define releasedate 2009091500 %define progname thunderbird %define progdir %{_prefix}/%_lib/thunderbird %define libgssapi libgssapi_krb5.so.2 @@ -85,9 +85,9 @@ Mozilla application suite. %package translations-common -License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ +License: GPL v2 or later ; LGPL v2.1 or later ; MPL 1.1 or later Summary: Common translations for MozillaThunderbird -Provides: locale(%{name}:ar;ca;cs;de;en_GB;es_AR;es_ES;fi;fr;hu;it;ja;ko;nb_NO;nl;pl;pt_BR;pt_PT;ru;sv_SE;zh_CN;zh_TW) +Provides: locale(%{name}:ar;ca;cs;de;en_GB;es_AR;es_ES;fi;fr;hu;it;ja;ko;nb_NO;nl;pl;pt_BR;pt_PT;ru;sv_SE;zh_CN) Group: System/Localization PreReq: %{name} = %{mainversion} Obsoletes: %{name}-translations < %{version}-%{release} @@ -98,9 +98,9 @@ of MozillaThunderbird. %package translations-other -License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ +License: GPL v2 or later ; LGPL v2.1 or later ; MPL 1.1 or later Summary: Extra translations for MozillaThunderbird -Provides: locale(%{name}:af;be;bg;bn_BD;el;et;eu;fy_NL;ga_IE;gl;he;id;is;ka;lt;nn_NO;pa_IN;ro;si;sk;sq;sr;ta_LK;tr;uk;vi) +Provides: locale(%{name}:af;be;bn_BD;el;et;eu;fy_NL;ga_IE;gl;id;is;lt;nn_NO;pa_IN;ro;si;sk;sq;ta_LK;tr;uk;vi) Group: System/Localization PreReq: %{name} = %{mainversion} Obsoletes: %{name}-translations < %{version}-%{release} @@ -111,7 +111,7 @@ of MozillaThunderbird. %package devel -License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ +License: GPL v2 or later ; LGPL v2.1 or later ; MPL 1.1 or later Summary: Mozilla Thunderbird SDK Group: Development/Libraries/Other Requires: mozilla-nspr-devel >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr-devel) @@ -123,10 +123,11 @@ Software Development Kit to build plugins/extensions against Thunderbird. %if %lightning + %package lightning Version: 0.9 Release: 1 -License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ +License: GPL v2 or later ; LGPL v2.1 or later ; MPL 1.1 or later Summary: Calendaring extension for Thunderbird Group: Productivity/Networking/Email/Clients PreReq: %{name} = %{mainversion} @@ -134,12 +135,12 @@ PreReq: %{name} = %{mainversion} %description lightning This package contains the Lightning calendar extension for Mozilla Thunderbird. %endif - %if %build_enigmail + %package -n enigmail -Version: 1.0.0 -Release: 1 -License: GPLv2+ ; MPLv1.1+ +Version: 0.96.99 +Release: 4 +License: GPL v2 or later ; MPL 1.1 Summary: OpenPGP addon for Thunderbird and SeaMonkey Group: Productivity/Networking/Email/Clients Url: http://enigmail.mozdev.org @@ -164,10 +165,8 @@ popd %endif # xulrunner patches pushd mozilla -%patch1 -p1 %patch3 -p1 %patch4 -p1 -%patch8 -p1 %patch7 -p1 %patch9 -p1 pushd extensions @@ -178,6 +177,11 @@ popd %patch2 %patch5 %patch11 +%patch12 -p1 +# l10n patches +pushd ../l10n +%patch1 +popd %build export SUSE_ASNEEDED=0 @@ -214,7 +218,6 @@ ac_add_options --with-system-nss ac_add_options --with-system-jpeg ac_add_options --with-system-zlib ac_add_options --with-l10n-base=../l10n -ac_add_options --disable-updater #ac_add_options --with-system-png # no apng support %if %lightning ac_add_options --enable-extensions=default,lightning @@ -238,7 +241,7 @@ make -f client.mk build # ### enigmail build %if %build_enigmail -cp -r $RPM_BUILD_DIR/enigmail $RPM_BUILD_DIR/thunderbird/mailnews/extensions/ +mv $RPM_BUILD_DIR/enigmail/src $RPM_BUILD_DIR/thunderbird/mailnews/extensions/enigmail (cd $RPM_BUILD_DIR/thunderbird/mailnews/extensions/enigmail; ./makemake -r; make; make xpi) %endif @@ -349,6 +352,7 @@ rm -f $RPM_BUILD_ROOT%{progdir}/enigmail*.xpi # # remove spurious executable bits find $RPM_BUILD_ROOT/usr/include/%{progname} -type f -exec chmod a-x {} \; +#find $RPM_BUILD_ROOT%{_libdir}/pkgconfig/* -type f -exec chmod a-x {} \; find $RPM_BUILD_ROOT%{_libdir}/%{progname} -name "*.js" | xargs chmod a-x # for size in 16 22 24 32 48 256; do @@ -357,6 +361,7 @@ for size in 16 22 24 32 48 256; do done %suse_update_desktop_file %{name} Network Email GTK # excluded files +# excluded files rm -f $RPM_BUILD_ROOT%{progdir}/thunderbird rm -f $RPM_BUILD_ROOT%{progdir}/removed-files rm -f $RPM_BUILD_ROOT%{progdir}/updater @@ -414,7 +419,9 @@ exit 0 %dir %{progdir} %{progdir}/application.ini %{progdir}/res/ +%{progdir}/icons/ %{progdir}/dependentlibs.list +%{progdir}/LICENSE.txt %{progdir}/README.txt %{progdir}/libldap60.so %{progdir}/libprldap60.so @@ -424,6 +431,7 @@ exit 0 %{progdir}/libmozjs.so %{progdir}/libxpcom_core.so %{progdir}/libxpcom.so +%{progdir}/license.html %{progdir}/mozilla-xremote-client %{progdir}/platform.ini %{progdir}/run-mozilla.sh @@ -466,14 +474,14 @@ exit 0 %{_libdir}/%{progname}/xpt_link #%{_libdir}/pkgconfig/*.pc %{_includedir}/%{progname}/ - %if %lightning + %files lightning %defattr(-,root,root) %{progdir}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103} %endif - %if %build_enigmail + %files -n enigmail %defattr(-,root,root) %dir %{_libdir}/mozilla diff --git a/create-tar.sh b/create-tar.sh index 9ba131c..a05094b 100644 --- a/create-tar.sh +++ b/create-tar.sh @@ -1,19 +1,16 @@ #!/bin/bash +RELEASE_TAG="THUNDERBIRD_3_0b4_RELEASE" +VERSION="3.0b4" -BRANCH="releases/comm-1.9.1" # comm-central -RELEASE_TAG="THUNDERBIRD_3_0rc2_RELEASE" -VERSION="3.0.0" - -echo "cloning $BRANCH..." -hg clone http://hg.mozilla.org/$BRANCH thunderbird +echo "cloning comm-central..." +hg clone http://hg.mozilla.org/comm-central thunderbird pushd thunderbird -hg update -r $RELEASE_TAG +#hg update -r $RELEASE_TAG echo "running client.py..." -[ "$RELEASE_TAG" == "default" ] || _extra="--comm-rev=$RELEASE_TAG --mozilla-rev=$RELEASE_TAG" -python client.py checkout --skip-chatzilla --skip-venkman $_extra +python client.py checkout --skip-chatzilla --skip-venkman --comm-rev=$RELEASE_TAG --mozilla-rev=$RELEASE_TAG popd -echo "creating archive..." +echo "creating archivei..." tar cjf thunderbird-$VERSION-source.tar.bz2 --exclude=.hgtags --exclude=.hgignore --exclude=.hg --exclude=CVS thunderbird # l10n diff --git a/enigmail-1.0.0.tar.bz2 b/enigmail-1.0.0.tar.bz2 deleted file mode 100644 index b22296c..0000000 --- a/enigmail-1.0.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c55b6f008f0a24d5e783d845f6d3534e1279757afcc41ca5c26a9802576ec100 -size 838623 diff --git a/enigmail-20090813.tar.bz2 b/enigmail-20090813.tar.bz2 new file mode 100644 index 0000000..15f3e3e --- /dev/null +++ b/enigmail-20090813.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8620d4d69826726b0c98d82e58ef76a9f5f3b72eb408e740a6d89447430ff885 +size 789423 diff --git a/l10n-3.0.0.tar.bz2 b/l10n-3.0.0.tar.bz2 deleted file mode 100644 index de391b6..0000000 --- a/l10n-3.0.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1d629c015dc62c47efa22f2d5780889f3fd15dee2ebdda6f063988336bc5acd4 -size 19183180 diff --git a/l10n-3.0b4.tar.bz2 b/l10n-3.0b4.tar.bz2 new file mode 100644 index 0000000..7995d5a --- /dev/null +++ b/l10n-3.0b4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ae866c27789391b89a4e483ead93d3f9899497680c424c5251ee7c43352cbf32 +size 15400735 diff --git a/mozilla-clipboard.patch b/mozilla-clipboard.patch deleted file mode 100644 index c0d662d..0000000 --- a/mozilla-clipboard.patch +++ /dev/null @@ -1,110 +0,0 @@ -From: Martin Stránský -Subject: Fix crash in clipboard handling -References: -https://bugzilla.mozilla.org/show_bug.cgi?id=495392 - - -diff --git a/widget/src/gtk2/nsClipboard.cpp b/widget/src/gtk2/nsClipboard.cpp ---- a/widget/src/gtk2/nsClipboard.cpp -+++ b/widget/src/gtk2/nsClipboard.cpp -@@ -440,21 +440,21 @@ nsClipboard::HasDataMatchingFlavors(cons - if (!strcmp(aFlavorList[i], kUnicodeMime) && - gtk_selection_data_targets_include_text(selection_data)) { - *_retval = PR_TRUE; - break; - } - - for (PRInt32 j = 0; j < n_targets; j++) { - gchar *atom_name = gdk_atom_name(targets[j]); -- if (!strcmp(atom_name, aFlavorList[i])) -+ if (!g_strcmp0(atom_name, aFlavorList[i])) - *_retval = PR_TRUE; - - // X clipboard wants image/jpeg, not image/jpg -- if (!strcmp(aFlavorList[i], kJPEGImageMime) && !strcmp(atom_name, "image/jpeg")) -+ if (!g_strcmp0(aFlavorList[i], kJPEGImageMime) && !g_strcmp0(atom_name, "image/jpeg")) - *_retval = PR_TRUE; - - g_free(atom_name); - - if (*_retval) - break; - } - } -diff --git a/widget/src/gtk2/nsDragService.cpp b/widget/src/gtk2/nsDragService.cpp ---- a/widget/src/gtk2/nsDragService.cpp -+++ b/widget/src/gtk2/nsDragService.cpp -@@ -796,46 +796,43 @@ nsDragService::IsDataFlavorSupported(con - GList *tmp; - for (tmp = mTargetDragContext->targets; tmp; tmp = tmp->next) { - /* Bug 331198 */ - GdkAtom atom = GDK_POINTER_TO_ATOM(tmp->data); - gchar *name = NULL; - name = gdk_atom_name(atom); - PR_LOG(sDragLm, PR_LOG_DEBUG, - ("checking %s against %s\n", name, aDataFlavor)); -- if (name && (strcmp(name, aDataFlavor) == 0)) { -+ if (g_strcmp0(name, aDataFlavor) == 0) { - PR_LOG(sDragLm, PR_LOG_DEBUG, ("good!\n")); - *_retval = PR_TRUE; - } - // check for automatic text/uri-list -> text/x-moz-url mapping - if (*_retval == PR_FALSE && -- name && -- (strcmp(name, gTextUriListType) == 0) && -- (strcmp(aDataFlavor, kURLMime) == 0)) { -+ (g_strcmp0(name, gTextUriListType) == 0) && -+ (g_strcmp0(aDataFlavor, kURLMime) == 0)) { - PR_LOG(sDragLm, PR_LOG_DEBUG, - ("good! ( it's text/uri-list and \ - we're checking against text/x-moz-url )\n")); - *_retval = PR_TRUE; - } - // check for automatic _NETSCAPE_URL -> text/x-moz-url mapping - if (*_retval == PR_FALSE && -- name && -- (strcmp(name, gMozUrlType) == 0) && -- (strcmp(aDataFlavor, kURLMime) == 0)) { -+ (g_strcmp0(name, gMozUrlType) == 0) && -+ (g_strcmp0(aDataFlavor, kURLMime) == 0)) { - PR_LOG(sDragLm, PR_LOG_DEBUG, - ("good! ( it's _NETSCAPE_URL and \ - we're checking against text/x-moz-url )\n")); - *_retval = PR_TRUE; - } - // check for auto text/plain -> text/unicode mapping - if (*_retval == PR_FALSE && -- name && -- (strcmp(name, kTextMime) == 0) && -- ((strcmp(aDataFlavor, kUnicodeMime) == 0) || -- (strcmp(aDataFlavor, kFileMime) == 0))) { -+ (g_strcmp0(name, kTextMime) == 0) && -+ ((g_strcmp0(aDataFlavor, kUnicodeMime) == 0) || -+ (g_strcmp0(aDataFlavor, kFileMime) == 0))) { - PR_LOG(sDragLm, PR_LOG_DEBUG, - ("good! ( it's text plain and we're checking \ - against text/unicode or application/x-moz-file)\n")); - *_retval = PR_TRUE; - } - g_free(name); - } - return NS_OK; -@@ -946,17 +943,17 @@ nsDragService::IsTargetContextList(void) - - // walk the list of context targets and see if one of them is a list - // of items. - for (tmp = mTargetDragContext->targets; tmp; tmp = tmp->next) { - /* Bug 331198 */ - GdkAtom atom = GDK_POINTER_TO_ATOM(tmp->data); - gchar *name = NULL; - name = gdk_atom_name(atom); -- if (strcmp(name, gMimeListType) == 0) -+ if (g_strcmp0(name, gMimeListType) == 0) - retval = PR_TRUE; - g_free(name); - if (retval) - break; - } - return retval; - } - diff --git a/mozilla-helper-app.patch b/mozilla-helper-app.patch deleted file mode 100644 index edf164e..0000000 --- a/mozilla-helper-app.patch +++ /dev/null @@ -1,118 +0,0 @@ -From: Wolfgang Rosenauer -Subject: no helper app for application/octet-stream but recognized extensions -References: -https://bugzilla.novell.com/show_bug.cgi?id=406979 -https://bugzilla.mozilla.org/show_bug.cgi?id=327323 - - -diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp ---- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp -+++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp -@@ -41,16 +41,17 @@ - #include - #include - #endif - - - #include "nsMIMEInfoUnix.h" - #include "nsGNOMERegistry.h" - #include "nsIGnomeVFSService.h" -+#include "nsAutoPtr.h" - #ifdef MOZ_ENABLE_DBUS - #include "nsDBusHandlerApp.h" - #endif - - - nsresult - nsMIMEInfoUnix::LoadUriInternal(nsIURI * aURI) - { -@@ -69,23 +70,26 @@ nsMIMEInfoUnix::LoadUriInternal(nsIURI * - #endif - return rv; - } - - NS_IMETHODIMP - nsMIMEInfoUnix::GetHasDefaultHandler(PRBool *_retval) - { - *_retval = PR_FALSE; -- nsCOMPtr vfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID); -- if (vfs) { -- nsCOMPtr app; -- if (NS_SUCCEEDED(vfs->GetAppForMimeType(mType, getter_AddRefs(app))) && app) -- *_retval = PR_TRUE; -+ nsRefPtr mimeInfo = nsGNOMERegistry::GetFromType(mType); -+ if (!mimeInfo) { -+ nsCAutoString ext; -+ GetPrimaryExtension(ext); -+ mimeInfo = nsGNOMERegistry::GetFromExtension(ext); - } - -+ if (mimeInfo) -+ *_retval = PR_TRUE; -+ - if (*_retval) - return NS_OK; - - #ifdef MOZ_PLATFORM_HILDON - HildonURIAction *action = hildon_uri_get_default_action(mType.get(), nsnull); - if (action) { - *_retval = PR_TRUE; - hildon_uri_action_unref(action); -@@ -104,16 +108,26 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns - aFile->GetNativePath(nativePath); - - nsCOMPtr vfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID); - - if (vfs) { - nsCOMPtr app; - if (NS_SUCCEEDED(vfs->GetAppForMimeType(mType, getter_AddRefs(app))) && app) - return app->Launch(nativePath); -+ -+ // If we haven't got an app we try to get a valid one by searching for the -+ // extension mapped type -+ nsRefPtr mimeInfo = nsGNOMERegistry::GetFromExtension(nativePath); -+ if (mimeInfo) { -+ nsCAutoString type; -+ mimeInfo->GetType(type); -+ if (NS_SUCCEEDED(vfs->GetAppForMimeType(type, getter_AddRefs(app))) && app) -+ return app->Launch(nativePath); -+ } - } - - if (!mDefaultApplication) - return NS_ERROR_FILE_NOT_FOUND; - - return LaunchWithIProcess(mDefaultApplication, nativePath); - } - -diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exthandler/unix/nsOSHelperAppService.cpp ---- a/uriloader/exthandler/unix/nsOSHelperAppService.cpp -+++ b/uriloader/exthandler/unix/nsOSHelperAppService.cpp -@@ -1641,18 +1641,26 @@ nsOSHelperAppService::GetMIMEInfoFromOS( - NS_ADDREF(retval); - if (!aFileExt.IsEmpty()) - retval->AppendExtension(aFileExt); - } - - return retval; - } - -- // Copy the attributes of retval onto miByExt, to return it -+ // Copy the attributes of retval onto miByExt, to return it but keep -+ // just collected mDefaultAppDescription -+ nsAutoString byExtDefault; -+ miByExt->GetDefaultDescription(byExtDefault); -+ retval->SetDefaultDescription(byExtDefault); - retval->CopyBasicDataTo(miByExt); -+ // But set the extensions primary since CopyBasicDataTo overwrites the -+ // list -+ if (!aFileExt.IsEmpty()) -+ miByExt->SetPrimaryExtension(aFileExt); - - miByExt.swap(retval); - } - return retval; - } - - NS_IMETHODIMP - nsOSHelperAppService::GetProtocolHandlerInfoFromOS(const nsACString &aScheme, diff --git a/suse-default-prefs.js b/suse-default-prefs.js index d8ce9b0..0709e71 100644 --- a/suse-default-prefs.js +++ b/suse-default-prefs.js @@ -1,5 +1,6 @@ pref("general.useragent.vendor", "SUSE"); pref("general.useragent.vendorSub", "RPM_VERSION"); +pref("app.update.enabled", false); pref("font.default", "sans-serif"); pref("font.default.x-western", "sans-serif"); pref("font.name.monospace.x-western", "monospace"); diff --git a/thunderbird-3.0.0-source.tar.bz2 b/thunderbird-3.0.0-source.tar.bz2 deleted file mode 100644 index 39a07c5..0000000 --- a/thunderbird-3.0.0-source.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ce0811dc48058a453fd4d4c647a2fa2029c592b564d12b46806f0f3ab3dcf408 -size 60186501 diff --git a/thunderbird-3.0b4-source.tar.bz2 b/thunderbird-3.0b4-source.tar.bz2 new file mode 100644 index 0000000..631a41a --- /dev/null +++ b/thunderbird-3.0b4-source.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:33d28a2847e1b5673c50f8bf63ccf123c96b39dfcbd442dd9966edd952f99f6e +size 59231572 diff --git a/thunderbird-cs-smtpauth.patch b/thunderbird-cs-smtpauth.patch new file mode 100644 index 0000000..5609140 --- /dev/null +++ b/thunderbird-cs-smtpauth.patch @@ -0,0 +1,9 @@ +--- cs/mail/chrome/messenger/messengercompose/composeMsgs.properties.orig 2009-09-29 13:35:48.000000000 +0200 ++++ cs/mail/chrome/messenger/messengercompose/composeMsgs.properties 2009-09-29 13:36:19.000000000 +0200 +@@ -347,5 +347,5 @@ + ## LOCALIZATION NOTE(smtpEnterPasswordPromptWithUsername): Do not translate the + ## words %1$S and %2$S. Place the word %1$S where the host name should appear, + ## and %2$S where the user name should appear. +-smtpEnterPasswordPromptWithUsername=Zadejte heslo k účtu %S na %1$S: ++smtpEnterPasswordPromptWithUsername=Zadejte heslo k účtu %2$S na %1$S: + smtpEnterPasswordPromptTitle=SMTP server vyžaduje heslo diff --git a/thunderbird-no-update.patch b/thunderbird-no-update.patch new file mode 100644 index 0000000..ac787d3 --- /dev/null +++ b/thunderbird-no-update.patch @@ -0,0 +1,28 @@ +diff --git a/mail/base/content/utilityOverlay.js b/mail/base/content/utilityOverlay.js +--- a/mail/base/content/utilityOverlay.js ++++ b/mail/base/content/utilityOverlay.js +@@ -237,7 +237,13 @@ function buildHelpMenu() + // administrator or if we cannot update for some other reason. + var checkForUpdates = document.getElementById("checkForUpdates"); + var canUpdate = updates.canUpdate; ++ var prefs = Components.classes["@mozilla.org/preferences-service;1"] ++ .getService(Components.interfaces.nsIPrefBranch); ++ var updateEnabled = prefs.getBoolPref("app.update.enabled", true); + checkForUpdates.setAttribute("disabled", !canUpdate); ++ checkForUpdates.setAttribute("hidden", !canUpdate || !updateEnabled); ++ var updateSeparator = document.getElementById("menu_HelpAfterUpdatesSeparator"); ++ updateSeparator.setAttribute("hidden", !canUpdate || !updateEnabled); + if (!canUpdate) + return; + +diff --git a/mail/components/preferences/advanced.js b/mail/components/preferences/advanced.js +--- a/mail/components/preferences/advanced.js ++++ b/mail/components/preferences/advanced.js +@@ -238,6 +238,7 @@ var gAdvancedPane = { + var enableAppUpdate = document.getElementById("enableAppUpdate"); + + enableAppUpdate.disabled = !aus.canUpdate || enabledPref.locked; ++ enableAppUpdate.hidden = !aus.canUpdate || !enabledPref.value; + }, + + updateAutoItems: function () diff --git a/thunderbird-shared-nss-db.patch b/thunderbird-shared-nss-db.patch index 33d953e..c6468ea 100644 --- a/thunderbird-shared-nss-db.patch +++ b/thunderbird-shared-nss-db.patch @@ -1,21 +1,26 @@ -From: Hans Petter Jansson - Wolfgang Rosenauer -Subject: use libnsssharedhelper if available at compile time - (can be disabled by exporting MOZ_XRE_NO_NSSHELPER=1) -References: - - -diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in ---- a/config/autoconf.mk.in -+++ config/autoconf.mk.in -@@ -478,16 +478,20 @@ MOZ_XIE_LIBS = @MOZ_XIE_LIBS@ - XT_LIBS = @XT_LIBS@ +--- mail/app/Makefile.in.orig 2009-02-26 11:02:11.000000000 +0100 ++++ mail/app/Makefile.in 2009-02-26 11:04:00.000000000 +0100 +@@ -129,6 +129,7 @@ + $(EXTRA_DSO_LIBS) \ + $(APP_XPCOM_LIBS) \ + $(NSPR_LIBS) \ ++ $(NSSHELPER_LIBS) \ + $(TK_LIBS) \ + $(NULL) - MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@ - - GLIB_CFLAGS = @GLIB_CFLAGS@ +Index: config/autoconf.mk.in +=================================================================== +RCS file: /cvsroot/mozilla/config/autoconf.mk.in,v +retrieving revision 3.464 +diff -u -p -6 -r3.464 autoconf.mk.in +--- config/autoconf.mk.in 18 Sep 2008 22:00:51 -0000 3.464 ++++ config/autoconf.mk.in 19 Nov 2008 10:12:46 -0000 +@@ -532,12 +532,16 @@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@ + LIBIDL_CFLAGS = @LIBIDL_CFLAGS@ + LIBIDL_LIBS = @LIBIDL_LIBS@ + STATIC_LIBIDL = @STATIC_LIBIDL@ +MOZ_ENABLE_NSSHELPER = @MOZ_ENABLE_NSSHELPER@ +NSSHELPER_CFLAGS = @NSSHELPER_CFLAGS@ @@ -27,17 +32,9 @@ diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in LIBS_PATH = @LIBS_PATH@ MOZ_AUTO_DEPS = @MOZ_AUTO_DEPS@ - COMPILER_DEPEND = @COMPILER_DEPEND@ - MDDEPDIR := @MDDEPDIR@ -diff --git a/configure.in b/configure.in ---- a/configure.in -+++ configure.in -@@ -6979,16 +6979,31 @@ AC_SUBST(MOZ_CAIRO_LIBS) - - dnl qcms - dnl ======================================================== - - QCMS_LIBS='$(DEPTH)/mozilla/gfx/qcms/$(LIB_PREFIX)mozqcms.$(LIB_SUFFIX)' +--- configure.in.orig 2009-05-11 19:50:11.000000000 +0200 ++++ configure.in 2009-05-11 19:49:35.000000000 +0200 +@@ -7028,6 +7028,22 @@ QCMS_LIBS='$(DEPTH)/mozilla/gfx/qcms/$(L AC_SUBST(QCMS_LIBS) dnl ======================================================== @@ -55,22 +52,8 @@ diff --git a/configure.in b/configure.in +AC_SUBST(NSSHELPER_CFLAGS) +AC_SUBST(NSSHELPER_LIBS) + ++ +dnl ======================================================== dnl disable xul dnl ======================================================== MOZ_ARG_DISABLE_BOOL(xul, - [ --disable-xul Disable XUL], - MOZ_XUL= ) - if test "$MOZ_XUL"; then - AC_DEFINE(MOZ_XUL) - fi ---- mail/app/Makefile.in.orig 2009-02-26 11:02:11.000000000 +0100 -+++ mail/app/Makefile.in 2009-02-26 11:04:00.000000000 +0100 -@@ -129,6 +129,7 @@ - $(EXTRA_DSO_LIBS) \ - $(APP_XPCOM_LIBS) \ - $(NSPR_LIBS) \ -+ $(NSSHELPER_LIBS) \ - $(TK_LIBS) \ - $(NULL) - From ac1bf56af0ecaabdf6f544b48c7be632f39449835c7f747f5b5be8a99f076b4e Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 8 Dec 2009 12:41:27 +0000 Subject: [PATCH 8/8] Updating link to change in openSUSE:Factory/MozillaThunderbird revision 43.0 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaThunderbird?expand=0&rev=867cf832cf41e01dfb3754f92dd0a3fb --- MozillaThunderbird.changes | 11 +++ MozillaThunderbird.spec | 51 ++++++------- create-tar.sh | 17 +++-- enigmail-1.0.0.tar.bz2 | 3 + enigmail-20090813.tar.bz2 | 3 - l10n-3.0.0.tar.bz2 | 3 + l10n-3.0b4.tar.bz2 | 3 - mozilla-clipboard.patch | 110 ++++++++++++++++++++++++++++ mozilla-helper-app.patch | 118 +++++++++++++++++++++++++++++++ suse-default-prefs.js | 1 - thunderbird-3.0.0-source.tar.bz2 | 3 + thunderbird-3.0b4-source.tar.bz2 | 3 - thunderbird-cs-smtpauth.patch | 9 --- thunderbird-no-update.patch | 28 -------- thunderbird-shared-nss-db.patch | 65 ++++++++++------- 15 files changed, 321 insertions(+), 107 deletions(-) create mode 100644 enigmail-1.0.0.tar.bz2 delete mode 100644 enigmail-20090813.tar.bz2 create mode 100644 l10n-3.0.0.tar.bz2 delete mode 100644 l10n-3.0b4.tar.bz2 create mode 100644 mozilla-clipboard.patch create mode 100644 mozilla-helper-app.patch create mode 100644 thunderbird-3.0.0-source.tar.bz2 delete mode 100644 thunderbird-3.0b4-source.tar.bz2 delete mode 100644 thunderbird-cs-smtpauth.patch delete mode 100644 thunderbird-no-update.patch diff --git a/MozillaThunderbird.changes b/MozillaThunderbird.changes index cab40a9..9844d25 100644 --- a/MozillaThunderbird.changes +++ b/MozillaThunderbird.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Dec 7 10:04:05 CET 2009 - wr@rosenauer.org + +- update to 3.0 (bnc#559819) +- update enigmail to final version 1.0.0 +- use --disable-updater and removed obsolete UI patch and + pref changes +- use internal cairo up to 11.1 (Gecko now requires at least 1.8.8) +- added mozilla-clipboard.patch fixing a common crash (bmo#495392) +- removed upstreamed patch thunderbird-cs-smtpauth.patch + ------------------------------------------------------------------- Wed Oct 7 21:41:15 CEST 2009 - wr@rosenauer.org diff --git a/MozillaThunderbird.spec b/MozillaThunderbird.spec index ee2047e..81843b6 100644 --- a/MozillaThunderbird.spec +++ b/MozillaThunderbird.spec @@ -1,5 +1,5 @@ # -# spec file for package MozillaThunderbird (Version 3.0b4) +# spec file for package MozillaThunderbird (Version 3.0.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 Wolfgang Rosenauer @@ -27,10 +27,11 @@ BuildRequires: hunspell-devel %if %suse_version > 1100 BuildRequires: nss-shared-helper-devel %endif -License: GPL v2 or later ; LGPL v2.1 or later ; MPL 1.1 or later -%define mainversion 3.0b4 +License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ +%define mainversion 3.0.0 Version: %{mainversion} -Release: 3 +Release: 1 +%define releasedate 2009113000 Summary: The Stand-Alone Mozilla Mail Component Url: http://www.mozilla.org/products/thunderbird/ Group: Productivity/Networking/Email/Clients @@ -43,24 +44,24 @@ Source4: l10n-%{version}.tar.bz2 Source6: suse-default-prefs.js Source7: find-external-requires.sh Source8: MozillaThunderbird-rpmlintrc -Source9: enigmail-20090813.tar.bz2 +Source9: enigmail-1.0.0.tar.bz2 Source10: create-tar.sh -Patch1: thunderbird-cs-smtpauth.patch +Patch1: mozilla-clipboard.patch Patch2: thunderbird-appname.patch Patch3: mozilla-startup-notification.patch Patch4: mozilla-gtkfilepicker-buttonorder.patch Patch5: tb-develdirs.patch Patch7: mozilla-path_len.patch +Patch8: mozilla-helper-app.patch Patch9: mozilla-shared-nss-db.patch Patch10: mozilla-system-hunspell.patch.bz2 Patch11: thunderbird-shared-nss-db.patch -Patch12: thunderbird-no-update.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: coreutils fileutils textutils /bin/sh ### build options %define build_enigmail 1 %define has_system_cairo 0 -%if %suse_version > 1100 +%if %suse_version > 1110 %define has_system_cairo 1 %endif %define localize 1 @@ -72,7 +73,6 @@ PreReq: coreutils fileutils textutils /bin/sh %global __find_provides %provfind Requires: mozilla-nspr >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr) Requires: mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss) -%define releasedate 2009091500 %define progname thunderbird %define progdir %{_prefix}/%_lib/thunderbird %define libgssapi libgssapi_krb5.so.2 @@ -85,9 +85,9 @@ Mozilla application suite. %package translations-common -License: GPL v2 or later ; LGPL v2.1 or later ; MPL 1.1 or later +License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ Summary: Common translations for MozillaThunderbird -Provides: locale(%{name}:ar;ca;cs;de;en_GB;es_AR;es_ES;fi;fr;hu;it;ja;ko;nb_NO;nl;pl;pt_BR;pt_PT;ru;sv_SE;zh_CN) +Provides: locale(%{name}:ar;ca;cs;de;en_GB;es_AR;es_ES;fi;fr;hu;it;ja;ko;nb_NO;nl;pl;pt_BR;pt_PT;ru;sv_SE;zh_CN;zh_TW) Group: System/Localization PreReq: %{name} = %{mainversion} Obsoletes: %{name}-translations < %{version}-%{release} @@ -98,9 +98,9 @@ of MozillaThunderbird. %package translations-other -License: GPL v2 or later ; LGPL v2.1 or later ; MPL 1.1 or later +License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ Summary: Extra translations for MozillaThunderbird -Provides: locale(%{name}:af;be;bn_BD;el;et;eu;fy_NL;ga_IE;gl;id;is;lt;nn_NO;pa_IN;ro;si;sk;sq;ta_LK;tr;uk;vi) +Provides: locale(%{name}:af;be;bg;bn_BD;el;et;eu;fy_NL;ga_IE;gl;he;id;is;ka;lt;nn_NO;pa_IN;ro;si;sk;sq;sr;ta_LK;tr;uk;vi) Group: System/Localization PreReq: %{name} = %{mainversion} Obsoletes: %{name}-translations < %{version}-%{release} @@ -111,7 +111,7 @@ of MozillaThunderbird. %package devel -License: GPL v2 or later ; LGPL v2.1 or later ; MPL 1.1 or later +License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ Summary: Mozilla Thunderbird SDK Group: Development/Libraries/Other Requires: mozilla-nspr-devel >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr-devel) @@ -127,7 +127,7 @@ Software Development Kit to build plugins/extensions against Thunderbird. %package lightning Version: 0.9 Release: 1 -License: GPL v2 or later ; LGPL v2.1 or later ; MPL 1.1 or later +License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ Summary: Calendaring extension for Thunderbird Group: Productivity/Networking/Email/Clients PreReq: %{name} = %{mainversion} @@ -138,9 +138,9 @@ This package contains the Lightning calendar extension for Mozilla Thunderbird. %if %build_enigmail %package -n enigmail -Version: 0.96.99 -Release: 4 -License: GPL v2 or later ; MPL 1.1 +Version: 1.0.0 +Release: 1 +License: GPLv2+ ; MPLv1.1+ Summary: OpenPGP addon for Thunderbird and SeaMonkey Group: Productivity/Networking/Email/Clients Url: http://enigmail.mozdev.org @@ -165,8 +165,10 @@ popd %endif # xulrunner patches pushd mozilla +%patch1 -p1 %patch3 -p1 %patch4 -p1 +%patch8 -p1 %patch7 -p1 %patch9 -p1 pushd extensions @@ -177,11 +179,6 @@ popd %patch2 %patch5 %patch11 -%patch12 -p1 -# l10n patches -pushd ../l10n -%patch1 -popd %build export SUSE_ASNEEDED=0 @@ -218,6 +215,7 @@ ac_add_options --with-system-nss ac_add_options --with-system-jpeg ac_add_options --with-system-zlib ac_add_options --with-l10n-base=../l10n +ac_add_options --disable-updater #ac_add_options --with-system-png # no apng support %if %lightning ac_add_options --enable-extensions=default,lightning @@ -241,7 +239,7 @@ make -f client.mk build # ### enigmail build %if %build_enigmail -mv $RPM_BUILD_DIR/enigmail/src $RPM_BUILD_DIR/thunderbird/mailnews/extensions/enigmail +cp -r $RPM_BUILD_DIR/enigmail $RPM_BUILD_DIR/thunderbird/mailnews/extensions/ (cd $RPM_BUILD_DIR/thunderbird/mailnews/extensions/enigmail; ./makemake -r; make; make xpi) %endif @@ -352,7 +350,6 @@ rm -f $RPM_BUILD_ROOT%{progdir}/enigmail*.xpi # # remove spurious executable bits find $RPM_BUILD_ROOT/usr/include/%{progname} -type f -exec chmod a-x {} \; -#find $RPM_BUILD_ROOT%{_libdir}/pkgconfig/* -type f -exec chmod a-x {} \; find $RPM_BUILD_ROOT%{_libdir}/%{progname} -name "*.js" | xargs chmod a-x # for size in 16 22 24 32 48 256; do @@ -361,7 +358,6 @@ for size in 16 22 24 32 48 256; do done %suse_update_desktop_file %{name} Network Email GTK # excluded files -# excluded files rm -f $RPM_BUILD_ROOT%{progdir}/thunderbird rm -f $RPM_BUILD_ROOT%{progdir}/removed-files rm -f $RPM_BUILD_ROOT%{progdir}/updater @@ -419,9 +415,7 @@ exit 0 %dir %{progdir} %{progdir}/application.ini %{progdir}/res/ -%{progdir}/icons/ %{progdir}/dependentlibs.list -%{progdir}/LICENSE.txt %{progdir}/README.txt %{progdir}/libldap60.so %{progdir}/libprldap60.so @@ -431,7 +425,6 @@ exit 0 %{progdir}/libmozjs.so %{progdir}/libxpcom_core.so %{progdir}/libxpcom.so -%{progdir}/license.html %{progdir}/mozilla-xremote-client %{progdir}/platform.ini %{progdir}/run-mozilla.sh diff --git a/create-tar.sh b/create-tar.sh index a05094b..9ba131c 100644 --- a/create-tar.sh +++ b/create-tar.sh @@ -1,16 +1,19 @@ #!/bin/bash -RELEASE_TAG="THUNDERBIRD_3_0b4_RELEASE" -VERSION="3.0b4" -echo "cloning comm-central..." -hg clone http://hg.mozilla.org/comm-central thunderbird +BRANCH="releases/comm-1.9.1" # comm-central +RELEASE_TAG="THUNDERBIRD_3_0rc2_RELEASE" +VERSION="3.0.0" + +echo "cloning $BRANCH..." +hg clone http://hg.mozilla.org/$BRANCH thunderbird pushd thunderbird -#hg update -r $RELEASE_TAG +hg update -r $RELEASE_TAG echo "running client.py..." -python client.py checkout --skip-chatzilla --skip-venkman --comm-rev=$RELEASE_TAG --mozilla-rev=$RELEASE_TAG +[ "$RELEASE_TAG" == "default" ] || _extra="--comm-rev=$RELEASE_TAG --mozilla-rev=$RELEASE_TAG" +python client.py checkout --skip-chatzilla --skip-venkman $_extra popd -echo "creating archivei..." +echo "creating archive..." tar cjf thunderbird-$VERSION-source.tar.bz2 --exclude=.hgtags --exclude=.hgignore --exclude=.hg --exclude=CVS thunderbird # l10n diff --git a/enigmail-1.0.0.tar.bz2 b/enigmail-1.0.0.tar.bz2 new file mode 100644 index 0000000..b22296c --- /dev/null +++ b/enigmail-1.0.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c55b6f008f0a24d5e783d845f6d3534e1279757afcc41ca5c26a9802576ec100 +size 838623 diff --git a/enigmail-20090813.tar.bz2 b/enigmail-20090813.tar.bz2 deleted file mode 100644 index 15f3e3e..0000000 --- a/enigmail-20090813.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8620d4d69826726b0c98d82e58ef76a9f5f3b72eb408e740a6d89447430ff885 -size 789423 diff --git a/l10n-3.0.0.tar.bz2 b/l10n-3.0.0.tar.bz2 new file mode 100644 index 0000000..de391b6 --- /dev/null +++ b/l10n-3.0.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1d629c015dc62c47efa22f2d5780889f3fd15dee2ebdda6f063988336bc5acd4 +size 19183180 diff --git a/l10n-3.0b4.tar.bz2 b/l10n-3.0b4.tar.bz2 deleted file mode 100644 index 7995d5a..0000000 --- a/l10n-3.0b4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ae866c27789391b89a4e483ead93d3f9899497680c424c5251ee7c43352cbf32 -size 15400735 diff --git a/mozilla-clipboard.patch b/mozilla-clipboard.patch new file mode 100644 index 0000000..c0d662d --- /dev/null +++ b/mozilla-clipboard.patch @@ -0,0 +1,110 @@ +From: Martin Stránský +Subject: Fix crash in clipboard handling +References: +https://bugzilla.mozilla.org/show_bug.cgi?id=495392 + + +diff --git a/widget/src/gtk2/nsClipboard.cpp b/widget/src/gtk2/nsClipboard.cpp +--- a/widget/src/gtk2/nsClipboard.cpp ++++ b/widget/src/gtk2/nsClipboard.cpp +@@ -440,21 +440,21 @@ nsClipboard::HasDataMatchingFlavors(cons + if (!strcmp(aFlavorList[i], kUnicodeMime) && + gtk_selection_data_targets_include_text(selection_data)) { + *_retval = PR_TRUE; + break; + } + + for (PRInt32 j = 0; j < n_targets; j++) { + gchar *atom_name = gdk_atom_name(targets[j]); +- if (!strcmp(atom_name, aFlavorList[i])) ++ if (!g_strcmp0(atom_name, aFlavorList[i])) + *_retval = PR_TRUE; + + // X clipboard wants image/jpeg, not image/jpg +- if (!strcmp(aFlavorList[i], kJPEGImageMime) && !strcmp(atom_name, "image/jpeg")) ++ if (!g_strcmp0(aFlavorList[i], kJPEGImageMime) && !g_strcmp0(atom_name, "image/jpeg")) + *_retval = PR_TRUE; + + g_free(atom_name); + + if (*_retval) + break; + } + } +diff --git a/widget/src/gtk2/nsDragService.cpp b/widget/src/gtk2/nsDragService.cpp +--- a/widget/src/gtk2/nsDragService.cpp ++++ b/widget/src/gtk2/nsDragService.cpp +@@ -796,46 +796,43 @@ nsDragService::IsDataFlavorSupported(con + GList *tmp; + for (tmp = mTargetDragContext->targets; tmp; tmp = tmp->next) { + /* Bug 331198 */ + GdkAtom atom = GDK_POINTER_TO_ATOM(tmp->data); + gchar *name = NULL; + name = gdk_atom_name(atom); + PR_LOG(sDragLm, PR_LOG_DEBUG, + ("checking %s against %s\n", name, aDataFlavor)); +- if (name && (strcmp(name, aDataFlavor) == 0)) { ++ if (g_strcmp0(name, aDataFlavor) == 0) { + PR_LOG(sDragLm, PR_LOG_DEBUG, ("good!\n")); + *_retval = PR_TRUE; + } + // check for automatic text/uri-list -> text/x-moz-url mapping + if (*_retval == PR_FALSE && +- name && +- (strcmp(name, gTextUriListType) == 0) && +- (strcmp(aDataFlavor, kURLMime) == 0)) { ++ (g_strcmp0(name, gTextUriListType) == 0) && ++ (g_strcmp0(aDataFlavor, kURLMime) == 0)) { + PR_LOG(sDragLm, PR_LOG_DEBUG, + ("good! ( it's text/uri-list and \ + we're checking against text/x-moz-url )\n")); + *_retval = PR_TRUE; + } + // check for automatic _NETSCAPE_URL -> text/x-moz-url mapping + if (*_retval == PR_FALSE && +- name && +- (strcmp(name, gMozUrlType) == 0) && +- (strcmp(aDataFlavor, kURLMime) == 0)) { ++ (g_strcmp0(name, gMozUrlType) == 0) && ++ (g_strcmp0(aDataFlavor, kURLMime) == 0)) { + PR_LOG(sDragLm, PR_LOG_DEBUG, + ("good! ( it's _NETSCAPE_URL and \ + we're checking against text/x-moz-url )\n")); + *_retval = PR_TRUE; + } + // check for auto text/plain -> text/unicode mapping + if (*_retval == PR_FALSE && +- name && +- (strcmp(name, kTextMime) == 0) && +- ((strcmp(aDataFlavor, kUnicodeMime) == 0) || +- (strcmp(aDataFlavor, kFileMime) == 0))) { ++ (g_strcmp0(name, kTextMime) == 0) && ++ ((g_strcmp0(aDataFlavor, kUnicodeMime) == 0) || ++ (g_strcmp0(aDataFlavor, kFileMime) == 0))) { + PR_LOG(sDragLm, PR_LOG_DEBUG, + ("good! ( it's text plain and we're checking \ + against text/unicode or application/x-moz-file)\n")); + *_retval = PR_TRUE; + } + g_free(name); + } + return NS_OK; +@@ -946,17 +943,17 @@ nsDragService::IsTargetContextList(void) + + // walk the list of context targets and see if one of them is a list + // of items. + for (tmp = mTargetDragContext->targets; tmp; tmp = tmp->next) { + /* Bug 331198 */ + GdkAtom atom = GDK_POINTER_TO_ATOM(tmp->data); + gchar *name = NULL; + name = gdk_atom_name(atom); +- if (strcmp(name, gMimeListType) == 0) ++ if (g_strcmp0(name, gMimeListType) == 0) + retval = PR_TRUE; + g_free(name); + if (retval) + break; + } + return retval; + } + diff --git a/mozilla-helper-app.patch b/mozilla-helper-app.patch new file mode 100644 index 0000000..edf164e --- /dev/null +++ b/mozilla-helper-app.patch @@ -0,0 +1,118 @@ +From: Wolfgang Rosenauer +Subject: no helper app for application/octet-stream but recognized extensions +References: +https://bugzilla.novell.com/show_bug.cgi?id=406979 +https://bugzilla.mozilla.org/show_bug.cgi?id=327323 + + +diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp +--- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp ++++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp +@@ -41,16 +41,17 @@ + #include + #include + #endif + + + #include "nsMIMEInfoUnix.h" + #include "nsGNOMERegistry.h" + #include "nsIGnomeVFSService.h" ++#include "nsAutoPtr.h" + #ifdef MOZ_ENABLE_DBUS + #include "nsDBusHandlerApp.h" + #endif + + + nsresult + nsMIMEInfoUnix::LoadUriInternal(nsIURI * aURI) + { +@@ -69,23 +70,26 @@ nsMIMEInfoUnix::LoadUriInternal(nsIURI * + #endif + return rv; + } + + NS_IMETHODIMP + nsMIMEInfoUnix::GetHasDefaultHandler(PRBool *_retval) + { + *_retval = PR_FALSE; +- nsCOMPtr vfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID); +- if (vfs) { +- nsCOMPtr app; +- if (NS_SUCCEEDED(vfs->GetAppForMimeType(mType, getter_AddRefs(app))) && app) +- *_retval = PR_TRUE; ++ nsRefPtr mimeInfo = nsGNOMERegistry::GetFromType(mType); ++ if (!mimeInfo) { ++ nsCAutoString ext; ++ GetPrimaryExtension(ext); ++ mimeInfo = nsGNOMERegistry::GetFromExtension(ext); + } + ++ if (mimeInfo) ++ *_retval = PR_TRUE; ++ + if (*_retval) + return NS_OK; + + #ifdef MOZ_PLATFORM_HILDON + HildonURIAction *action = hildon_uri_get_default_action(mType.get(), nsnull); + if (action) { + *_retval = PR_TRUE; + hildon_uri_action_unref(action); +@@ -104,16 +108,26 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns + aFile->GetNativePath(nativePath); + + nsCOMPtr vfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID); + + if (vfs) { + nsCOMPtr app; + if (NS_SUCCEEDED(vfs->GetAppForMimeType(mType, getter_AddRefs(app))) && app) + return app->Launch(nativePath); ++ ++ // If we haven't got an app we try to get a valid one by searching for the ++ // extension mapped type ++ nsRefPtr mimeInfo = nsGNOMERegistry::GetFromExtension(nativePath); ++ if (mimeInfo) { ++ nsCAutoString type; ++ mimeInfo->GetType(type); ++ if (NS_SUCCEEDED(vfs->GetAppForMimeType(type, getter_AddRefs(app))) && app) ++ return app->Launch(nativePath); ++ } + } + + if (!mDefaultApplication) + return NS_ERROR_FILE_NOT_FOUND; + + return LaunchWithIProcess(mDefaultApplication, nativePath); + } + +diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exthandler/unix/nsOSHelperAppService.cpp +--- a/uriloader/exthandler/unix/nsOSHelperAppService.cpp ++++ b/uriloader/exthandler/unix/nsOSHelperAppService.cpp +@@ -1641,18 +1641,26 @@ nsOSHelperAppService::GetMIMEInfoFromOS( + NS_ADDREF(retval); + if (!aFileExt.IsEmpty()) + retval->AppendExtension(aFileExt); + } + + return retval; + } + +- // Copy the attributes of retval onto miByExt, to return it ++ // Copy the attributes of retval onto miByExt, to return it but keep ++ // just collected mDefaultAppDescription ++ nsAutoString byExtDefault; ++ miByExt->GetDefaultDescription(byExtDefault); ++ retval->SetDefaultDescription(byExtDefault); + retval->CopyBasicDataTo(miByExt); ++ // But set the extensions primary since CopyBasicDataTo overwrites the ++ // list ++ if (!aFileExt.IsEmpty()) ++ miByExt->SetPrimaryExtension(aFileExt); + + miByExt.swap(retval); + } + return retval; + } + + NS_IMETHODIMP + nsOSHelperAppService::GetProtocolHandlerInfoFromOS(const nsACString &aScheme, diff --git a/suse-default-prefs.js b/suse-default-prefs.js index 0709e71..d8ce9b0 100644 --- a/suse-default-prefs.js +++ b/suse-default-prefs.js @@ -1,6 +1,5 @@ pref("general.useragent.vendor", "SUSE"); pref("general.useragent.vendorSub", "RPM_VERSION"); -pref("app.update.enabled", false); pref("font.default", "sans-serif"); pref("font.default.x-western", "sans-serif"); pref("font.name.monospace.x-western", "monospace"); diff --git a/thunderbird-3.0.0-source.tar.bz2 b/thunderbird-3.0.0-source.tar.bz2 new file mode 100644 index 0000000..39a07c5 --- /dev/null +++ b/thunderbird-3.0.0-source.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce0811dc48058a453fd4d4c647a2fa2029c592b564d12b46806f0f3ab3dcf408 +size 60186501 diff --git a/thunderbird-3.0b4-source.tar.bz2 b/thunderbird-3.0b4-source.tar.bz2 deleted file mode 100644 index 631a41a..0000000 --- a/thunderbird-3.0b4-source.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:33d28a2847e1b5673c50f8bf63ccf123c96b39dfcbd442dd9966edd952f99f6e -size 59231572 diff --git a/thunderbird-cs-smtpauth.patch b/thunderbird-cs-smtpauth.patch deleted file mode 100644 index 5609140..0000000 --- a/thunderbird-cs-smtpauth.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- cs/mail/chrome/messenger/messengercompose/composeMsgs.properties.orig 2009-09-29 13:35:48.000000000 +0200 -+++ cs/mail/chrome/messenger/messengercompose/composeMsgs.properties 2009-09-29 13:36:19.000000000 +0200 -@@ -347,5 +347,5 @@ - ## LOCALIZATION NOTE(smtpEnterPasswordPromptWithUsername): Do not translate the - ## words %1$S and %2$S. Place the word %1$S where the host name should appear, - ## and %2$S where the user name should appear. --smtpEnterPasswordPromptWithUsername=Zadejte heslo k účtu %S na %1$S: -+smtpEnterPasswordPromptWithUsername=Zadejte heslo k účtu %2$S na %1$S: - smtpEnterPasswordPromptTitle=SMTP server vyžaduje heslo diff --git a/thunderbird-no-update.patch b/thunderbird-no-update.patch deleted file mode 100644 index ac787d3..0000000 --- a/thunderbird-no-update.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/mail/base/content/utilityOverlay.js b/mail/base/content/utilityOverlay.js ---- a/mail/base/content/utilityOverlay.js -+++ b/mail/base/content/utilityOverlay.js -@@ -237,7 +237,13 @@ function buildHelpMenu() - // administrator or if we cannot update for some other reason. - var checkForUpdates = document.getElementById("checkForUpdates"); - var canUpdate = updates.canUpdate; -+ var prefs = Components.classes["@mozilla.org/preferences-service;1"] -+ .getService(Components.interfaces.nsIPrefBranch); -+ var updateEnabled = prefs.getBoolPref("app.update.enabled", true); - checkForUpdates.setAttribute("disabled", !canUpdate); -+ checkForUpdates.setAttribute("hidden", !canUpdate || !updateEnabled); -+ var updateSeparator = document.getElementById("menu_HelpAfterUpdatesSeparator"); -+ updateSeparator.setAttribute("hidden", !canUpdate || !updateEnabled); - if (!canUpdate) - return; - -diff --git a/mail/components/preferences/advanced.js b/mail/components/preferences/advanced.js ---- a/mail/components/preferences/advanced.js -+++ b/mail/components/preferences/advanced.js -@@ -238,6 +238,7 @@ var gAdvancedPane = { - var enableAppUpdate = document.getElementById("enableAppUpdate"); - - enableAppUpdate.disabled = !aus.canUpdate || enabledPref.locked; -+ enableAppUpdate.hidden = !aus.canUpdate || !enabledPref.value; - }, - - updateAutoItems: function () diff --git a/thunderbird-shared-nss-db.patch b/thunderbird-shared-nss-db.patch index c6468ea..33d953e 100644 --- a/thunderbird-shared-nss-db.patch +++ b/thunderbird-shared-nss-db.patch @@ -1,26 +1,21 @@ ---- mail/app/Makefile.in.orig 2009-02-26 11:02:11.000000000 +0100 -+++ mail/app/Makefile.in 2009-02-26 11:04:00.000000000 +0100 -@@ -129,6 +129,7 @@ - $(EXTRA_DSO_LIBS) \ - $(APP_XPCOM_LIBS) \ - $(NSPR_LIBS) \ -+ $(NSSHELPER_LIBS) \ - $(TK_LIBS) \ - $(NULL) +From: Hans Petter Jansson + Wolfgang Rosenauer +Subject: use libnsssharedhelper if available at compile time + (can be disabled by exporting MOZ_XRE_NO_NSSHELPER=1) +References: + + +diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in +--- a/config/autoconf.mk.in ++++ config/autoconf.mk.in +@@ -478,16 +478,20 @@ MOZ_XIE_LIBS = @MOZ_XIE_LIBS@ + XT_LIBS = @XT_LIBS@ -Index: config/autoconf.mk.in -=================================================================== -RCS file: /cvsroot/mozilla/config/autoconf.mk.in,v -retrieving revision 3.464 -diff -u -p -6 -r3.464 autoconf.mk.in ---- config/autoconf.mk.in 18 Sep 2008 22:00:51 -0000 3.464 -+++ config/autoconf.mk.in 19 Nov 2008 10:12:46 -0000 -@@ -532,12 +532,16 @@ GLIB_CFLAGS = @GLIB_CFLAGS@ + MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@ + + GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@ - LIBIDL_CFLAGS = @LIBIDL_CFLAGS@ - LIBIDL_LIBS = @LIBIDL_LIBS@ - STATIC_LIBIDL = @STATIC_LIBIDL@ +MOZ_ENABLE_NSSHELPER = @MOZ_ENABLE_NSSHELPER@ +NSSHELPER_CFLAGS = @NSSHELPER_CFLAGS@ @@ -32,9 +27,17 @@ diff -u -p -6 -r3.464 autoconf.mk.in LIBS_PATH = @LIBS_PATH@ MOZ_AUTO_DEPS = @MOZ_AUTO_DEPS@ ---- configure.in.orig 2009-05-11 19:50:11.000000000 +0200 -+++ configure.in 2009-05-11 19:49:35.000000000 +0200 -@@ -7028,6 +7028,22 @@ QCMS_LIBS='$(DEPTH)/mozilla/gfx/qcms/$(L + COMPILER_DEPEND = @COMPILER_DEPEND@ + MDDEPDIR := @MDDEPDIR@ +diff --git a/configure.in b/configure.in +--- a/configure.in ++++ configure.in +@@ -6979,16 +6979,31 @@ AC_SUBST(MOZ_CAIRO_LIBS) + + dnl qcms + dnl ======================================================== + + QCMS_LIBS='$(DEPTH)/mozilla/gfx/qcms/$(LIB_PREFIX)mozqcms.$(LIB_SUFFIX)' AC_SUBST(QCMS_LIBS) dnl ======================================================== @@ -52,8 +55,22 @@ diff -u -p -6 -r3.464 autoconf.mk.in +AC_SUBST(NSSHELPER_CFLAGS) +AC_SUBST(NSSHELPER_LIBS) + -+ +dnl ======================================================== dnl disable xul dnl ======================================================== MOZ_ARG_DISABLE_BOOL(xul, + [ --disable-xul Disable XUL], + MOZ_XUL= ) + if test "$MOZ_XUL"; then + AC_DEFINE(MOZ_XUL) + fi +--- mail/app/Makefile.in.orig 2009-02-26 11:02:11.000000000 +0100 ++++ mail/app/Makefile.in 2009-02-26 11:04:00.000000000 +0100 +@@ -129,6 +129,7 @@ + $(EXTRA_DSO_LIBS) \ + $(APP_XPCOM_LIBS) \ + $(NSPR_LIBS) \ ++ $(NSSHELPER_LIBS) \ + $(TK_LIBS) \ + $(NULL) +