[arch-commits] Commit in deepin-file-manager/trunk (2 files)

[Felix Yan]

    Date: Monday, April 27, 2020 @ 02:52:41
  Author: felixonmars
Revision: 621772

upgpkg: deepin-file-manager 1:5.1.1.15-1

Modified:
  deepin-file-manager/trunk/PKGBUILD
Deleted:
  deepin-file-manager/trunk/deepin-file-manager-qt-5.14.patch

-----------------------------------+
 PKGBUILD                          |   16 ++++++----------
 deepin-file-manager-qt-5.14.patch |   22 ----------------------
 2 files changed, 6 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-27 02:52:24 UTC (rev 621771)
+++ PKGBUILD	2020-04-27 02:52:41 UTC (rev 621772)
@@ -3,15 +3,15 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=deepin-file-manager
-pkgver=5.0.0
-pkgrel=6
+pkgver=5.1.1.15
+pkgrel=1
 epoch=1
 pkgdesc='Deepin File Manager'
 arch=('x86_64')
 url="https://github.com/linuxdeepin/dde-file-manager"
 license=('GPL3')
-depends=('deepin-qt5integration' 'deepin-anything' 'disomaster' 'file' 'avfs' 'polkit-qt5' 'poppler'
-         'ffmpegthumbnailer' 'xdg-user-dirs' 'jemalloc' 'kcodecs' 'taglib')
+depends=('deepin-qt5integration' 'deepin-anything' 'disomaster' 'file' 'gio-qt' 'libmediainfo' 'avfs' 'polkit-qt5' 'poppler'
+         'ffmpegthumbnailer' 'jemalloc' 'kcodecs' 'taglib')
 makedepends=('qt5-tools' 'deepin-dock' 'deepin-movie' 'deepin-gettext-tools')
 optdepends=('deepin-manual: for help menual'
             'deepin-shortcut-viewer: for shortcut display'
@@ -23,16 +23,12 @@
 provides=('deepin-desktop')
 conflicts=('deepin-desktop')
 replaces=('deepin-desktop')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-file-manager/archive/$pkgver.tar.gz"
-         deepin-file-manager-qt-5.14.patch)
-sha512sums=('045430f279417bb95ecbc55994207719f591e16ed0359ed337db797cf52ff1d7ec7d12d1c042e7837eaa9156c8dfe4f029f83b8ad567d2a9cc30552138b604ed'
-            '04ee5dbd479e1fb7cc8e6371fd5c457e4f29ea373bc0058a4340db5397b0d47862c02fa1b23335ce6f2d259a935b9ebb5178f1f02dee585c92e849ec3366609d')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-file-manager/archive/$pkgver.tar.gz")
+sha512sums=('1d51fae9861a30d06395ab26e945330385f192def142635da5d92ce7027662cba6d4a784a33286b43bac1ca4fede46c35f34116db34ea4b6357917552a572738')
 
 prepare() {
   cd dde-file-manager-$pkgver
   sed -i 's|systembusconf.path = /etc/dbus-1/system.d|systembusconf.path = /usr/share/dbus-1/system.d|' dde-file-manager-daemon/dde-file-manager-daemon.pro
-
-  patch -p1 -i ../deepin-file-manager-qt-5.14.patch # Fix build with Qt 5.14
 }
 
 build() {

Deleted: deepin-file-manager-qt-5.14.patch
===================================================================
--- deepin-file-manager-qt-5.14.patch	2020-04-27 02:52:24 UTC (rev 621771)
+++ deepin-file-manager-qt-5.14.patch	2020-04-27 02:52:41 UTC (rev 621772)
@@ -1,22 +0,0 @@
-diff --git a/dde-file-manager-lib/shutil/dsqlitehandle.h b/dde-file-manager-lib/shutil/dsqlitehandle.h
-index ae7b5e94..ec0eed6e 100644
---- a/dde-file-manager-lib/shutil/dsqlitehandle.h
-+++ b/dde-file-manager-lib/shutil/dsqlitehandle.h
-@@ -21,7 +21,7 @@
- #include <QtSql/QSqlDatabase>
- 
- 
--
-+#if QT_VERSION < QT_VERSION_CHECK(5,14,0)
- namespace std
- {
- 
-@@ -35,7 +35,7 @@ struct hash<QString>
- };
- 
- }
--
-+#endif
- 
- 
- class DSqliteHandle : public QObject