[packages/mozilla-thunderbird] - up to 17.0.3

qboosh qboosh at pld-linux.org
Sun Feb 24 07:42:34 CET 2013 

commit d44f54198b3135656804f2e124b231012988c346
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Feb 24 07:42:46 2013 +0100

    - up to 17.0.3

 mozilla-thunderbird-bug-722975-workaround.patch | 37 -------------
 mozilla-thunderbird-crashreporter.patch         | 11 ----
 mozilla-thunderbird-enigmail-shared.patch       | 10 ----
 mozilla-thunderbird-gyp-slashism.patch          | 66 +++++++++++++++++++++++
 mozilla-thunderbird-install.patch               | 44 +++++++++++----
 mozilla-thunderbird-makefile.patch              |  9 +---
 mozilla-thunderbird-system-cairo.patch          | 44 +++++++++++++++
 mozilla-thunderbird-system-virtualenv.patch     | 24 +++++++++
 mozilla-thunderbird-system-xulrunner.patch      | 49 -----------------
 mozilla-thunderbird.spec                        | 71 +++++++++++++++++--------
 10 files changed, 217 insertions(+), 148 deletions(-)
---
diff --git a/mozilla-thunderbird.spec b/mozilla-thunderbird.spec
index 32e595e..04505d2 100644
--- a/mozilla-thunderbird.spec
+++ b/mozilla-thunderbird.spec
@@ -21,11 +21,11 @@
 %undefine	crashreporter
 %endif
 
-%define		enigmail_ver	1.4.1
-%define		nspr_ver	4.9
-%define		nss_ver		3.13.3
+%define		enigmail_ver	1.5.1
+%define		nspr_ver	4.9.3
+%define		nss_ver		3.14.1
 
-%define		xulrunner_ver	2:12.0
+%define		xulrunner_ver	2:17.0
 
 %if %{without xulrunner}
 # The actual sqlite version (see RHBZ#480989):
@@ -35,29 +35,30 @@
 Summary:	Thunderbird Community Edition - email client
 Summary(pl.UTF-8):	Thunderbird Community Edition - klient poczty
 Name:		mozilla-thunderbird
-Version:	12.0.1
+Version:	17.0.3
 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:	64cacde4cb2b1e8736f1c3a0ea6a02db
+# Source0-md5:	180f7768f6419182ea78eeb80da7f588
 Source1:	http://www.mozilla-enigmail.org/download/source/enigmail-%{enigmail_ver}.tar.gz
-# Source1-md5:	0eba75fbcf8f0bb32d538df102fbb8e9
+# Source1-md5:	3e71f84ed2c11471282412ebe4f5eb2d
 Source2:	%{name}.png
 Source4:	%{name}.desktop
 Source5:	%{name}.sh
 Patch1:		%{name}-enigmail-shared.patch
-Patch2:		%{name}-system-xulrunner.patch
 Patch3:		%{name}-fonts.patch
 Patch4:		%{name}-install.patch
 Patch5:		%{name}-hunspell.patch
 Patch6:		%{name}-prefs.patch
 Patch7:		%{name}-system-mozldap.patch
 Patch8:		%{name}-makefile.patch
-# this is only workaround, check if it is fixed with newer firefox
-Patch9:		%{name}-bug-722975-workaround.patch
+Patch9:		%{name}-system-cairo.patch
 Patch11:	%{name}-crashreporter.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
 URL:		http://www.mozilla.org/projects/thunderbird/
 BuildRequires:	GConf2-devel >= 1.2.1
 BuildRequires:	alsa-lib-devel
@@ -74,7 +75,9 @@ BuildRequires:	libIDL-devel >= 0.8.0
 %{?with_gnomeui:BuildRequires:	libgnome-keyring-devel}
 %{?with_gnomeui:BuildRequires:	libgnomeui-devel >= 2.2.0}
 BuildRequires:	libiw-devel
+# requires libjpeg-turbo implementing at least libjpeg 6b API
 BuildRequires:	libjpeg-devel >= 6b
+BuildRequires:	libjpeg-turbo-devel
 BuildRequires:	libnotify-devel >= 0.4
 BuildRequires:	libpng-devel >= 1.4.1
 BuildRequires:	libstdc++-devel
@@ -94,6 +97,7 @@ BuildRequires:	yasm
 BuildRequires:	zip
 %if %{with xulrunner}
 BuildRequires:	xulrunner-devel >= %{xulrunner_ver}
+BuildRequires:	xulrunner-devel < 2:18
 %else
 Requires:	myspell-common
 Requires:	nspr >= 1:%{nspr_ver}
@@ -104,17 +108,21 @@ Requires(post):	mktemp >= 1.5-18
 %if %{with xulrunner}
 %requires_eq_to	xulrunner xulrunner-devel
 %endif
+Requires:	libjpeg-turbo
 Obsoletes:	mozilla-thunderbird-dictionary-en-US
+Conflicts:	mozilla-thunderbird-lang-resources < %{version}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		filterout_cpp		-D_FORTIFY_SOURCE=[0-9]+
 
 # don't satisfy other packages (don't use %{name} here)
 %define		_noautoprovfiles	%{_libdir}/mozilla-thunderbird/components
-# we don't want these to satisfy xulrunner-devel
-%define		_noautoprov		libmozjs.so libxpcom.so libxul.so
+%if %{without xulrunner}
+# we don't want these to satisfy packages depending on xulrunner
+%define		_noautoprov		libmozalloc.so libxpcom.so libxul.so
 # and as we don't provide them, don't require either
-%define		_noautoreq		libmozjs.so libxpcom.so libxul.so
+%define		_noautoreq		libmozalloc.so libxpcom.so libxul.so
+%endif
 
 %define		topdir		%{_builddir}/%{name}-%{version}
 %define		objdir		%{topdir}/obj-%{_target_cpu}
@@ -180,21 +188,20 @@ Główne możliwości:
 
 %prep
 %setup -q -c
-mv comm-release mozilla
+mv comm-esr17 mozilla
 cd mozilla
 %{?with_enigmail:%{__gzip} -dc %{SOURCE1} | %{__tar} xf - -C mailnews/extensions}
 %{?with_enigmail:%patch1 -p1}
-%{?with_xulrunner:%patch2 -p1}
 %patch3 -p1
 %patch4 -p1
 %patch6 -p1
 %patch7 -p1
 %patch8 -p2
-cd mozilla
 %patch9 -p1
-cd -
 %patch11 -p2
 %patch12 -p1
+%patch13 -p1
+%patch14 -p1
 
 %build
 cd mozilla
@@ -310,6 +317,7 @@ EOF
 %{__make} -j1 -f client.mk build \
 	STRIP="/bin/true" \
 	MOZ_MAKE_FLAGS="%{?_smp_mflags}" \
+	XLIBS="-lX11 -lXt" \
 	CC="%{__cc}" \
 	CXX="%{__cxx}"
 
@@ -325,6 +333,11 @@ cd mailnews/extensions/enigmail
 	STRIP="/bin/true" \
 	CC="%{__cc}" \
 	CXX="%{__cxx}"
+
+%{__make} -C %{objdir}/mailnews/extensions/enigmail xpi \
+	STRIP="/bin/true" \
+	CC="%{__cc}" \
+	CXX="%{__cxx}"
 %endif
 
 %install
@@ -342,7 +355,7 @@ cd %{objdir}
 ln -s ../xulrunner $RPM_BUILD_ROOT%{_libdir}/%{name}/xulrunner
 %endif
  
-# Enable crash reporter for Firefox application
+# Enable crash reporter for Thunderbird application
 %if %{with crashreporter}
 %{__sed} -i -e 's/\[Crash Reporter\]/[Crash Reporter]\nEnabled=1/' $RPM_BUILD_ROOT%{_libdir}/%{name}/application.ini
 
@@ -408,15 +421,14 @@ chmod a+rx $RPM_BUILD_ROOT%{_libdir}/%{name}/register
 
 %if %{with enigmail}
 ext_dir=$RPM_BUILD_ROOT%{_libdir}/%{name}/extensions/\{847b3a00-7ab1-11d4-8f02-006008948af5\}
-install -d $ext_dir/{chrome,components,defaults/preferences}
+install -d $ext_dir/{chrome,components,defaults/preferences,modules}
 cd mozilla/dist/bin
-#cp -rfLp chrome/enigmail.jar $ext_dir/chrome
-#cp -rfLp chrome/enigmime.jar $ext_dir/chrome
+cp -rfLp chrome/enigmail.jar $ext_dir/chrome
 cp -rfLp components/enig* $ext_dir/components
 cp -rfLp components/libenigmime.so $ext_dir/components
-cp -rfLp components/libipc.so $ext_dir/components
-cp -rfLp components/ipc.xpt $ext_dir/components
 cp -rfLp defaults/preferences/enigmail.js $ext_dir/defaults/preferences
+cp -rfLp modules/{commonFuncs,enigmailCommon,keyManagement,pipeConsole,subprocess}.jsm $ext_dir/modules
+cp -rfLp modules/{subprocess_worker_unix,subprocess_worker_win}.js $ext_dir/modules
 cd -
 cp -p %{topdir}/mozilla/mailnews/extensions/enigmail/package/install.rdf $ext_dir
 cp -p %{topdir}/mozilla/mailnews/extensions/enigmail/package/chrome.manifest $ext_dir/chrome.manifest
@@ -468,6 +480,7 @@ exit 0
 %attr(755,root,root) %{_libdir}/%{name}/thunderbird
 %attr(755,root,root) %{_libdir}/%{name}/register
 %if %{without xulrunner}
+%{_libdir}/%{name}/dependentlibs.list
 %{_libdir}/%{name}/platform.ini
 %{_libdir}/%{name}/greprefs.js
 %attr(755,root,root) %{_libdir}/%{name}/components/*.so
@@ -501,6 +514,15 @@ exit 0
 %{_datadir}/%{name}/extensions
 %{_datadir}/%{name}/isp
 %{_datadir}/%{name}/modules
+%if %{with enigmail}
+%exclude %{_datadir}/%{name}/modules/commonFuncs.jsm
+%exclude %{_datadir}/%{name}/modules/enigmailCommon.jsm
+%exclude %{_datadir}/%{name}/modules/keyManagement.jsm
+%exclude %{_datadir}/%{name}/modules/pipeConsole.jsm
+%exclude %{_datadir}/%{name}/modules/subprocess.jsm
+%exclude %{_datadir}/%{name}/modules/subprocess_worker_unix.js
+%exclude %{_datadir}/%{name}/modules/subprocess_worker_win.js
+%endif
 %{_datadir}/%{name}/searchplugins
 %if %{without xulrunner}
 %{_datadir}/%{name}/res
@@ -551,4 +573,7 @@ exit 0
 %attr(755,root,root) %{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/*.so
 %{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/*.xpt
 %{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/*.js
+%dir %{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules
+%{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/*.jsm
+%{_libdir}/%{name}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/*.js
 %endif
diff --git a/mozilla-thunderbird-bug-722975-workaround.patch b/mozilla-thunderbird-bug-722975-workaround.patch
deleted file mode 100644
index 1e91631..0000000
--- a/mozilla-thunderbird-bug-722975-workaround.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://bugzilla.mozilla.org/show_bug.cgi?id=722975
-https://bug722975.bugzilla.mozilla.org/attachment.cgi?id=595000
-
---- firefox/gfx/thebes/gfxPlatform.cpp~	2012-02-07 11:59:39.717184907 +0000
-+++ firefox/gfx/thebes/gfxPlatform.cpp	2012-02-07 13:06:01.084668445 +0000
-@@ -446,6 +446,7 @@
-   static_cast<SourceSurface*>(srcBuffer)->Release();
- }
- 
-+#ifdef MOZ_TREE_CAIRO
- void SourceSnapshotDetached(cairo_surface_t *nullSurf)
- {
-   gfxImageSurface* origSurf =
-@@ -453,6 +454,7 @@
- 
-   origSurf->SetData(&kSourceSurface, NULL, NULL);
- }
-+#endif
- 
- RefPtr<SourceSurface>
- gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface)
-@@ -522,6 +524,7 @@
-                                                      imgSurface->Stride(),
-                                                      format);
- 
-+    #ifdef MOZ_TREE_CAIRO
-     cairo_surface_t *nullSurf =
- 	cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA);
-     cairo_surface_set_user_data(nullSurf,
-@@ -530,6 +533,7 @@
- 				NULL);
-     cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached);
-     cairo_surface_destroy(nullSurf);
-+    #endif
-   }
- 
-   srcBuffer->AddRef();
diff --git a/mozilla-thunderbird-crashreporter.patch b/mozilla-thunderbird-crashreporter.patch
index dfe3a17..df44594 100644
--- a/mozilla-thunderbird-crashreporter.patch
+++ b/mozilla-thunderbird-crashreporter.patch
@@ -8,14 +8,3 @@
  
  #include <algorithm>
  #include <cassert>
---- icedove-3.1.2/mozilla/mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in~	2010-08-17 18:24:25.755776132 +0300
-+++ icedove-3.1.2/mozilla/mozilla/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in	2010-08-17 19:16:17.356296784 +0300
-@@ -62,8 +62,4 @@
- CPP_PROG_LINK = 1
- FORCE_USE_PIC = 1
- 
--#XXX: bug 554854 causes us to be unable to run binaries on the build slaves
--# due to them having an older libstdc++
--HOST_LDFLAGS += -static
--
- include $(topsrcdir)/config/rules.mk
diff --git a/mozilla-thunderbird-enigmail-shared.patch b/mozilla-thunderbird-enigmail-shared.patch
index a3233ec..b8ed1ec 100644
--- a/mozilla-thunderbird-enigmail-shared.patch
+++ b/mozilla-thunderbird-enigmail-shared.patch
@@ -1,13 +1,3 @@
---- mozilla/mailnews/extensions/enigmail/ipc/src/Makefile.in.orig	2005-06-14 09:19:56.000000000 +0200
-+++ mozilla/mailnews/extensions/enigmail/ipc/src/Makefile.in	2005-06-14 09:20:09.000000000 +0200
-@@ -74,6 +74,7 @@ EXPORTS		=		    \
- 
- LOCAL_INCLUDES	= \
- 		-I$(srcdir)/../build \
-+		-fPIC \
- 		$(NULL)
- 
- CPPSRCS		=		    \
 --- mozilla/mailnews/extensions/enigmail/build/Makefile.in.orig	2005-10-04 20:12:03.000000000 +0200
 +++ mozilla/mailnews/extensions/enigmail/build/Makefile.in	2005-10-04 20:12:35.000000000 +0200
 @@ -51,7 +51,7 @@
diff --git a/mozilla-thunderbird-gyp-slashism.patch b/mozilla-thunderbird-gyp-slashism.patch
new file mode 100644
index 0000000..ccab456
--- /dev/null
+++ b/mozilla-thunderbird-gyp-slashism.patch
@@ -0,0 +1,66 @@
+--- 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)
+@@ -376,7 +382,7 @@
+     WriteMakefile(output_file, data, build_file, depth, top,
+                   # we set srcdir up one directory, since the subdir
+                   # doesn't actually exist in the source directory
+-                  swapslashes(os.path.join(top, self.relative_srcdir, os.path.split(rel_path)[0])),
++                  swapslashes(append_relative(append_relative(top, self.relative_srcdir), os.path.split(rel_path)[0])),
+                   self.relative_srcdir)
+     return True
+ 
+@@ -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-install.patch b/mozilla-thunderbird-install.patch
index 320efbd..e819c9c 100644
--- a/mozilla-thunderbird-install.patch
+++ b/mozilla-thunderbird-install.patch
@@ -1,21 +1,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 @@
+@@ -708,41 +708,41 @@
  endif
  
  stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_REMOVALS_GEN) elfhack
--	@rm -rf $(DIST)/$(MOZ_PKG_DIR) $(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar $(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST)
-+	@rm -rf $(DESTDIR)/$(MOZ_PKG_DIR) $(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar $(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST)
+-	@rm -rf $(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar $(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST)
++	@rm -rf $(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar $(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST)
+ ifndef MOZ_FAST_PACKAGE
+-	@rm -rf $(DIST)/$(MOZ_PKG_DIR)
++	@rm -rf $(DESTDIR)/$(MOZ_PKG_DIR)
+ endif
  # NOTE: this must be a tar now that dist links into the tree so that we
  # do not strip the binaries actually in the tree.
  	@echo "Creating package directory..."
--	@mkdir $(DIST)/$(MOZ_PKG_DIR)
-+	@mkdir $(DESTDIR)/$(MOZ_PKG_DIR)
+-	if ! test -d $(DIST)/$(MOZ_PKG_DIR) ; then \
+-		mkdir $(DIST)/$(MOZ_PKG_DIR); \
++	if ! test -d $(DESTDIR)/$(MOZ_PKG_DIR) ; then \
++		mkdir $(DESTDIR)/$(MOZ_PKG_DIR); \
+	fi
  ifndef UNIVERSAL_BINARY
  # If UNIVERSAL_BINARY, the package will be made from an already-prepared
  # STAGEPATH
  ifdef MOZ_PKG_MANIFEST
+ ifndef MOZ_FAST_PACKAGE
  	$(RM) -rf $(DIST)/xpt $(DIST)/manifests
+ endif
  	$(call PACKAGER_COPY, "$(call core_abspath,$(DIST))",\
 -	  "$(call core_abspath,$(DIST)/$(MOZ_PKG_DIR))", \
 +	  "$(call core_abspath,$(DESTDIR)/$(MOZ_PKG_DIR))", \
@@ -34,10 +43,16 @@
 -	  $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/localized.manifest \
 +	  $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/localized.manifest \
  	  $(patsubst %,$(DIST)/manifests/%/chrome,$(MOZ_LOCALIZED_PKG_LIST))
+ ifdef MOZ_WEBAPP_RUNTIME
+-	mv $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome/$(AB_CD).manifest $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome/localized.manifest
+-	sed 's/$(AB_CD)/localized/' $(DIST)/bin/webapprt/chrome.manifest > $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome.manifest
++	mv $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome/$(AB_CD).manifest $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome/localized.manifest
++	sed 's/$(AB_CD)/localized/' $(DESTDIR)/bin/webapprt/chrome.manifest > $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/webapprt/chrome.manifest
+ endif
 -	printf "manifest components/interfaces.manifest\nmanifest components/components.manifest\nmanifest chrome/nonlocalized.manifest\nmanifest chrome/localized.manifest\n" > $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome.manifest
 +	printf "manifest components/interfaces.manifest\nmanifest components/components.manifest\nmanifest chrome/nonlocalized.manifest\nmanifest chrome/localized.manifest\n" > $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome.manifest
  else # !MOZ_PKG_MANIFEST
- ifeq ($(MOZ_PKG_FORMAT),DMG)
+ ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
  ifndef STAGE_SDK
 @@ -741,10 +741,10 @@
  	@$(NSINSTALL) -D $(DIST)/xpt
@@ -52,6 +67,15 @@
  	@echo "Linking XPT files..."
  	@rm -rf $(DIST)/xpt
  	@$(NSINSTALL) -D $(DIST)/xpt
+@@ -801,7 +801,7 @@
+ endif # DMG
+ endif # MOZ_PKG_MANIFEST
+ endif # UNIVERSAL_BINARY
+-	$(OPTIMIZE_JARS_CMD) --optimize $(JARLOG_DIR_AB_CD) $(DIST)/bin/chrome $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/chrome
++	$(OPTIMIZE_JARS_CMD) --optimize $(JARLOG_DIR_AB_CD) $(DIST)/bin/chrome $(DESTDIR)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/chrome
+ ifndef PKG_SKIP_STRIP
+   ifeq ($(OS_ARCH),OS2)
+ 		@echo "Stripping package directory..."
 @@ -830,7 +830,7 @@
  	cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) && $(PACK_OMNIJAR)
  endif
@@ -64,11 +88,11 @@
 --- comm-1.9.1/mail/app/Makefile.in.orig	2009-12-18 14:49:43.990647725 +0100
 +++ comm-1.9.1/mail/app/Makefile.in	2009-12-18 14:49:53.830739781 +0100
 @@ -48,7 +48,7 @@
- GRE_BUILDID = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build BuildID)
- 
  DEFINES += \
--  -DTHUNDERBIRD_ICO=\"$(DIST)/branding/thunderbird.ico\" \
-+  -DTHUNDERBIRD_ICO=\"$(DIST)/branding/$(MOZ_APP_NAME).ico\" -DAB_CD=$(AB_CD) \
    -DAB_CD=$(AB_CD) \
+   -DAPP_VERSION="$(MOZ_APP_VERSION)" \
+-  -DTHUNDERBIRD_ICO=\"$(DIST)/branding/thunderbird.ico\" \
++  -DTHUNDERBIRD_ICO=\"$(DIST)/branding/$(MOZ_APP_NAME).ico\" \
    -DGRE_MILESTONE=$(GRE_MILESTONE) \
    -DGRE_BUILDID=$(GRE_BUILDID) \
+    $(NULL)
diff --git a/mozilla-thunderbird-makefile.patch b/mozilla-thunderbird-makefile.patch
index ef2f849..19143c4 100644
--- a/mozilla-thunderbird-makefile.patch
+++ b/mozilla-thunderbird-makefile.patch
@@ -1,18 +1,11 @@
 --- icedove-6.0/mozilla/Makefile.in~	2011-08-12 16:52:03.000000000 +0300
 +++ icedove-6.0/mozilla/Makefile.in	2011-08-26 13:00:59.373870016 +0300
-@@ -58,8 +58,6 @@
+@@ -26,21 +26,7 @@
  
  include $(topsrcdir)/config/config.mk
  
 -default alldep all:: $(topsrcdir)/configure config.status
 -
- ifndef INCLUDED_BRIDGE_MK
- include $(topsrcdir)/bridge/bridge.mk
- endif
-@@ -67,19 +65,7 @@
- # workaround Bug 599809 by making these makefiles be generated here
- SUBMAKEFILES += $(addsuffix /Makefile, $(APP_LIBXUL_DIRS) $(APP_LIBXUL_STATICDIRS))
- 
 -$(topsrcdir)/configure: $(topsrcdir)/configure.in
 -	@echo "STOP!  configure.in has changed, and your configure is out of date."
 -	@echo "Please rerun autoconf and configure."
diff --git a/mozilla-thunderbird-system-cairo.patch b/mozilla-thunderbird-system-cairo.patch
new file mode 100644
index 0000000..d395822
--- /dev/null
+++ b/mozilla-thunderbird-system-cairo.patch
@@ -0,0 +1,44 @@
+diff -r baec1efc87a4 gfx/thebes/gfxPlatform.cpp
+--- a/mozilla/gfx/thebes/gfxPlatform.cpp	Sun Mar 04 00:38:41 2012 +0000
++++ b/mozilla/gfx/thebes/gfxPlatform.cpp	Wed May 16 17:37:10 2012 +0200
+@@ -448,21 +448,19 @@ gfxPlatform::CreateDrawTargetForSurface(
+ 
+ cairo_user_data_key_t kSourceSurface;
+ 
+ void SourceBufferDestroy(void *srcBuffer)
+ {
+   static_cast<SourceSurface*>(srcBuffer)->Release();
+ }
+ 
+-void SourceSnapshotDetached(cairo_surface_t *nullSurf)
++void SourceSnapshotDetached(void *nullSurf)
+ {
+-  gfxImageSurface* origSurf =
+-    static_cast<gfxImageSurface*>(cairo_surface_get_user_data(nullSurf, &kSourceSurface));
+-
++  gfxImageSurface *origSurf = static_cast<gfxImageSurface*>(nullSurf);
+   origSurf->SetData(&kSourceSurface, NULL, NULL);
+ }
+ 
+ RefPtr<SourceSurface>
+ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface)
+ {
+   void *userData = aSurface->GetData(&kSourceSurface);
+ 
+@@ -524,14 +522,8 @@ gfxPlatform::GetSourceSurfaceForSurface(
+ 
+     }
+ 
+-    cairo_surface_t *nullSurf =
+-	cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA);
+-    cairo_surface_set_user_data(nullSurf,
+-                                &kSourceSurface,
+-                                imgSurface,
+-                                NULL);
+-    cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached);
+-    cairo_surface_destroy(nullSurf);
++    cairo_surface_set_mime_data(imgSurface->CairoSurface(), "mozilla/magic",
++		(const unsigned char *) "data", 4, SourceSnapshotDetached, imgSurface.get());
+   }
+ 
+   srcBuffer->AddRef();
diff --git a/mozilla-thunderbird-system-virtualenv.patch b/mozilla-thunderbird-system-virtualenv.patch
new file mode 100644
index 0000000..a69cd1a
--- /dev/null
+++ b/mozilla-thunderbird-system-virtualenv.patch
@@ -0,0 +1,24 @@
+Restore --system-site-packages when system virtualenv gets 1.7 upgrade
+
+--- xulrunner-15.0/mozilla/configure.in~	2012-08-29 11:06:34.517985819 +0200
++++ xulrunner-15.0/mozilla/configure.in	2012-08-29 11:23:47.234616054 +0200
+@@ -9069,7 +9069,7 @@
+ AC_MSG_RESULT([Creating Python virtualenv])
+ rm -rf _virtualenv
+ mkdir -p _virtualenv
+-MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= $PYTHON $_topsrcdir/python/virtualenv/virtualenv.py --system-site-packages ./_virtualenv
++MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= /usr/bin/virtualenv ./_virtualenv
+ case "$host_os" in
+ mingw*)
+     PYTHON=`pwd`/_virtualenv/Scripts/python.exe
+--- xulrunner-15.0/mozilla/configure~	2012-08-29 11:25:28.121279162 +0200
++++ xulrunner-15.0/mozilla/configure	2012-08-29 11:27:27.981274936 +0200
+@@ -25468,7 +25468,7 @@
+ echo "$ac_t""Creating Python virtualenv" 1>&6
+ rm -rf _virtualenv
+ mkdir -p _virtualenv
+-MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= $PYTHON $_topsrcdir/python/virtualenv/virtualenv.py --system-site-packages ./_virtualenv
++MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= /usr/bin/virtualenv ./_virtualenv
+ case "$host_os" in
+ mingw*)
+     PYTHON=`pwd`/_virtualenv/Scripts/python.exe
diff --git a/mozilla-thunderbird-system-xulrunner.patch b/mozilla-thunderbird-system-xulrunner.patch
deleted file mode 100644
index 4260f50..0000000
--- a/mozilla-thunderbird-system-xulrunner.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- mozilla/mail/app/Makefile.in.orig	2012-04-28 21:31:30.000000000 +0200
-+++ mozilla/mail/app/Makefile.in	2012-05-29 20:12:43.887999371 +0200
-@@ -44,6 +44,8 @@
- 
- AB_CD = $(MOZ_UI_LOCALE) 
- 
-+DIST_FILES = application.ini
-+
- GRE_MILESTONE = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build Milestone)
- GRE_BUILDID = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build BuildID)
- 
-@@ -79,6 +81,7 @@
-     $(srcdir)/profile/channel-prefs.js \
-     $(NULL)
- 
-+ifndef LIBXUL_SDK
- ifneq (,$(filter OS2 Darwin WINNT,$(OS_ARCH)))
- PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
- else
-@@ -88,8 +91,6 @@
- 
- CPPSRCS = nsMailApp.cpp
- 
--DIST_FILES = application.ini
--
- LOCAL_INCLUDES += \
-   -I$(MOZILLA_SRCDIR)/toolkit/xre \
-   -I$(MOZILLA_SRCDIR)/xpcom/base \
-@@ -116,6 +117,8 @@
- LIBS += $(MOZ_DBUS_GLIB_LIBS)
- endif
- 
-+endif # LIBXUL_SDK
-+
- ifndef MOZ_WINCONSOLE
- ifdef MOZ_DEBUG
- MOZ_WINCONSOLE = 1
-@@ -233,6 +236,11 @@
- 	$(SYSINSTALL) $(IFLAGS1) $(DIST)/branding/default* $(DESTDIR)$(mozappdir)/chrome/icons/default
- endif
- 
-+ifdef LIBXUL_SDK
-+libs::
-+	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)))
- ifneq (,$(filter-out Darwin,$(OS_ARCH)))
- $(MOZ_APP_NAME):: $(MOZILLA_DIR)/build/unix/mozilla.in $(GLOBAL_DEPS) $(DEPTH)/config/autoconf.mk
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mozilla-thunderbird.git/commitdiff/d44f54198b3135656804f2e124b231012988c346

More information about the pld-cvs-commit mailing list