Fix build

4 files changed, 20 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 913e3d4737fd..f10f69f3e5ca 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -46,12 +46,10 @@ pkgbase = thunderbird-beta
 	source = thunderbird-beta.desktop
 	source = thunderbird-install-dir.patch
 	source = no-crmf.diff
-	source = fix-wifi-scanner.diff
 	sha512sums = 384d78346413c66b02573a6138bde223b6388a306ba535eaf5498867a4dd7bb44b73dda4e7811b728202df0283813bc3365317007a170696bdba0703beb83215
 	sha512sums = e5649ddee3ca9cfdcf56652e9c8e6160d52c69d1439f9135b0c0d436ce61a25f17758afc0dd6cac3434c26234c584828eb07fdf9604797f7dd3f617ec194b79a
-	sha512sums = 8100fd3ea37d998905498d41c8504bfdd6d86766542d6b93107c92382a7525da7f75a83f8ff1e15ad95039d51da2add7e6b18af76d45516a41cdfd1e9f98f262
+	sha512sums = b10b74e073a369bf06069f21eddaa145eaa93e4b5128ff659eb186598ecce773afc1ce5a4b2208a7c2bb54ee118827db28171875dfdb91fb31cac4598a300371
 	sha512sums = 951667941520e66e7b6aad55619ec2b38364da58c5cf8a71775a3032921cfc0a8e5c7ba14e0df35588175f94a6b4785566d39177ff536ab9cefcbd19a03dc065
-	sha512sums = 1bd2804bea1fe8c85b602f8c5f8777f4ba470c9e767ad284cb3d0287c6d6e1b126e760738d7c671f38933ee3ec6b8931186df8e978995b5109797ae86dfdd85a
 
 pkgname = thunderbird-beta
 
diff --git a/PKGBUILD b/PKGBUILD
index 4b2fbe80c04c..cea2e43bf12f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,13 +22,11 @@ install=$pkgname.install
 source=(https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.xz
         $pkgname.desktop
         thunderbird-install-dir.patch
-        no-crmf.diff
-        fix-wifi-scanner.diff)
+        no-crmf.diff)
 sha512sums=('384d78346413c66b02573a6138bde223b6388a306ba535eaf5498867a4dd7bb44b73dda4e7811b728202df0283813bc3365317007a170696bdba0703beb83215'
             'e5649ddee3ca9cfdcf56652e9c8e6160d52c69d1439f9135b0c0d436ce61a25f17758afc0dd6cac3434c26234c584828eb07fdf9604797f7dd3f617ec194b79a'
-            '8100fd3ea37d998905498d41c8504bfdd6d86766542d6b93107c92382a7525da7f75a83f8ff1e15ad95039d51da2add7e6b18af76d45516a41cdfd1e9f98f262'
-            '951667941520e66e7b6aad55619ec2b38364da58c5cf8a71775a3032921cfc0a8e5c7ba14e0df35588175f94a6b4785566d39177ff536ab9cefcbd19a03dc065'
-            '1bd2804bea1fe8c85b602f8c5f8777f4ba470c9e767ad284cb3d0287c6d6e1b126e760738d7c671f38933ee3ec6b8931186df8e978995b5109797ae86dfdd85a')
+            'b10b74e073a369bf06069f21eddaa145eaa93e4b5128ff659eb186598ecce773afc1ce5a4b2208a7c2bb54ee118827db28171875dfdb91fb31cac4598a300371'
+            '951667941520e66e7b6aad55619ec2b38364da58c5cf8a71775a3032921cfc0a8e5c7ba14e0df35588175f94a6b4785566d39177ff536ab9cefcbd19a03dc065')
 # RC
 if [[ $_build = ? ]]; then
   source[0]="https://ftp.mozilla.org/pub/thunderbird/candidates/$_major-candidates/build$_build/source/thunderbird-$_major.source.tar.xz"
@@ -59,9 +57,6 @@ prepare() {
   msg2 "no-crmf.diff: https://bugzilla.mozilla.org/show_bug.cgi?id=1371991"
   patch -Np1 -i ../no-crmf.diff
 
-  msg2 "fix-wifi-scanner.diff: https://bugzilla.mozilla.org/show_bug.cgi?id=1314968"
-  patch -d mozilla -Np1 < ../fix-wifi-scanner.diff
-
   # API keys
   echo -n "$_google_api_key" >google-api-key
   echo -n "$_mozilla_api_key" >mozilla-api-key
diff --git a/fix-wifi-scanner.diff b/fix-wifi-scanner.diff
deleted file mode 100644
index f8fdd6c42142..000000000000
--- a/fix-wifi-scanner.diff
+++ /dev/null
@@ -1,16 +0,0 @@
- 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/thunderbird-install-dir.patch b/thunderbird-install-dir.patch
index f8ebdc1ff924..d1e390b303df 100644
--- a/thunderbird-install-dir.patch
+++ b/thunderbird-install-dir.patch
@@ -1,12 +1,17 @@
-diff -upr comm-esr31.orig/mozilla/config/baseconfig.mk comm-esr31/mozilla/config/baseconfig.mk
---- comm-esr31.orig/mozilla/config/baseconfig.mk	2014-07-22 09:44:22.000000000 +0300
-+++ comm-esr31/mozilla/config/baseconfig.mk	2014-07-22 09:46:45.000000000 +0300
-@@ -4,7 +4,7 @@
- # whether a normal build is happening or whether the check is running.
- includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
- idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+diff -upr thunderbird-59.0b1.orig/mozilla/config/baseconfig.mk
+thunderbird-59.0b1/mozilla/config/baseconfig.mk
+--- thunderbird-59.0b1.orig/mozilla/config/baseconfig.mk
+2018-02-03 21:40:48.387811590 +0300
++++ thunderbird-59.0b1/mozilla/config/baseconfig.mk        2018-02-03
+21:40:17.997729401 +0300
+@@ -2,7 +2,7 @@
+ # directly in python/mozbuild/mozbuild/base.py for gmake validation.
+ # We thus use INCLUDED_AUTOCONF_MK to enable/disable some parts
+depending
+ # whether a normal build is happening or whether the check is
+running.
+-installdir = $(libdir)/$(MOZ_APP_NAME)
 +installdir = $(libdir)/$(MOZ_APP_NAME)-beta
- sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
- ifndef TOP_DIST
- TOP_DIST = dist
+ ifeq (.,$(DEPTH))
+ DIST = dist
+ else