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

[Antonio Rojas via arch-commits]

    Date: Tuesday, May 26, 2020 @ 12:26:05
  Author: arojas
Revision: 635036

Qt 5.15 rebuild

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2020-05-26 12:17:39 UTC (rev 635035)
+++ PKGBUILD    2020-05-26 12:26:05 UTC (rev 635036)
@@ -2,7 +2,7 @@
 
 pkgname=deepin-qt5integration
 pkgver=5.1.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc='Qt platform theme integration plugins for DDE'
 arch=('x86_64')
 url="https://github.com/linuxdeepin/qt5integration";
@@ -13,13 +13,16 @@
 conflicts=('qt5dxcb-plugin')
 groups=('deepin')
 
source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/qt5integration/archive/$pkgver.tar.gz";
-        
$pkgname-qt-5.14-fix.patch::https://github.com/linuxdeepin/qt5integration/pull/26.patch)
+        
$pkgname-qt-5.14-fix.patch::https://github.com/linuxdeepin/qt5integration/pull/26.patch
+        deepin-qt5integration-qt5.15.patch)
 
sha512sums=('a302e9177eca680f13a266a2297247ac35817af7811830e4974dfa207adf73617ac16f24cdba1bfccf419ab72cc9dd1d4b5d5109f544063a4c55a59c2b4abbcf'
-            
'6de3090f1200d0833a5e8b567186687cee0c1f51aa6a732d0a226b903b15a1641f1da06f8ec124d36fdf46e24d28f55b1441ec81afc36c8d30f61983652b11c9')
+            
'6de3090f1200d0833a5e8b567186687cee0c1f51aa6a732d0a226b903b15a1641f1da06f8ec124d36fdf46e24d28f55b1441ec81afc36c8d30f61983652b11c9'
+            
'e77cccce5de00881305d1c117d571ee33e18ca2d7a4b1fabb86d38786045079c7b92ae3ced4093688af23af415c978c9035498188fa63481253393eaef16bd05')
 
 prepare() {
   cd qt5integration-$pkgver
   patch -p1 -i ../$pkgname-qt-5.14-fix.patch
+  patch -p1 -i ../deepin-qt5integration-qt5.15.patch # Fix build with Qt 5.15
 }
 
 build() {

Added: deepin-qt5integration-qt5.15.patch
===================================================================
--- deepin-qt5integration-qt5.15.patch                          (rev 0)
+++ deepin-qt5integration-qt5.15.patch  2020-05-26 12:26:05 UTC (rev 635036)
@@ -0,0 +1,48 @@
+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>
+