[arch-commits] Commit in dtkwidget/trunk (PKGBUILD fix-qt5.patch)

[Felix Yan]

    Date: Monday, May 17, 2021 @ 16:44:38
  Author: felixonmars
Revision: 936060

upgpkg: dtkwidget 5.4.20-1

Added:
  dtkwidget/trunk/fix-qt5.patch
Modified:
  dtkwidget/trunk/PKGBUILD

---------------+
 PKGBUILD      |   13 ++++++++++---
 fix-qt5.patch |   13 +++++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-17 16:20:07 UTC (rev 936059)
+++ PKGBUILD	2021-05-17 16:44:38 UTC (rev 936060)
@@ -3,7 +3,7 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=dtkwidget
-pkgver=5.4.16
+pkgver=5.4.20
 pkgrel=1
 pkgdesc='Deepin graphical user interface library'
 arch=('x86_64')
@@ -14,9 +14,16 @@
 makedepends=('qt5-tools' 'gtest')
 replaces=('deepin-tool-kit')
 conflicts=('deepin-tool-kit<0.3.4')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dtkwidget/archive/$pkgver.tar.gz")
-sha512sums=('9c5c6df277ba5e3f6ebfa3862bede1e4698fabcb29bcf885ead2b3452411f42595470ed6872fe6096f9c8efffc311e2cc66c7cd34d0f51e54ae0b30392c2d0b2')
+source=("https://github.com/linuxdeepin/dtkwidget/archive/$pkgver/$pkgname-$pkgver.tar.gz"
+        fix-qt5.patch)
+sha512sums=('7c32732c3ace8544cf3be95783bad780e36155e36f7610d6dec7e12c6600e672f6e3af64424fbedf3df346117d606fbb00280f7fbcc8b77e6d7d19ca123958c9'
+            '3b2564af4cb518e5528ea057799c09e829fe3503ffa6e85fdfe292a43a54f7aa33af357cd3ff7454cc3776f182f1a3c638f02d4a60f944b266cc842fe7a25ac2')
 
+prepare() {
+  cd dtkwidget-$pkgver
+  patch -p1 -i ../fix-qt5.patch
+}
+
 build() {
   cd dtkwidget-$pkgver
   qmake-qt5 PREFIX=/usr

Added: fix-qt5.patch
===================================================================
--- fix-qt5.patch	                        (rev 0)
+++ fix-qt5.patch	2021-05-17 16:44:38 UTC (rev 936060)
@@ -0,0 +1,13 @@
+diff --git a/src/widgets/dstyle.cpp b/src/widgets/dstyle.cpp
+index fe80df89..ddd2b238 100644
+--- a/src/widgets/dstyle.cpp
++++ b/src/widgets/dstyle.cpp
+@@ -1995,7 +1995,7 @@ int DStyle::pixelMetric(QStyle::PixelMetric m, const QStyleOption *opt, const QW
+     case PM_ListViewIconSize:
+     case PM_LargeIconSize:
+         return 24;
+-#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
++#if (QT_VERSION >= QT_VERSION_CHECK(6, 2, 0))
+     case PM_LineEditIconSize:
+         return widget ? (widget->height() < 34 ? 16 : 32) : 24;
+ #endif