packages: icedove/icedove.spec, icedove/bug-722975-workaround.patch (NEW)=?UTF-8?Q?=20?=-...

[glen]

Author: glen                         Date: Wed May 16 19:52:34 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 12.0

---- Files affected:
packages/icedove:
   icedove.spec (1.154 -> 1.155) , bug-722975-workaround.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/icedove/icedove.spec
diff -u packages/icedove/icedove.spec:1.154 packages/icedove/icedove.spec:1.155
--- packages/icedove/icedove.spec:1.154	Mon Mar 26 21:09:10 2012
+++ packages/icedove/icedove.spec	Wed May 16 21:52:29 2012
@@ -24,8 +24,8 @@
 %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
+# convert thunderbird release number to platform version: 12.0.x -> 12.0.x
+%define		xulrunner_main	12.0
 %define		xulrunner_ver	%(v=%{version}; echo %{xulrunner_main}${v#11.0})
 
 %if %{without xulrunner}
@@ -36,12 +36,12 @@
 Summary:	Icedove - email client
 Summary(pl.UTF-8):	Icedove - klient poczty
 Name:		icedove
-Version:	11.0
-Release:	2
+Version:	12.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:	1d7127a3282e62d95eb9b59d47291b70
+# Source0-md5:	7b30b72472a65bce74ba0ae60e4d4e6c
 Source1:	http://www.mozilla-enigmail.org/download/source/enigmail-%{enigmail_ver}.tar.gz
 # Source1-md5:	5cf3d9720ed1cda1b22eabe5457772c2
 Source2:	%{name}-branding.tar.bz2
@@ -58,7 +58,8 @@
 Patch6:		%{name}-prefs.patch
 Patch7:		system-mozldap.patch
 Patch8:		%{name}-makefile.patch
-
+# this is only workaround, check if it is fixed with newer firefox
+Patch9:		bug-722975-workaround.patch
 Patch10:	%{name}-extensiondir.patch
 Patch11:	crashreporter.patch
 Patch12:	no-subshell.patch
@@ -84,7 +85,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
@@ -197,6 +198,9 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p2
+cd mozilla
+%patch9 -p1
+cd -
 %patch10 -p2
 %patch11 -p2
 %patch12 -p1
@@ -436,6 +440,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} -f $RPM_BUILD_ROOT%{_libdir}/%{name}/distribution/extensions/tbtestpilot at labs.mozilla.com.xpi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -565,6 +571,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.155  2012/05/16 19:52:29  glen
+- up to 12.0
+
 Revision 1.154  2012/03/26 19:09:10  arekm
 - release 2
 

================================================================
Index: packages/icedove/bug-722975-workaround.patch
diff -u /dev/null packages/icedove/bug-722975-workaround.patch:1.1
--- /dev/null	Wed May 16 21:52:34 2012
+++ packages/icedove/bug-722975-workaround.patch	Wed May 16 21:52:29 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/icedove/icedove.spec?r1=1.154&r2=1.155