571

2 files changed, 64 insertions, 51 deletions

diff --git a/.SRCINFO b/.SRCINFO
index abbcb39f90d4..e94449a92b0d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,8 @@
-# Generated by mksrcinfo v8
-# Wed Apr 27 18:26:25 UTC 2016
 pkgbase = firefox-eme-free
-	pkgdesc = Standalone web browser from mozilla.org
-	pkgver = 46.0
+	pkgdesc = Deblobbed and EME free Firefox
+	pkgver = 57.0.1
 	pkgrel = 1
 	url = https://www.mozilla.org/firefox/
-	install = firefox.install
 	arch = i686
 	arch = x86_64
 	license = MPL
@@ -19,9 +16,14 @@ pkgbase = firefox-eme-free
 	makedepends = mesa
 	makedepends = imake
 	makedepends = gconf
-	makedepends = xorg-server-xvfb
-	makedepends = libpulse
 	makedepends = inetutils
+	makedepends = xorg-server-xvfb
+	makedepends = autoconf2.13
+	makedepends = rust
+	makedepends = mercurial
+	makedepends = clang
+	makedepends = llvm
+	makedepends = jack
 	depends = gtk3
 	depends = gtk2
 	depends = mozilla-common
@@ -29,41 +31,51 @@ pkgbase = firefox-eme-free
 	depends = startup-notification
 	depends = mime-types
 	depends = dbus-glib
-	depends = alsa-lib
 	depends = ffmpeg
-	depends = desktop-file-utils
-	depends = hicolor-icon-theme
-	depends = libvpx
-	depends = icu
-	depends = libevent
 	depends = nss
 	depends = hunspell
 	depends = sqlite
 	depends = ttf-font
+	depends = libpulse
 	optdepends = networkmanager: Location detection via available WiFi networks
-	optdepends = upower: Battery API
-	provides = firefox
-	conflicts = firefox
+	optdepends = libnotify: Notification integration
+	optdepends = pulseaudio: Audio support
+	optdepends = speech-dispatcher: Text-to-Speech
 	options = !emptydirs
 	options = !makeflags
-	source = https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/46.0/source/firefox-46.0.source.tar.xz
-	source = mozconfig
+	options = !strip
+	source = hg+https://hg.mozilla.org/mozilla-unified#tag=FIREFOX_57_0_1_RELEASE
+	source = wifi-disentangle.patch
+	source = wifi-fix-interface.patch
+	source = 0001-Bug-1384062-Make-SystemResourceMonitor.stop-more-res.patch
+	source = no-plt.diff
+	source = plugin-crash.diff
+	source = glibc-2.26-fix.diff
 	source = firefox.desktop
-	source = firefox-install-dir.patch
-	source = vendor.js
 	source = firefox-symbolic.svg
-	source = firefox-fixed-loading-icon.png
-	source = firefox-gtk3-20.patch
-	source = no-libnotify.patch
-	sha256sums = b35aa05162362d73cd308066adca207f7aa40ceae10931fa4819371df6c4f8bf
-	sha256sums = 4e79065e0fd20120eaf3de7a57a27f012db6bd69db4f976732c0f04f41a504a0
-	sha256sums = c202e5e18da1eeddd2e1d81cb3436813f11e44585ca7357c4c5f1bddd4bec826
-	sha256sums = d86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd
-	sha256sums = 4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4
+	source = firefox-install-dir.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-reader.patch
+	source = https://raw.githubusercontent.com/bn0785ac/firefox-beta/master/firefox-52-disable-sponsored-tiles.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-52-prefs.patch
+	sha256sums = SKIP
+	sha256sums = f068b84ad31556095145d8fefc012dd3d1458948533ed3fff6cbc7250b6e73ed
+	sha256sums = e98a3453d803cc7ddcb81a7dc83f883230dd8591bdf936fc5a868428979ed1f1
+	sha256sums = aba767995ffb1a55345e30aaba667f43d469e23bd9b1b68263cf71b8118acc96
+	sha256sums = ea8e1b871c0f1dd29cdea1b1a2e7f47bf4713e2ae7b947ec832dba7dfcc67daa
+	sha256sums = a7e5d2430bb562f6367deb07417dad4368317e8e8be5d1cfa842c3356de3cfc0
+	sha256sums = cd7ff441da66a287f8712e60cdc9e216c30355d521051e2eaae28a66d81915e8
+	sha256sums = ada313750e6fb14558b37c764409a17c1672a351a46c73b350aa1fe4ea9220ef
 	sha256sums = a2474b32b9b2d7e0fb53a4c89715507ad1c194bef77713d798fa39d507def9e9
-	sha256sums = 68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213
-	sha256sums = 440c3e22d98ecf8c44dcedbe90bbb302da3a059e3fc3fba205d89f0eca329cbf
-	sha256sums = e4ebdd14096d177d264a7993dbd5df46463605ff45f783732c26d30b9caa53a7
+	sha256sums = d86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd
+	sha256sums = bdad68eafe110b9f94a0e025635e32a6ab53e2f9adcd594c8dd2e3225f6453ab
+	sha256sums = 8d9afa1f940a9dac689ead40a57990d1491f34a1787b2222f8f5b5e485d54103
+	sha256sums = 7f171b7d69866ac6d8945ab0867b2646964362c791875c6428b4c2c8e3f3fb5b
+	sha256sums = a72c657784dc5804509456d9ba39ccc8d5e5998c847f49abbcfeb2a547290815
+	sha256sums = 24019d3d7e6b169087d4515db9d3a179239d1e4fe726f0906f6f26877c726040
+	sha256sums = 80d6181d11c200aca2781f69ffeafb59ea23952304d161c2812a2f5a98b273b0
 
 pkgname = firefox-eme-free
 
diff --git a/PKGBUILD b/PKGBUILD
index a38ae817c615..afea35c93b2a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,6 +4,7 @@
 # Contributor: Jakub Schmidtke <sjakub@gmail.com>
 
 pkgname=firefox-eme-free
+name=firefox
 pkgver=57.0.1
 pkgrel=1
 pkgdesc="Deblobbed and EME free Firefox"
@@ -24,7 +25,7 @@ source=("hg+$_repo#tag=FIREFOX_${pkgver//./_}_RELEASE"
         wifi-disentangle.patch wifi-fix-interface.patch
         0001-Bug-1384062-Make-SystemResourceMonitor.stop-more-res.patch
         no-plt.diff plugin-crash.diff glibc-2.26-fix.diff
-        $pkgname.desktop firefox-symbolic.svg firefox-install-dir.patch
+        $name.desktop firefox-symbolic.svg firefox-install-dir.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-reader.patch
@@ -150,7 +151,7 @@ package() {
   DESTDIR="$pkgdir" ./mach install
   find . -name '*crashreporter-symbols-full.zip' -exec cp -fvt "$startdir" {} +
 
-  _vendorjs="$pkgdir/usr/lib/$pkgname/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);
@@ -166,7 +167,7 @@ pref("extensions.shownSelectionUI", true);
 pref("browser.tabs.remote.autostart", true);
 END
 
-  _distini="$pkgdir/usr/lib/$pkgname/distribution/distribution.ini"
+  _distini="$pkgdir/usr/lib/$name/distribution/distribution.ini"
   install -Dm644 /dev/stdin "$_distini" <<END
 [Global]
 id=archlinux
@@ -175,45 +176,45 @@ 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/$pkgname.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/$pkgname.png"
+    "$pkgdir/usr/share/icons/hicolor/64x64/apps/$name.png"
   install -Dm644 browser/branding/official/mozicon128.png \
-    "$pkgdir/usr/share/icons/hicolor/128x128/apps/$pkgname.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/$pkgname.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/$pkgname.png"
+    "$pkgdir/usr/share/icons/hicolor/384x384/apps/$name.png"
   install -Dm644 ../firefox-symbolic.svg \
-    "$pkgdir/usr/share/icons/hicolor/symbolic/apps/$pkgname-symbolic.svg"
+    "$pkgdir/usr/share/icons/hicolor/symbolic/apps/$name-symbolic.svg"
 
-  install -Dm644 ../$pkgname.desktop \
-    "$pkgdir/usr/share/applications/$pkgname.desktop"
+  install -Dm644 ../$name.desktop \
+    "$pkgdir/usr/share/applications/$name.desktop"
 
   # Use system-provided dictionaries
-  rm -r "$pkgdir"/usr/lib/$pkgname/dictionaries
-  ln -Ts /usr/share/hunspell "$pkgdir/usr/lib/$pkgname/dictionaries"
-  ln -Ts /usr/share/hyphen "$pkgdir/usr/lib/$pkgname/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/usr/bin/$pkgname" <<END
+  install -Dm755 /dev/stdin "$pkgdir/usr/bin/$name" <<END
 #!/bin/sh
-exec /usr/lib/$pkgname/firefox "\$@"
+exec /usr/lib/$name/firefox "\$@"
 END
 
   # Replace duplicate binary with wrapper
   # https://bugzilla.mozilla.org/show_bug.cgi?id=658850
-  ln -srf "$pkgdir/usr/bin/$pkgname" \
-    "$pkgdir/usr/lib/$pkgname/firefox-bin"
+  ln -srf "$pkgdir/usr/bin/$name" \
+    "$pkgdir/usr/lib/$name/firefox-bin"
 
   # Use system certificates
   ln -srf "$pkgdir/usr/lib/libnssckbi.so" \
-    "$pkgdir/usr/lib/$pkgname/libnssckbi.so"
+    "$pkgdir/usr/lib/$name/libnssckbi.so"
 }