[arch-commits] Commit in dtkwidget/repos/community-testing-x86_64 (4 files)

Felix Yan felixonmars at archlinux.org
Sat Jun 5 21:17:22 UTC 2021


    Date: Saturday, June 5, 2021 @ 21:17:22
  Author: felixonmars
Revision: 956162

archrelease: copy trunk to community-testing-x86_64

Added:
  dtkwidget/repos/community-testing-x86_64/PKGBUILD
    (from rev 956161, dtkwidget/trunk/PKGBUILD)
  dtkwidget/repos/community-testing-x86_64/fix-qt5.patch
    (from rev 956161, dtkwidget/trunk/fix-qt5.patch)
Deleted:
  dtkwidget/repos/community-testing-x86_64/PKGBUILD
  dtkwidget/repos/community-testing-x86_64/fix-qt5.patch

---------------+
 PKGBUILD      |   77 +++++++++++++++++++++++++++++---------------------------
 fix-qt5.patch |   26 +++++++++---------
 2 files changed, 54 insertions(+), 49 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-05 21:17:03 UTC (rev 956161)
+++ PKGBUILD	2021-06-05 21:17:22 UTC (rev 956162)
@@ -1,36 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
-# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
-
-pkgname=dtkwidget
-pkgver=5.4.20
-pkgrel=1
-pkgdesc='Deepin graphical user interface library'
-arch=('x86_64')
-url="https://github.com/linuxdeepin/dtkwidget"
-license=('LGPL3')
-depends=('deepin-qt-dbus-factory' 'dtkcore' 'dtkgui' 'librsvg' 'qt5-multimedia' 'qt5-svg'
-         'qt5-x11extras' 'startup-notification')
-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=('7c32732c3ace8544cf3be95783bad780e36155e36f7610d6dec7e12c6600e672f6e3af64424fbedf3df346117d606fbb00280f7fbcc8b77e6d7d19ca123958c9'
-            '3b2564af4cb518e5528ea057799c09e829fe3503ffa6e85fdfe292a43a54f7aa33af357cd3ff7454cc3776f182f1a3c638f02d4a60f944b266cc842fe7a25ac2')
-
-prepare() {
-  cd dtkwidget-$pkgver
-  patch -p1 -i ../fix-qt5.patch
-}
-
-build() {
-  cd dtkwidget-$pkgver
-  qmake-qt5 PREFIX=/usr
-  make
-}
-
-package() {
-  cd dtkwidget-$pkgver
-  make INSTALL_ROOT="$pkgdir" install
-}

Copied: dtkwidget/repos/community-testing-x86_64/PKGBUILD (from rev 956161, dtkwidget/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-06-05 21:17:22 UTC (rev 956162)
@@ -0,0 +1,41 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
+# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
+
+pkgname=dtkwidget
+pkgver=5.5.7
+pkgrel=1
+pkgdesc='Deepin graphical user interface library'
+arch=('x86_64')
+url="https://github.com/linuxdeepin/dtkwidget"
+license=('LGPL3')
+depends=('deepin-qt-dbus-factory' 'dtkcore' 'dtkgui' 'librsvg' 'qt5-multimedia' 'qt5-svg'
+         'qt5-x11extras' 'startup-notification')
+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')
+
+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
+  make
+}
+
+package() {
+  cd dtkwidget-$pkgver
+  make INSTALL_ROOT="$pkgdir" install
+}

Deleted: fix-qt5.patch
===================================================================
--- fix-qt5.patch	2021-06-05 21:17:03 UTC (rev 956161)
+++ fix-qt5.patch	2021-06-05 21:17:22 UTC (rev 956162)
@@ -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

Copied: dtkwidget/repos/community-testing-x86_64/fix-qt5.patch (from rev 956161, dtkwidget/trunk/fix-qt5.patch)
===================================================================
--- fix-qt5.patch	                        (rev 0)
+++ fix-qt5.patch	2021-06-05 21:17:22 UTC (rev 956162)
@@ -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



More information about the arch-commits mailing list