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

[Felix Yan]

    Date: Friday, July 3, 2020 @ 09:37:55
  Author: felixonmars
Revision: 657588

upgpkg: deepin-qt5integration 5.1.0.3-1

Modified:
  deepin-qt5integration/trunk/PKGBUILD
Deleted:
  deepin-qt5integration/trunk/deepin-qt5integration-qt5.15.patch

------------------------------------+
 PKGBUILD                           |   13 ++-------
 deepin-qt5integration-qt5.15.patch |   48 -----------------------------------
 2 files changed, 3 insertions(+), 58 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-03 09:33:39 UTC (rev 657587)
+++ PKGBUILD	2020-07-03 09:37:55 UTC (rev 657588)
@@ -1,7 +1,7 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 
 pkgname=deepin-qt5integration
-pkgver=5.1.0.2
+pkgver=5.1.0.3
 pkgrel=1
 pkgdesc='Qt platform theme integration plugins for DDE'
 arch=('x86_64')
@@ -10,16 +10,9 @@
 depends=('dtkwidget' 'libqtxdg' 'deepin-qt5platform-plugins')
 makedepends=('xcb-util-renderutil' 'deepin-file-manager')
 groups=('deepin')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/qt5integration/archive/$pkgver.tar.gz"
-        deepin-qt5integration-qt5.15.patch)
-sha512sums=('bd4212ec5c2dab711ddc2dc58b15e8c3b91a3e516ade512b9b35059de6fe987161aae864642dc85fcb30cf07e72f1aafb903138df8f7c22db3a1c4ee0aa28ba7'
-            'e77cccce5de00881305d1c117d571ee33e18ca2d7a4b1fabb86d38786045079c7b92ae3ced4093688af23af415c978c9035498188fa63481253393eaef16bd05')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/qt5integration/archive/$pkgver.tar.gz")
+sha512sums=('d5811f34d3c6a7de6e719dab4cfd8dd04450633adfe9eeae8f92d63819e9da494f26e3ab84574af1fdff8c3ef386085544a3cc9675aded00130de355ecd33f8f')
 
-prepare() {
-  cd qt5integration-$pkgver
-  patch -p1 -i ../deepin-qt5integration-qt5.15.patch # Fix build with Qt 5.15
-}
-
 build() {
   cd qt5integration-$pkgver
   qmake-qt5 PREFIX=/usr

Deleted: deepin-qt5integration-qt5.15.patch
===================================================================
--- deepin-qt5integration-qt5.15.patch	2020-07-03 09:33:39 UTC (rev 657587)
+++ deepin-qt5integration-qt5.15.patch	2020-07-03 09:37:55 UTC (rev 657588)
@@ -1,48 +0,0 @@
-diff --git a/styleplugins/dstyleplugin/painterhelper.cpp b/styleplugins/dstyleplugin/painterhelper.cpp
-index 3db216d..66d548f 100644
---- a/styleplugins/dstyleplugin/painterhelper.cpp
-+++ b/styleplugins/dstyleplugin/painterhelper.cpp
-@@ -18,6 +18,7 @@
- #include "painterhelper.h"
- 
- #include <QPainter>
-+#include <QPainterPath>
- #include <QDebug>
- 
- namespace dstyle {
-diff --git a/styleplugins/dstyleplugin/pushbuttonhelper.cpp b/styleplugins/dstyleplugin/pushbuttonhelper.cpp
-index a903a7d..31026db 100644
---- a/styleplugins/dstyleplugin/pushbuttonhelper.cpp
-+++ b/styleplugins/dstyleplugin/pushbuttonhelper.cpp
-@@ -30,6 +30,7 @@
- 
- #include <QDebug>
- #include <QStyleOptionButton>
-+#include <QPainterPath>
- 
- DWIDGET_USE_NAMESPACE
- 
-diff --git a/styleplugins/dstyleplugin/tabbarhelper.cpp b/styleplugins/dstyleplugin/tabbarhelper.cpp
-index 51f677b..e0ef36c 100644
---- a/styleplugins/dstyleplugin/tabbarhelper.cpp
-+++ b/styleplugins/dstyleplugin/tabbarhelper.cpp
-@@ -33,6 +33,7 @@ DWIDGET_USE_NAMESPACE
- #include <QStyleOptionTabBarBase>
- #include <QStyleOptionToolButton>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QToolButton>
- #include <QLinearGradient>
- #include <QDebug>
-diff --git a/styleplugins/dstyleplugin/tabwidgethelper.cpp b/styleplugins/dstyleplugin/tabwidgethelper.cpp
-index a2b6756..f51d43d 100644
---- a/styleplugins/dstyleplugin/tabwidgethelper.cpp
-+++ b/styleplugins/dstyleplugin/tabwidgethelper.cpp
-@@ -20,6 +20,7 @@
- #include "painterhelper.h"
- 
- #include <QPainter>
-+#include <QPainterPath>
- #include <QTabWidget>
- #include <QDebug>
-