Update to version 4.9.5.0

4 files changed, 67 insertions, 83 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1e7120afb8ca..44aee1912b45 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,37 +1,42 @@
 pkgbase = megasync
-	pkgdesc = Easy automated syncing between your computers and your MEGA cloud drive
-	pkgver = 4.9.0.0
+	pkgdesc = Official MEGA desktop application for syncing with MEGA Cloud Drive
+	pkgver = 4.9.5.0
 	pkgrel = 1
 	url = https://github.com/meganz/MEGAsync
-	arch = i686
 	arch = x86_64
-	license = custom:MEGA LIMITED CODE REVIEW LICENCE
-	makedepends = qt5-tools
-	makedepends = swig
+	license = custom
+	makedepends = git
 	makedepends = doxygen
 	makedepends = lsb-release
-	makedepends = git
+	makedepends = qt5-tools
+	makedepends = swig
 	depends = c-ares
 	depends = crypto++
+	depends = curl
+	depends = ffmpeg
+	depends = freeimage
+	depends = icu
+	depends = libmediainfo
+	depends = libpdfium
 	depends = libsodium
-	depends = hicolor-icon-theme
+	depends = libudev.so
 	depends = libuv
+	depends = libxcb
+	depends = libzen
+	depends = openssl
+	depends = qt5-base
 	depends = qt5-svg
 	depends = qt5-x11extras
-	depends = libmediainfo
-	depends = libraw
-	depends = qt5-base
-	depends = ffmpeg
-	depends = libpdfium
-	depends = freeimage
-	depends = libudev.so
-	source = git+https://github.com/meganz/MEGAsync.git#tag=v4.9.0.0_Linux
+	depends = sqlite
+	depends = zlib
+	depends = hicolor-icon-theme
+	source = git+https://github.com/meganz/MEGAsync.git#tag=v4.9.5.0_Linux
 	source = meganz-sdk::git+https://github.com/meganz/sdk.git
-	source = pdfium.patch
-	source = ffmpeg.patch
+	source = 010-megasync-libpdfium.patch
+	source = 020-megasync-ffmpeg.patch
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = bdad237f67d772789bf6e6835108827201296fc5cf793d28d94af8a1b04e56c9
-	sha256sums = d5fcd4018a665e7a591ab796569777cf0a74fadc7c953f6879f37c949f82e7ae
+	sha256sums = d42ce082425c4b730f6d75de1c4914b02af0ab8993cd9dd65bde389469dfe500
+	sha256sums = 49690421d98e8f61a600ee1ec97adc3e4d1cbe2f736fcf56056da23d02db378b
 
 pkgname = megasync
diff --git a/pdfium.patch b/010-megasync-libpdfium.patch
index 447aa8f73d90..e0f29f4be82d 100644
--- a/pdfium.patch
+++ b/010-megasync-libpdfium.patch
@@ -1,8 +1,6 @@
-diff --git a/bindings/qt/sdk.pri b/bindings/qt/sdk.pri
-index 822469fbb..cd01467b3 100644
 --- a/bindings/qt/sdk.pri
 +++ b/bindings/qt/sdk.pri
-@@ -303,6 +303,11 @@ CONFIG(USE_PDFIUM) {
+@@ -290,6 +290,11 @@ CONFIG(USE_PDFIUM) {
                  DEFINES += HAVE_PDFIUM
                  LIBS += -lpdfium
              }
diff --git a/ffmpeg.patch b/020-megasync-ffmpeg.patch
index 9a1af1458e29..b3b1424afad7 100644
--- a/ffmpeg.patch
+++ b/020-megasync-ffmpeg.patch
@@ -1,5 +1,3 @@
-diff --git a/src/gfx/freeimage.cpp b/src/gfx/freeimage.cpp
-index 2f685279a..e4b0a8c4a 100644
 --- a/src/gfx/freeimage.cpp
 +++ b/src/gfx/freeimage.cpp
 @@ -209,12 +209,6 @@ bool GfxProviderFreeImage::readbitmapFreeimage(FileSystemAccess*, const LocalPat
@@ -15,20 +13,10 @@ index 2f685279a..e4b0a8c4a 100644
  const char *GfxProviderFreeImage::supportedformatsFfmpeg()
  {
      return  ".264.265.3g2.3gp.3gpa.3gpp.3gpp2.mp3"
-@@ -313,7 +307,7 @@ bool GfxProviderFreeImage::readbitmapFfmpeg(FileSystemAccess* fa, const LocalPat
- 
-     // Find decoder for video stream
-     AVCodecID codecId = codecParm->codec_id;
--    AVCodec* decoder = avcodec_find_decoder(codecId);
-+    const AVCodec* decoder = avcodec_find_decoder(codecId);
-     if (!decoder)
-     {
-         LOG_warn << "Codec not found: " << codecId;
-@@ -330,11 +324,6 @@ bool GfxProviderFreeImage::readbitmapFfmpeg(FileSystemAccess* fa, const LocalPat
+@@ -330,10 +324,6 @@ bool GfxProviderFreeImage::readbitmapFfmpeg(FileSystemAccess* fa, const LocalPat
  
      // Force seeking to key frames
      formatContext->seek2any = false;
--    videoStream->skip_to_keyframe = true;
 -    if (decoder->capabilities & CAP_TRUNCATED)
 -    {
 -        codecContext->flags |= CAP_TRUNCATED;
diff --git a/PKGBUILD b/PKGBUILD
index 49bb1e17de52..40e9a356767e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
-# Maintainer: Rafał Kozdrój <kozeid2+aur@gmail.com>
+# Maintainer : Daniel Bermond <dbermond@archlinux.org>
+# Contributor: Rafał Kozdrój <kozeid2+aur@gmail.com>
 # Contributor: kikadf <kikadf.01@gmail.com>
 # Contributor: Daniel Henry <d at hackr dot pl>
 # Contributor: Miguel Revilla <yo at  miguelrevilla dot com>
@@ -6,43 +7,42 @@
 # Contributor: Hexchain Tong <i at hexchain dot org>
 
 pkgname=megasync
-pkgver=4.9.0.0
+pkgver=4.9.5.0
 pkgrel=1
-pkgdesc="Easy automated syncing between your computers and your MEGA cloud drive"
-arch=('i686' 'x86_64')
-url="https://github.com/meganz/MEGAsync"
-license=('custom:MEGA LIMITED CODE REVIEW LICENCE')
-depends=('c-ares' 'crypto++' 'libsodium' 'hicolor-icon-theme' 'libuv'
-         'qt5-svg' 'qt5-x11extras' 'libmediainfo' 'libraw' 'qt5-base'
-         'ffmpeg' 'libpdfium' 'freeimage' 'libudev.so')
-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"
-        "pdfium.patch"
-        "ffmpeg.patch")
+pkgdesc='Official MEGA desktop application for syncing with MEGA Cloud Drive'
+arch=('x86_64')
+url='https://github.com/meganz/MEGAsync'
+license=('custom')
+depends=('c-ares' 'crypto++' 'curl' 'ffmpeg' 'freeimage' 'icu' 'libmediainfo'
+         'libpdfium' 'libsodium' 'libudev.so' 'libuv' 'libxcb' 'libzen' 'openssl'
+         'qt5-base' 'qt5-svg' 'qt5-x11extras' 'sqlite' 'zlib'  'hicolor-icon-theme')
+makedepends=('git' 'doxygen' 'lsb-release' 'qt5-tools' 'swig')
+source=("git+https://github.com/meganz/MEGAsync.git#tag=v${pkgver}_Linux"
+        'meganz-sdk'::'git+https://github.com/meganz/sdk.git'
+        '010-megasync-libpdfium.patch'
+        '020-megasync-ffmpeg.patch')
 sha256sums=('SKIP'
             'SKIP'
-            'bdad237f67d772789bf6e6835108827201296fc5cf793d28d94af8a1b04e56c9'
-            'd5fcd4018a665e7a591ab796569777cf0a74fadc7c953f6879f37c949f82e7ae')
+            'd42ce082425c4b730f6d75de1c4914b02af0ab8993cd9dd65bde389469dfe500'
+            '49690421d98e8f61a600ee1ec97adc3e4d1cbe2f736fcf56056da23d02db378b')
 
 prepare() {
-    cd "MEGAsync"
-    git submodule init
-    git config submodule.src/MEGASync/mega.url "../meganz-sdk"
-    git -c protocol.file.allow=always submodule update
-
-    cd "src/MEGASync/mega"
-    patch -Np1 -i "$srcdir/pdfium.patch"
-    patch -Np1 -i "$srcdir/ffmpeg.patch"
+    git -C MEGAsync submodule init
+    git -C MEGAsync config submodule.src/MEGASync/mega.url "${srcdir}/meganz-sdk"
+    git -C MEGAsync -c protocol.file.allow='always' submodule update
+    
+    patch -d MEGAsync/src/MEGASync/mega -Np1 -i "${srcdir}/010-megasync-libpdfium.patch"
+    patch -d MEGAsync/src/MEGASync/mega -Np1 -i "${srcdir}/020-megasync-ffmpeg.patch"
+    
+    cd MEGAsync/src/MEGASync/mega
+    ./autogen.sh
 }
 
 build() {
-    # build sdk
-    cd "MEGAsync/src/MEGASync/mega"
-
-    ./autogen.sh
+    # sdk
+    cd MEGAsync/src/MEGASync/mega
     ./configure \
+        --prefix="${srcdir}/MEGAsync/src/MEGASync/mega/bindings/qt/3rdparty" \
         --disable-shared \
         --enable-static \
         --disable-silent-rules \
@@ -61,27 +61,20 @@ build() {
         --with-libzen \
         --with-libmediainfo \
         --with-ffmpeg \
-        --enable-drive-notifications \
-        --prefix="${srcdir}/MEGAsync/src/MEGASync/mega/bindings/qt/3rdparty"
-
-    # build megasync
-    cd "../.."
-    qmake-qt5 \
-        "CONFIG += FULLREQUIREMENTS" \
-        MEGA.pro
+        --enable-drive-notifications
+    
+    # megasync
+    cd "${srcdir}/MEGAsync/src"
+    qmake-qt5 'CONFIG += FULLREQUIREMENTS' MEGA.pro
     lrelease-qt5 MEGASync/MEGASync.pro
     make
 }
 
 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"
-
-    cd "src"
-    mkdir -pm 755 "${pkgdir}/usr/bin"
-    make INSTALL_ROOT="${pkgdir}" TARGET="${pkgdir}/usr/bin/megasync" install
-
-    install -Dm 755 "MEGASync/megasync" "${pkgdir}/usr/bin/megasync"
+    make -C MEGAsync/src INSTALL_ROOT="$pkgdir" TARGET="${pkgdir}/usr/bin/megasync" install
+    install -D -m755 MEGAsync/src/MEGASync/megasync -t "${pkgdir}/usr/bin"
+    install -D -m644 MEGAsync/LICENCE.md -t "${pkgdir}/usr/share/licenses/megasync"
+    install -D -m644 MEGAsync/installer/terms.txt -t "${pkgdir}/usr/share/licenses/megasync"
+    install -D -m644 MEGAsync/src/MEGASync/mega/LICENSE "${pkgdir}/usr/share/licenses/megasync/SDK-LICENCE"
+    rm -r "${pkgdir}/usr/share/icons/ubuntu-mono-dark"
 }