[arch-commits] Commit in deepin-file-manager/repos/community-x86_64 (3 files)
Felix Yan
felixonmars at archlinux.org
Wed Jun 7 06:46:59 UTC 2017
Date: Wednesday, June 7, 2017 @ 06:46:59
Author: felixonmars
Revision: 235293
archrelease: copy trunk to community-x86_64
Added:
deepin-file-manager/repos/community-x86_64/PKGBUILD
(from rev 235292, deepin-file-manager/trunk/PKGBUILD)
deepin-file-manager/repos/community-x86_64/qt5.9.patch
(from rev 235292, deepin-file-manager/trunk/qt5.9.patch)
Deleted:
deepin-file-manager/repos/community-x86_64/PKGBUILD
-------------+
PKGBUILD | 80 ++++++++++++++++++++++++++++----------------------
qt5.9.patch | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 136 insertions(+), 35 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2017-06-07 06:43:00 UTC (rev 235292)
+++ PKGBUILD 2017-06-07 06:46:59 UTC (rev 235293)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
-# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
-
-pkgname=deepin-file-manager
-pkgver=4.1.5
-pkgrel=2
-epoch=1
-pkgdesc='Deepin File Manager'
-arch=('i686' 'x86_64')
-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')
-optdepends=('deepin-terminal: for "Open in terminal"'
- 'file-roller: for "Compress" and "Extract"')
-makedepends=('qt5-tools' 'deepin-dock')
-groups=('deepin')
-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=('03f724e3e1392022b1df1f9f6af24071be9de53df447d02cc81f1c75e271807c31314140954297806c9a71bcf301d60f746eac9caa3af5145615f76a41e54b6a')
-
-build() {
- cd dde-file-manager-$pkgver
- qmake-qt5 PREFIX=/usr QMAKE_CFLAGS_ISYSTEM=
- make
-}
-
-package() {
- cd dde-file-manager-$pkgver
- make INSTALL_ROOT="$pkgdir" install
-}
Copied: deepin-file-manager/repos/community-x86_64/PKGBUILD (from rev 235292, deepin-file-manager/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2017-06-07 06:46:59 UTC (rev 235293)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
+# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
+
+pkgname=deepin-file-manager
+pkgver=4.1.5.20170607
+_commit=d6ed53941fa0734eb3176f4016b1a5c1a8cc8e9f
+pkgrel=1
+epoch=1
+pkgdesc='Deepin File Manager'
+arch=('i686' 'x86_64')
+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"')
+makedepends=('qt5-tools' 'deepin-dock' 'deepin-gettext-tools')
+groups=('deepin')
+provides=('deepin-desktop')
+conflicts=('deepin-desktop')
+replaces=('deepin-desktop')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-file-manager/archive/$_commit.tar.gz"
+ qt5.9.patch)
+sha512sums=('e59ef1b9ed730a0b2bb6ef3a7d0834db39d27a39d2224cdee6f0121b7014c485b0e8d651b59c0e0eeb51f4c6a49950ad658f84daeba618658c834f57fa5151ab'
+ '1cc25323ffa057654cc64720dfa9bcd4a0532a49c2ab29bc2d5c80c1dc063fd17cd2ea6b7de5cdd55599baf1bcff3e56fb08be19240d217ff949a6e6e8e2cae4')
+
+prepare() {
+ mv dde-file-manager-* dde-file-manager-$pkgver
+ cd dde-file-manager-$pkgver
+ # patch -p1 -i ../qt5.9.patch
+}
+
+build() {
+ cd dde-file-manager-$pkgver
+ qmake-qt5 PREFIX=/usr QMAKE_CFLAGS_ISYSTEM=
+ make
+}
+
+package() {
+ cd dde-file-manager-$pkgver
+ make INSTALL_ROOT="$pkgdir" install
+}
Copied: deepin-file-manager/repos/community-x86_64/qt5.9.patch (from rev 235292, deepin-file-manager/trunk/qt5.9.patch)
===================================================================
--- qt5.9.patch (rev 0)
+++ qt5.9.patch 2017-06-07 06:46:59 UTC (rev 235293)
@@ -0,0 +1,91 @@
+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();
More information about the arch-commits
mailing list