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

[Felix Yan]

    Date: Tuesday, July 16, 2019 @ 17:58:57
  Author: felixonmars
Revision: 490054

upgpkg: deepin-file-manager 1:4.8.8-1

Modified:
  deepin-file-manager/trunk/PKGBUILD
Deleted:
  deepin-file-manager/trunk/deepin-file-manager-qt5.13.patch

----------------------------------+
 PKGBUILD                         |   13 +++++--------
 deepin-file-manager-qt5.13.patch |   22 ----------------------
 2 files changed, 5 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-07-16 14:24:15 UTC (rev 490053)
+++ PKGBUILD	2019-07-16 17:58:57 UTC (rev 490054)
@@ -3,14 +3,14 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=deepin-file-manager
-pkgver=4.8.6.4
-pkgrel=3
+pkgver=4.8.8
+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' 'file' 'avfs' 'polkit-qt5' 'poppler'
+depends=('deepin-qt5integration' 'deepin-anything' 'disomaster' 'file' 'avfs' 'polkit-qt5' 'poppler'
          'ffmpegthumbnailer' 'xdg-user-dirs' 'jemalloc' 'kcodecs' 'taglib')
 makedepends=('qt5-tools' 'deepin-dock' 'deepin-movie' 'deepin-gettext-tools')
 optdepends=('deepin-manual: for help menual'
@@ -23,15 +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-qt5.13.patch)
-sha512sums=('532cfcce9fc986ae3eb5ddaffcc52230139f8b14f54900dcead59ccf52950d452a2a36a073c7b569bdae0201c7178414c8b521922cac4edc7f27e4d4b77ed9d2'
-            '87be44cd6a89f90baef2737ff2a73343f1a69aac919c84ca827c515efe22ff481904df48096c8b095089aae85fc3d0615253582e78f97eb30456dd5fa8e06295')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-file-manager/archive/$pkgver.tar.gz")
+sha512sums=('61ab5f54a57851e2d3e28282125157a365305b326378b2fd8ebbafdd4aecefd3a0c0fc33803a0bf318f859d16b8407ca6205af3b37d83368df8407fac00ead82')
 
 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-qt5.13.patch # Fix build with Qt 5.13
 }
 
 build() {

Deleted: deepin-file-manager-qt5.13.patch
===================================================================
--- deepin-file-manager-qt5.13.patch	2019-07-16 14:24:15 UTC (rev 490053)
+++ deepin-file-manager-qt5.13.patch	2019-07-16 17:58:57 UTC (rev 490054)
@@ -1,22 +0,0 @@
-diff --git a/dde-file-manager-lib/views/dfiledialog.cpp b/dde-file-manager-lib/views/dfiledialog.cpp
-index c0eef394..1a1d775f 100644
---- a/dde-file-manager-lib/views/dfiledialog.cpp
-+++ b/dde-file-manager-lib/views/dfiledialog.cpp
-@@ -99,7 +99,7 @@ DFileDialog::DFileDialog(QWidget *parent)
- 
-     DFMEventDispatcher::instance()->installEventFilter(this);
- 
--    QPlatformFileDialogHelper::filterRegExp = "^(.*)\\(([^()]*)\\)$";
-+    // QPlatformFileDialogHelper::filterRegExp = "^(.*)\\(([^()]*)\\)$";
- 
-     connect(statusBar()->acceptButton(), &QPushButton::clicked, this, &DFileDialog::onAcceptButtonClicked);
-     connect(statusBar()->rejectButton(), &QPushButton::clicked, this, &DFileDialog::onRejectButtonClicked);
-@@ -236,7 +236,7 @@ void DFileDialog::addDisableUrlScheme(const QString &scheme)
- QStringList qt_strip_filters(const QStringList &filters)
- {
-     QStringList strippedFilters;
--    QRegExp r(QString::fromLatin1(QPlatformFileDialogHelper::filterRegExp));
-+    QRegExp r(QString::fromLatin1("^(.*)\\(([^()]*)\\)$"));
-     const int numFilters = filters.count();
-     strippedFilters.reserve(numFilters);
-     for (int i = 0; i < numFilters; ++i) {