Date: Monday, September 21, 2020 @ 12:08:22 Author: felixonmars Revision: 711185
archrelease: copy trunk to community-x86_64 Added: deepin-file-manager/repos/community-x86_64/PKGBUILD (from rev 711184, deepin-file-manager/trunk/PKGBUILD) deepin-file-manager/repos/community-x86_64/deepin-file-manager-qt5.15.patch (from rev 711184, deepin-file-manager/trunk/deepin-file-manager-qt5.15.patch) Deleted: deepin-file-manager/repos/community-x86_64/PKGBUILD deepin-file-manager/repos/community-x86_64/deepin-file-manager-qt5.15.patch ----------------------------------+ PKGBUILD | 98 ++++++++++----------- deepin-file-manager-qt5.15.patch | 168 ++++++++++++++++++------------------- 2 files changed, 133 insertions(+), 133 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-09-21 12:08:04 UTC (rev 711184) +++ PKGBUILD 2020-09-21 12:08:22 UTC (rev 711185) @@ -1,49 +0,0 @@ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Josip Ponjavic <josipponjavic at gmail dot com> -# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com> - -pkgname=deepin-file-manager -pkgver=5.2.0.42 -pkgrel=1 -epoch=1 -pkgdesc='Deepin File Manager' -arch=('x86_64') -url="https://github.com/linuxdeepin/dde-file-manager" -license=('GPL3') -# startdde: for com.deepin.SessionManager -depends=('deepin-qt5integration' 'deepin-anything' 'disomaster' 'file' 'gio-qt' 'libmediainfo' - 'lucene++' 'avfs' 'polkit-qt5' 'poppler' 'ffmpegthumbnailer' 'jemalloc' 'kcodecs' - 'startdde' 'taglib' 'htmlcxx' 'libgsf' 'mimetic' 'boost-libs') -makedepends=('boost' 'qt5-tools' 'deepin-dock' 'deepin-movie' 'deepin-gettext-tools') -optdepends=('deepin-manual: for help menual' - 'deepin-shortcut-viewer: for shortcut display' - 'deepin-screensaver: for screensaver chooser' - 'deepin-movie: for video preview' - 'deepin-terminal: for opening in terminal' - 'deepin-compressor: for compress/decompress') -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" - deepin-file-manager-qt5.15.patch) -sha512sums=('7d6606290f44db4615b18a5ad4f54085e5d62bdf4eb90894eb8237f0cb97fb45344ad71869557668e79ba457b5d34aca88cb1e5f5f5fe16c5757a1aff88ad067' - '0c38761b7a44dc581d7d4fedc2c51cf702769ec43a325384f13ce427cf2dccc8af4b59e82f4bd567449073926f4a7ad433147ea01db0ad8ab75eb46f7150a3eb') - -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.15.patch # Fix build with Qt 5.15 -} - -build() { - cd dde-file-manager-$pkgver - qmake-qt5 PREFIX=/usr filemanager.pro - make -} - -package() { - cd dde-file-manager-$pkgver - make INSTALL_ROOT="$pkgdir" install -} Copied: deepin-file-manager/repos/community-x86_64/PKGBUILD (from rev 711184, deepin-file-manager/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-09-21 12:08:22 UTC (rev 711185) @@ -0,0 +1,49 @@ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Josip Ponjavic <josipponjavic at gmail dot com> +# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com> + +pkgname=deepin-file-manager +pkgver=5.2.0.43 +pkgrel=1 +epoch=1 +pkgdesc='Deepin File Manager' +arch=('x86_64') +url="https://github.com/linuxdeepin/dde-file-manager" +license=('GPL3') +# startdde: for com.deepin.SessionManager +depends=('deepin-qt5integration' 'deepin-anything' 'disomaster' 'file' 'gio-qt' 'libmediainfo' + 'lucene++' 'avfs' 'polkit-qt5' 'poppler' 'ffmpegthumbnailer' 'jemalloc' 'kcodecs' + 'startdde' 'taglib' 'htmlcxx' 'libgsf' 'mimetic' 'boost-libs') +makedepends=('boost' 'qt5-tools' 'deepin-dock' 'deepin-movie' 'deepin-gettext-tools') +optdepends=('deepin-manual: for help menual' + 'deepin-shortcut-viewer: for shortcut display' + 'deepin-screensaver: for screensaver chooser' + 'deepin-movie: for video preview' + 'deepin-terminal: for opening in terminal' + 'deepin-compressor: for compress/decompress') +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" + deepin-file-manager-qt5.15.patch) +sha512sums=('ba359fe7b92553276d6d6562f6712d69b3e01a9dc755df3631a9a91bf3837b1067008cee0edf241df86be875485cf78e029710905de6f6211bc8244e83b071fc' + '0c38761b7a44dc581d7d4fedc2c51cf702769ec43a325384f13ce427cf2dccc8af4b59e82f4bd567449073926f4a7ad433147ea01db0ad8ab75eb46f7150a3eb') + +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.15.patch # Fix build with Qt 5.15 +} + +build() { + cd dde-file-manager-$pkgver + qmake-qt5 PREFIX=/usr filemanager.pro + make +} + +package() { + cd dde-file-manager-$pkgver + make INSTALL_ROOT="$pkgdir" install +} Deleted: deepin-file-manager-qt5.15.patch =================================================================== --- deepin-file-manager-qt5.15.patch 2020-09-21 12:08:04 UTC (rev 711184) +++ deepin-file-manager-qt5.15.patch 2020-09-21 12:08:22 UTC (rev 711185) @@ -1,84 +0,0 @@ -diff --git a/dde-file-manager-lib/dialogs/openwithdialog.cpp b/dde-file-manager-lib/dialogs/openwithdialog.cpp -index 95d8bb9b..c6cc2ecf 100644 ---- a/dde-file-manager-lib/dialogs/openwithdialog.cpp -+++ b/dde-file-manager-lib/dialogs/openwithdialog.cpp -@@ -48,6 +48,7 @@ - #include <QStandardPaths> - #include <QScroller> - #include <QCommandLinkButton> -+#include <QPainterPath> - #include <DHorizontalLine> - #include <DStyle> - #include <DIconButton> -diff --git a/dde-file-manager-lib/dialogs/propertydialog.cpp b/dde-file-manager-lib/dialogs/propertydialog.cpp -index 740c1f76..ff822213 100644 ---- a/dde-file-manager-lib/dialogs/propertydialog.cpp -+++ b/dde-file-manager-lib/dialogs/propertydialog.cpp -@@ -79,6 +79,7 @@ - #include <QButtonGroup> - #include <QProgressBar> - #include <QPainter> -+#include <QPainterPath> - #include <QPushButton> - #include <QStackedWidget> - #include <QStorageInfo> -diff --git a/dde-file-manager-lib/interfaces/dfmglobal.cpp b/dde-file-manager-lib/interfaces/dfmglobal.cpp -index 56b0140a..58be9814 100644 ---- a/dde-file-manager-lib/interfaces/dfmglobal.cpp -+++ b/dde-file-manager-lib/interfaces/dfmglobal.cpp -@@ -70,6 +70,7 @@ - #include <QMediaPlayer> - #include <QDBusObjectPath> - #include <QRegularExpression> -+#include <QPainterPath> - - #include <private/qtextengine_p.h> - -diff --git a/dde-file-manager-lib/interfaces/dfmstyleditemdelegate.cpp b/dde-file-manager-lib/interfaces/dfmstyleditemdelegate.cpp -index fdf4b2d2..d6fde0e6 100644 ---- a/dde-file-manager-lib/interfaces/dfmstyleditemdelegate.cpp -+++ b/dde-file-manager-lib/interfaces/dfmstyleditemdelegate.cpp -@@ -14,6 +14,7 @@ - #include <QDebug> - #include <QAbstractItemView> - #include <QPainter> -+#include <QPainterPath> - #include <QGuiApplication> - #include <QThreadStorage> - -diff --git a/dde-file-manager-lib/interfaces/diconitemdelegate.cpp b/dde-file-manager-lib/interfaces/diconitemdelegate.cpp -index 02a91283..d500aac8 100644 ---- a/dde-file-manager-lib/interfaces/diconitemdelegate.cpp -+++ b/dde-file-manager-lib/interfaces/diconitemdelegate.cpp -@@ -34,6 +34,7 @@ - - #include <QLabel> - #include <QPainter> -+#include <QPainterPath> - #include <QTextEdit> - #include <QLineEdit> - #include <QTextBlock> -diff --git a/dde-file-manager-lib/interfaces/dlistitemdelegate.cpp b/dde-file-manager-lib/interfaces/dlistitemdelegate.cpp -index 3e78dc7a..01392e06 100644 ---- a/dde-file-manager-lib/interfaces/dlistitemdelegate.cpp -+++ b/dde-file-manager-lib/interfaces/dlistitemdelegate.cpp -@@ -16,6 +16,7 @@ - - #include <QLabel> - #include <QPainter> -+#include <QPainterPath> - #include <QAbstractItemView> - #include <QLineEdit> - #include <QApplication> -diff --git a/dialogs/dfmtaskwidget.cpp b/dialogs/dfmtaskwidget.cpp -index 94069ee8..464c2095 100644 ---- a/dialogs/dfmtaskwidget.cpp -+++ b/dialogs/dfmtaskwidget.cpp -@@ -30,6 +30,7 @@ - #include <DGuiApplicationHelper> - #include <QTimer> - #include <QException> -+#include <QPainterPath> - - #include "app/define.h" - #include "dfileservices.h" Copied: deepin-file-manager/repos/community-x86_64/deepin-file-manager-qt5.15.patch (from rev 711184, deepin-file-manager/trunk/deepin-file-manager-qt5.15.patch) =================================================================== --- deepin-file-manager-qt5.15.patch (rev 0) +++ deepin-file-manager-qt5.15.patch 2020-09-21 12:08:22 UTC (rev 711185) @@ -0,0 +1,84 @@ +diff --git a/dde-file-manager-lib/dialogs/openwithdialog.cpp b/dde-file-manager-lib/dialogs/openwithdialog.cpp +index 95d8bb9b..c6cc2ecf 100644 +--- a/dde-file-manager-lib/dialogs/openwithdialog.cpp ++++ b/dde-file-manager-lib/dialogs/openwithdialog.cpp +@@ -48,6 +48,7 @@ + #include <QStandardPaths> + #include <QScroller> + #include <QCommandLinkButton> ++#include <QPainterPath> + #include <DHorizontalLine> + #include <DStyle> + #include <DIconButton> +diff --git a/dde-file-manager-lib/dialogs/propertydialog.cpp b/dde-file-manager-lib/dialogs/propertydialog.cpp +index 740c1f76..ff822213 100644 +--- a/dde-file-manager-lib/dialogs/propertydialog.cpp ++++ b/dde-file-manager-lib/dialogs/propertydialog.cpp +@@ -79,6 +79,7 @@ + #include <QButtonGroup> + #include <QProgressBar> + #include <QPainter> ++#include <QPainterPath> + #include <QPushButton> + #include <QStackedWidget> + #include <QStorageInfo> +diff --git a/dde-file-manager-lib/interfaces/dfmglobal.cpp b/dde-file-manager-lib/interfaces/dfmglobal.cpp +index 56b0140a..58be9814 100644 +--- a/dde-file-manager-lib/interfaces/dfmglobal.cpp ++++ b/dde-file-manager-lib/interfaces/dfmglobal.cpp +@@ -70,6 +70,7 @@ + #include <QMediaPlayer> + #include <QDBusObjectPath> + #include <QRegularExpression> ++#include <QPainterPath> + + #include <private/qtextengine_p.h> + +diff --git a/dde-file-manager-lib/interfaces/dfmstyleditemdelegate.cpp b/dde-file-manager-lib/interfaces/dfmstyleditemdelegate.cpp +index fdf4b2d2..d6fde0e6 100644 +--- a/dde-file-manager-lib/interfaces/dfmstyleditemdelegate.cpp ++++ b/dde-file-manager-lib/interfaces/dfmstyleditemdelegate.cpp +@@ -14,6 +14,7 @@ + #include <QDebug> + #include <QAbstractItemView> + #include <QPainter> ++#include <QPainterPath> + #include <QGuiApplication> + #include <QThreadStorage> + +diff --git a/dde-file-manager-lib/interfaces/diconitemdelegate.cpp b/dde-file-manager-lib/interfaces/diconitemdelegate.cpp +index 02a91283..d500aac8 100644 +--- a/dde-file-manager-lib/interfaces/diconitemdelegate.cpp ++++ b/dde-file-manager-lib/interfaces/diconitemdelegate.cpp +@@ -34,6 +34,7 @@ + + #include <QLabel> + #include <QPainter> ++#include <QPainterPath> + #include <QTextEdit> + #include <QLineEdit> + #include <QTextBlock> +diff --git a/dde-file-manager-lib/interfaces/dlistitemdelegate.cpp b/dde-file-manager-lib/interfaces/dlistitemdelegate.cpp +index 3e78dc7a..01392e06 100644 +--- a/dde-file-manager-lib/interfaces/dlistitemdelegate.cpp ++++ b/dde-file-manager-lib/interfaces/dlistitemdelegate.cpp +@@ -16,6 +16,7 @@ + + #include <QLabel> + #include <QPainter> ++#include <QPainterPath> + #include <QAbstractItemView> + #include <QLineEdit> + #include <QApplication> +diff --git a/dialogs/dfmtaskwidget.cpp b/dialogs/dfmtaskwidget.cpp +index 94069ee8..464c2095 100644 +--- a/dialogs/dfmtaskwidget.cpp ++++ b/dialogs/dfmtaskwidget.cpp +@@ -30,6 +30,7 @@ + #include <DGuiApplicationHelper> + #include <QTimer> + #include <QException> ++#include <QPainterPath> + + #include "app/define.h" + #include "dfileservices.h"