Felix Yan pushed to branch main at Arch Linux / Packaging / Packages / 
dtk6widget


Commits:
39ff8243 by Felix Yan at 2024-06-16T13:04:13+00:00
upgpkg: 6.0.16-1

- - - - -


3 changed files:

- .SRCINFO
- PKGBUILD
- − qt-6.7.patch


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,6 +1,6 @@
 pkgbase = dtk6widget
        pkgdesc = Deepin base graphical widgets library
-       pkgver = 6.0.15
+       pkgver = 6.0.16
        pkgrel = 1
        url = https://github.com/linuxdeepin/dtk6widget
        arch = x86_64
@@ -24,9 +24,7 @@ pkgbase = dtk6widget
        depends = qt6-svg
        depends = startup-notification
        depends = xcb-util
-       source = git+https://github.com/linuxdeepin/dtk6widget.git#tag=6.0.15
-       source = qt-6.7.patch
-       sha512sums = 
4af0fe6d05234cc94a9e9d2820940938747de086b0b76cc852d4c92689995d67902dd05530d34c3a2ad39de788cff2fd45f0eba726b7e768e19125de611ecf65
-       sha512sums = 
e6cdd45b6e83b4dc86aec9e7784b51d84d0a074582eb04ac084cbe90e9c58d25399ebc8b52d401cf7d8cb9abd4ec7a3b5b2646b99b8814cfcca5faffd1b8f18d
+       source = git+https://github.com/linuxdeepin/dtk6widget.git#tag=6.0.16
+       sha512sums = 
e71cd4517beba351d88ce826339cb07705d7bddffa73a4643fff99c78351cb97356155d7fceb128dec66e0fd209d32487a10379d4faf5ea7e921600fd30662ff
 
 pkgname = dtk6widget


=====================================
PKGBUILD
=====================================
@@ -3,7 +3,7 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=dtk6widget
-pkgver=6.0.15
+pkgver=6.0.16
 pkgrel=1
 pkgdesc='Deepin base graphical widgets library'
 arch=('x86_64')
@@ -13,14 +13,8 @@ license=('LGPL3')
 depends=('dtk6core' 'dtk6gui' 'gcc-libs' 'glibc' 'libx11' 'libxcb' 'libxext' 
'libxi'
          'qt6-base' 'qt6-imageformats' 'qt6-svg' 'startup-notification' 
'xcb-util')
 makedepends=('git' 'cmake' 'ninja' 'qt6-tools' 'gtest' 'doxygen')
-source=("git+https://github.com/linuxdeepin/dtk6widget.git#tag=$pkgver";
-         qt-6.7.patch)
-sha512sums=('4af0fe6d05234cc94a9e9d2820940938747de086b0b76cc852d4c92689995d67902dd05530d34c3a2ad39de788cff2fd45f0eba726b7e768e19125de611ecf65'
-            
'e6cdd45b6e83b4dc86aec9e7784b51d84d0a074582eb04ac084cbe90e9c58d25399ebc8b52d401cf7d8cb9abd4ec7a3b5b2646b99b8814cfcca5faffd1b8f18d')
-
-prepare() {
-  patch -d $pkgname -p1 < qt-6.7.patch # Fix build with Qt 6.7
-}
+source=("git+https://github.com/linuxdeepin/dtk6widget.git#tag=$pkgver";)
+sha512sums=('e71cd4517beba351d88ce826339cb07705d7bddffa73a4643fff99c78351cb97356155d7fceb128dec66e0fd209d32487a10379d4faf5ea7e921600fd30662ff')
 
 build() {
   cd dtk6widget


=====================================
qt-6.7.patch deleted
=====================================
@@ -1,13 +0,0 @@
-diff --git a/src/widgets/dkeysequenceedit.cpp 
b/src/widgets/dkeysequenceedit.cpp
-index a99e17ae..b3e34014 100644
---- a/src/widgets/dkeysequenceedit.cpp
-+++ b/src/widgets/dkeysequenceedit.cpp
-@@ -276,7 +276,7 @@ void DKeySequenceEdit::keyPressEvent(QKeyEvent *e)
-     }
- 
-     if (e->modifiers() & Qt::ShiftModifier) {
--        QList<int> possibleKeys = QKeyMapper::possibleKeys(e);
-+        QList<QKeyCombination> possibleKeys = QKeyMapper::possibleKeys(e);
-         int pkTotal = possibleKeys.count();
-         if (!pkTotal)
-             return;



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/dtk6widget/-/commit/39ff8243a5dd520a875c356982a95202309a3a37

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/dtk6widget/-/commit/39ff8243a5dd520a875c356982a95202309a3a37
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to