[arch-commits] Commit in deepin-file-manager/repos (6 files)
Felix Yan
felixonmars at archlinux.org
Thu Jun 8 14:50:46 UTC 2017
Date: Thursday, June 8, 2017 @ 14:50:45
Author: felixonmars
Revision: 235448
archrelease: copy trunk to community-testing-i686, community-testing-x86_64
Added:
deepin-file-manager/repos/community-testing-i686/PKGBUILD
(from rev 235447, deepin-file-manager/trunk/PKGBUILD)
deepin-file-manager/repos/community-testing-x86_64/PKGBUILD
(from rev 235447, deepin-file-manager/trunk/PKGBUILD)
Deleted:
deepin-file-manager/repos/community-testing-i686/PKGBUILD
deepin-file-manager/repos/community-testing-i686/qt5.9.patch
deepin-file-manager/repos/community-testing-x86_64/PKGBUILD
deepin-file-manager/repos/community-testing-x86_64/qt5.9.patch
--------------------------------------+
/PKGBUILD | 78 ++++++++++++++++++++++++++++
community-testing-i686/PKGBUILD | 41 --------------
community-testing-i686/qt5.9.patch | 91 ---------------------------------
community-testing-x86_64/PKGBUILD | 41 --------------
community-testing-x86_64/qt5.9.patch | 91 ---------------------------------
5 files changed, 78 insertions(+), 264 deletions(-)
Deleted: community-testing-i686/PKGBUILD
===================================================================
--- community-testing-i686/PKGBUILD 2017-06-08 14:50:14 UTC (rev 235447)
+++ community-testing-i686/PKGBUILD 2017-06-08 14:50:45 UTC (rev 235448)
@@ -1,41 +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.20170608
-_commit=b35b34db87cfa65b7dc0c78653f7ebb347143c86
-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")
-sha512sums=('b1aa3ed492012dc3e3533f681ea0709f95d625cce64f8c388374a1b962eaba51fff41726f4b2bc9750b21f55cac22bfb214d7ccaa7ca69f3677a9867a8bf847d')
-
-prepare() {
- mv dde-file-manager-* dde-file-manager-$pkgver
-}
-
-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-testing-i686/PKGBUILD (from rev 235447, deepin-file-manager/trunk/PKGBUILD)
===================================================================
--- community-testing-i686/PKGBUILD (rev 0)
+++ community-testing-i686/PKGBUILD 2017-06-08 14:50:45 UTC (rev 235448)
@@ -0,0 +1,39 @@
+# $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.20170608
+_commit=b35b34db87cfa65b7dc0c78653f7ebb347143c86
+pkgrel=3
+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' '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')
+conflicts=('deepin-desktop')
+replaces=('deepin-desktop')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-file-manager/archive/$_commit.tar.gz")
+sha512sums=('b1aa3ed492012dc3e3533f681ea0709f95d625cce64f8c388374a1b962eaba51fff41726f4b2bc9750b21f55cac22bfb214d7ccaa7ca69f3677a9867a8bf847d')
+
+prepare() {
+ mv dde-file-manager-* dde-file-manager-$pkgver
+}
+
+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
+}
Deleted: community-testing-i686/qt5.9.patch
===================================================================
--- community-testing-i686/qt5.9.patch 2017-06-08 14:50:14 UTC (rev 235447)
+++ community-testing-i686/qt5.9.patch 2017-06-08 14:50:45 UTC (rev 235448)
@@ -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();
Deleted: community-testing-x86_64/PKGBUILD
===================================================================
--- community-testing-x86_64/PKGBUILD 2017-06-08 14:50:14 UTC (rev 235447)
+++ community-testing-x86_64/PKGBUILD 2017-06-08 14:50:45 UTC (rev 235448)
@@ -1,41 +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.20170608
-_commit=b35b34db87cfa65b7dc0c78653f7ebb347143c86
-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")
-sha512sums=('b1aa3ed492012dc3e3533f681ea0709f95d625cce64f8c388374a1b962eaba51fff41726f4b2bc9750b21f55cac22bfb214d7ccaa7ca69f3677a9867a8bf847d')
-
-prepare() {
- mv dde-file-manager-* dde-file-manager-$pkgver
-}
-
-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-testing-x86_64/PKGBUILD (from rev 235447, deepin-file-manager/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD (rev 0)
+++ community-testing-x86_64/PKGBUILD 2017-06-08 14:50:45 UTC (rev 235448)
@@ -0,0 +1,39 @@
+# $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.20170608
+_commit=b35b34db87cfa65b7dc0c78653f7ebb347143c86
+pkgrel=3
+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' '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')
+conflicts=('deepin-desktop')
+replaces=('deepin-desktop')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-file-manager/archive/$_commit.tar.gz")
+sha512sums=('b1aa3ed492012dc3e3533f681ea0709f95d625cce64f8c388374a1b962eaba51fff41726f4b2bc9750b21f55cac22bfb214d7ccaa7ca69f3677a9867a8bf847d')
+
+prepare() {
+ mv dde-file-manager-* dde-file-manager-$pkgver
+}
+
+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
+}
Deleted: community-testing-x86_64/qt5.9.patch
===================================================================
--- community-testing-x86_64/qt5.9.patch 2017-06-08 14:50:14 UTC (rev 235447)
+++ community-testing-x86_64/qt5.9.patch 2017-06-08 14:50:45 UTC (rev 235448)
@@ -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();
More information about the arch-commits
mailing list