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

[Felix Yan]

    Date: Monday, July 5, 2021 @ 16:00:35
  Author: felixonmars
Revision: 972379

upgpkg: dtkwidget 5.5.17.1-1

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-07-05 16:00:26 UTC (rev 972378)
+++ PKGBUILD	2021-07-05 16:00:35 UTC (rev 972379)
@@ -3,7 +3,7 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=dtkwidget
-pkgver=5.5.7
+pkgver=5.5.17.1
 pkgrel=1
 pkgdesc='Deepin graphical user interface library'
 arch=('x86_64')
@@ -14,21 +14,9 @@
 makedepends=('qt5-tools' 'gtest')
 replaces=('deepin-tool-kit')
 conflicts=('deepin-tool-kit<0.3.4')
-source=("https://github.com/linuxdeepin/dtkwidget/archive/$pkgver/$pkgname-$pkgver.tar.gz"
-        fix-qt5.patch)
-sha512sums=('b5c8a6ceb38ae56a5e29860eace2fb1f89fd27e00af183552591da9864927a351050e58058ad7360de7713236778aa600f58a055d9345709c383526c6d1c8e0e'
-            '3b2564af4cb518e5528ea057799c09e829fe3503ffa6e85fdfe292a43a54f7aa33af357cd3ff7454cc3776f182f1a3c638f02d4a60f944b266cc842fe7a25ac2')
+source=("https://github.com/linuxdeepin/dtkwidget/archive/$pkgver/$pkgname-$pkgver.tar.gz")
+sha512sums=('ff7233f711d33e443acbda7bec99352fb83f2b70e7350dab20fcbb1c103f599f4705474af817dc72d66793b12003077db96cc1212eb401167d5c2a17e082d074')
 
-prepare() {
-  cd dtkwidget-$pkgver
-  patch -p1 -i ../fix-qt5.patch
-
-  # Patch out 5.5 suffix. The version number in dtkcore & friends never matched their tags,
-  # and current version of dde-session-shell requires 5.5 explicitly. Let's make qmake and
-  # cmake happy while upstream didn't react on this matter.
-  find . -name '*.pro' -exec sed -i 's/dtkcore5.5/dtkcore/g;s/dtkgui5.5/dtkgui/g;s/dtkwidget5.5/dtkwidget/g' {} \;
-}
-
 build() {
   cd dtkwidget-$pkgver
   qmake-qt5 PREFIX=/usr

Deleted: fix-qt5.patch
===================================================================
--- fix-qt5.patch	2021-07-05 16:00:26 UTC (rev 972378)
+++ fix-qt5.patch	2021-07-05 16:00:35 UTC (rev 972379)
@@ -1,13 +0,0 @@
-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