[arch-commits] Commit in deepin-file-manager/trunk (PKGBUILD qt5.9.patch)

[Felix Yan]

    Date: Thursday, June 8, 2017 @ 14:35:40
  Author: felixonmars
Revision: 235445

upgpkg: deepin-file-manager 1:4.1.5.20170608-2

Adjust dependencies

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

-------------+
 PKGBUILD    |    8 +----
 qt5.9.patch |   91 ----------------------------------------------------------
 2 files changed, 3 insertions(+), 96 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-06-08 14:34:13 UTC (rev 235444)
+++ PKGBUILD	2017-06-08 14:35:40 UTC (rev 235445)
@@ -6,7 +6,7 @@
 pkgname=deepin-file-manager
 pkgver=4.1.5.20170608
 _commit=b35b34db87cfa65b7dc0c78653f7ebb347143c86
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc='Deepin File Manager'
 arch=('i686' 'x86_64')
@@ -13,10 +13,8 @@
 url="https://github.com/linuxdeepin/dde-file-manager"
 license=('GPL3')
 depends=('deepin-tool-kit' 'gtk2' 'gsettings-qt' 'libsecret' 'qt5-svg' 'file' 'polkit-qt5'
-         'deepin-shortcut-viewer' 'poppler' 'ffmpegthumbnailer' 'deepin-manual'
-         'deepin-qt-dbus-factory' 'treefrog-framework')
-optdepends=('deepin-terminal: for "Open in terminal"'
-            'file-roller: for "Compress" and "Extract"')
+         'deepin-shortcut-viewer' 'poppler' 'ffmpegthumbnailer' 'deepin-manual' 'file-roller'
+         'deepin-qt-dbus-factory' 'treefrog-framework' 'deepin-terminal' 'gst-plugins-good')
 makedepends=('qt5-tools' 'deepin-dock' 'deepin-gettext-tools')
 groups=('deepin')
 provides=('deepin-desktop')

Deleted: qt5.9.patch
===================================================================
--- qt5.9.patch	2017-06-08 14:34:13 UTC (rev 235444)
+++ qt5.9.patch	2017-06-08 14:35:40 UTC (rev 235445)
@@ -1,91 +0,0 @@
-commit 39c7135a4d972d5f412b3288e4100851361d507c
-Author: Felix Yan <felixonmars at archlinux.org>
-Date:   Fri Jun 2 16:44:39 2017 +0800
-
-    Fix compatibility with Qt 5.9
-    
-    QFlags only works on Enums since Qt 5.9. This should not break old Qt
-    versions.
-    
-    Change-Id: I80326bf39d5ebe8c20db19aac8ad8beaa3af7371
-
-diff --git a/dde-desktop/model/dfileselectionmodel.cpp b/dde-desktop/model/dfileselectionmodel.cpp
-index 296e0342..af588ddb 100644
---- a/dde-desktop/model/dfileselectionmodel.cpp
-+++ b/dde-desktop/model/dfileselectionmodel.cpp
-@@ -18,7 +18,7 @@ DFileSelectionModel::DFileSelectionModel(QAbstractItemModel *model, QObject *par
- 
- bool DFileSelectionModel::isSelected(const QModelIndex &index) const
- {
--    if (m_currentCommand != QFlags<QItemSelectionModel::SelectionFlags>(Current|Rows|ClearAndSelect))
-+    if (m_currentCommand != QItemSelectionModel::SelectionFlags(Current|Rows|ClearAndSelect))
-         return QItemSelectionModel::isSelected(index);
- 
-     for (const QItemSelectionRange &range : m_selection) {
-@@ -31,7 +31,7 @@ bool DFileSelectionModel::isSelected(const QModelIndex &index) const
- 
- int DFileSelectionModel::selectedCount() const
- {
--    if (m_currentCommand != QFlags<QItemSelectionModel::SelectionFlags>(Current|Rows|ClearAndSelect))
-+    if (m_currentCommand != QItemSelectionModel::SelectionFlags(Current|Rows|ClearAndSelect))
-         return selectedIndexes().count();
- 
-     return m_lastSelectedIndex.row() - m_firstSelectedIndex.row() + 1;
-@@ -40,7 +40,7 @@ int DFileSelectionModel::selectedCount() const
- QModelIndexList DFileSelectionModel::selectedIndexes() const
- {
-     if (m_selectedList.isEmpty()) {
--        if (m_currentCommand != QFlags<QItemSelectionModel::SelectionFlags>(Current|Rows|ClearAndSelect)) {
-+        if (m_currentCommand != QItemSelectionModel::SelectionFlags(Current|Rows|ClearAndSelect)) {
-             m_selectedList = QItemSelectionModel::selectedIndexes();
-         } else {
-             for (const QItemSelectionRange &range : m_selection) {
-@@ -57,7 +57,7 @@ void DFileSelectionModel::select(const QItemSelection &selection, QItemSelection
-     if (!command.testFlag(NoUpdate))
-         m_selectedList.clear();
- 
--    if (command != QFlags<QItemSelectionModel::SelectionFlags>(Current|Rows|ClearAndSelect)) {
-+    if (command != QItemSelectionModel::SelectionFlags(Current|Rows|ClearAndSelect)) {
-         if (m_timer.isActive()) {
-             m_timer.stop();
-             updateSelecteds();
-diff --git a/dde-file-manager-lib/models/dfileselectionmodel.cpp b/dde-file-manager-lib/models/dfileselectionmodel.cpp
-index a61f3844..8650f66d 100644
---- a/dde-file-manager-lib/models/dfileselectionmodel.cpp
-+++ b/dde-file-manager-lib/models/dfileselectionmodel.cpp
-@@ -20,7 +20,7 @@ DFileSelectionModel::DFileSelectionModel(QAbstractItemModel *model, QObject *par
- 
- bool DFileSelectionModel::isSelected(const QModelIndex &index) const
- {
--    if (m_currentCommand != QFlags<QItemSelectionModel::SelectionFlags>(Current|Rows|ClearAndSelect))
-+    if (m_currentCommand != QItemSelectionModel::SelectionFlags(Current|Rows|ClearAndSelect))
-         return QItemSelectionModel::isSelected(index);
- 
-     for (const QItemSelectionRange &range : m_selection) {
-@@ -35,7 +35,7 @@ bool DFileSelectionModel::isSelected(const QModelIndex &index) const
- 
- int DFileSelectionModel::selectedCount() const
- {
--    if (m_currentCommand != QFlags<QItemSelectionModel::SelectionFlags>(Current|Rows|ClearAndSelect))
-+    if (m_currentCommand != QItemSelectionModel::SelectionFlags(Current|Rows|ClearAndSelect))
-         return selectedIndexes().count();
- 
-     return m_lastSelectedIndex.row() - m_firstSelectedIndex.row() + 1;
-@@ -44,7 +44,7 @@ int DFileSelectionModel::selectedCount() const
- QModelIndexList DFileSelectionModel::selectedIndexes() const
- {
-     if (m_selectedList.isEmpty()) {
--        if (m_currentCommand != QFlags<QItemSelectionModel::SelectionFlags>(Current|Rows|ClearAndSelect)) {
-+        if (m_currentCommand != QItemSelectionModel::SelectionFlags(Current|Rows|ClearAndSelect)) {
-             m_selectedList = QItemSelectionModel::selectedIndexes();
-         } else {
-             for (const QItemSelectionRange &range : m_selection) {
-@@ -61,7 +61,7 @@ void DFileSelectionModel::select(const QItemSelection &selection, QItemSelection
-     if (!command.testFlag(NoUpdate))
-         m_selectedList.clear();
- 
--    if (command != QFlags<QItemSelectionModel::SelectionFlags>(Current|Rows|ClearAndSelect)) {
-+    if (command != QItemSelectionModel::SelectionFlags(Current|Rows|ClearAndSelect)) {
-         if (m_timer.isActive()) {
-             m_timer.stop();
-             updateSelecteds();