packages: xulrunner/xulrunner.spec, xulrunner/xulrunner-bug-722975-workarou...

[arekm]

Author: arekm                        Date: Sun May  6 10:26:04 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 12.0

---- Files affected:
packages/xulrunner:
   xulrunner.spec (1.225 -> 1.226) , xulrunner-bug-722975-workaround.patch (NONE -> 1.1)  (NEW), xulrunner-ppc.patch (1.2 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/xulrunner/xulrunner.spec
diff -u packages/xulrunner/xulrunner.spec:1.225 packages/xulrunner/xulrunner.spec:1.226
--- packages/xulrunner/xulrunner.spec:1.225	Sun Apr 29 22:29:19 2012
+++ packages/xulrunner/xulrunner.spec	Sun May  6 12:25:58 2012
@@ -24,7 +24,7 @@
 Summary:	XULRunner - Mozilla Runtime Environment for XUL+XPCOM applications
 Summary(pl.UTF-8):	XULRunner - środowisko uruchomieniowe Mozilli dla aplikacji XUL+XPCOM
 Name:		xulrunner
-Version:	11.0
+Version:	12.0
 Release:	1
 Epoch:		2
 License:	MPL v1.1 or GPL v2+ or LGPL v2.1+
@@ -32,14 +32,15 @@
 # Source tarball for xulrunner is in fact firefox tarball (checked on 1.9), so lets use it
 # instead of waiting for mozilla to copy file on ftp.
 Source0:	http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.bz2
-# Source0-md5:	4b07acf47857aff72776d805409cdd1b
+# Source0-md5:	80c3e5927274de7f181fb5f931ac5fd4
 Patch0:		%{name}-install.patch
 Patch1:		%{name}-rpath.patch
 Patch3:		%{name}-nss_cflags.patch
 Patch4:		%{name}-paths.patch
 Patch5:		%{name}-pc.patch
 Patch6:		%{name}-prefs.patch
-Patch8:		%{name}-ppc.patch
+# this is only workaround, check if it is fixed with newer firefox
+Patch7:		xulrunner-bug-722975-workaround.patch
 # http://pkgs.fedoraproject.org/gitweb/?p=xulrunner.git;a=tree
 Patch9:		%{name}-gtkmozembed.patch
 Patch10:	%{name}-linux3.patch
@@ -180,9 +181,6 @@
 mv -f mozilla-release mozilla
 cd mozilla
 
-# libvpx fix
-grep -q VPX_CODEC_USE_INPUT_PARTITION configure.in && sed -i 's#VPX_CODEC_USE_INPUT_PARTITION#VPX_CODEC_USE_INPUT_FRAGMENTS#' configure* || exit 1
-
 # avoid using included headers (-I. is before HUNSPELL_CFLAGS)
 %{__rm} extensions/spellcheck/hunspell/src/{*.hxx,hunspell.h}
 # hunspell needed for factory including mozHunspell.h
@@ -194,7 +192,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch8 -p1
+%patch7 -p1
 %patch9 -p2
 %patch10 -p1
 %patch11 -p2
@@ -429,6 +427,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.226  2012/05/06 10:25:58  arekm
+- up to 12.0
+
 Revision 1.225  2012/04/29 20:29:19  sls
 - added BR: unzip
 

================================================================
Index: packages/xulrunner/xulrunner-bug-722975-workaround.patch
diff -u /dev/null packages/xulrunner/xulrunner-bug-722975-workaround.patch:1.1
--- /dev/null	Sun May  6 12:26:04 2012
+++ packages/xulrunner/xulrunner-bug-722975-workaround.patch	Sun May  6 12:25:58 2012
@@ -0,0 +1,34 @@
+--- 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/xulrunner/xulrunner.spec?r1=1.225&r2=1.226