summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFredrik Rinnestam <fredrik@crux.nu>2015-08-18 19:12:30 +0200
committerFredrik Rinnestam <fredrik@crux.nu>2015-08-18 19:12:47 +0200
commita150c70045e25647d61b5da1beff1f00e5c2a340 (patch)
tree78c0097c5a3a0f72d2d000dca743bdfd6b8e3b13
parent8e2ab306139ff02f7ac26bd8e1f163ed914f4459 (diff)
downloadopt-a150c70045e25647d61b5da1beff1f00e5c2a340.tar.gz
opt-a150c70045e25647d61b5da1beff1f00e5c2a340.tar.xz
firefox: use bundled cairo. Seems to prevent crashes
-rw-r--r--firefox/.footprint14
-rw-r--r--firefox/Pkgfile4
2 files changed, 16 insertions, 2 deletions
diff --git a/firefox/.footprint b/firefox/.footprint
index 142b4ce36..f564d90c1 100644
--- a/firefox/.footprint
+++ b/firefox/.footprint
@@ -327,6 +327,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/Pkgfile b/firefox/Pkgfile
index 63438b642..ec753061a 100644
--- a/firefox/Pkgfile
+++ b/firefox/Pkgfile
@@ -5,7 +5,7 @@
name=firefox
version=40.0
-release=1
+release=2
source=(http://ftp.mozilla.org/pub/firefox/releases/$version/source/firefox-$version.source.tar.bz2
firefox-install-dir.patch firefox.desktop)
@@ -27,7 +27,7 @@ cat <<- EOF > .mozconfig
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

Generated by cgit