[packages/xulrunner] - up to 24.0 - system-cairo patch applied upstream

[baggins]

commit 2786ef7f97725c9b9130fae9e7a701e168d1a985
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Oct 1 18:02:35 2013 +0200

    - up to 24.0
    - system-cairo patch applied upstream

 system-cairo.patch | 34 ----------------------------------
 xulrunner.spec     |  6 ++----
 2 files changed, 2 insertions(+), 38 deletions(-)
---
diff --git a/xulrunner.spec b/xulrunner.spec
index 5229a3c..68db466 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -16,7 +16,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:	23.0.1
+Version:	24.0
 Release:	1
 Epoch:		2
 License:	MPL v1.1 or GPL v2+ or LGPL v2.1+
@@ -24,12 +24,11 @@ Group:		X11/Applications
 # 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:	0fa25582fb5e0fba37c9f1add8370af2
+# Source0-md5:	06a4c0fe8d3a979aea2fce8d0fdbf328
 Patch1:		%{name}-rpath.patch
 Patch2:		%{name}-paths.patch
 Patch3:		%{name}-pc.patch
 Patch4:		%{name}-prefs.patch
-Patch5:		system-cairo.patch
 Patch6:		idl-parser.patch
 # Edit patch below and restore --system-site-packages when system virtualenv gets 1.7 upgrade
 Patch7:		system-virtualenv.patch
@@ -184,7 +183,6 @@ echo 'LOCAL_INCLUDES += $(MOZ_HUNSPELL_CFLAGS)' >> extensions/spellcheck/src/Mak
 %patch2 -p2
 %patch3 -p1
 %patch4 -p1
-%patch5 -p2
 %patch6 -p2
 %patch7 -p2
 %patch8 -p2
diff --git a/system-cairo.patch b/system-cairo.patch
deleted file mode 100644
index 072173f..0000000
--- a/system-cairo.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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,11 +448,9 @@ gfxPlatform::CreateDrawTargetForSurface(
-   delete static_cast<SourceSurfaceUserData*>(srcSurfUD);
- }
- 
--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);
- }
- 
-@@ -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();
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xulrunner.git/commitdiff/2786ef7f97725c9b9130fae9e7a701e168d1a985