Pop version to 4.3.3

* Drop old qt patch.
* Add missing x11extras qt dependency.
* Fix licence path.

3 files changed, 13 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 93de7e928c6a..3c0bdd052367 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = megasync-nopdfium
 	pkgdesc = Easy automated syncing between your computers and your MEGA cloud drive(stripped of pdfium dependency)
-	pkgver = 4.3.1.0
-	pkgrel = 2
+	pkgver = 4.3.3.0
+	pkgrel = 1
 	url = https://github.com/meganz/MEGAsync
 	arch = i686
 	arch = x86_64
@@ -14,21 +14,19 @@ pkgbase = megasync-nopdfium
 	depends = c-ares
 	depends = crypto++
 	depends = libsodium
-	depends = hicolor-icon-theme
 	depends = libuv
-	depends = qt5-svg
 	depends = libmediainfo
 	depends = libraw
 	depends = qt5-base
+	depends = qt5-svg
+	depends = qt5-x11extras
 	depends = ffmpeg
 	provides = megasync
 	conflicts = megasync
-	source = git+https://github.com/meganz/MEGAsync.git#tag=v4.3.1.0_Linux
+	source = git+https://github.com/meganz/MEGAsync.git#tag=v4.3.3.0_Linux
 	source = meganz-sdk::git+https://github.com/meganz/sdk.git
-	source = qt5_5.15.patch
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = 27cf5f69ed40ae02e2a4145ccb4931834a60c32d907b083e8b3db626c3062562
 
 pkgname = megasync-nopdfium
 
diff --git a/PKGBUILD b/PKGBUILD
index 308175438c9b..6d6d7b055fbe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,25 +10,23 @@
 # shellcheck disable=SC2164 # cd safe
 
 pkgname=megasync-nopdfium
-pkgver=4.3.1.0
-pkgrel=2
+pkgver=4.3.3.0
+pkgrel=1
 pkgdesc="Easy automated syncing between your computers and your MEGA cloud drive(stripped of pdfium dependency)"
 arch=('i686' 'x86_64')
 provides=(megasync)
 conflicts=(megasync)
 url="https://github.com/meganz/MEGAsync"
 license=('custom:MEGA LIMITED CODE REVIEW LICENCE')
-depends=('c-ares' 'crypto++' 'libsodium' 'hicolor-icon-theme' 'libuv'
-         'qt5-svg' 'libmediainfo' 'libraw' 'qt5-base' 'ffmpeg')
+depends=('c-ares' 'crypto++' 'libsodium' 'libuv'
+         'libmediainfo' 'libraw' 'qt5-base' 'qt5-svg' 'qt5-x11extras' 'ffmpeg')
 makedepends=('qt5-tools' 'swig' 'doxygen' 'lsb-release' 'git')
 _extname="_Linux"
 source=("git+https://github.com/meganz/MEGAsync.git#tag=v${pkgver}${_extname}"
         "meganz-sdk::git+https://github.com/meganz/sdk.git"
-        "qt5_5.15.patch"
         )
 sha256sums=('SKIP'
-            'SKIP'
-            '27cf5f69ed40ae02e2a4145ccb4931834a60c32d907b083e8b3db626c3062562')
+            'SKIP')
 
 prepare() {
     cd "MEGAsync"
@@ -39,8 +37,6 @@ prepare() {
     cd "src/MEGASync"
     sed -i '/DEFINES += REQUIRE_HAVE_PDFIUM/d' MEGASync.pro
     sed -i '/CONFIG += USE_PDFIUM/d' MEGASync.pro
-
-    git -C "$srcdir"/MEGAsync apply "$srcdir"/qt5_5.15.patch
 }
 
 build() {
@@ -76,9 +72,9 @@ build() {
 
 package () {
     cd "MEGAsync"
-    install -Dm 644 LICENCE.md "${pkgdir}/usr/share/licenses/megasync/LICENCE"
-    install -Dm 644 installer/terms.txt "${pkgdir}/usr/share/licenses/megasync/terms.txt"
-    install -Dm 644 src/MEGASync/mega/LICENSE "${pkgdir}/usr/share/licenses/megasync/SDK-LICENCE"
+    install -Dm 644 LICENCE.md "${pkgdir}/usr/share/licenses/$pkgname/LICENCE"
+    install -Dm 644 installer/terms.txt "${pkgdir}/usr/share/licenses/$pkgname/terms.txt"
+    install -Dm 644 src/MEGASync/mega/LICENSE "${pkgdir}/usr/share/licenses/$pkgname/SDK-LICENCE"
     
     cd "src"
     install -dm 755 "${pkgdir}/usr/bin"
diff --git a/qt5_5.15.patch b/qt5_5.15.patch
deleted file mode 100644
index 509a97b1a386..000000000000
--- a/qt5_5.15.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 99295fc0b9858b08d379a86625902d92f5129542 Mon Sep 17 00:00:00 2001
-From: bartus <szczepaniak.bartek+github@gmail.com>
-Date: Sun, 7 Jun 2020 23:22:49 +0200
-Subject: [PATCH] Fix build against qt>=5.15
-
----
- src/MEGASync/gui/MegaSpeedGraph.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/MEGASync/gui/MegaSpeedGraph.h b/src/MEGASync/gui/MegaSpeedGraph.h
-index d98f582a..b7ffbcbb 100644
---- a/src/MEGASync/gui/MegaSpeedGraph.h
-+++ b/src/MEGASync/gui/MegaSpeedGraph.h
-@@ -2,6 +2,7 @@
- #define MEGASPEEDGRAPH_H
- 
- #include <QWidget>
-+#include <QPainterPath>
- #include "megaapi.h"
- 
- namespace Ui {
--- 
-2.27.0
-