From c5082f81691af38da6c84ecbeb9068d5729c99b1 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Sun, 30 Aug 2015 02:32:44 +0200 Subject: [PATCH 1/1] firefox: updated to 40.0.3 --- firefox/.footprint | 14 ++++++ firefox/.md5sum | 3 +- .../0001-Fix-build-with-USE_SKIA_GPU.patch | 50 ------------------- firefox/Pkgfile | 7 ++- 4 files changed, 18 insertions(+), 56 deletions(-) delete mode 100644 firefox/0001-Fix-build-with-USE_SKIA_GPU.patch diff --git a/firefox/.footprint b/firefox/.footprint index 7c55b86..e8452b9 100644 --- a/firefox/.footprint +++ b/firefox/.footprint @@ -319,6 +319,20 @@ drwxr-xr-x root/root usr/include/firefox/angle/KHR/ -rwxr-xr-x root/root usr/include/firefox/angle/KHR/khrplatform.h -rw-r--r-- root/root usr/include/firefox/angle/ShaderLang.h -rw-r--r-- root/root usr/include/firefox/angle/ShaderVars.h +drwxr-xr-x root/root usr/include/firefox/cairo/ +-rw-r--r-- root/root usr/include/firefox/cairo/cairo-deprecated.h +-rw-r--r-- root/root usr/include/firefox/cairo/cairo-features.h +-rw-r--r-- root/root usr/include/firefox/cairo/cairo-ft.h +-rw-r--r-- root/root usr/include/firefox/cairo/cairo-pdf.h +-rw-r--r-- root/root usr/include/firefox/cairo/cairo-platform.h +-rw-r--r-- root/root usr/include/firefox/cairo/cairo-ps.h +-rw-r--r-- root/root usr/include/firefox/cairo/cairo-rename.h +-rw-r--r-- root/root usr/include/firefox/cairo/cairo-tee.h +-rw-r--r-- root/root usr/include/firefox/cairo/cairo-version.h +-rw-r--r-- root/root usr/include/firefox/cairo/cairo-xlib-xrender.h +-rw-r--r-- root/root usr/include/firefox/cairo/cairo-xlib.h +-rw-r--r-- root/root usr/include/firefox/cairo/cairo.h +-rw-r--r-- root/root usr/include/firefox/cairo/pixman-rename.h -rw-r--r-- root/root usr/include/firefox/chromium_types.h drwxr-xr-x root/root usr/include/firefox/cubeb/ -rw-r--r-- root/root usr/include/firefox/cubeb/cubeb-stdint.h diff --git a/firefox/.md5sum b/firefox/.md5sum index 8a216ba..c4a5581 100644 --- a/firefox/.md5sum +++ b/firefox/.md5sum @@ -1,4 +1,3 @@ -e5eec0b630885ba0d6b2ddf7bf8cddac 0001-Fix-build-with-USE_SKIA_GPU.patch -62b9e6a4a46874a0be523fe41d3176e2 firefox-40.0.source.tar.bz2 +26a64a80cbd5b77d3b0d9734bff5bbad firefox-40.0.3.source.tar.bz2 aaa49c9be863428d12cb31fedf2e795c firefox-install-dir.patch cf6971669f70b440cb6ff8df8b2722ae firefox.desktop diff --git a/firefox/0001-Fix-build-with-USE_SKIA_GPU.patch b/firefox/0001-Fix-build-with-USE_SKIA_GPU.patch deleted file mode 100644 index e5cc5f2..0000000 --- a/firefox/0001-Fix-build-with-USE_SKIA_GPU.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 1601a9912c33035adf4b23aaff3b8030142c7e93 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= -Date: Sat, 22 Nov 2014 02:14:42 +0100 -Subject: [PATCH] Fix build with !USE_SKIA_GPU - - gfx/2d/SourceSurfaceSkia.cpp | 2 ++ - gfx/2d/SourceSurfaceSkia.h | 3 ++- - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/gfx/2d/SourceSurfaceSkia.cpp b/gfx/2d/SourceSurfaceSkia.cpp -index 4b95bc2..29ee658 100644 ---- a/gfx/2d/SourceSurfaceSkia.cpp -+++ b/gfx/2d/SourceSurfaceSkia.cpp -@@ -91,6 +91,7 @@ SourceSurfaceSkia::InitFromData(unsigned char* aData, - return true; - } - -+#ifdef USE_SKIA_GPU - bool - SourceSurfaceSkia::InitFromTexture(DrawTargetSkia* aOwner, - unsigned int aTexture, -@@ -116,6 +117,7 @@ SourceSurfaceSkia::InitFromTexture(DrawTargetSkia* aOwner, - mDrawTarget = aOwner; - return true; - } -+#endif - - unsigned char* - SourceSurfaceSkia::GetData() -diff --git a/gfx/2d/SourceSurfaceSkia.h b/gfx/2d/SourceSurfaceSkia.h -index de57602..d572560 100644 ---- a/gfx/2d/SourceSurfaceSkia.h -+++ b/gfx/2d/SourceSurfaceSkia.h -@@ -41,6 +41,7 @@ public: - SurfaceFormat aFormat, - DrawTargetSkia* aOwner); - -+#ifdef USE_SKIA_GPU - /** - * NOTE: While wrapping a Texture for SkiaGL, the texture *must* be created - * with the same GLcontext of DrawTargetSkia -@@ -49,7 +50,7 @@ public: - unsigned int aTexture, - const IntSize &aSize, - SurfaceFormat aFormat); -- -+#endif - virtual unsigned char *GetData(); - - virtual int32_t Stride() { return mStride; } diff --git a/firefox/Pkgfile b/firefox/Pkgfile index b656353..d1e6410 100644 --- a/firefox/Pkgfile +++ b/firefox/Pkgfile @@ -5,16 +5,15 @@ # Depends on: nss, libidl, gtk, python, alsa-lib, xorg-libxt, yasm, mesa3d, gst-plugins-base name=firefox -version=40.0 +version=40.0.3 release=1 source=(http://ftp.mozilla.org/pub/firefox/releases/$version/source/firefox-$version.source.tar.bz2 - firefox-install-dir.patch 0001-Fix-build-with-USE_SKIA_GPU.patch firefox.desktop) + firefox-install-dir.patch firefox.desktop) build() { cd mozilla-release patch -p1 -i $SRC/firefox-install-dir.patch - patch -p1 -i $SRC/0001-Fix-build-with-USE_SKIA_GPU.patch cat <<- EOF > .mozconfig mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/firefox-shared @@ -29,7 +28,7 @@ build() { ac_add_options --enable-system-ffi ac_add_options --enable-system-pixman ac_add_options --enable-system-sqlite - ac_add_options --enable-system-cairo + #ac_add_options --enable-system-cairo ac_add_options --with-pthreads ac_add_options --enable-optimize="$CFLAGS" ac_add_options --enable-official-branding -- 2.26.2