v4.17.21

7 files changed, 39 insertions, 86 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1c2114cb1653..6d8365da3e21 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = deezer
 	pkgdesc = A proprietary music streaming service
-	pkgver = 4.17.10
-	pkgrel = 5
+	pkgver = 4.17.21
+	pkgrel = 1
 	url = https://www.deezer.com/
 	arch = any
 	license = custom:"Copyright (c) 2006-2018 Deezer S.A."
@@ -11,21 +11,19 @@ pkgbase = deezer
 	makedepends = imagemagick
 	depends = electron6
 	provides = deezer
-	source = deezer-4.17.10-setup.exe::https://www.deezer.com/desktop/download/artifact/win32/x86/4.17.10
+	source = deezer-4.17.21-setup.exe::https://www.deezer.com/desktop/download/artifact/win32/x86/4.17.21
 	source = deezer.desktop
 	source = systray.patch
 	source = menu-bar.patch
 	source = oauth.patch
-	source = nav-buttons.patch
 	source = 0001-MPRIS-interface.patch
 	source = https://github.com/SibrenVasse/deezer/raw/mpris/node_modules.tar.xz
-	sha256sums = 4fea147de6cfa4ee083a1cecf24a13230045cbca816667df6f5674a654da0b7b
+	sha256sums = 433fe36ee19c4b13eb715bd740a6ae325199b00da15c4ea376b03944cb57b0fe
 	sha256sums = f8a5279239b56082a5c85487b0c261fb332623f27dac3ec8093458b8c55d8d99
-	sha256sums = c024851f4c87580b4f764c88f630d77a28794338d0b43947e68939afb146bc0a
-	sha256sums = 964d23e5fa473bd1a78bed4213d0a546a253541e0b82337dc5929c3719bbe020
-	sha256sums = bcb546b71c94fcec80cdde9a4c56df6b35f17ce3619db1bd051f446a3b5adaf0
-	sha256sums = 7384fbec4e6e4e5dc3b003614ac8068fe30e7fa7e3072846fc3d15a58f88be19
-	sha256sums = 54794e94142aa509313ffa9d53cf795cc16f9cb2483b3652825ab837d5dfb425
+	sha256sums = f7df7ba3dd91d8d327c3bfe69c65d3969b3f7a80ca253c29bad316e09f65ab8b
+	sha256sums = 9c1a1c809f813646f14355af03670f6c10a5ad47c606b0ef45e1b66b6aa559b5
+	sha256sums = 5cbe1696d5f948cdda1fdd5ef9f8d94d5e14d8594558e35472517fa659057add
+	sha256sums = 7cd2ba25d61bbd86d49ca99be96366e72fc6e6a57d50bdbeacf1a6a5535c3e76
 	sha256sums = 8a8a42fd38c6fc5a5f9523620ce7e794355ceec5d71c93a7cee378c9a5b3d8ec
 
 pkgname = deezer
diff --git a/0001-MPRIS-interface.patch b/0001-MPRIS-interface.patch
index 19e706688195..0330d3409893 100644
--- a/0001-MPRIS-interface.patch
+++ b/0001-MPRIS-interface.patch
@@ -1,23 +1,23 @@
-diff --git a/app/main.js b/app/main.js
-index caf4699..5e88d7d 100644
---- a/app/main.js
-+++ b/app/main.js
-@@ -2636,6 +2636,7 @@
+diff --git a/build/main.js b/build/main.js
+index 6f97abb..aaf62f5 100644
+--- a/build/main.js
++++ b/build/main.js
+@@ -2108,6 +2108,7 @@ module.exports = (function(modules) {
          this.ipc.send(constants.c, control);
        }
        isSupportedSMTC() {
 +        return true;
-         return (
-           !Object(utils.h)(constants.l) &&
-           Object(utils.i)({
-@@ -3216,6 +3217,7 @@
+         if (void 0 !== this.isSupported) return this.isSupported;
+         if (Object(utils.h)(constants.n))
+           return (this.isSupported = !1), this.isSupported;
+@@ -3998,6 +3999,7 @@ module.exports = (function(modules) {
                services_SchemeHandler.handleSchemeFromOpenUrl(url),
                event.preventDefault();
            }),
-+          external_electron_.app.commandLine.appendSwitch('disable-features', 'MediaSessionService');
++          external_electron_.app.commandLine.appendSwitch('disable-features', 'MediaSessionService'),
            external_electron_.app.on("ready", () => {
              external_electron_log_default.a.debug("App is ready"),
-               services_AutoUpdater.init(),
+               this.applicationMenu.init(),
 diff --git a/node_modules/electron-media-service/src/index.js b/node_modules/electron-media-service/src/index.js
 index 301db0d..9677e7c 100644
 --- a/node_modules/electron-media-service/src/index.js
@@ -33,8 +33,11 @@ index 301db0d..9677e7c 100644
 +} else {
    module.exports = require('./NullService');
  }
---- /dev/null	2019-10-12 21:52:32.461829196 +0200
-+++ b/node_modules/electron-media-service/src/linux/index.js	2019-10-12 22:23:11.969848536 +0200
+diff --git a/node_modules/electron-media-service/src/linux/index.js b/node_modules/electron-media-service/src/linux/index.js
+new file mode 100644
+index 0000000..23c6ff5
+--- /dev/null
++++ b/node_modules/electron-media-service/src/linux/index.js
 @@ -0,0 +1,97 @@
 +const { EventEmitter } = require('events');
 +const mpris = require('mpris-service');
diff --git a/PKGBUILD b/PKGBUILD
index d38fc6b1b373..81330982d1ae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Sibren Vasse <arch@sibrenvasse.nl>
 # Contributor: Ilya Gulya <ilyagulya@gmail.com>
 pkgname="deezer"
-pkgver=4.17.10
-pkgrel=5
+pkgver=4.17.21
+pkgrel=1
 pkgdesc="A proprietary music streaming service"
 arch=('any')
 url="https://www.deezer.com/"
@@ -15,16 +15,14 @@ source=("$pkgname-$pkgver-setup.exe::https://www.deezer.com/desktop/download/art
         systray.patch
         menu-bar.patch
         oauth.patch
-        nav-buttons.patch
         0001-MPRIS-interface.patch
         https://github.com/SibrenVasse/deezer/raw/mpris/node_modules.tar.xz)
-sha256sums=('4fea147de6cfa4ee083a1cecf24a13230045cbca816667df6f5674a654da0b7b'
+sha256sums=('433fe36ee19c4b13eb715bd740a6ae325199b00da15c4ea376b03944cb57b0fe'
             'f8a5279239b56082a5c85487b0c261fb332623f27dac3ec8093458b8c55d8d99'
-            'c024851f4c87580b4f764c88f630d77a28794338d0b43947e68939afb146bc0a'
-            '964d23e5fa473bd1a78bed4213d0a546a253541e0b82337dc5929c3719bbe020'
-            'bcb546b71c94fcec80cdde9a4c56df6b35f17ce3619db1bd051f446a3b5adaf0'
-            '7384fbec4e6e4e5dc3b003614ac8068fe30e7fa7e3072846fc3d15a58f88be19'
-            '54794e94142aa509313ffa9d53cf795cc16f9cb2483b3652825ab837d5dfb425'
+            'f7df7ba3dd91d8d327c3bfe69c65d3969b3f7a80ca253c29bad316e09f65ab8b'
+            '9c1a1c809f813646f14355af03670f6c10a5ad47c606b0ef45e1b66b6aa559b5'
+            '5cbe1696d5f948cdda1fdd5ef9f8d94d5e14d8594558e35472517fa659057add'
+            '7cd2ba25d61bbd86d49ca99be96366e72fc6e6a57d50bdbeacf1a6a5535c3e76'
             '8a8a42fd38c6fc5a5f9523620ce7e794355ceec5d71c93a7cee378c9a5b3d8ec')
 
 prepare() {
@@ -43,16 +41,14 @@ prepare() {
     rm -r app/node_modules/@nodert
 
     cd app
-    prettier --write "app/*.js"
-    prettier --write "app/assets/cache/js/route-naboo*ads*.js"
+
+    prettier --write "build/*.js"
     # Fix crash on startup since 4.14.1 (patch systray icon path)
     patch -p1 < "$srcdir/systray.patch"
     # Disable menu bar
     patch -p1 < "$srcdir/menu-bar.patch"
     # Fix oauth login
     patch -p1 < "$srcdir/oauth.patch"
-    # Force enable nav buttons
-    patch -p1 < "$srcdir/nav-buttons.patch"
 
     # Monkeypatch MPRIS D-Bus interface
     patch -p1 < "$srcdir/0001-MPRIS-interface.patch"
diff --git a/menu-bar.patch b/menu-bar.patch
index e008ddc8f7d1..76b5b8206e69 100644
--- a/menu-bar.patch
+++ b/menu-bar.patch
@@ -1,5 +1,5 @@
---- a/app/main.js	2019-08-30 19:55:24.091850904 +0200
-+++ b/app/main.js	2019-08-30 19:57:32.550487630 +0200
+--- a/build/main.js	2019-08-30 19:55:24.091850904 +0200
++++ b/build/main.js	2019-08-30 19:57:32.550487630 +0200
 @@ -2589,6 +2589,7 @@
              this._adjustViewToContentSize(),
              this.mainView.setAutoResize({ width: !0, height: !0 })),
diff --git a/nav-buttons.patch b/nav-buttons.patch
deleted file mode 100644
index 81216d0299b3..000000000000
--- a/nav-buttons.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/app/assets/cache/js/route-naboo-ads.c43bc090f18fbfacb3f5.js b/app/assets/cache/js/route-naboo-ads.c43bc090f18fbfacb3f5.js
-index 6171d73..00cd49e 100644
---- a/app/assets/cache/js/route-naboo-ads.c43bc090f18fbfacb3f5.js
-+++ b/app/assets/cache/js/route-naboo-ads.c43bc090f18fbfacb3f5.js
-@@ -14174,7 +14174,7 @@
-                       "button",
-                       {
-                         className: "sidebar-navbar-arrow",
--                        disabled: !this.state.canGoBack,
-+                        disabled: false,
-                         onClick: Dt.a.history.goBack,
-                         type: "button"
-                       },
-@@ -14184,7 +14184,7 @@
-                       "button",
-                       {
-                         className: "sidebar-navbar-arrow",
--                        disabled: !this.state.canGoForward,
-+                        disabled: false,
-                         onClick: Dt.a.history.goForward,
-                         type: "button"
-                       },
-diff --git a/app/assets/cache/js/route-naboo-no-ads.0673cfa1834672d3c740.js b/app/assets/cache/js/route-naboo-no-ads.0673cfa1834672d3c740.js
-index 3657965..f7653a6 100644
---- a/app/assets/cache/js/route-naboo-no-ads.0673cfa1834672d3c740.js
-+++ b/app/assets/cache/js/route-naboo-no-ads.0673cfa1834672d3c740.js
-@@ -12979,7 +12979,7 @@
-                       "button",
-                       {
-                         className: "sidebar-navbar-arrow",
--                        disabled: !this.state.canGoBack,
-+                        disabled: false,
-                         onClick: Dt.a.history.goBack,
-                         type: "button"
-                       },
-@@ -12989,7 +12989,7 @@
-                       "button",
-                       {
-                         className: "sidebar-navbar-arrow",
--                        disabled: !this.state.canGoForward,
-+                        disabled: false,
-                         onClick: Dt.a.history.goForward,
-                         type: "button"
-                       },
diff --git a/oauth.patch b/oauth.patch
index 0cda2a736856..d441fe02c4dc 100644
--- a/oauth.patch
+++ b/oauth.patch
@@ -1,5 +1,5 @@
---- a/app/main.js	2019-08-30 19:55:24.091850904 +0200
-+++ b/app/main.js	2019-08-30 20:24:34.256473021 +0200
+--- a/build/main.js	2019-08-30 19:55:24.091850904 +0200
++++ b/build/main.js	2019-08-30 20:24:34.256473021 +0200
 @@ -1819,7 +1819,7 @@
        }
        handleSchemeFromNonSingleInstance(args) {
diff --git a/systray.patch b/systray.patch
index 807d8aad290c..7421762fb251 100644
--- a/systray.patch
+++ b/systray.patch
@@ -1,5 +1,5 @@
---- a/app/main.js	2019-08-30 19:55:24.091850904 +0200
-+++ b/app/main.js	2019-08-30 19:59:10.241735036 +0200
+--- a/build/main.js	2019-08-30 19:55:24.091850904 +0200
++++ b/build/main.js	2019-08-30 19:59:10.241735036 +0200
 @@ -82,6 +82,7 @@
        external_path_default = __webpack_require__.n(external_path_),
        constants_platform = __webpack_require__(4);