packages: mozilla-thunderbird/mozilla-thunderbird-system-xulrunner.patch, m...

qboosh qboosh at pld-linux.org
Wed May 30 16:50:54 CEST 2012 

Author: qboosh                       Date: Wed May 30 14:50:54 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 12.0.1

---- Files affected:
packages/mozilla-thunderbird:
   mozilla-thunderbird-system-xulrunner.patch (1.2 -> 1.3) , mozilla-thunderbird.spec (1.136 -> 1.137) , mozilla-thunderbird-bug-722975-workaround.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/mozilla-thunderbird/mozilla-thunderbird-system-xulrunner.patch
diff -u packages/mozilla-thunderbird/mozilla-thunderbird-system-xulrunner.patch:1.2 packages/mozilla-thunderbird/mozilla-thunderbird-system-xulrunner.patch:1.3
--- packages/mozilla-thunderbird/mozilla-thunderbird-system-xulrunner.patch:1.2	Sun Mar 25 20:02:22 2012
+++ packages/mozilla-thunderbird/mozilla-thunderbird-system-xulrunner.patch	Wed May 30 16:50:49 2012
@@ -1,6 +1,6 @@
---- 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 @@
+--- 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) 
  
@@ -8,12 +8,13 @@
 +
  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 WINCE WINNT,$(OS_ARCH)))
+ ifneq (,$(filter OS2 Darwin WINNT,$(OS_ARCH)))
  PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
  else
 @@ -88,8 +91,6 @@

================================================================
Index: packages/mozilla-thunderbird/mozilla-thunderbird.spec
diff -u packages/mozilla-thunderbird/mozilla-thunderbird.spec:1.136 packages/mozilla-thunderbird/mozilla-thunderbird.spec:1.137
--- packages/mozilla-thunderbird/mozilla-thunderbird.spec:1.136	Mon Mar 26 19:39:49 2012
+++ packages/mozilla-thunderbird/mozilla-thunderbird.spec	Wed May 30 16:50:49 2012
@@ -22,10 +22,12 @@
 %undefine	crashreporter
 %endif
 
-%define		enigmail_ver	1.4
+%define		enigmail_ver	1.4.1
 %define		nspr_ver	4.9
 %define		nss_ver		3.13.3
 
+%define		xulrunner_ver	2:12.0
+
 %if %{without xulrunner}
 # The actual sqlite version (see RHBZ#480989):
 %define		sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo ERROR)
@@ -34,14 +36,14 @@
 Summary:	Thunderbird Community Edition - email client
 Summary(pl.UTF-8):	Thunderbird Community Edition - klient poczty
 Name:		mozilla-thunderbird
-Version:	11.0
+Version:	12.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:	1d7127a3282e62d95eb9b59d47291b70
+# Source0-md5:	64cacde4cb2b1e8736f1c3a0ea6a02db
 Source1:	http://www.mozilla-enigmail.org/download/source/enigmail-%{enigmail_ver}.tar.gz
-# Source1-md5:	5cf3d9720ed1cda1b22eabe5457772c2
+# Source1-md5:	0eba75fbcf8f0bb32d538df102fbb8e9
 Source2:	%{name}.png
 Source4:	%{name}.desktop
 Source5:	%{name}.sh
@@ -53,10 +55,12 @@
 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
 Patch11:	%{name}-crashreporter.patch
 Patch12:	%{name}-no-subshell.patch
 URL:		http://www.mozilla.org/projects/thunderbird/
-%{?with_gnomevfs:BuildRequires:	GConf2-devel >= 1.2.1}
+BuildRequires:	GConf2-devel >= 1.2.1
 BuildRequires:	alsa-lib-devel
 BuildRequires:	automake
 BuildRequires:	bzip2-devel
@@ -77,7 +81,7 @@
 BuildRequires:	libstdc++-devel
 BuildRequires:	nspr-devel >= 1:%{nspr_ver}
 BuildRequires:	nss-devel >= 1:%{nss_ver}
-BuildRequires:	pango-devel >= 1:1.1.0
+BuildRequires:	pango-devel >= 1:1.14.0
 BuildRequires:	perl-base >= 1:5.6
 BuildRequires:	pkgconfig
 BuildRequires:	python >= 1:2.5
@@ -90,7 +94,7 @@
 BuildRequires:	yasm
 BuildRequires:	zip
 %if %{with xulrunner}
-BuildRequires:	xulrunner-devel >= 2:%{version}
+BuildRequires:	xulrunner-devel >= %{xulrunner_ver}
 %else
 Requires:	myspell-common
 Requires:	nspr >= 1:%{nspr_ver}
@@ -187,6 +191,9 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p2
+cd mozilla
+%patch9 -p1
+cd -
 %patch11 -p2
 %patch12 -p1
 
@@ -423,6 +430,8 @@
 %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{nspr4,plc4,plds4}.so
 # mozldap
 %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{ldap,ldif,prldap,ssldap}60.so
+# testpilot quiz
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/distribution/extensions/tbtestpilot at labs.mozilla.com.xpi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -551,6 +560,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.137  2012/05/30 14:50:49  qboosh
+- updated to 12.0.1
+
 Revision 1.136  2012/03/26 17:39:49  qboosh
 - added xulrunner symlink
 

================================================================
Index: packages/mozilla-thunderbird/mozilla-thunderbird-bug-722975-workaround.patch
diff -u /dev/null packages/mozilla-thunderbird/mozilla-thunderbird-bug-722975-workaround.patch:1.1
--- /dev/null	Wed May 30 16:50:54 2012
+++ packages/mozilla-thunderbird/mozilla-thunderbird-bug-722975-workaround.patch	Wed May 30 16:50:49 2012
@@ -0,0 +1,37 @@
+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();
================================================================

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

More information about the pld-cvs-commit mailing list