Felix Yan pushed to branch main at Arch Linux / Packaging / Packages /
dtk6declarative
Commits:
7015eae9 by Felix Yan at 2024-05-12T14:48:52+00:00
upgpkg: 6.0.11-1
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- − qt-6.7.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,6 +1,6 @@
pkgbase = dtk6declarative
pkgdesc = Deepin Toolkit, declarative module for DDE look and feel
- pkgver = 6.0.10
+ pkgver = 6.0.11
pkgrel = 1
url = https://github.com/linuxdeepin/dtk6declarative
arch = x86_64
@@ -22,9 +22,7 @@ pkgbase = dtk6declarative
depends = qt6-shadertools
depends = libgl
depends = gcc-libs
- source =
git+https://github.com/linuxdeepin/dtk6declarative.git#tag=6.0.10
- source = qt-6.7.patch
- sha512sums =
3130b5b3e8bd32fe28366622a6945e06635d051e2f2d2dba8ed98d2796e24f76ba3342df15aeaa3e0c123983f9963f8773505811d1a0976e0d16bd493b889b2c
- sha512sums =
b537f0828f3fce7c876ad2c9aeefac54a178a0bebdc35bf9e75fe47824d92dcc0ea4a15422fc561889a8f9e91111f3b0a56e4dc3635565f025d80e2c3ea0ab79
+ source =
git+https://github.com/linuxdeepin/dtk6declarative.git#tag=6.0.11
+ sha512sums =
c13ce2115f2e7b487c06c8de3dc04ba782bfc07c647fa81dc92b0625c02a256ac634265119553e2704a3bda872b01b5d1acbb6a8a5d7f5b37a2e039ebf355100
pkgname = dtk6declarative
=====================================
PKGBUILD
=====================================
@@ -2,7 +2,7 @@
# Contributor: zccrs <zhangj...@deepin.org>
pkgname=dtk6declarative
-pkgver=6.0.10
+pkgver=6.0.11
pkgrel=1
pkgdesc='Deepin Toolkit, declarative module for DDE look and feel'
arch=('x86_64')
@@ -13,14 +13,8 @@ license=('LGPL3')
depends=('dtk6core' 'dtk6gui' 'qt6-declarative' 'qt6-quickcontrols2'
'qt6-base' 'qt6-5compat'
'qt6-shadertools' 'libgl' 'gcc-libs')
makedepends=('git' 'cmake' 'ninja' 'qt6-tools' 'qt6-shadertools' 'doxygen'
'gtest' 'gmock')
-source=("git+https://github.com/linuxdeepin/dtk6declarative.git#tag=$pkgver";
- qt-6.7.patch)
-sha512sums=('3130b5b3e8bd32fe28366622a6945e06635d051e2f2d2dba8ed98d2796e24f76ba3342df15aeaa3e0c123983f9963f8773505811d1a0976e0d16bd493b889b2c'
-
'b537f0828f3fce7c876ad2c9aeefac54a178a0bebdc35bf9e75fe47824d92dcc0ea4a15422fc561889a8f9e91111f3b0a56e4dc3635565f025d80e2c3ea0ab79')
-
-prepare() {
- patch -d $pkgname -p1 < qt-6.7.patch # Fix build with Qt 6.7
-}
+source=("git+https://github.com/linuxdeepin/dtk6declarative.git#tag=$pkgver";)
+sha512sums=('c13ce2115f2e7b487c06c8de3dc04ba782bfc07c647fa81dc92b0625c02a256ac634265119553e2704a3bda872b01b5d1acbb6a8a5d7f5b37a2e039ebf355100')
build() {
cd $pkgname
=====================================
qt-6.7.patch deleted
=====================================
@@ -1,13 +0,0 @@
-diff --git a/src/private/dquickkeylistener.cpp
b/src/private/dquickkeylistener.cpp
-index 5d2c733..4f8699b 100644
---- a/src/private/dquickkeylistener.cpp
-+++ b/src/private/dquickkeylistener.cpp
-@@ -146,7 +146,7 @@ int DQuickKeyListenerPrivate::doNativeShiftKey(QKeyEvent
*e, int nativeKey)
- if (!(e->modifiers() & Qt::ShiftModifier))
- return key;
-
-- QList<int> possibleKeys = QKeyMapper::possibleKeys(e);
-+ QList<QKeyCombination> possibleKeys = QKeyMapper::possibleKeys(e);
- int pkTotal = possibleKeys.count();
- if (!pkTotal)
- return false;
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/dtk6declarative/-/commit/7015eae9304a4a9bbe146429b836384f12ffd053
--
This project does not include diff previews in email notifications.
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/dtk6declarative/-/commit/7015eae9304a4a9bbe146429b836384f12ffd053
You're receiving this email because of your account on gitlab.archlinux.org.
