Felix Yan pushed to branch main at Arch Linux / Packaging / Packages / dtk6core
Commits:
c92fe8f4 by Felix Yan at 2024-08-26T19:21:51+03:00
upgpkg: 6.0.17-1
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- − qt-6.7.1.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = dtk6core
pkgdesc = DTK core modules
- pkgver = 6.0.16
- pkgrel = 2
+ pkgver = 6.0.17
+ pkgrel = 1
url = https://github.com/linuxdeepin/dtk6core
arch = x86_64
license = LGPL3
@@ -21,9 +21,7 @@ pkgbase = dtk6core
depends = qt6-base
depends = uchardet
depends = spdlog
- source = git+https://github.com/linuxdeepin/dtk6core.git#tag=6.0.16
- source = qt-6.7.1.patch
- sha512sums =
d200df6c72101f2a63fddfbe2277609acd2e08a57506782a7f47019f5d34705d283e50e30be3611d4d3a5892af02989fdc3ce60395437e6397fbd049f8756c8e
- sha512sums =
39130b23e52e864ad5ed47085af89c0f558f4b246073d1452b3f2ebfc4e8cdfc473e2e487215e72b49b883e361522c29bed67ec6084a43484fe797e1aed7f103
+ source = git+https://github.com/linuxdeepin/dtk6core.git#tag=6.0.17
+ sha512sums =
cff9e5c9815089eb8b678013ef56fcadd170052ddff9f0a5eac1fb0ee9260945e5b99210b20cbef03218b1bab943195e7aa8fff6af44ef5959577ad1322fdbac
pkgname = dtk6core
=====================================
PKGBUILD
=====================================
@@ -3,8 +3,8 @@
# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
pkgname=dtk6core
-pkgver=6.0.16
-pkgrel=2
+pkgver=6.0.17
+pkgrel=1
pkgdesc='DTK core modules'
arch=('x86_64')
url="https://github.com/linuxdeepin/dtk6core";
@@ -12,15 +12,12 @@ license=('LGPL3')
depends=('deepin-desktop-base' 'dtkcommon' 'gcc-libs' 'glibc' 'icu'
'libsystemd' 'lshw' 'qt6-base'
'uchardet' 'spdlog')
makedepends=('git' 'cmake' 'ninja' 'qt6-tools' 'gtest' 'doxygen')
-source=("git+https://github.com/linuxdeepin/dtk6core.git#tag=$pkgver";
- qt-6.7.1.patch)
-sha512sums=('d200df6c72101f2a63fddfbe2277609acd2e08a57506782a7f47019f5d34705d283e50e30be3611d4d3a5892af02989fdc3ce60395437e6397fbd049f8756c8e'
-
'39130b23e52e864ad5ed47085af89c0f558f4b246073d1452b3f2ebfc4e8cdfc473e2e487215e72b49b883e361522c29bed67ec6084a43484fe797e1aed7f103')
+source=("git+https://github.com/linuxdeepin/dtk6core.git#tag=$pkgver";)
+sha512sums=('cff9e5c9815089eb8b678013ef56fcadd170052ddff9f0a5eac1fb0ee9260945e5b99210b20cbef03218b1bab943195e7aa8fff6af44ef5959577ad1322fdbac')
prepare() {
cd dtk6core
sed -i 's|/etc/os-version|/etc/uos-version|' src/dsysinfo.cpp
- patch -p1 -i ../qt-6.7.1.patch
}
build() {
=====================================
qt-6.7.1.patch deleted
=====================================
@@ -1,26 +0,0 @@
-diff --git a/src/dci/private/ddcifileengine.cpp
b/src/dci/private/ddcifileengine.cpp
-index f1de7ab..abccb85 100644
---- a/src/dci/private/ddcifileengine.cpp
-+++ b/src/dci/private/ddcifileengine.cpp
-@@ -531,7 +531,7 @@ void DDciFileEngine::setFileName(const QString &fullPath)
- file = getDciFile(dciFilePath, QFile::exists(dciFilePath));
- }
-
--QDateTime DDciFileEngine::fileTime(QAbstractFileEngine::FileTime time) const
-+QDateTime DDciFileEngine::fileTime(QFile::FileTime time) const
- {
- return
QFileInfo(dciFilePath).fileTime(static_cast<QFile::FileTime>(time));
- }
-diff --git a/src/dci/private/ddcifileengine_p.h
b/src/dci/private/ddcifileengine_p.h
-index 9b8af44..b20c455 100644
---- a/src/dci/private/ddcifileengine_p.h
-+++ b/src/dci/private/ddcifileengine_p.h
-@@ -95,7 +95,7 @@ public:
-
- void setFileName(const QString &fullPath) override;
-
-- QDateTime fileTime(FileTime time) const override;
-+ QDateTime fileTime(QFile::FileTime time) const override;
-
- typedef DDciFileEngineIterator Iterator;
- Iterator *beginEntryList(QDir::Filters filters, const QStringList
&filterNames) override;
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/dtk6core/-/commit/c92fe8f435a0b41745eb5ba7978e13708ec398c9
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/dtk6core/-/commit/c92fe8f435a0b41745eb5ba7978e13708ec398c9
You're receiving this email because of your account on gitlab.archlinux.org.
