upload

2 files changed, 186 insertions, 90 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1842ef923a76..e1e458e92316 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,9 @@
 pkgbase = firefox-beta
-	pkgdesc = Standalone web browser from mozilla.org - Beta [testing]
-	pkgver = 53.0RC3
+	pkgdesc = Standalone web browser from mozilla.org, with telemetry, webrtc and signing disabled
+	pkgver = 57.0.14
 	pkgrel = 1
 	url = https://www.mozilla.org/firefox/
+	arch = i686
 	arch = x86_64
 	license = MPL
 	license = GPL
@@ -15,11 +16,14 @@ pkgbase = firefox-beta
 	makedepends = mesa
 	makedepends = imake
 	makedepends = gconf
-	makedepends = libpulse
 	makedepends = inetutils
 	makedepends = xorg-server-xvfb
 	makedepends = autoconf2.13
-	makedepends = cargo
+	makedepends = rust
+	makedepends = mercurial
+	makedepends = clang
+	makedepends = llvm
+	makedepends = jack
 	depends = gtk3
 	depends = gtk2
 	depends = mozilla-common
@@ -27,32 +31,69 @@ pkgbase = firefox-beta
 	depends = startup-notification
 	depends = mime-types
 	depends = dbus-glib
-	depends = alsa-lib
 	depends = ffmpeg
-	depends = libvpx
-	depends = libevent
+	depends = nss
 	depends = hunspell
 	depends = sqlite
 	depends = ttf-font
-	depends = icu
-	depends = nss>=3.29.5
+	depends = libpulse
 	optdepends = networkmanager: Location detection via available WiFi networks
 	optdepends = libnotify: Notification integration
+	optdepends = pulseaudio: Audio support
 	optdepends = speech-dispatcher: Text-to-Speech
-	conflicts = firefox-beta-bin
 	options = !emptydirs
 	options = !makeflags
 	options = !strip
-	source = http://ftp.mozilla.org/pub/firefox/candidates/53.0-candidates/build3/source/firefox-53.0.source.tar.xz
-	source = firefox-beta.desktop
-	source = firefox-symbolic.svg
-	source = firefox-install-dir.patch
-	source = fix-wifi-scanner.diff
-	sha256sums = 757a24781799c6a8d70bc9e423fb09c1e37500440f2918b08ca0a0427215315a
+	source = https://archive.mozilla.org/pub/firefox/releases/57.0b14/source/firefox-57.0b14.source.tar.xz
+	source = https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/firefox-beta.desktop
+	source = https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/firefox-symbolic.svg
+	source = https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/firefox-install-dir.patch
+	source = https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/1000_gentoo_install_dir.patch
+	source = https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/1001_add_gentoo_preferences.patch
+	source = https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/1002_drop_build_id.patch
+	source = https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/1003_gentoo_specific_pgo.patch
+	source = https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/1004_fix_hardened_pie_detection.patch
+	source = https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/1005_fix_fortify_sources.patch
+	source = https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/2001_system_harfbuzz.patch
+	source = https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/2002_system_graphite2.patch
+	source = https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/2003_musl_fix_gettid_inclusion.patch
+	source = https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/2004_nICEr-implicit-decls.patch
+	source = https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/6001_add_missing_header_for_basename.patch
+	source = https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/6002_add_alternate_name_for_private_siginfo_struct_member.patch
+	source = https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/6003_fix_syscall_wrappers_on_musl.patch
+	source = https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/6004_musl_drop_alloc_hooks.patch
+	source = https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/6005_musl_memory_report.patch
+	source = https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/6006_musl_pthread_setname.patch
+	source = https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/6007_musl_fix_tools.patch
+	source = https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/firefox-52-disable-data-sharing-infobar.patch
+	source = https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/firefox-52-disable-location.services.mozilla.com.patch
+	source = https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/firefox-52-disable-telemetry.patch
+	source = https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/firefox-install-dir.patch
+	sha256sums = 1a94235f4e9783ea0528361d6fc601f8cb3a448eb69bcd0f521aed192e90dd10
 	sha256sums = d6b4c91a7fe77f9a335b44b943e120ce44511e46bbb16ae305cc82b4c3db66cd
 	sha256sums = a2474b32b9b2d7e0fb53a4c89715507ad1c194bef77713d798fa39d507def9e9
 	sha256sums = d86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd
-	sha256sums = 9765bca5d63fb5525bbd0520b7ab1d27cabaed697e2fc7791400abc3fa4f13b8
+	sha256sums = f337793c7ba07d2e2d4df9a8adf8e47da3ed61f2ef77330c673a521361614b44
+	sha256sums = 3a3ebfc60dc7f307faad86bbd4b19ddf3831c79e5ac48a6e844ee4f11700c493
+	sha256sums = 9595a3be842a1bb40076d70ffec2b09dc8b9d9318b7cbf226229dda6f3aad26d
+	sha256sums = 765d9670345a02cadd56b7f6e9c931961ec79632187ab88a304cd6313c00deab
+	sha256sums = f112c7b500c281d429669f92b39efa9990bdee2b178b9474150adf0c0d403652
+	sha256sums = 34cf4e33dc1ff6bd4416ec91ea27cdd8b4149be37c97c1c38910193a38abd232
+	sha256sums = 9fb4323d9afc43486ba26d6b0233583c9a8735f18f60c368125385be8cd22bd9
+	sha256sums = 9c24e722d560ad62ee6672577742674d1479f955bb2ae5b7ef5b91eff0dde408
+	sha256sums = 33ed936b143342969d2cf86d7724fe86954724ad6a65ce6a3fc6df662e7df865
+	sha256sums = 10956f70de73d726ee8e6e71ace291cf842f78b3b91faa3f8868ac36c11c7387
+	sha256sums = 6f51f713abe4f6c5955b38d10d4ba266a4cee538719e0b7681fecec56b916d39
+	sha256sums = 0c8a66e4a787edf48d4c4b88cafa3e284dea6f9f523b5a370ad3a52fdf39a797
+	sha256sums = 45d5f114fe589fc789dc7c981cfe5aea29a90fd60aa00b4a59a356440343c793
+	sha256sums = 878f1f071f8cd1259bd00674bfa02df49a7eb1a84da94ed7919cc900a7b3999f
+	sha256sums = b74b1a880065e4b6598206265fca5376165190291ddf2df51671eed7aaadfb19
+	sha256sums = 9d918abce2abaa8633a56b5509f088fb0524c5b0134a062c6f00175f6f23329e
+	sha256sums = 2b4a1780670ceb6e2022153f3c35f82e4c40d19ac67dbeaf47f53bd5be6fedbb
+	sha256sums = bdad68eafe110b9f94a0e025635e32a6ab53e2f9adcd594c8dd2e3225f6453ab
+	sha256sums = 8d9afa1f940a9dac689ead40a57990d1491f34a1787b2222f8f5b5e485d54103
+	sha256sums = 24019d3d7e6b169087d4515db9d3a179239d1e4fe726f0906f6f26877c726040
+	sha256sums = d86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd
 
 pkgname = firefox-beta
 
diff --git a/PKGBUILD b/PKGBUILD
index a1b35b1be32d..251d2647ba91 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,49 +1,104 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
+# Contributor: Jakub Schmidtke <sjakub@gmail.com>
+
 pkgname=firefox-beta
-_pkgver=53.0
-pkgver=${_pkgver}RC3
+name=firefox-beta
+pkgver=57.0.14
 pkgrel=1
-pkgdesc="Standalone web browser from mozilla.org - Beta [testing]"
-arch=('x86_64')
-license=('MPL' 'GPL' 'LGPL')
+pkgdesc="Standalone web browser from mozilla.org, with telemetry, webrtc and signing disabled"
+arch=(i686 x86_64)
+license=(MPL GPL LGPL)
 url="https://www.mozilla.org/firefox/"
-depends=('gtk3' 'gtk2' 'mozilla-common' 'libxt' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'ffmpeg' 'libvpx' 'libevent' 'hunspell' 'sqlite' 'ttf-font' 'icu' 'nss>=3.29.5')
-makedepends=('unzip' 'zip' 'diffutils' 'python2' 'yasm' 'mesa' 'imake' 'gconf' 'libpulse' 'inetutils' 'xorg-server-xvfb' 'autoconf2.13' 'cargo')
-optdepends=('networkmanager: Location detection via available WiFi networks' 'libnotify: Notification integration' 'speech-dispatcher: Text-to-Speech')
-conflicts=("firefox-beta-bin")
-options=("!emptydirs" "!makeflags" "!strip")
-source=("http://ftp.mozilla.org/pub/firefox/candidates/53.0-candidates/build3/source/firefox-53.0.source.tar.xz"
-#source=("https://ftp.mozilla.org/pub/firefox/releases/${pkgver}/source/firefox-${pkgver}.source.tar.xz"
-'firefox-beta.desktop' 'firefox-symbolic.svg' 'firefox-install-dir.patch' 'fix-wifi-scanner.diff')
-sha256sums=('757a24781799c6a8d70bc9e423fb09c1e37500440f2918b08ca0a0427215315a'
+depends=(gtk3 gtk2 mozilla-common libxt startup-notification mime-types dbus-glib ffmpeg
+         nss hunspell sqlite ttf-font libpulse)
+makedepends=(unzip zip diffutils python2 yasm mesa imake gconf inetutils xorg-server-xvfb
+             autoconf2.13 rust mercurial clang llvm jack)
+optdepends=('networkmanager: Location detection via available WiFi networks'
+            'libnotify: Notification integration'
+            'pulseaudio: Audio support'
+            'speech-dispatcher: Text-to-Speech')
+options=(!emptydirs !makeflags !strip)
+source=("https://archive.mozilla.org/pub/firefox/releases/57.0b14/source/firefox-57.0b14.source.tar.xz"
+        https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/$name.desktop 
+https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/firefox-symbolic.svg 
+https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/firefox-install-dir.patch
+https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/1000_gentoo_install_dir.patch
+https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/1001_add_gentoo_preferences.patch
+https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/1002_drop_build_id.patch
+https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/1003_gentoo_specific_pgo.patch
+https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/1004_fix_hardened_pie_detection.patch
+https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/1005_fix_fortify_sources.patch
+https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/2001_system_harfbuzz.patch
+https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/2002_system_graphite2.patch
+https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/2003_musl_fix_gettid_inclusion.patch
+https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/2004_nICEr-implicit-decls.patch
+https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/6001_add_missing_header_for_basename.patch
+https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/6002_add_alternate_name_for_private_siginfo_struct_member.patch
+https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/6003_fix_syscall_wrappers_on_musl.patch
+https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/6004_musl_drop_alloc_hooks.patch
+https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/6005_musl_memory_report.patch
+https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/6006_musl_pthread_setname.patch
+https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/6007_musl_fix_tools.patch
+https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/firefox-52-disable-data-sharing-infobar.patch
+https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/firefox-52-disable-location.services.mozilla.com.patch
+https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/firefox-52-disable-telemetry.patch
+https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/firefox-install-dir.patch
+)
+sha256sums=('1a94235f4e9783ea0528361d6fc601f8cb3a448eb69bcd0f521aed192e90dd10'
             'd6b4c91a7fe77f9a335b44b943e120ce44511e46bbb16ae305cc82b4c3db66cd'
             'a2474b32b9b2d7e0fb53a4c89715507ad1c194bef77713d798fa39d507def9e9'
             'd86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd'
-            '9765bca5d63fb5525bbd0520b7ab1d27cabaed697e2fc7791400abc3fa4f13b8')
+            'f337793c7ba07d2e2d4df9a8adf8e47da3ed61f2ef77330c673a521361614b44'
+            '3a3ebfc60dc7f307faad86bbd4b19ddf3831c79e5ac48a6e844ee4f11700c493'
+            '9595a3be842a1bb40076d70ffec2b09dc8b9d9318b7cbf226229dda6f3aad26d'
+            '765d9670345a02cadd56b7f6e9c931961ec79632187ab88a304cd6313c00deab'
+            'f112c7b500c281d429669f92b39efa9990bdee2b178b9474150adf0c0d403652'
+            '34cf4e33dc1ff6bd4416ec91ea27cdd8b4149be37c97c1c38910193a38abd232'
+            '9fb4323d9afc43486ba26d6b0233583c9a8735f18f60c368125385be8cd22bd9'
+            '9c24e722d560ad62ee6672577742674d1479f955bb2ae5b7ef5b91eff0dde408'
+            '33ed936b143342969d2cf86d7724fe86954724ad6a65ce6a3fc6df662e7df865'
+            '10956f70de73d726ee8e6e71ace291cf842f78b3b91faa3f8868ac36c11c7387'
+            '6f51f713abe4f6c5955b38d10d4ba266a4cee538719e0b7681fecec56b916d39'
+            '0c8a66e4a787edf48d4c4b88cafa3e284dea6f9f523b5a370ad3a52fdf39a797'
+            '45d5f114fe589fc789dc7c981cfe5aea29a90fd60aa00b4a59a356440343c793'
+            '878f1f071f8cd1259bd00674bfa02df49a7eb1a84da94ed7919cc900a7b3999f'
+            'b74b1a880065e4b6598206265fca5376165190291ddf2df51671eed7aaadfb19'
+            '9d918abce2abaa8633a56b5509f088fb0524c5b0134a062c6f00175f6f23329e'
+            '2b4a1780670ceb6e2022153f3c35f82e4c40d19ac67dbeaf47f53bd5be6fedbb'
+            'bdad68eafe110b9f94a0e025635e32a6ab53e2f9adcd594c8dd2e3225f6453ab'
+            '8d9afa1f940a9dac689ead40a57990d1491f34a1787b2222f8f5b5e485d54103'
+            '24019d3d7e6b169087d4515db9d3a179239d1e4fe726f0906f6f26877c726040'
+            'd86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd')
+
 
 # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
 # Note: These are for Arch Linux use ONLY. For your own distribution, please
 # get your own set of keys. Feel free to contact foutrelis@archlinux.org for
 # more information.
-_google_api_key=AIzaSyDwr302FpOSkGRpLlUpPThNTDPbXcIn_FM
+
 
 # Mozilla API keys (see https://location.services.mozilla.com/api)
 # Note: These are for Arch Linux use ONLY. For your own distribution, please
 # get your own set of keys. Feel free to contact heftig@archlinux.org for
 # more information.
-_mozilla_api_key=16674381-f021-49de-8622-3021c5942aff
+
 
 prepare() {
   mkdir path
   ln -s /usr/bin/python2 path/python
 
-  cd firefox-${_pkgver}
+  cd firefox-57.0b14
   patch -Np1 -i ../firefox-install-dir.patch
 
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1314968
-  patch -Np1 -i ../fix-wifi-scanner.diff
 
-  echo -n "$_google_api_key" >google-api-key
-  echo -n "$_mozilla_api_key" >mozilla-api-key
+
+patch -Np1 -i ../firefox-52-disable-data-sharing-infobar.patch
+patch -Np1 -i ../firefox-52-disable-location.services.mozilla.com.patch
+patch -Np1 -i ../firefox-52-disable-telemetry.patch
+
+
 
   cat >.mozconfig <<END
 ac_add_options --enable-application=browser
@@ -52,73 +107,61 @@ ac_add_options --prefix=/usr
 ac_add_options --enable-release
 ac_add_options --enable-gold
 ac_add_options --enable-pie
-ac_add_options --enable-rust
+ac_add_options --enable-optimize="-O2"
+ac_add_options --disable-stylo
 
 # Branding
 ac_add_options --enable-official-branding
 ac_add_options --enable-update-channel=release
 ac_add_options --with-distribution-id=org.archlinux
 export MOZILLA_OFFICIAL=1
-export MOZ_TELEMETRY_REPORTING=1
-export MOZ_SOURCE_REPO=${_repo@Q}
+export MOZ_TELEMETRY_REPORTING=0
 export MOZ_ADDON_SIGNING=1
-export MOZ_REQUIRE_SIGNING=1
+export MOZ_REQUIRE_SIGNING=0
 
 # Keys
-ac_add_options --with-google-api-keyfile=${PWD@Q}/google-api-key
-ac_add_options --with-mozilla-api-keyfile=${PWD@Q}/mozilla-api-key
-
 # System libraries
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-icu
-ac_add_options --with-system-jpeg
 ac_add_options --with-system-zlib
 ac_add_options --with-system-bz2
-ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
 ac_add_options --enable-system-hunspell
 ac_add_options --enable-system-sqlite
 ac_add_options --enable-system-ffi
-ac_add_options --enable-system-pixman
+ac_add_options --disable-gamepad
+ac_add_options --disable-necko-wifi 
+ac_add_options --disable-webspeech
+ac_add_options --disable-webrtc
 
 # Features
+ac_add_options --enable-alsa
+ac_add_options --enable-jack
 ac_add_options --enable-startup-notification
 ac_add_options --enable-crashreporter
-ac_add_options --enable-alsa
 ac_add_options --disable-updater
-
-STRIP_FLAGS="--strip-debug"
 END
 }
 
 build() {
-  cd firefox-${_pkgver}
+  cd firefox-57.0b14
 
   # _FORTIFY_SOURCE causes configure failures
   CPPFLAGS+=" -O2"
 
-  # Hardening
-  LDFLAGS+=" -Wl,-z,now"
-
   export PATH="$srcdir/path:$PATH"
+  export MOZ_SOURCE_REPO="$_repo"
 
   # Do PGO
   #xvfb-run -a -n 95 -s "-extension GLX -screen 0 1280x1024x24" \
-  #  make -f client.mk build MOZ_PGO=1
-  make -f client.mk build
+  #  MOZ_PGO=1 ./mach build
+  ./mach build
+  ./mach buildsymbols
 }
 
 package() {
-  cd firefox-${_pkgver}
-
-  make -f client.mk DESTDIR="$pkgdir" INSTALL_SDK= install
-  install -d -m755 "$pkgdir"/opt/firefox-beta
-  mv "$pkgdir"/opt/firefox/* "$pkgdir"/opt/firefox-beta/
-  rm "$pkgdir"/opt/firefox/
+  cd firefox-57.0b14
+  DESTDIR="$pkgdir" ./mach install
+  find . -name '*crashreporter-symbols-full.zip' -exec cp -fvt "$startdir" {} +
 
-
-  _vendorjs="$pkgdir/opt/firefox-beta/browser/defaults/preferences/vendor.js"
+  _vendorjs="$pkgdir/usr/lib/$name/browser/defaults/preferences/vendor.js"
   install -Dm644 /dev/stdin "$_vendorjs" <<END
 // Use LANG environment variable to choose locale
 pref("intl.locale.matchOS", true);
@@ -134,7 +177,7 @@ pref("extensions.shownSelectionUI", true);
 pref("browser.tabs.remote.autostart", true);
 END
 
-  _distini="$pkgdir/opt/firefox-beta/distribution/distribution.ini"
+  _distini="$pkgdir/usr/lib/$name/distribution/distribution.ini"
   install -Dm644 /dev/stdin "$_distini" <<END
 [Global]
 id=archlinux
@@ -143,41 +186,53 @@ about=Mozilla Firefox for Arch Linux
 
 [Preferences]
 app.distributor=archlinux
-app.distributor.channel=$pkgname
+app.distributor.channel=$name
 app.partner.archlinux=archlinux
 END
 
   for i in 16 22 24 32 48 256; do
     install -Dm644 browser/branding/official/default$i.png \
-    "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/firefox.png"
+      "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$name.png"
   done
   install -Dm644 browser/branding/official/content/icon64.png \
-  "$pkgdir/usr/share/icons/hicolor/64x64/apps/firefox.png"
+    "$pkgdir/usr/share/icons/hicolor/64x64/apps/$name.png"
   install -Dm644 browser/branding/official/mozicon128.png \
-  "$pkgdir/usr/share/icons/hicolor/128x128/apps/firefox.png"
+    "$pkgdir/usr/share/icons/hicolor/128x128/apps/$name.png"
   install -Dm644 browser/branding/official/content/about-logo.png \
-  "$pkgdir/usr/share/icons/hicolor/192x192/apps/firefox.png"
+    "$pkgdir/usr/share/icons/hicolor/192x192/apps/$name.png"
   install -Dm644 browser/branding/official/content/about-logo@2x.png \
-  "$pkgdir/usr/share/icons/hicolor/384x384/apps/firefox.png"
+    "$pkgdir/usr/share/icons/hicolor/384x384/apps/$name.png"
   install -Dm644 ../firefox-symbolic.svg \
-  "$pkgdir/usr/share/icons/hicolor/symbolic/apps/firefox-symbolic.svg"
+    "$pkgdir/usr/share/icons/hicolor/symbolic/apps/$name-symbolic.svg"
 
-  install -Dm644 ../firefox-beta.desktop \
-  "$pkgdir/usr/share/applications/firefox-beta.desktop"
+  install -Dm644 ../$name.desktop \
+    "$pkgdir/usr/share/applications/$name.desktop"
 
   # Use system-provided dictionaries
-  rm -r "$pkgdir"/opt/firefox-beta/dictionaries
-  ln -Ts /usr/share/hunspell "$pkgdir/opt/firefox-beta/dictionaries"
-  ln -Ts /usr/share/hyphen "$pkgdir/opt/firefox-beta/hyphenation"
+  #rm -r "$pkgdir"/usr/lib/$name/dictionaries
+  ln -Ts /usr/share/hunspell "$pkgdir/usr/lib/$name/dictionaries"
+  ln -Ts /usr/share/hyphen "$pkgdir/usr/lib/$name/hyphenation"
 
   # Install a wrapper to avoid confusion about binary path
-  install -Dm755 /dev/stdin "$pkgdir/opt/firefox-beta" <<END
-#!/bin/sh
-exec /opt/firefox-beta/firefox "\$@"
-END
 
   # Replace duplicate binary with wrapper
   # https://bugzilla.mozilla.org/show_bug.cgi?id=658850
-  ln -srf "$pkgdir/opt/firefox-beta" \
-  "$pkgdir/opt/firefox-beta/firefox-beta-bin"
-}
+
+
+  # Use system certificates
+  ln -srf "$pkgdir/usr/lib/libnssckbi.so" \
+    "$pkgdir/usr/lib/$name/libnssckbi.so"
+
+
+
+msg2 'renaming'
+
+  ln -s "/usr/lib/firefox-beta/firefox/firefox-bin"  "$pkgdir/usr/bin/firefox-beta"
+
+
+
+
+mv $pkgdir/usr/lib/firefox/ $pkgdir/usr/lib/firefox-beta/
+rm "$pkgdir/usr/lib/firefox-beta/firefox/firefox"
+rm "$pkgdir/usr/bin/firefox"
+}
\ No newline at end of file