diff options
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/firefox/APKBUILD | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/testing/firefox/APKBUILD b/testing/firefox/APKBUILD index f5d9fadee9..d4b9d9ca1b 100644 --- a/testing/firefox/APKBUILD +++ b/testing/firefox/APKBUILD @@ -4,7 +4,7 @@ pkgname=firefox pkgver=57.0 _pkgver=$pkgver _xulver=$pkgver -pkgrel=0 +pkgrel=1 pkgdesc="Firefox web browser" url="http://www.firefox.com" # limited by rust and cargo @@ -18,6 +18,7 @@ makedepends=" bsd-compat-headers bzip2-dev cargo + clang-dev dbus-glib-dev gconf-dev gtk+2.0-dev @@ -35,6 +36,7 @@ makedepends=" libvpx-dev libxt-dev libxcomposite-dev + llvm5-dev mesa-dev nspr-dev nss-dev @@ -81,13 +83,15 @@ prepare() { local i mkdir -p "$builddir" cd "$builddir"/.. + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done cp "$srcdir"/stab.h toolkit/crashreporter/google-breakpad/src/ + # https://bugzilla.mozilla.org/show_bug.cgi?id=1341234 + echo "ac_add_options BINDGEN_CFLAGS='-I/usr/include/nspr -I/usr/include/pixman-1'" >>.mozconfig } build() { @@ -114,7 +118,6 @@ build() { --disable-profiling \ --disable-pulseaudio \ --disable-strip \ - --disable-stylo \ --disable-tests \ --disable-updater \ \ @@ -139,11 +142,12 @@ build() { --with-system-pixman \ --with-system-png \ --with-system-zlib \ - || return 1 - make || return 1 + --with-clang-path=/usr/bin/clang \ + --with-libclang-path=/usr/lib + make # paxmark outside fakeroot - paxmark -msp dist/bin/xpcshell || return 1 + paxmark -msp dist/bin/xpcshell } @@ -152,12 +156,11 @@ package() { # only used for startupcache creation. local paxflags="-msp" - paxmark "$paxflags" dist/bin/xpcshell || return 1 + paxmark "$paxflags" dist/bin/xpcshell make install \ DESTDIR="$pkgdir" \ - MOZ_MAKE_FLAGS="$MAKEOPTS" \ - || return 1 + MOZ_MAKE_FLAGS="$MAKEOPTS" install -m755 -d ${pkgdir}/usr/share/applications install -m755 -d ${pkgdir}/usr/share/pixmaps @@ -166,11 +169,11 @@ package() { for png in ../browser/branding/official/default*.png; do local i=${_png%.png} i=${i##*/default} - install -D -m644 "$png" "$pkgdir"/usr/share/icons/hicolor/${i}x${i}/apps/firefox.png || return 1 + install -D -m644 "$png" "$pkgdir"/usr/share/icons/hicolor/${i}x${i}/apps/firefox.png done install -m644 "$builddir"/../browser/branding/official/default48.png \ - ${pkgdir}/usr/share/pixmaps/firefox.png || return 1 + ${pkgdir}/usr/share/pixmaps/firefox.png install -m644 ${srcdir}/firefox.desktop ${pkgdir}/usr/share/applications/firefox.desktop install -m644 ${srcdir}/firefox-safe.desktop ${pkgdir}/usr/share/applications/firefox-safe.desktop @@ -178,15 +181,15 @@ package() { local paxflags="-mp" [ "$CARCH" = "x86" ] && paxflags="-msp" - paxmark "$paxflags" "$pkgdir"/$_mozappdir/firefox || return 1 - paxmark "$paxflags" "$pkgdir"/$_mozappdir/plugin-container || return 1 + paxmark "$paxflags" "$pkgdir"/$_mozappdir/firefox + paxmark "$paxflags" "$pkgdir"/$_mozappdir/plugin-container # xulrunner stub launcher has changed to using a symlink overlay... # go figure ln -sf /usr/lib/xulrunner-${_xulver} ${pkgdir}/$_mozappdir/xulrunner # launcher as symlink is broken from firefox-7.0 - rm "$pkgdir"/usr/bin/firefox || return 1 + rm "$pkgdir"/usr/bin/firefox libgl=$(scanelf -qF '#F%S' /usr/lib/libGL.so) cat > "$pkgdir"/usr/bin/firefox << __EOF__ #!/bin/sh |