// 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
+--- comm-release/mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm.addons 2011-11-21 11:28:32.000000000 +0100
++++ comm-release/mozilla/toolkit/mozapps/extensions/internal/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);
- }
+ 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
+++ /dev/null
---- 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()
// Enables some extra Extension System Logging (can reduce performance)
pref("extensions.logging.enabled", false);
+@@ -208,6 +207,7 @@ pref("extensions.update.url", "https://versioncheck.addons.mozilla.org/update/Ve
+ pref("extensions.update.interval", 86400); // Check for updates to Extensions and
+ // Themes every day
+
++pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/themes/");
+ pref("extensions.dss.enabled", false); // Dynamic Skin Switching
+ pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next
+
@@ -391,7 +391,7 @@
pref("spellchecker.dictionary", "");
// Windows taskbar support
#ifdef XP_WIN
---- mozilla/mail/base/content/baseMenuOverlay.xul~ 2011-08-12 15:52:04.000000000 +0200
-+++ mozilla/mail/base/content/baseMenuOverlay.xul 2011-09-17 15:29:32.946531066 +0200
-@@ -73,9 +73,6 @@
- <menuitem id="whatsNew"
- label="&whatsNewCmd.label;" accesskey="&whatsNewCmd.accesskey;"
- oncommand="openWhatsNew();"/>
-- <menuitem id="releaseNotes"
-- label="&releaseCmd2.label;" accesskey="&releaseCmd2.accesskey;"
-- oncommand="openFormattedURL('app.releaseNotesURL');"/>
- <menuseparator id="functionsSeparator"/>
- <menuitem id="featureConfigurator"
- label="&featureConfiguratorCmd.label;"
+--- mozilla/mail/locales/en-US/chrome/messenger/accountCreation.dtd~
++++ mozilla/mail/locales/en-US/chrome/messenger/accountCreation.dtd
+@@ -78,7 +78,7 @@
+ <!ENTITY changeSettings.label "Change Settings">
+ <!ENTITY changeSettings.accesskey "S">
+
+-<!ENTITY contactYourProvider.description "&brandShortName; can allow you to get to your mail using the provided configurations. However, you should contact your administrator or email provider regarding these improper connections. See the Thunderbird FAQ for more information.">
++<!ENTITY contactYourProvider.description "&brandShortName; can allow you to get to your mail using the provided configurations. However, you should contact your administrator or email provider regarding these improper connections. See the Icedove FAQ for more information.">
+
+ <!ENTITY insecureServer.tooltip.title "Warning! This is an insecure server.">
+ <!ENTITY insecureServer.tooltip.details "Click circle for more details.">
--- mozilla/mail/confvars.sh~ 2011-08-12 15:52:05.000000000 +0200
+++ mozilla/mail/confvars.sh 2011-09-17 15:34:33.613167078 +0200
@@ -36,8 +36,8 @@
MOZ_UPDATER=1
MOZ_THUNDERBIRD=1
MOZ_CHROME_FILE_FORMAT=omni
---- mozilla/mozilla/toolkit/xre/nsAppRunner.cpp~ 2011-08-12 16:16:45.000000000 +0200
-+++ mozilla/mozilla/toolkit/xre/nsAppRunner.cpp 2011-09-17 15:36:16.599823973 +0200
-@@ -1324,8 +1324,7 @@
- static inline void
- DumpVersion()
- {
-- printf("%s %s %s",
-- gAppData->vendor ? gAppData->vendor : "", gAppData->name, gAppData->version);
-+ printf("%s %s", gAppData->name, gAppData->version);
- if (gAppData->copyright)
- printf(", %s", gAppData->copyright);
- printf("\n");
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);
+@@ -2138,13 +2138,13 @@
+ pref("font.size.variable.x-tibt", 16);
+ pref("font.size.fixed.x-tibt", 13);
-pref("font.default.x-unicode", "serif");
+pref("font.default.x-unicode", "sans-serif");
-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.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);
-
+++ /dev/null
---- 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
- ]
Summary: Icedove - email client
Summary(pl.UTF-8): Icedove - klient poczty
Name: icedove
-Version: 24.8.1
-Release: 1
+Version: 31.3.0
+Release: 0.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: 3781dfb541412c7f6b530a654b834ce5
Source2: %{name}-branding.tar.bz2
# Source2-md5: d8e6897870bf288fdf264c0e9ef85f7d
Source3: %{name}-rm_nonfree.sh
Source4: %{name}.desktop
Source5: %{name}.sh
Patch0: %{name}-branding.patch
-Patch2: %{name}-sh.patch
Patch3: %{name}-fonts.patch
Patch6: %{name}-prefs.patch
Patch7: system-mozldap.patch
Patch12: no-subshell.patch
# Edit patch below and restore --system-site-packages when system virtualenv gets 1.7 upgrade
Patch13: system-virtualenv.patch
-Patch14: gyp-slashism.patch
Patch15: enable-addons.patch
URL: http://www.pld-linux.org/Packages/Icedove
BuildRequires: GConf2-devel >= 1.2.1
%prep
%setup -qc
-mv comm-esr24 mozilla
+%{__mv} comm-esr31 mozilla
%setup -q -T -D -a2
cd mozilla
/bin/sh %{SOURCE3}
%patch0 -p1
-%patch2 -p1
%patch3 -p1
%patch6 -p1
%patch7 -p1
%patch10 -p2
%patch12 -p1
%patch13 -p1
-%patch14 -p1
%patch15 -p1
%build
+ 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,
+ LDAP_CFLAGS='-I${DIST}/public/ldap'
+ if test "$OS_ARCH" = "WINNT"; then
+ if test -n "$GNU_CC"; then
@@ -118,7 +130,7 @@
# if we're building the LDAP XPCOM component, we need to build
---- 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-27.0/mozilla/python/mozbuild/mozbuild/virtualenv.py~ 2013-05-11 21:19:23.000000000 +0200
++++ xulrunner-27.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):