Depend on QT 5.9.5 packages

Change dependencies to cian1500ww's QT 5.9.5 packages. This is the
latest version offically supported by upstream.

3 files changed, 11 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c4db81cf1317..59b7620bc6dd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = plex-media-player-git
 	pkgdesc = Next generation Plex Desktop Client
-	pkgver = r1302.e74d341
-	pkgrel = 2
+	pkgver = r1306.11b21f5
+	pkgrel = 1
 	url = https://github.com/plexinc/plex-media-player
 	arch = i686
 	arch = x86_64
@@ -13,15 +13,13 @@ pkgbase = plex-media-player-git
 	depends = sdl2
 	depends = p8-platform
 	depends = protobuf
-	depends = qt5-webengine
-	depends = qt5-x11extras
-	depends = qt5-quickcontrols
+	depends = qt5-webengine-595
+	depends = qt5-x11extras-595
+	depends = qt5-quickcontrols-595
 	provides = plex-media-player
 	conflicts = plex-media-player
 	source = git+https://github.com/plexinc/plex-media-player.git
-	source = qt5.14.patch
 	sha256sums = SKIP
-	sha256sums = 9f4416f434103947672000b0172cb8875efa57b73a580c1d3fde9a35b7cc729f
 
 pkgname = plex-media-player-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 1ab00faa4048..f77e00bdd1ec 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,18 @@
 # Maintainer: Jeff Henson <jeff@henson.io>
 
 pkgname=plex-media-player-git
-pkgver=r1302.e74d341
-pkgrel=2
+pkgver=r1306.11b21f5
+pkgrel=1
 pkgdesc='Next generation Plex Desktop Client'
 arch=('i686' 'x86_64')
 license=('GPL')
 url='https://github.com/plexinc/plex-media-player'
 provides=('plex-media-player')
 conflicts=('plex-media-player')
-depends=('mpv' 'libcec' 'sdl2' 'p8-platform' 'protobuf' 'qt5-webengine' 'qt5-x11extras' 'qt5-quickcontrols')
+depends=('mpv' 'libcec' 'sdl2' 'p8-platform' 'protobuf' 'qt5-webengine-595' 'qt5-x11extras-595' 'qt5-quickcontrols-595')
 makedepends=('cmake' 'git')
-source=('git+https://github.com/plexinc/plex-media-player.git'
-        'qt5.14.patch')
-sha256sums=('SKIP'
-            '9f4416f434103947672000b0172cb8875efa57b73a580c1d3fde9a35b7cc729f')
+source=('git+https://github.com/plexinc/plex-media-player.git')
+sha256sums=('SKIP')
 
 pkgver() {
   cd plex-media-player
@@ -23,17 +21,12 @@ pkgver() {
 
 prepare() {
   mkdir -p "${srcdir}/plex-media-player/build"
-
-  # This hack is to fix the build error on qt 5.14. It's probably the worst way
-  # to fix it so hopefully it's fixed upstream soon.
-  cd "${srcdir}/plex-media-player"
-  git apply ../qt5.14.patch
 }
 
 build() {
   cd "${srcdir}/plex-media-player/build"
   cmake -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release' -DCMAKE_SKIP_RPATH=1 \
-        -DQTROOT='/usr' ..
+        -DQTROOT='/opt/qt595' ..
   make
 }
 
diff --git a/qt5.14.patch b/qt5.14.patch
deleted file mode 100644
index ead15f92ffd7..000000000000
--- a/qt5.14.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/src/player/CodecsComponent.cpp    2019-12-10 20:22:36.000000000 +0300
-+++ b/src/player/CodecsComponent.cpp    2019-12-25 18:13:48.973701844 +0300
-@@ -683,9 +683,9 @@
-   Downloader::HeaderList headers;
-   QString auth = SystemComponent::Get().authenticationToken();
-   if (auth.size())
--    headers.append({"X-Plex-Token", auth});
--  headers.append({"X-Plex-Product", WITH_CODECS ? "Plex Media Player" : "openpmp"});
--  headers.append({"X-Plex-Platform", "Konvergo"});
-+    headers.append(qMakePair<QString, QString>("X-Plex-Token", auth));
-+  headers.append(qMakePair<QString, QString>("X-Plex-Product", WITH_CODECS ? "Plex Media Player" : "openpmp"));
-+  headers.append(qMakePair<QString, QString>("X-Plex-Platform", "Konvergo"));
-   return headers;
- }
-