upkg

4 files changed, 57 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 10d5e7216ee0..e9c8116fddb1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu Dec  1 12:59:55 UTC 2016
+# Mon Dec 19 18:49:15 UTC 2016
 pkgbase = firefox-kde-opensuse
 	pkgdesc = Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE
-	pkgver = 50.0.2
+	pkgver = 50.1.0
 	pkgrel = 1
 	url = https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox
 	arch = i686
@@ -43,11 +43,11 @@ pkgbase = firefox-kde-opensuse
 	depends = gtk3
 	optdepends = networkmanager: Location detection via available WiFi networks
 	optdepends = upower: Battery API
-	provides = firefox=50.0.2
+	provides = firefox=50.1.0
 	conflicts = firefox
 	options = !emptydirs
 	options = strip
-	source = https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/50.0.2/source/firefox-50.0.2.source.tar.xz
+	source = https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/50.1.0/source/firefox-50.1.0.source.tar.xz
 	source = mozconfig
 	source = firefox.desktop
 	source = firefox-install-dir.patch
@@ -66,7 +66,9 @@ pkgbase = firefox-kde-opensuse
 	source = pgo_fix_missing_kdejs.patch
 	source = rb39193.patch
 	source = fix_mozalloc.patch
-	md5sums = 11b4f60e31007caf2a34aeed11b74b2d
+	source = fix-wifi-scanner.diff
+	source = rust-i686.patch
+	md5sums = 0f6a56cd8da8fa9deedfd61bcb43a65d
 	md5sums = 169f583544e9efaf1f80f8548b57a8cc
 	md5sums = 14e0f6237a79b85e60256f4808163160
 	md5sums = dbf14588e85812ee769bd735823a0146
@@ -85,6 +87,8 @@ pkgbase = firefox-kde-opensuse
 	md5sums = 3fa8bd22d97248de529780f5797178af
 	md5sums = 43550e772f110a338d5a42914ee2c3a6
 	md5sums = 0c1ed789c06297659137a2ed2ef769f7
+	md5sums = e2396b9918aa602427f80d48caf319b4
+	md5sums = 40b197fcf8c855b3902414f4d591b18b
 
 pkgname = firefox-kde-opensuse
 
diff --git a/PKGBUILD b/PKGBUILD
index 1e00d64cec43..9d10a428de91 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,7 +14,7 @@ _gtk3=true
 
 _pkgname=firefox
 pkgname=$_pkgname-kde-opensuse
-pkgver=50.0.2
+pkgver=50.1.0
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE"
 arch=('i686' 'x86_64')
@@ -53,6 +53,8 @@ source=(https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/
         pgo_fix_missing_kdejs.patch
         rb39193.patch
         fix_mozalloc.patch
+        fix-wifi-scanner.diff
+        rust-i686.patch
 )
 
 
@@ -113,6 +115,13 @@ prepare() {
 
   # CVE-2016-6354 (bmo#1292534)
   patch -Np1 -i "$srcdir"/mozilla-flex_buffer_overrun.patch
+
+
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=1314968
+  patch -Np1 -i "$srcdir"/fix-wifi-scanner.diff
+  
+  # Build with the rust targets we actually ship
+  patch -Np1 -i "$srcdir"/rust-i686.patch
   
   # WebRTC build tries to execute "python" and expects Python 2
   mkdir -p "$srcdir/path"
@@ -123,7 +132,8 @@ prepare() {
   # TODO: Remove this; Firefox 34 might use CSS animations for the loading icon
   # https://bugzilla.mozilla.org/show_bug.cgi?id=759252
   cp "$srcdir/firefox-fixed-loading-icon.png" \
-    browser/themes/linux/tabbrowser/loading.png
+     browser/themes/linux/tabbrowser/loading.png
+     
 }
 
 build() {
@@ -192,7 +202,7 @@ package() {
   #https://bugzilla.mozilla.org/show_bug.cgi?id=658850
   ln -sf firefox "$pkgdir/usr/lib/firefox/firefox-bin"
 }
-md5sums=('11b4f60e31007caf2a34aeed11b74b2d'
+md5sums=('0f6a56cd8da8fa9deedfd61bcb43a65d'
          '169f583544e9efaf1f80f8548b57a8cc'
          '14e0f6237a79b85e60256f4808163160'
          'dbf14588e85812ee769bd735823a0146'
@@ -210,4 +220,6 @@ md5sums=('11b4f60e31007caf2a34aeed11b74b2d'
          'fe24f5ea463013bb7f1c12d12dce41b2'
          '3fa8bd22d97248de529780f5797178af'
          '43550e772f110a338d5a42914ee2c3a6'
-         '0c1ed789c06297659137a2ed2ef769f7')
+         '0c1ed789c06297659137a2ed2ef769f7'
+         'e2396b9918aa602427f80d48caf319b4'
+         '40b197fcf8c855b3902414f4d591b18b')
diff --git a/fix-wifi-scanner.diff b/fix-wifi-scanner.diff
new file mode 100644
index 000000000000..f8fdd6c42142
--- /dev/null
+++ b/fix-wifi-scanner.diff
@@ -0,0 +1,16 @@
+ netwerk/wifi/nsWifiScannerDBus.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git c/netwerk/wifi/nsWifiScannerDBus.cpp i/netwerk/wifi/nsWifiScannerDBus.cpp
+index 182553e18fa6e104..6fa0a0b023d3e45f 100644
+--- c/netwerk/wifi/nsWifiScannerDBus.cpp
++++ i/netwerk/wifi/nsWifiScannerDBus.cpp
+@@ -62,7 +62,7 @@ nsWifiScannerDBus::SendMessage(const char* aInterface,
+       return NS_ERROR_FAILURE;
+     }
+   } else if (!strcmp(aFuncCall, "GetAll")) {
+-    const char* param = "";
++    const char* param = "org.freedesktop.NetworkManager.AccessPoint";
+     if (!dbus_message_iter_append_basic(&argsIter, DBUS_TYPE_STRING, &param)) {
+       return NS_ERROR_FAILURE;
+     }
diff --git a/rust-i686.patch b/rust-i686.patch
new file mode 100644
index 000000000000..85512e1436b8
--- /dev/null
+++ b/rust-i686.patch
@@ -0,0 +1,16 @@
+ build/moz.configure/rust.configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git c/build/moz.configure/rust.configure i/build/moz.configure/rust.configure
+index cd86b24153debb1b..44911715e25d95e3 100644
+--- c/build/moz.configure/rust.configure
++++ i/build/moz.configure/rust.configure
+@@ -81,7 +81,7 @@ def rust_target(rust_compiler, rustc, target, cross_compiling):
+             # OpenBSD
+             ('x86_64', 'OpenBSD'): 'x86_64-unknown-openbsd',
+             # Linux
+-            ('x86', 'Linux'): 'i586-unknown-linux-gnu',
++            ('x86', 'Linux'): 'i686-unknown-linux-gnu',
+             # Linux
+             ('x86_64', 'Linux'): 'x86_64-unknown-linux-gnu',
+             # OS X and iOS