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

[Antonio Rojas]

    Date: Friday, June 21, 2019 @ 22:26:22
  Author: arojas
Revision: 482635

Qt 5.13 rebuild

Added:
  deepin-file-manager/trunk/deepin-file-manager-qt5.13.patch
Modified:
  deepin-file-manager/trunk/PKGBUILD
Deleted:
  deepin-file-manager/trunk/fix-plugin-link.patch

----------------------------------+
 PKGBUILD                         |    9 ++++++---
 deepin-file-manager-qt5.13.patch |   22 ++++++++++++++++++++++
 fix-plugin-link.patch            |   13 -------------
 3 files changed, 28 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-06-21 21:33:03 UTC (rev 482634)
+++ PKGBUILD	2019-06-21 22:26:22 UTC (rev 482635)
@@ -4,7 +4,7 @@
 
 pkgname=deepin-file-manager
 pkgver=4.8.6.4
-pkgrel=2
+pkgrel=3
 epoch=1
 pkgdesc='Deepin File Manager'
 arch=('x86_64')
@@ -23,12 +23,15 @@
 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")
-sha512sums=('532cfcce9fc986ae3eb5ddaffcc52230139f8b14f54900dcead59ccf52950d452a2a36a073c7b569bdae0201c7178414c8b521922cac4edc7f27e4d4b77ed9d2')
+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')
 
 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() {

Added: deepin-file-manager-qt5.13.patch
===================================================================
--- deepin-file-manager-qt5.13.patch	                        (rev 0)
+++ deepin-file-manager-qt5.13.patch	2019-06-21 22:26:22 UTC (rev 482635)
@@ -0,0 +1,22 @@
+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) {

Deleted: fix-plugin-link.patch
===================================================================
--- fix-plugin-link.patch	2019-06-21 21:33:03 UTC (rev 482634)
+++ fix-plugin-link.patch	2019-06-21 22:26:22 UTC (rev 482635)
@@ -1,13 +0,0 @@
-diff --git a/dde-dock-plugins/disk-mount/disk-mount.pro b/dde-dock-plugins/disk-mount/disk-mount.pro
-index c5d336e8..c9575b15 100644
---- a/dde-dock-plugins/disk-mount/disk-mount.pro
-+++ b/dde-dock-plugins/disk-mount/disk-mount.pro
-@@ -15,7 +15,7 @@ DISTFILES       += disk-mount.json
- 
- DEFINES += QT_MESSAGELOGCONTEXT DFM_NO_FILE_WATCHER
- 
--#unix: LIBS += -L$$OUT_PWD/../../dde-file-manager-lib -ldde-file-manager
-+LIBS += -L$$OUT_PWD/../../dde-file-manager-lib -ldde-file-manager
- 
- HEADERS += \
-     diskmountplugin.h \