packages: icedove/icedove-branding.patch, icedove/icedove-install.patch, ic...

qboosh qboosh at pld-linux.org
Sun Mar 25 16:50:46 CEST 2012 

Author: qboosh                       Date: Sun Mar 25 14:50:46 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 11.0
- updated branding,install patches
- needed to drop --disable-jsd --disable-xul configure options (some icedove code relies on these features)

---- Files affected:
packages/icedove:
   icedove-branding.patch (1.23 -> 1.24) , icedove-install.patch (1.7 -> 1.8) , icedove.spec (1.150 -> 1.151) 

---- Diffs:

================================================================
Index: packages/icedove/icedove-branding.patch
diff -u packages/icedove/icedove-branding.patch:1.23 packages/icedove/icedove-branding.patch:1.24
--- packages/icedove/icedove-branding.patch:1.23	Tue Feb 14 16:46:35 2012
+++ packages/icedove/icedove-branding.patch	Sun Mar 25 16:50:41 2012
@@ -31,8 +31,8 @@
  Version=@APP_VERSION@
  BuildID=@GRE_BUILDID@
  #ifdef MOZ_SOURCE_REPO
---- mozilla/mail/app/profile/all-thunderbird.js~	2011-08-12 15:52:04.000000000 +0200
-+++ mozilla/mail/app/profile/all-thunderbird.js	2011-09-17 15:28:09.543206613 +0200
+--- mozilla/mail/app/profile/all-thunderbird.js.orig	2012-03-13 03:37:11.000000000 +0100
++++ mozilla/mail/app/profile/all-thunderbird.js	2012-03-24 21:42:35.608437888 +0100
 @@ -74,7 +74,7 @@
  // App-specific update preferences
  
@@ -51,7 +51,7 @@
  // User-settable override to app.update.url for testing purposes.
  //pref("app.update.url.override", "");
  
-@@ -125,10 +125,10 @@
+@@ -120,10 +120,10 @@
  pref("app.update.showInstalledUI", false);
  
  // Release notes URL
@@ -64,22 +64,24 @@
  
  // Controls enabling of the extension system logging (can reduce performance)
  pref("extensions.logging.enabled", false);
-@@ -145,10 +145,10 @@
+@@ -145,11 +145,11 @@
  // 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.get.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%");
+-pref("extensions.getAddons.getWithPerformance.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%/%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.get.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%");
++pref("extensions.getAddons.getWithPerformance.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%/%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 @@
+@@ -174,7 +174,7 @@
  pref("extensions.update.interval", 86400);  // Check for updates to Extensions and 
                                              // Themes every day
  
@@ -88,7 +90,7 @@
  pref("extensions.dss.enabled", false);          // Dynamic Skin Switching                                               
  pref("extensions.dss.switchPending", false);    // Non-dynamic switch pending after next
  
-@@ -352,7 +352,7 @@
+@@ -370,7 +370,7 @@
  
  pref("spellchecker.dictionary", "");
  // Dictionary download preference
@@ -97,7 +99,7 @@
  
  // profile.force.migration can be used to bypass the migration wizard, forcing migration from a particular
  // mail application without any user intervention. Possible values are: 
-@@ -489,7 +489,7 @@
+@@ -507,7 +507,7 @@
  pref("mailnews.database.global.logging.console", true);
  
  // page to load to find good header add-ons

================================================================
Index: packages/icedove/icedove-install.patch
diff -u packages/icedove/icedove-install.patch:1.7 packages/icedove/icedove-install.patch:1.8
--- packages/icedove/icedove-install.patch:1.7	Tue Feb 14 16:46:35 2012
+++ packages/icedove/icedove-install.patch	Sun Mar 25 16:50:41 2012
@@ -1,6 +1,6 @@
---- ./mozilla/toolkit/mozapps/installer/packager.mk.orig	2011-03-19 00:34:12.000000000 +0100
-+++ ./mozilla/toolkit/mozapps/installer/packager.mk	2011-03-22 23:53:43.877485659 +0100
-@@ -496,30 +496,30 @@
+--- mozilla/mozilla/toolkit/mozapps/installer/packager.mk.orig	2012-03-13 03:43:47.000000000 +0100
++++ mozilla/mozilla/toolkit/mozapps/installer/packager.mk	2012-03-24 21:50:54.171788606 +0100
+@@ -708,30 +708,30 @@
  endif
  
  stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_REMOVALS_GEN) elfhack
@@ -10,7 +10,7 @@
  # do not strip the binaries actually in the tree.
  	@echo "Creating package directory..."
 -	@mkdir $(DIST)/$(MOZ_PKG_DIR)
-+	@mkdir -p $(DESTDIR)/$(MOZ_PKG_DIR)
++	@mkdir $(DESTDIR)/$(MOZ_PKG_DIR)
  ifndef UNIVERSAL_BINARY
  # If UNIVERSAL_BINARY, the package will be made from an already-prepared
  # STAGEPATH
@@ -20,8 +20,8 @@
 -	  "$(call core_abspath,$(DIST)/$(MOZ_PKG_DIR))", \
 +	  "$(call core_abspath,$(DESTDIR)/$(MOZ_PKG_DIR))", \
  	  "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1)
--	$(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)"
-+	$(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)"
+-	$(PERL) $(MOZILLA_DIR)/toolkit/mozapps/installer/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)"
++	$(PERL) $(MOZILLA_DIR)/toolkit/mozapps/installer/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)"
  	$(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \
 -	  $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/components/components.manifest \
 +	  $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/components/components.manifest \
@@ -39,7 +39,7 @@
  else # !MOZ_PKG_MANIFEST
  ifeq ($(MOZ_PKG_FORMAT),DMG)
  ifndef STAGE_SDK
-@@ -529,10 +529,10 @@
+@@ -741,10 +741,10 @@
  	@$(NSINSTALL) -D $(DIST)/xpt
  	@($(XPIDL_LINK) $(DIST)/xpt/$(MOZ_PKG_APPNAME).xpt $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/*.xpt && rm -f $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/*.xpt && cp $(DIST)/xpt/$(MOZ_PKG_APPNAME).xpt $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components && printf "interfaces $(MOZ_PKG_APPNAME).xpt\n" >$(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/interfaces.manifest) || echo No *.xpt files found in: $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/components/.  Continuing...
  else
@@ -52,7 +52,7 @@
  	@echo "Linking XPT files..."
  	@rm -rf $(DIST)/xpt
  	@$(NSINSTALL) -D $(DIST)/xpt
-@@ -620,7 +620,7 @@
+@@ -830,7 +830,7 @@
  	cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) && $(PACK_OMNIJAR)
  endif
  	$(NSINSTALL) -D $(DESTDIR)$(installdir)

================================================================
Index: packages/icedove/icedove.spec
diff -u packages/icedove/icedove.spec:1.150 packages/icedove/icedove.spec:1.151
--- packages/icedove/icedove.spec:1.150	Fri Mar 23 15:09:42 2012
+++ packages/icedove/icedove.spec	Sun Mar 25 16:50:41 2012
@@ -20,13 +20,13 @@
 %undefine	crashreporter
 %endif
 
-%define		enigmail_ver	1.3.5
-%define		nspr_ver	4.8.8
-%define		nss_ver		3.12.10
-
-# convert thunderbird release number to platform version: 9.0.x -> 9.0.x
-%define		xulrunner_main	10.0
-%define		xulrunner_ver	%(v=%{version}; echo %{xulrunner_main}${v#10.0})
+%define		enigmail_ver	1.4
+%define		nspr_ver	4.9
+%define		nss_ver		3.13.3
+
+# convert thunderbird release number to platform version: 11.0.x -> 11.0.x
+%define		xulrunner_main	11.0
+%define		xulrunner_ver	%(v=%{version}; echo %{xulrunner_main}${v#11.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:	10.0.2
-Release:	3
+Version:	11.0
+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:	624bef982d7ac610b1175737d9905150
+# Source0-md5:	1d7127a3282e62d95eb9b59d47291b70
 Source1:	http://www.mozilla-enigmail.org/download/source/enigmail-%{enigmail_ver}.tar.gz
-# Source1-md5:	1b008b0d106e238c11e4bead08126bc0
+# Source1-md5:	5cf3d9720ed1cda1b22eabe5457772c2
 Source2:	%{name}-branding.tar.bz2
 # Source2-md5:	2da351522bdd7f4a3bd8aaff4c776976
 Source3:	%{name}-rm_nonfree.sh
@@ -277,7 +277,6 @@
 ac_add_options --disable-calendar
 %endif
 ac_add_options --disable-installer
-ac_add_options --disable-jsd
 ac_add_options --disable-updater
 ac_add_options --disable-xprint
 ac_add_options --disable-permissions
@@ -302,8 +301,6 @@
 ac_add_options --enable-shared-js
 ac_add_options --with-libxul-sdk=$(pkg-config --variable=sdkdir libxul)
 ac_add_options --with-system-libxul
-%else
-ac_add_options --disable-xul
 %endif
 ac_add_options --with-pthreads
 ac_add_options --with-system-bz2
@@ -553,6 +550,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.151  2012/03/25 14:50:41  qboosh
+- updated to 11.0
+- updated branding,install patches
+- needed to drop --disable-jsd --disable-xul configure options (some icedove code relies on these features)
+
 Revision 1.150  2012/03/23 14:09:42  qboosh
 - really try to use system xulrunner, if bcond is enabled; but it doesn't work in 10, so disable bcond by default
   (system-xulrunner patch contains some partial fixes, more needed)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/icedove/icedove-branding.patch?r1=1.23&r2=1.24
    http://cvs.pld-linux.org/packages/icedove/icedove-install.patch?r1=1.7&r2=1.8
    http://cvs.pld-linux.org/packages/icedove/icedove.spec?r1=1.150&r2=1.151

More information about the pld-cvs-commit mailing list