From 6864d0a2be46340a08bb04a9492bfcf0a2157ba4 Mon Sep 17 00:00:00 2001 From: Andrzej Zawadzki Date: Tue, 14 Feb 2012 15:46:35 +0000 Subject: [PATCH] - up to 10.0.1 Changed files: icedove-branding.patch -> 1.23 icedove-extensiondir.patch -> 1.2 icedove-install.patch -> 1.7 icedove.spec -> 1.143 --- icedove-branding.patch | 8 ++++---- icedove-extensiondir.patch | 17 +++++++++-------- icedove-install.patch | 9 --------- icedove.spec | 18 +++++++++--------- 4 files changed, 22 insertions(+), 30 deletions(-) diff --git a/icedove-branding.patch b/icedove-branding.patch index ecc5129..b6d937a 100644 --- a/icedove-branding.patch +++ b/icedove-branding.patch @@ -64,19 +64,19 @@ // Controls enabling of the extension system logging (can reduce performance) pref("extensions.logging.enabled", false); -@@ -138,10 +138,10 @@ +@@ -145,10 +145,10 @@ // Preferences for AMO integration pref("extensions.getAddons.cache.enabled", true); pref("extensions.getAddons.maxResults", 15); -pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); -pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search?q=%TERMS%"); --pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%?src=thunderbird"); +-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=thunderbird"); -pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/%APP%/discovery/pane/%VERSION%/%OS%"); +pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); +pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/search?q=%TERMS%"); -+pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%?src=thunderbird"); ++pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=thunderbird"); +pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/discovery/pane/%VERSION%/%OS%"); - + // Blocklist preferences pref("extensions.blocklist.enabled", true); @@ -165,7 +165,7 @@ diff --git a/icedove-extensiondir.patch b/icedove-extensiondir.patch index b8487b5..836c0b5 100644 --- a/icedove-extensiondir.patch +++ b/icedove-extensiondir.patch @@ -1,17 +1,17 @@ --- icedove-3.1.2/mozilla/mozilla/toolkit/xre/nsXREDirProvider.cpp~ 2010-08-03 02:28:31.000000000 +0300 +++ icedove-3.1.2/mozilla/mozilla/toolkit/xre/nsXREDirProvider.cpp 2010-08-17 15:46:17.972676534 +0300 -@@ -320,7 +320,7 @@ - #endif +@@ -328,7 +328,7 @@ #if defined(XP_UNIX) && !defined(XP_MACOSX) else if (!strcmp(aProperty, XRE_SYS_SHARE_EXTENSION_PARENT_DIR)) { + #ifdef ENABLE_SYSTEM_EXTENSION_DIRS - static const char *const sysLExtDir = "/usr/share/mozilla/extensions"; + static const char *const sysLExtDir = "/usr/share/icedove/extensions"; return NS_NewNativeLocalFile(nsDependentCString(sysLExtDir), - PR_FALSE, (nsILocalFile**)(nsIFile**) aFile); - } -@@ -1231,9 +1231,9 @@ + false, (nsILocalFile**)(nsIFile**) aFile); + #else +@@ -1129,9 +1129,9 @@ #elif defined(XP_UNIX) - static const char *const sysSExtDir = + static const char *const sysSExtDir = #ifdef HAVE_USR_LIB64_DIR - "/usr/lib64/mozilla/extensions"; + "/usr/lib64/icedove/extensions"; @@ -19,5 +19,6 @@ - "/usr/lib/mozilla/extensions"; + "/usr/lib/icedove/extensions"; #endif - - rv = NS_NewNativeLocalFile(nsDependentCString(sysSExtDir), PR_FALSE, + + rv = NS_NewNativeLocalFile(nsDependentCString(sysSExtDir), false, + rv = NS_NewNativeLocalFile(nsDependentCString(sysSExtDir), PR_FALSE, diff --git a/icedove-install.patch b/icedove-install.patch index 7464b04..78474ed 100644 --- a/icedove-install.patch +++ b/icedove-install.patch @@ -72,12 +72,3 @@ -DAB_CD=$(AB_CD) \ -DGRE_MILESTONE=$(GRE_MILESTONE) \ -DGRE_BUILDID=$(GRE_BUILDID) \ -@@ -359,7 +359,7 @@ - endif - mkdir -p $(DIST)/$(APP_NAME).app/Contents/Library/Spotlight - rsync -a --copy-unsafe-links $(DIST)/package/Thunderbird.mdimporter $(DIST)/$(APP_NAME).app/Contents/Library/Spotlight -- cp -RL $(DIST)/branding/thunderbird.icns $(DIST)/$(APP_NAME).app/Contents/Resources/thunderbird.icns -+ cp -RL $(DIST)/branding/thunderbird.icns $(DIST)/branding/$(MOZ_APP_NAME).icns - printf APPLMOZM > $(DIST)/$(APP_NAME).app/Contents/PkgInfo - # remove CVS dirs from packaged app - find $(DIST)/$(APP_NAME).app -type d -name "CVS" -prune -exec rm -rf {} \; diff --git a/icedove.spec b/icedove.spec index 7ba5d2f..cd4adff 100644 --- a/icedove.spec +++ b/icedove.spec @@ -20,13 +20,13 @@ %undefine crashreporter %endif -%define enigmail_ver 1.3.4 +%define enigmail_ver 1.3.5 %define nspr_ver 4.8.8 %define nss_ver 3.12.10 # convert firefox release number to platform version: 9.0.x -> 9.0.x -%define xulrunner_main 9.0 -%define xulrunner_ver %(v=%{version}; echo %{xulrunner_main}${v#9.0}) +%define xulrunner_main 10.0 +%define xulrunner_ver %(v=%{version}; echo %{xulrunner_main}${v#10.0}) %if %{without xulrunner} # The actual sqlite version (see RHBZ#480989): @@ -36,14 +36,14 @@ Summary: Icedove - email client Summary(pl.UTF-8): Icedove - klient poczty Name: icedove -Version: 9.0.1 -Release: 2 +Version: 10.0.1 +Release: 1 License: MPL 1.1 or GPL v2+ or LGPL v2.1+ Group: X11/Applications/Networking Source0: http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/source/thunderbird-%{version}.source.tar.bz2 -# Source0-md5: a5904751dbd33074682b438b732fdbab +# Source0-md5: 623c32d9deae370383e1422b1ea48061 Source1: http://www.mozilla-enigmail.org/download/source/enigmail-%{enigmail_ver}.tar.gz -# Source1-md5: 2b5f188791811d248b6ff1fc51a5806a +# Source1-md5: 1b008b0d106e238c11e4bead08126bc0 Source2: %{name}-branding.tar.bz2 # Source2-md5: 2da351522bdd7f4a3bd8aaff4c776976 Source3: %{name}-rm_nonfree.sh @@ -58,7 +58,7 @@ Patch5: %{name}-hunspell.patch Patch6: %{name}-prefs.patch Patch7: system-mozldap.patch Patch8: %{name}-makefile.patch -Patch9: %{name}-libpng.patch +#Patch9: %{name}-libpng.patch Patch10: %{name}-extensiondir.patch Patch11: crashreporter.patch Patch12: no-subshell.patch @@ -198,7 +198,7 @@ cd mozilla %patch6 -p1 %patch7 -p1 %patch8 -p2 -%patch9 -p1 +#%patch9 -p1 %patch10 -p2 %patch11 -p2 %patch12 -p1 -- 2.44.0