Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1215d3edbdf3186aeea208dd10a3c1f780761c49
commit 1215d3edbdf3186aeea208dd10a3c1f780761c49 Author: jercel <[email protected]> Date: Sun Apr 29 12:09:04 2012 +0200 firefox-12.0-1-x86_64 * Version bump diff --git a/source/xapps/firefox/FrugalBuild b/source/xapps/firefox/FrugalBuild index 3d978e6..f0fa5ad 100644 --- a/source/xapps/firefox/FrugalBuild +++ b/source/xapps/firefox/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Miklos Vajna <[email protected]> pkgname=firefox -pkgver=11.0 +pkgver=12.0 pathver=${pkgver} # version used in path names pkgrel=1 pkgdesc="Mozilla Firefox web browser" @@ -19,8 +19,10 @@ source=(ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/fi ffremote \ $pkgname.desktop \ prefs.js \ - asciidel.patch) -signatures=("${source[0]}.asc" '' '' '' '') + asciidel.patch \ + gcc47.patch \ + gfx.patch) +signatures=("${source[0]}.asc" '' '' '' '' '' '') options=('scriptlet') Fconfopts="${Fconfopts[@]} --with-default-mozilla-five-home=/usr \ @@ -66,7 +68,7 @@ Fconfopts="${Fconfopts[@]} --with-default-mozilla-five-home=/usr \ build() { unset MAKEFLAGS Fcd mozilla-release - + # Autodetect language. sed -i '/intl.locale.matchOS/s/false/true/' modules/libpref/src/init/all.js || Fdie diff --git a/source/xapps/firefox/gcc47.patch b/source/xapps/firefox/gcc47.patch new file mode 100644 index 0000000..195c9df --- /dev/null +++ b/source/xapps/firefox/gcc47.patch @@ -0,0 +1,67 @@ +diff --git a/ipc/chromium/src/base/file_util_linux.cc b/ipc/chromium/src/base/file_util_linux.cc +--- a/ipc/chromium/src/base/file_util_linux.cc ++++ b/ipc/chromium/src/base/file_util_linux.cc +@@ -1,15 +1,18 @@ + // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. + + #include "base/file_util.h" + + #include <fcntl.h> ++#if defined(ANDROID) || defined(OS_POSIX) ++#include <unistd.h> ++#endif + + #include <string> + #include <vector> + + #include "base/eintr_wrapper.h" + #include "base/file_path.h" + #include "base/string_util.h" + +diff --git a/ipc/chromium/src/base/message_pump_libevent.cc b/ipc/chromium/src/base/message_pump_libevent.cc +--- a/ipc/chromium/src/base/message_pump_libevent.cc ++++ b/ipc/chromium/src/base/message_pump_libevent.cc +@@ -1,16 +1,19 @@ + // Copyright (c) 2008 The Chromium Authors. All rights reserved. + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. + + #include "base/message_pump_libevent.h" + + #include <errno.h> + #include <fcntl.h> ++#if defined(ANDROID) || defined(OS_POSIX) ++#include <unistd.h> ++#endif + + #include "eintr_wrapper.h" + #include "base/logging.h" + #include "base/scoped_nsautorelease_pool.h" + #include "base/scoped_ptr.h" + #include "base/time.h" + #include "third_party/libevent/event.h" + +diff --git a/ipc/chromium/src/base/time_posix.cc b/ipc/chromium/src/base/time_posix.cc +--- a/ipc/chromium/src/base/time_posix.cc ++++ b/ipc/chromium/src/base/time_posix.cc +@@ -8,16 +8,19 @@ + #include <mach/mach_time.h> + #endif + #include <sys/time.h> + #ifdef ANDROID + #include <time64.h> + #else + #include <time.h> + #endif ++#if defined(ANDROID) || defined(OS_POSIX) ++#include <unistd.h> ++#endif + + #include <limits> + + #include "base/basictypes.h" + #include "base/logging.h" + + namespace base { diff --git a/source/xapps/firefox/gfx.patch b/source/xapps/firefox/gfx.patch new file mode 100644 index 0000000..e9823af --- /dev/null +++ b/source/xapps/firefox/gfx.patch @@ -0,0 +1,34 @@ +--- mozilla-release/gfx/thebes/gfxPlatform.cpp~ 2012-02-07 11:59:39.717184907 +0000 ++++ mozilla-release/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(); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
