forked from mirrors/nixpkgs
firefox: upgrade to 24.0
This commit is contained in:
parent
386257e019
commit
36b503e06a
|
@ -19,9 +19,9 @@ assert useSystemCairo -> cairo != null;
|
|||
let optional = stdenv.lib.optional;
|
||||
in rec {
|
||||
|
||||
firefoxVersion = "23.0.1";
|
||||
firefoxVersion = "24.0";
|
||||
|
||||
xulVersion = "23.0.1"; # this attribute is used by other packages
|
||||
xulVersion = "24.0"; # this attribute is used by other packages
|
||||
|
||||
|
||||
src = fetchurl {
|
||||
|
@ -31,7 +31,7 @@ in rec {
|
|||
# Fall back to this url for versions not available at releases.mozilla.org.
|
||||
"ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
|
||||
];
|
||||
sha1 = "66361fcvyl9liyh41gvgysiim90wsywk";
|
||||
sha1 = "8scch0gr59j86vp9c1v0yx6mq1pkwcvg";
|
||||
};
|
||||
|
||||
commonConfigureFlags =
|
||||
|
@ -57,6 +57,7 @@ in rec {
|
|||
"--disable-necko-wifi" # maybe we want to enable this at some point
|
||||
"--disable-installer"
|
||||
"--disable-updater"
|
||||
"--disable-gstreamer"
|
||||
] ++ optional useSystemCairo "--enable-system-cairo";
|
||||
|
||||
|
||||
|
@ -82,8 +83,6 @@ in rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
patches = optional useSystemCairo ./system-cairo.patch;
|
||||
|
||||
preConfigure =
|
||||
''
|
||||
export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}"
|
||||
|
|
|
@ -1,73 +0,0 @@
|
|||
# HG changeset patch
|
||||
# From: https://hg.mozilla.org/mozilla-central/rev/52b02042b27f
|
||||
# User Connor Behan <connor.behan@gmail.com>
|
||||
# Date 1370038985 -7200
|
||||
# Node ID 52b02042b27f75acbcb2bd4822bedb00ab680e67
|
||||
# Parent 08ed531fed70978385cf9253bbc8389b0abe76ca
|
||||
Bug 722975: Unbreak builds using --with-system-cairo. r=bas
|
||||
|
||||
diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp
|
||||
--- a/gfx/thebes/gfxPlatform.cpp
|
||||
+++ b/gfx/thebes/gfxPlatform.cpp
|
||||
@@ -548,23 +548,31 @@ struct SourceSurfaceUserData
|
||||
BackendType mBackendType;
|
||||
};
|
||||
|
||||
void SourceBufferDestroy(void *srcSurfUD)
|
||||
{
|
||||
delete static_cast<SourceSurfaceUserData*>(srcSurfUD);
|
||||
}
|
||||
|
||||
+#if MOZ_TREE_CAIRO
|
||||
void SourceSnapshotDetached(cairo_surface_t *nullSurf)
|
||||
{
|
||||
gfxImageSurface* origSurf =
|
||||
static_cast<gfxImageSurface*>(cairo_surface_get_user_data(nullSurf, &kSourceSurface));
|
||||
|
||||
origSurf->SetData(&kSourceSurface, NULL, NULL);
|
||||
}
|
||||
+#else
|
||||
+void SourceSnapshotDetached(void *nullSurf)
|
||||
+{
|
||||
+ gfxImageSurface* origSurf = static_cast<gfxImageSurface*>(nullSurf);
|
||||
+ origSurf->SetData(&kSourceSurface, NULL, NULL);
|
||||
+}
|
||||
+#endif
|
||||
|
||||
RefPtr<SourceSurface>
|
||||
gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface)
|
||||
{
|
||||
void *userData = aSurface->GetData(&kSourceSurface);
|
||||
|
||||
if (userData) {
|
||||
SourceSurfaceUserData *surf = static_cast<SourceSurfaceUserData*>(userData);
|
||||
@@ -667,24 +675,28 @@ gfxPlatform::GetSourceSurfaceForSurface(
|
||||
}
|
||||
|
||||
srcBuffer = Factory::CreateWrappingDataSourceSurface(imgSurface->Data(),
|
||||
imgSurface->Stride(),
|
||||
size, format);
|
||||
|
||||
}
|
||||
|
||||
+#if MOZ_TREE_CAIRO
|
||||
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);
|
||||
+#else
|
||||
+ cairo_surface_set_mime_data(imgSurface->CairoSurface(), "mozilla/magic", (const unsigned char*) "data", 4, SourceSnapshotDetached, imgSurface.get());
|
||||
+#endif
|
||||
}
|
||||
|
||||
SourceSurfaceUserData *srcSurfUD = new SourceSurfaceUserData;
|
||||
srcSurfUD->mBackendType = aTarget->GetType();
|
||||
srcSurfUD->mSrcSurface = srcBuffer;
|
||||
aSurface->SetData(&kSourceSurface, srcSurfUD, SourceBufferDestroy);
|
||||
|
||||
return srcBuffer;
|
||||
|
Loading…
Reference in a new issue