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

[Felix Yan]

    Date: Sunday, April 26, 2020 @ 04:32:13
  Author: felixonmars
Revision: 621375

upgpkg: deepin-qt5integration 5.1.0-1

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

------------------------------------+
 PKGBUILD                           |   12 ++++++------
 deepin-qt5integration-qt5.13.patch |   11 -----------
 2 files changed, 6 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-26 04:22:40 UTC (rev 621374)
+++ PKGBUILD	2020-04-26 04:32:13 UTC (rev 621375)
@@ -1,8 +1,8 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 
 pkgname=deepin-qt5integration
-pkgver=5.0.0
-pkgrel=10
+pkgver=5.1.0
+pkgrel=1
 pkgdesc='Qt platform theme integration plugins for DDE'
 arch=('x86_64')
 url="https://github.com/linuxdeepin/qt5integration"
@@ -13,16 +13,16 @@
 conflicts=('qt5dxcb-plugin')
 groups=('deepin')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/qt5integration/archive/$pkgver.tar.gz"
-        deepin-qt5integration-qt5.13.patch
         deepin-qt5integration-qt5.14.patch)
-sha512sums=('bfaa0cf1ca1422da1e645e86275b290c186cb2e26264b3844afd77f31cdc2d1e4ac1b54bcc58a46b336534146865a0310b802f2477f7505f666aed76a2788f00'
-            '345590b7fa94c84adc0c894df8c70931a46769f7af40edf1e5d3623a5327b344be48e17db10791c8f75bf626874f2f031ef221c1218c6b0d889eca3b883c0764'
+sha512sums=('a550021508f968ec7501595a031dd400633216de704a48cd294a9b00b2a5aae57d88a3b9322f945d5adc4d13eb98b5eef6621e5967508e2a1a7c316cf0592feb'
             'd227f060b3dfd324c19a957e90a210256649c366645bb2e712dbdefb0b9287dc0ae97fa14e0252d168323b06e7ba526bc351600273a4afb7c3fa2b8d59e42aa0')
 
 prepare() {
   cd qt5integration-$pkgver
-  patch -p1 -i ../deepin-qt5integration-qt5.13.patch # Fix build with Qt 5.13
   patch -p1 -i ../deepin-qt5integration-qt5.14.patch # Fix build with Qt 5.14
+
+  sed -i 's/^.*DPlatformWindowHandle.*$/Dtk::Widget::DPlatformWindowHandle handle((QWidget *)w);/' styleplugins/dstyleplugin/config.tests/dtkwidget/main.cpp
+  sed -i 's/QSpinBox/DSpinBox/' styleplugins/chameleon/chameleonstyle.cpp
 }
 
 build() {

Deleted: deepin-qt5integration-qt5.13.patch
===================================================================
--- deepin-qt5integration-qt5.13.patch	2020-04-26 04:22:40 UTC (rev 621374)
+++ deepin-qt5integration-qt5.13.patch	2020-04-26 04:32:13 UTC (rev 621375)
@@ -1,11 +0,0 @@
-diff --git a/dstyleplugin/style.cpp b/dstyleplugin/style.cpp
-index 04e03fe..65be15f 100644
---- a/dstyleplugin/style.cpp
-+++ b/dstyleplugin/style.cpp
-@@ -1418,6 +1418,4 @@ void Style::fillBrush(QPainter *p, const QRect &rect, const QBrush &brush, qreal
-     }
- }
- 
--#include "moc_style.cpp"
--
- }