- updated to 31.2.0 (icedove update probably requires branding update)

- updated enable-addons,system-mozldap,system-virtualenv patches
- removed obsolete sh,gyp-slashism patches
- dropped fonts patch (important part no longer relevant; patch already dropped from firefox)

diff --git a/mozilla-thunderbird-enable-addons.patch b/mozilla-thunderbird-enable-addons.patch
index daff8d16bdd3fb87a757f4f22e4a91bb414d1864..9a7c0c89b7d2dc7208a3eb348da7c707b74b14c5 100644 (file)
--- a/mozilla-thunderbird-enable-addons.patch
+++ b/mozilla-thunderbird-enable-addons.patch
@@ -9,18 +9,18 @@
  
  // Preferences for AMO integration
  pref("extensions.getAddons.cache.enabled", true);
---- comm-release/mozilla/toolkit/mozapps/extensions/XPIProvider.jsm.addons     2011-11-21 11:28:32.000000000 +0100
-+++ comm-release/mozilla/toolkit/mozapps/extensions/XPIProvider.jsm    2011-12-14 12:43:42.461184351 +0100
-@@ -1591,8 +1591,8 @@ var XPIProvider = {
-       this.showUpgradeUI();
-       flushCaches = true;
-     }
--    else if (aAppChanged === undefined) {
--      // For new profiles we will never need to show the add-on selection UI
-+    else {
-+      // For all profiles we will never need to show the add-on selection UI
-       Services.prefs.setBoolPref(PREF_SHOWN_SELECTION_UI, true);
-     }
+--- comm-release/mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm.orig      2014-11-27 16:14:37.359219145 +0100
++++ comm-release/mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm   2014-11-27 16:26:38.952522196 +0100
+@@ -1894,8 +1894,8 @@
+         this.showUpgradeUI();
+         flushCaches = true;
+       }
+-      else if (aAppChanged === undefined) {
+-        // For new profiles we will never need to show the add-on selection UI
++      else {
++        // For all profiles we will never need to show the add-on selection UI
+         Services.prefs.setBoolPref(PREF_SHOWN_SELECTION_UI, true);
+       }
  
 --- comm-release/suite/browser/browser-prefs.js~       2013-11-06 19:54:38.789734061 +0100
 +++ comm-release/suite/browser/browser-prefs.js        2013-11-06 20:55:33.765611935 +0100

diff --git a/mozilla-thunderbird-fonts.patch b/mozilla-thunderbird-fonts.patch
deleted file mode 100644 (file)
index 8dc6fab..0000000
--- a/mozilla-thunderbird-fonts.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-diff -ur comm-1.9.1/mozilla/modules/libpref/src/init/all.js comm-1.9.1.new/mozilla/modules/libpref/src/init/all.js
---- comm-1.9.1/mozilla/modules/libpref/src/init/all.js 2009-12-05 02:56:20.000000000 +0100
-+++ comm-1.9.1.new/mozilla/modules/libpref/src/init/all.js     2009-12-21 09:16:41.372169512 +0100
-@@ -1240,9 +1240,9 @@
- pref("font.name.monospace.th", "Tahoma");
- pref("font.name.cursive.th", "Tahoma");
- 
--pref("font.name.serif.tr", "Times New Roman");
--pref("font.name.sans-serif.tr", "Arial");
--pref("font.name.monospace.tr", "Courier New");
-+pref("font.name.serif.tr", "serif");
-+pref("font.name.sans-serif.tr", "sans-serif");
-+pref("font.name.monospace.tr", "monospace");
- pref("font.name.cursive.tr", "Comic Sans MS");
- 
- pref("font.name.serif.x-baltic", "Times New Roman");
-@@ -1250,9 +1250,9 @@
- pref("font.name.monospace.x-baltic", "Courier New");
- pref("font.name.cursive.x-baltic", "Comic Sans MS");
- 
--pref("font.name.serif.x-central-euro", "Times New Roman");
--pref("font.name.sans-serif.x-central-euro", "Arial");
--pref("font.name.monospace.x-central-euro", "Courier New");
-+pref("font.name.serif.x-central-euro", "serif");
-+pref("font.name.sans-serif.x-central-euro", "sans-serif");
-+pref("font.name.monospace.x-central-euro", "monospace");
- pref("font.name.cursive.x-central-euro", "Comic Sans MS");
- 
- pref("font.name.serif.x-cyrillic", "Times New Roman");
-@@ -1260,9 +1260,9 @@
- pref("font.name.monospace.x-cyrillic", "Courier New");
- pref("font.name.cursive.x-cyrillic", "Comic Sans MS");
- 
--pref("font.name.serif.x-unicode", "Times New Roman");
--pref("font.name.sans-serif.x-unicode", "Arial");
--pref("font.name.monospace.x-unicode", "Courier New");
-+pref("font.name.serif.x-unicode", "serif");
-+pref("font.name.sans-serif.x-unicode", "sans-serif");
-+pref("font.name.monospace.x-unicode", "monospace");
- pref("font.name.cursive.x-unicode", "Comic Sans MS");
- 
- pref("font.name.serif.x-western", "Times New Roman");
-@@ -1396,23 +1396,23 @@
- 
- pref("font.default.ar", "sans-serif");
- pref("font.size.variable.ar", 16);
--pref("font.size.fixed.ar", 13);
-+pref("font.size.fixed.ar", 14);
- 
--pref("font.default.el", "serif");
-+pref("font.default.el", "sans-serif");
- pref("font.size.variable.el", 16);
--pref("font.size.fixed.el", 13);
-+pref("font.size.fixed.el", 14);
- 
- pref("font.default.he", "sans-serif");
- pref("font.size.variable.he", 16);
--pref("font.size.fixed.he", 13);
-+pref("font.size.fixed.he", 14);
- 
- pref("font.default.ja", "sans-serif");
- pref("font.size.variable.ja", 16);
--pref("font.size.fixed.ja", 16);
-+pref("font.size.fixed.ja", 14);
- 
- pref("font.default.ko", "sans-serif");
- pref("font.size.variable.ko", 16);
--pref("font.size.fixed.ko", 16);
-+pref("font.size.fixed.ko", 14);
- 
- pref("font.default.th", "serif");
- pref("font.size.variable.th", 16);
-@@ -1856,22 +1856,22 @@
- pref("font.size.variable.ko", 16);
- pref("font.size.fixed.ko", 16);
- 
--pref("font.default.th", "serif");
-+pref("font.default.th", "sans-serif");
- pref("font.size.variable.th", 16);
--pref("font.size.fixed.th", 13);
-+pref("font.size.fixed.th", 14);
- pref("font.minimum-size.th", 10);
- 
--pref("font.default.tr", "serif");
-+pref("font.default.tr", "sans-serif");
- pref("font.size.variable.tr", 16);
--pref("font.size.fixed.tr", 13);
-+pref("font.size.fixed.tr", 14);
- 
- pref("font.default.x-armn", "serif");
- pref("font.size.variable.x-armn", 16);
- pref("font.size.fixed.x-armn", 13);
- 
--pref("font.default.x-baltic", "serif");
-+pref("font.default.x-baltic", "sans-serif");
- pref("font.size.variable.x-baltic", 16);
--pref("font.size.fixed.x-baltic", 13);
-+pref("font.size.fixed.x-baltic", 14);
- 
- pref("font.default.x-beng", "serif");
- pref("font.size.variable.x-beng", 16);
-@@ -1881,9 +1881,9 @@
- pref("font.size.variable.x-cans", 16);
- pref("font.size.fixed.x-cans", 13);
- 
--pref("font.default.x-central-euro", "serif");
-+pref("font.default.x-central-euro", "sans-serif");
- pref("font.size.variable.x-central-euro", 16);
--pref("font.size.fixed.x-central-euro", 13);
-+pref("font.size.fixed.x-central-euro", 14);
- 
- pref("font.default.x-cyrillic", "serif");
- pref("font.size.variable.x-cyrillic", 16);
-@@ -2126,9 +2126,9 @@
- pref("font.size.variable.x-central-euro", 16);
- pref("font.size.fixed.x-central-euro", 13);
- 
--pref("font.default.x-cyrillic", "serif");
-+pref("font.default.x-cyrillic", "sans-serif");
- pref("font.size.variable.x-cyrillic", 16);
--pref("font.size.fixed.x-cyrillic", 13);
-+pref("font.size.fixed.x-cyrillic", 14);
- 
- pref("font.default.x-devanagari", "serif");
- pref("font.size.variable.x-devanagari", 16);
-@@ -2138,25 +2138,25 @@
- pref("font.size.variable.x-tamil", 16);
- pref("font.size.fixed.x-tamil", 13);
- 
--pref("font.default.x-unicode", "serif");
-+pref("font.default.x-unicode", "sans-serif");
- pref("font.size.variable.x-unicode", 16);
--pref("font.size.fixed.x-unicode", 13);
-+pref("font.size.fixed.x-unicode", 14);
- 
--pref("font.default.x-western", "serif");
-+pref("font.default.x-western", "sans-serif");
- pref("font.size.variable.x-western", 16);
--pref("font.size.fixed.x-western", 13);
-+pref("font.size.fixed.x-western", 14);
- 
--pref("font.default.zh-CN", "serif");
-+pref("font.default.zh-CN", "sans-serif");
- pref("font.size.variable.zh-CN", 16);
--pref("font.size.fixed.zh-CN", 16);
-+pref("font.size.fixed.zh-CN", 14);
- 
--pref("font.default.zh-TW", "serif");
-+pref("font.default.zh-TW", "sans-serif");
- pref("font.size.variable.zh-TW", 16);
--pref("font.size.fixed.zh-TW", 16);
-+pref("font.size.fixed.zh-TW", 14);
- 
--pref("font.default.zh-HK", "serif");
-+pref("font.default.zh-HK", "sans-serif");
- pref("font.size.variable.zh-HK", 16);
--pref("font.size.fixed.zh-HK", 16);
-+pref("font.size.fixed.zh-HK", 14);
- 
- pref("netinst.profile.show_profile_wizard", true); 
- 

diff --git a/mozilla-thunderbird-gyp-slashism.patch b/mozilla-thunderbird-gyp-slashism.patch
deleted file mode 100644 (file)
index 5100011..0000000
--- a/mozilla-thunderbird-gyp-slashism.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- xulrunner-18.0/mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py.orig    2013-01-05 00:44:41.000000000 +0100
-+++ xulrunner-18.0/mozilla/media/webrtc/trunk/tools/gyp/pylib/gyp/generator/mozmake.py 2013-01-13 20:13:40.033894757 +0100
-@@ -114,6 +114,12 @@
-   if dir and not os.path.exists(dir):
-     os.makedirs(dir)
- 
-+def append_relative(base, rel):
-+  if rel == '':
-+    return base
-+  else:
-+    return base + '/' + rel
-+
- def GetFlavor(params):
-   """Returns |params.flavor| if it's set, the system's default flavor else."""
-   flavors = {
-@@ -142,9 +148,9 @@
- 
- def WriteMakefile(filename, data, build_file, depth, topsrcdir, srcdir, relative_path, extra_data=None):
-   if not os.path.isabs(topsrcdir):
--    topsrcdir = depth + "/" + topsrcdir
-+    topsrcdir = append_relative(depth, topsrcdir)
-   if not os.path.isabs(srcdir):
--    srcdir = depth + "/" + srcdir
-+    srcdir = append_relative(depth, srcdir)
-   #TODO: should compare with the existing file and not overwrite it if the
-   # contents are the same!
-   ensure_directory_exists(filename)
-@@ -261,7 +267,7 @@
-       qualified_target)
-     build_file = os.path.abspath(build_file)
-     rel_path, output_file = self.CalculateMakefilePath(build_file, target)
--    subdepth = self.depth + "/" + getdepth(rel_path)
-+    subdepth = append_relative(self.depth, getdepth(rel_path))
-     if self.WriteTargetMakefile(output_file, rel_path, qualified_target, spec, build_file, subdepth):
-         # If WriteTargetMakefile returns True, then this is a useful target
-       dirs.append(rel_path)
-@@ -399,7 +405,7 @@
-   # The relative path from objdir to gyp_file_dir
-   srcdir = gyp.common.RelativePath(gyp_file_dir, objdir)
-   # The absolute path to the source dir
--  abs_srcdir = topsrcdir + "/" + relative_srcdir
-+  abs_srcdir = append_relative(topsrcdir, relative_srcdir)
-   # The path to get up to the root of the objdir from the output dir.
-   depth = getdepth(relative_srcdir)
-   # The output directory.
-@@ -408,9 +414,9 @@
-   makefile_path = os.path.join(output_dir, "Makefile")
- 
-   def topsrcdir_path(path):
--    return "$(topsrcdir)/" + swapslashes(gyp.common.RelativePath(path, topsrcdir))
-+    return append_relative("$(topsrcdir)", swapslashes(gyp.common.RelativePath(path, topsrcdir)))
-   def objdir_path(path):
--    return "$(DEPTH)/" + swapslashes(gyp.common.RelativePath(path, objdir))
-+    return append_relative("$(DEPTH)", swapslashes(gyp.common.RelativePath(path, objdir)))
- 
-   # Find the list of targets that derive from the gyp file(s) being built.
-   needed_targets = set()

diff --git a/mozilla-thunderbird-sh.patch b/mozilla-thunderbird-sh.patch
deleted file mode 100644 (file)
index 5666d73..0000000
--- a/mozilla-thunderbird-sh.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- mozilla/configure.orig     2014-04-24 18:27:27.000000000 +0200
-+++ mozilla/configure  2014-05-11 15:43:20.989605097 +0200
-@@ -1091,9 +1091,6 @@
- files = [
- EOF
- 
--for out in ; do
--  echo "    '$out'," >> $CONFIG_STATUS
--done
- 
- cat >> $CONFIG_STATUS <<\EOF
- ]

diff --git a/mozilla-thunderbird-system-mozldap.patch b/mozilla-thunderbird-system-mozldap.patch
index 3fe1c4e3cc996b2abe8339cdf2bd039e5e90bbdc..69e51f7e0a581d89be82d5bc6942361af269c697 100644 (file)
--- a/mozilla-thunderbird-system-mozldap.patch
+++ b/mozilla-thunderbird-system-mozldap.patch
@@ -14,9 +14,9 @@
  dnl ========================================================
  dnl = Trademarked Branding 
  dnl ========================================================
---- mozilla/mail/configure.in.orig     2010-06-23 19:43:07.000000000 +0200
-+++ mozilla/mail/configure.in  2010-07-06 11:14:54.350499449 +0200
-@@ -59,7 +59,12 @@
+--- mozilla/mail/configure.in.orig     2014-10-12 21:23:02.000000000 +0200
++++ mozilla/mail/configure.in  2014-11-25 22:25:39.028869972 +0100
+@@ -56,7 +56,12 @@
      MOZ_LDAP_XPCOM=,
      MOZ_LDAP_XPCOM=1)
  
@@ -27,10 +27,10 @@
 +    LDAP_COMPONENT=mozldap
 +    LDAP_MODULE="MODULE(nsLDAPProtocolModule)"
 +elif test "$MOZ_LDAP_XPCOM"; then
-     MOZ_ARG_ENABLE_BOOL(incomplete-toolkit-ldap-autocomplete,
-     [  --enable-incomplete-toolkit-ldap-autocomplete Builds a JavaScript component that implements an LDAP autocomplete component using the toolkit interfaces rather than the C++ component using the obsolete XPFE interfaces. ],
-         MOZ_INCOMPLETE_TOOLKIT_LDAP_AUTOCOMPLETE=1,
-@@ -118,7 +130,7 @@
+     LDAP_CFLAGS='-I${DIST}/public/ldap'
+     if test "$OS_ARCH" = "WINNT"; then
+         if test -n "$GNU_CC"; then
+@@ -101,7 +106,7 @@
  
  # if we're building the LDAP XPCOM component, we need to build
  # the c-sdk first.

diff --git a/mozilla-thunderbird-system-virtualenv.patch b/mozilla-thunderbird-system-virtualenv.patch
index a2d150ff8ac26a4d3defa301da506f462b755971..cefdc4b1e20be4187036946db50603f90fb6244a 100644 (file)
--- a/mozilla-thunderbird-system-virtualenv.patch
+++ b/mozilla-thunderbird-system-virtualenv.patch
@@ -1,5 +1,5 @@
---- xulrunner-21.0/mozilla/build/virtualenv/populate_virtualenv.py~    2013-05-11 21:19:23.000000000 +0200
-+++ xulrunner-21.0/mozilla/build/virtualenv/populate_virtualenv.py     2013-05-14 22:51:32.136719267 +0200
+--- xulrunner-21.0/mozilla/python/mozbuild/mozbuild/virtualenv.py~     2013-05-11 21:19:23.000000000 +0200
++++ xulrunner-21.0/mozilla/python/mozbuild/mozbuild/virtualenv.py      2013-05-14 22:51:32.136719267 +0200
 @@ -37,8 +37,7 @@
      @property
      def virtualenv_script_path(self):

diff --git a/mozilla-thunderbird.spec b/mozilla-thunderbird.spec
index ab86b1fb1f645ee23786c2e6c27cc8ae53604722..e67ebab29609d1ff7451fa208577d2e645d9e534 100644 (file)
--- a/mozilla-thunderbird.spec
+++ b/mozilla-thunderbird.spec
@@ -7,6 +7,7 @@
 %bcond_with    gtk3            # GTK+ 3.x instead of 2.x
 %bcond_without ldap            # disable e-mail address lookups in LDAP directories
 %bcond_without lightning       # disable Sunbird/Lightning calendar
+%bcond_with    shared_js       # shared libmozjs library [broken]
 %bcond_with    xulrunner       # system xulrunner
 %bcond_with    crashreporter   # report crashes to crash-stats.mozilla.com
 
@@ -27,24 +28,21 @@
 Summary:       Thunderbird Community Edition - email client
 Summary(pl.UTF-8):     Thunderbird Community Edition - klient poczty
 Name:          mozilla-thunderbird
-Version:       24.8.1
+Version:       31.2.0
 Release:       1
 License:       MPL v2.0
 Group:         X11/Applications/Mail
 Source0:       http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/source/thunderbird-%{version}.source.tar.bz2
-# Source0-md5: 24f90b2a2da3b0eee1ffc527bcf765a8
+# Source0-md5: 6bb66f5cb67d573939d4e2ead6f7c7ca
 Source2:       %{name}.png
 Source4:       %{name}.desktop
 Source5:       %{name}.sh
-Patch2:                %{name}-sh.patch
-Patch3:                %{name}-fonts.patch
 Patch6:                %{name}-prefs.patch
 Patch7:                %{name}-system-mozldap.patch
 Patch8:                %{name}-makefile.patch
 Patch12:       %{name}-no-subshell.patch
 # Edit patch below and restore --system-site-packages when system virtualenv gets 1.7 upgrade
 Patch13:       %{name}-system-virtualenv.patch
-Patch14:       %{name}-gyp-slashism.patch
 Patch15:       %{name}-enable-addons.patch
 URL:           http://www.mozilla.org/projects/thunderbird/
 BuildRequires: GConf2-devel >= 1.2.1
@@ -145,16 +143,13 @@ dodające funkcjonalność kalendarza.
 
 %prep
 %setup -qc
-mv comm-esr24 mozilla
+mv comm-esr31 mozilla
 cd mozilla
-%patch2 -p1
-%patch3 -p1
 %patch6 -p1
 %patch7 -p1
 %patch8 -p2
 %patch12 -p1
 %patch13 -p1
-%patch14 -p1
 %patch15 -p1
 
 %build
@@ -237,7 +232,7 @@ ac_add_options --disable-ldap
 ac_add_options --enable-libxul
 ac_add_options --enable-pango
 ac_add_options --enable-postscript
-ac_add_options --enable-shared-js
+%{?with_shared_js:ac_add_options --enable-shared-js}
 ac_add_options --enable-single-profile
 ac_add_options --enable-startup-notification
 ac_add_options --enable-system-cairo
@@ -385,7 +380,7 @@ exit 0
 %{_libdir}/%{name}/platform.ini
 %attr(755,root,root) %{_libdir}/%{name}/components/*.so
 %attr(755,root,root) %{_libdir}/%{name}/libmozalloc.so
-%attr(755,root,root) %{_libdir}/%{name}/libmozjs.so
+%{?with_shared_js:%attr(755,root,root) %{_libdir}/%{name}/libmozjs.so}
 %attr(755,root,root) %{_libdir}/%{name}/libxul.so
 %attr(755,root,root) %{_libdir}/%{name}/mozilla-xremote-client
 %attr(755,root,root) %{_libdir}/%{name}/plugin-container