Update to 43.0b1

4 files changed, 22 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d29993d2e635..9a0a7be443f8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = firefox-beta
 	pkgdesc = Standalone web browser from mozilla.org - Beta (build from source)
-	pkgver = 42.0rc2
+	pkgver = 43.0b1
 	pkgrel = 1
 	url = https://www.mozilla.org/firefox/
 	install = firefox-beta.install
@@ -19,9 +19,9 @@ pkgbase = firefox-beta
 	makedepends = gconf
 	makedepends = xorg-server-xvfb
 	makedepends = libpulse
-	makedepends = gst-plugins-base-libs
 	makedepends = inetutils
 	depends = gtk2
+	depends = gtk3
 	depends = mozilla-common
 	depends = libxt
 	depends = startup-notification
@@ -38,25 +38,22 @@ pkgbase = firefox-beta
 	depends = sqlite
 	depends = ttf-font
 	optdepends = networkmanager: Location detection via available WiFi networks
-	optdepends = gst-plugins-good: h.264 video
-	optdepends = gst-libav: h.264 video
+	optdepends = ffmpeg: additional video and audio decoders
 	optdepends = upower: Battery API
-	provides = firefox=42.0rc2
+	provides = firefox=43.0b1
 	conflicts = firefox-beta-bin
 	options = !emptydirs
 	options = !makeflags
-	source = https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/42.0-candidates/build2/source/firefox-42.0.source.tar.xz
+	source = https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/43.0b1/source/firefox-43.0b1.source.tar.xz
 	source = mozconfig
 	source = firefox-beta.desktop
 	source = firefox-install-dir.patch
-	source = freetype2-261.patch
 	source = vendor.js
 	source = firefox-fixed-loading-icon.png
-	sha256sums = 994a346699298277b64ec0cab72660b8d3e5b879a2ac79207576f7e6c33da3ae
-	sha256sums = ecd3a5982e52f789ca15216fcbda79bf6b47db8be9e9ab495665c934b40641ff
+	sha256sums = 71cdfe194cadf1de67da88d8e30e9b6f105546d95b2ba95131db30995ffc3c4c
+	sha256sums = d67d089fdfab328cea42833903ece1db23571dd62eea1a8549aa240292c63999
 	sha256sums = cf19552d5bbd14c2747aad9b92a2897b88701e9b42990cf28cf40c2d50a41909
 	sha256sums = d86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd
-	sha256sums = c65d7c784d382d24f47b49a86e8ca02158de04b8bfd14b097cf4839bd641fdd5
 	sha256sums = 4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4
 	sha256sums = 68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213
 
diff --git a/PKGBUILD b/PKGBUILD
index b445372c37ce..fd82f11cb0f4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,40 +1,34 @@
 # Maintainer: argymeg <argymeg at gmail dot com>
 
 pkgname=firefox-beta
-pkgver=42.0rc2
-_realpkgver=42.0
-_rcbuild=2
+pkgver=43.0b1
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org - Beta (build from source)"
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL' 'LGPL')
 url="https://www.mozilla.org/firefox/"
-depends=('gtk2' 'mozilla-common' 'libxt' 'startup-notification' 'mime-types'
+depends=('gtk2' 'gtk3' 'mozilla-common' 'libxt' 'startup-notification' 'mime-types'
          'dbus-glib' 'alsa-lib' 'desktop-file-utils' 'hicolor-icon-theme'
          'libvpx' 'icu' 'libevent' 'nss' 'hunspell' 'sqlite' 'ttf-font')
 makedepends=('unzip' 'zip' 'diffutils' 'python2' 'yasm' 'mesa' 'imake' 'gconf'
-             'xorg-server-xvfb' 'libpulse' 'gst-plugins-base-libs'
-             'inetutils')
+             'xorg-server-xvfb' 'libpulse' 'inetutils')
 optdepends=('networkmanager: Location detection via available WiFi networks'
-            'gst-plugins-good: h.264 video'
-            'gst-libav: h.264 video'
+            'ffmpeg: additional video and audio decoders'
             'upower: Battery API')
 provides=("firefox=$pkgver")
 conflicts=("firefox-beta-bin")            
 install=firefox-beta.install
 options=('!emptydirs' '!makeflags')
-source=(https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/$_realpkgver-candidates/build$_rcbuild/source/firefox-$_realpkgver.source.tar.xz
+source=(https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz
         mozconfig
         firefox-beta.desktop
         firefox-install-dir.patch
-        freetype2-261.patch
         vendor.js
         firefox-fixed-loading-icon.png)
-sha256sums=('994a346699298277b64ec0cab72660b8d3e5b879a2ac79207576f7e6c33da3ae'
-            'ecd3a5982e52f789ca15216fcbda79bf6b47db8be9e9ab495665c934b40641ff'
+sha256sums=('71cdfe194cadf1de67da88d8e30e9b6f105546d95b2ba95131db30995ffc3c4c'
+            'd67d089fdfab328cea42833903ece1db23571dd62eea1a8549aa240292c63999'
             'cf19552d5bbd14c2747aad9b92a2897b88701e9b42990cf28cf40c2d50a41909'
             'd86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd'
-            'c65d7c784d382d24f47b49a86e8ca02158de04b8bfd14b097cf4839bd641fdd5'
             '4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4'
             '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213')
 validpgpkeys=('2B90598A745E992F315E22C58AB132963A06537A')
@@ -55,11 +49,10 @@ _mozilla_api_key=16674381-f021-49de-8622-3021c5942aff
 
 
 prepare() {
-  cd firefox-$_realpkgver
+  cd firefox-$pkgver
 
   cp ../mozconfig .mozconfig
   patch -Np1 -i ../firefox-install-dir.patch
-  patch -Np0 --no-backup-if-mismatch -i ../freetype2-261.patch
   
   echo -n "$_google_api_key" >google-api-key
   echo "ac_add_options --with-google-api-keyfile=\"$PWD/google-api-key\"" >>.mozconfig
@@ -86,7 +79,7 @@ prepare() {
 }
 
 build() {
-  cd firefox-$_realpkgver
+  cd firefox-$pkgver
 
   export PATH="$srcdir/path:$PATH"
   export PYTHON="/usr/bin/python2"
@@ -97,7 +90,7 @@ build() {
 }
 
 package() {
-  cd firefox-$_realpkgver
+  cd firefox-$pkgver
   make -f client.mk DESTDIR="$pkgdir" INSTALL_SDK= install
   mkdir "$pkgdir"/opt/firefox-beta
   mv "$pkgdir"/opt/firefox/* "$pkgdir"/opt/firefox-beta/
diff --git a/freetype2-261.patch b/freetype2-261.patch
deleted file mode 100644
index 62dadf0c6939..000000000000
--- a/freetype2-261.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -c config/system-headers.FIX_SYSTEM_HEADERS config/system-headers
-*** config/system-headers.FIX_SYSTEM_HEADERS	Thu Oct  8 18:29:42 2015
---- config/system-headers	Thu Oct  8 18:29:42 2015
-***************
-*** 455,460 ****
---- 455,461 ----
-  frame/req.h
-  freetype/freetype.h
-  freetype/ftcache.h
-+ freetype/ftfntfmt.h
-  freetype/ftglyph.h
-  freetype/ftsynth.h
-  freetype/ftoutln.h 
diff --git a/mozconfig b/mozconfig
index 87e1c1df574a..786c2105ad16 100644
--- a/mozconfig
+++ b/mozconfig
@@ -7,7 +7,7 @@ ac_add_options --enable-pie
 ac_add_options --enable-official-branding
 
 # System libraries
-#ac_add_options --with-system-nspr
+ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-zlib
@@ -20,12 +20,15 @@ ac_add_options --enable-system-hunspell
 ac_add_options --enable-system-sqlite
 ac_add_options --enable-system-ffi
 #ac_add_options --enable-system-cairo
+ac_add_options --enable-default-toolkit=cairo-gtk3 
 ac_add_options --enable-system-pixman
 
+
 # Features
 ac_add_options --enable-startup-notification
 ac_add_options --enable-pulseaudio
-ac_add_options --enable-gstreamer=1.0
+#ac_add_options --enable-gstreamer=1.0
+ac_add_options --disable-gstreamer
 
 ac_add_options --enable-crashreporter
 ac_add_options --disable-telemetry-reporting