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

Antonio Rojas arojas at archlinux.org
Tue May 26 12:11:12 UTC 2020


    Date: Tuesday, May 26, 2020 @ 12:11:11
  Author: arojas
Revision: 635032

Qt 5.15 rebuild

Added:
  deepin-file-manager/trunk/deepin-file-manager-qt5.15.patch
Modified:
  deepin-file-manager/trunk/PKGBUILD

----------------------------------+
 PKGBUILD                         |   10 +++-
 deepin-file-manager-qt5.15.patch |   84 +++++++++++++++++++++++++++++++++++++
 2 files changed, 91 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-26 11:52:07 UTC (rev 635031)
+++ PKGBUILD	2020-05-26 12:11:11 UTC (rev 635032)
@@ -4,7 +4,7 @@
 
 pkgname=deepin-file-manager
 pkgver=5.1.1.25
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc='Deepin File Manager'
 arch=('x86_64')
@@ -23,12 +23,16 @@
 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=('95ce6d9ae846adc54129fe06deba3b8e3b80fd0e706c822d5714f27d5402d2e4d5ba8b78033e46f64079f5388c4a02ed674d87b356babba12529c3ca70ac3551')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-file-manager/archive/$pkgver.tar.gz"
+         deepin-file-manager-qt5.15.patch)
+sha512sums=('95ce6d9ae846adc54129fe06deba3b8e3b80fd0e706c822d5714f27d5402d2e4d5ba8b78033e46f64079f5388c4a02ed674d87b356babba12529c3ca70ac3551'
+            '2b58868fdaee9d42f8ba2029bcaa727c146c64b219faa52bd2df1c1483290e95a7cb6622227a24d35f7d7167061d264839bfeb47872d84519097b47af036daf7')
 
 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() {

Added: deepin-file-manager-qt5.15.patch
===================================================================
--- deepin-file-manager-qt5.15.patch	                        (rev 0)
+++ deepin-file-manager-qt5.15.patch	2020-05-26 12:11:11 UTC (rev 635032)
@@ -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
+@@ -29,6 +29,7 @@
+ #include <DIconButton>
+ #include <DGuiApplicationHelper>
+ #include <QTimer>
++#include <QPainterPath>
+ 
+ #include "app/define.h"
+ #include "dfileservices.h"



More information about the arch-commits mailing list