packages: mozilla-thunderbird/mozilla-thunderbird-install.patch, mozilla-th...

qboosh qboosh at pld-linux.org
Sun Mar 25 20:02:27 CEST 2012 

Author: qboosh                       Date: Sun Mar 25 18:02:27 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 11.0
- updated install,system-xulrunner patches; now build with system xulrunner is possible

---- Files affected:
packages/mozilla-thunderbird:
   mozilla-thunderbird-install.patch (1.2 -> 1.3) , mozilla-thunderbird-system-xulrunner.patch (1.1 -> 1.2) , mozilla-thunderbird.spec (1.134 -> 1.135) 

---- Diffs:

================================================================
Index: packages/mozilla-thunderbird/mozilla-thunderbird-install.patch
diff -u packages/mozilla-thunderbird/mozilla-thunderbird-install.patch:1.2 packages/mozilla-thunderbird/mozilla-thunderbird-install.patch:1.3
--- packages/mozilla-thunderbird/mozilla-thunderbird-install.patch:1.2	Tue Mar 20 15:09:35 2012
+++ packages/mozilla-thunderbird/mozilla-thunderbird-install.patch	Sun Mar 25 20:02:22 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/mozilla-thunderbird/mozilla-thunderbird-system-xulrunner.patch
diff -u packages/mozilla-thunderbird/mozilla-thunderbird-system-xulrunner.patch:1.1 packages/mozilla-thunderbird/mozilla-thunderbird-system-xulrunner.patch:1.2
--- packages/mozilla-thunderbird/mozilla-thunderbird-system-xulrunner.patch:1.1	Thu Mar 22 21:23:31 2012
+++ packages/mozilla-thunderbird/mozilla-thunderbird-system-xulrunner.patch	Sun Mar 25 20:02:22 2012
@@ -1,26 +1,3 @@
---- mozilla/config/config.mk.orig	2012-03-22 16:58:29.475414529 +0100
-+++ mozilla/config/config.mk	2012-03-22 19:11:29.342349305 +0100
-@@ -368,7 +368,7 @@
- CCC		= $(CXX)
- PURIFY		= purify $(PURIFYOPTIONS)
- QUANTIFY	= quantify $(QUANTIFYOPTIONS)
--XPIDL_LINK = $(PYTHON) $(SDK_BIN_DIR)/xpt.py link
-+XPIDL_LINK = $(PYTHON) $(LIBXUL_DIST)/sdk/bin/xpt.py link
- 
- INCLUDES = \
-   $(LOCAL_INCLUDES) \
---- mozilla/mail/build.mk.orig	2012-02-16 11:18:23.000000000 +0100
-+++ mozilla/mail/build.mk	2012-03-22 20:58:11.475895080 +0100
-@@ -45,6 +45,9 @@
- 
- ifndef LIBXUL_SDK
- include $(topsrcdir)/toolkit/toolkit-tiers.mk
-+else
-+tier_app_staticdirs += $(APP_LIBXUL_STATICDIRS)
-+tier_app_dirs += $(APP_LIBXUL_DIRS)
- endif
- 
- TIERS += app
 --- mozilla/mail/app/Makefile.in.orig	2012-02-16 11:18:22.000000000 +0100
 +++ mozilla/mail/app/Makefile.in	2012-03-22 16:43:33.608721456 +0100
 @@ -44,5 +44,7 @@
@@ -63,7 +40,7 @@
  
 +ifdef LIBXUL_SDK
 +libs::
-+	cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/$(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
++	cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/$(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
 +endif
 +
  ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH)))

================================================================
Index: packages/mozilla-thunderbird/mozilla-thunderbird.spec
diff -u packages/mozilla-thunderbird/mozilla-thunderbird.spec:1.134 packages/mozilla-thunderbird/mozilla-thunderbird.spec:1.135
--- packages/mozilla-thunderbird/mozilla-thunderbird.spec:1.134	Fri Mar 23 16:18:40 2012
+++ packages/mozilla-thunderbird/mozilla-thunderbird.spec	Sun Mar 25 20:02:22 2012
@@ -22,9 +22,9 @@
 %undefine	crashreporter
 %endif
 
-%define		enigmail_ver	1.3.5
-%define		nspr_ver	4.8.8
-%define		nss_ver		3.12.10
+%define		enigmail_ver	1.4
+%define		nspr_ver	4.9
+%define		nss_ver		3.13.3
 
 %if %{without xulrunner}
 # The actual sqlite version (see RHBZ#480989):
@@ -34,14 +34,14 @@
 Summary:	Thunderbird Community Edition - email client
 Summary(pl.UTF-8):	Thunderbird Community Edition - klient poczty
 Name:		mozilla-thunderbird
-Version:	10.0.2
+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}.png
 Source4:	%{name}.desktop
 Source5:	%{name}.sh
@@ -181,7 +181,7 @@
 cd mozilla
 %{?with_enigmail:%{__gzip} -dc %{SOURCE1} | %{__tar} xf - -C mailnews/extensions}
 %{?with_enigmail:%patch1 -p1}
-%{?with_system_xulrunner:%patch2 -p1}
+%{?with_xulrunner:%patch2 -p1}
 %patch3 -p1
 %patch4 -p1
 %patch6 -p1
@@ -200,8 +200,7 @@
 mk_add_options MOZ_OBJDIR=%{objdir}
 
 export CFLAGS="%{rpmcflags}"
-# use c++0x for char16_t (like in xulrunner 10.0.x)
-export CXXFLAGS="%{rpmcflags}%{?with_system_xulrunner: -std=gnu++0x}"
+export CXXFLAGS="%{rpmcflags}"
 
 %if %{with crashreporter}
 export MOZ_DEBUG_SYMBOLS=1
@@ -266,7 +265,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
@@ -290,8 +288,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
@@ -354,25 +350,28 @@
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults $RPM_BUILD_ROOT%{_datadir}/%{name}/defaults
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/isp $RPM_BUILD_ROOT%{_datadir}/%{name}/isp
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/modules $RPM_BUILD_ROOT%{_datadir}/%{name}/modules
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}/res $RPM_BUILD_ROOT%{_datadir}/%{name}/res
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/searchplugins $RPM_BUILD_ROOT%{_datadir}/%{name}/searchplugins
 ln -s ../../share/%{name}/chrome $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome
 ln -s ../../share/%{name}/defaults $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults
 ln -s ../../share/%{name}/isp $RPM_BUILD_ROOT%{_libdir}/%{name}/isp
 ln -s ../../share/%{name}/modules $RPM_BUILD_ROOT%{_libdir}/%{name}/modules
-ln -s ../../share/%{name}/res $RPM_BUILD_ROOT%{_libdir}/%{name}/res
 ln -s ../../share/%{name}/searchplugins $RPM_BUILD_ROOT%{_libdir}/%{name}/searchplugins
+%if %{without xulrunner}
+mv $RPM_BUILD_ROOT%{_libdir}/%{name}/res $RPM_BUILD_ROOT%{_datadir}/%{name}/res
+ln -s ../../share/%{name}/res $RPM_BUILD_ROOT%{_libdir}/%{name}/res
+%endif
 
 # dir for arch independant extensions besides arch dependant extensions
 # see mozilla/xpcom/build/nsXULAppAPI.h
 # XRE_SYS_LOCAL_EXTENSION_PARENT_DIR and XRE_SYS_SHARE_EXTENSION_PARENT_DIR
 install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions
 
+%if %{without xulrunner}
 %{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
 ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
-
 %{__rm} -r $RPM_BUILD_ROOT%{_libdir}/%{name}/hyphenation
 ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/hyphenation
+%endif
 
 %{__sed} -e 's, at LIBDIR@,%{_libdir},' %{SOURCE5} > $RPM_BUILD_ROOT%{_bindir}/mozilla-thunderbird
 ln -s %{name} $RPM_BUILD_ROOT%{_bindir}/thunderbird
@@ -391,7 +390,7 @@
 # also TMPDIR could be pointing to sudo user's homedir so we reset that too.
 t=$(mktemp -d)
 %{__rm} -f %{_libdir}/%{name}/components/{compreg,xpti}.dat
-TMPDIR= TMP= HOME=$t %{_libdir}/%{name}/icedove -register
+TMPDIR= TMP= HOME=$t %{_libdir}/%{name}/thunderbird -register
 rm -rf $t
 EOF
 chmod a+rx $RPM_BUILD_ROOT%{_libdir}/%{name}/register
@@ -444,35 +443,39 @@
 %attr(755,root,root) %{_bindir}/thunderbird
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/application.ini
-%{_libdir}/%{name}/platform.ini
 %{_libdir}/%{name}/blocklist.xml
 %{_libdir}/%{name}/chrome.manifest
-%{_libdir}/%{name}/greprefs.js
 %dir %{_libdir}/%{name}/components
-%attr(755,root,root) %{_libdir}/%{name}/components/*.so
 %{_libdir}/%{name}/components/*.js
 %{_libdir}/%{name}/components/*.xpt
 %{_libdir}/%{name}/components/components.manifest
 %{_libdir}/%{name}/components/interfaces.manifest
+%attr(755,root,root) %{_libdir}/%{name}/*.sh
+%attr(755,root,root) %{_libdir}/%{name}/*-bin
+%attr(755,root,root) %{_libdir}/%{name}/thunderbird
+%attr(755,root,root) %{_libdir}/%{name}/register
+%if %{without xulrunner}
+%{_libdir}/%{name}/platform.ini
+%{_libdir}/%{name}/greprefs.js
+%attr(755,root,root) %{_libdir}/%{name}/components/*.so
 %attr(755,root,root) %{_libdir}/%{name}/libmozalloc.so
 %attr(755,root,root) %{_libdir}/%{name}/libxpcom.so
 %attr(755,root,root) %{_libdir}/%{name}/libxul.so
-%attr(755,root,root) %{_libdir}/%{name}/*.sh
-%attr(755,root,root) %{_libdir}/%{name}/*-bin
 %attr(755,root,root) %{_libdir}/%{name}/mozilla-xremote-client
-%attr(755,root,root) %{_libdir}/%{name}/thunderbird
 %attr(755,root,root) %{_libdir}/%{name}/plugin-container
-%attr(755,root,root) %{_libdir}/%{name}/register
+%endif
 
 # symlinks
 %{_libdir}/%{name}/chrome
 %{_libdir}/%{name}/defaults
-%{_libdir}/%{name}/dictionaries
-%{_libdir}/%{name}/hyphenation
 %{_libdir}/%{name}/isp
 %{_libdir}/%{name}/modules
-%{_libdir}/%{name}/res
 %{_libdir}/%{name}/searchplugins
+%if %{without xulrunner}
+%{_libdir}/%{name}/dictionaries
+%{_libdir}/%{name}/hyphenation
+%{_libdir}/%{name}/res
+%endif
 
 %{_pixmapsdir}/mozilla-thunderbird.png
 %{_desktopdir}/mozilla-thunderbird.desktop
@@ -483,8 +486,10 @@
 %{_datadir}/%{name}/extensions
 %{_datadir}/%{name}/isp
 %{_datadir}/%{name}/modules
-%{_datadir}/%{name}/res
 %{_datadir}/%{name}/searchplugins
+%if %{without xulrunner}
+%{_datadir}/%{name}/res
+%endif
 
 %if %{with crashreporter}
 %attr(755,root,root) %{_libdir}/%{name}/crashreporter
@@ -539,6 +544,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.135  2012/03/25 18:02:22  qboosh
+- updated to 11.0
+- updated install,system-xulrunner patches; now build with system xulrunner is possible
+
 Revision 1.134  2012/03/23 15:18:40  qboosh
 - c/p, cleanup
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/mozilla-thunderbird/mozilla-thunderbird-install.patch?r1=1.2&r2=1.3
    http://cvs.pld-linux.org/packages/mozilla-thunderbird/mozilla-thunderbird-system-xulrunner.patch?r1=1.1&r2=1.2
    http://cvs.pld-linux.org/packages/mozilla-thunderbird/mozilla-thunderbird.spec?r1=1.134&r2=1.135

More information about the pld-cvs-commit mailing list