diff --git a/0001-fix-ut-link-error-in-dtk.patch b/0001-fix-ut-link-error-in-dtk.patch deleted file mode 100644 index b12c50bffb3e76ddd246bc656f84842fd3dae75f..0000000000000000000000000000000000000000 --- a/0001-fix-ut-link-error-in-dtk.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 90e010a7bafa442e46d19a6dc6a8b02d3cebce31 Mon Sep 17 00:00:00 2001 -From: zorowk -Date: Wed, 1 Dec 2021 10:12:58 +0800 -Subject: [PATCH] fix: ut link error in dtk. - -the member definition need to be separate in some build environment. - -Log: -Influence: build error. -Signed-off-by: zorowk -Change-Id: Idd982f0e0a17efa50e170c4590c83ea75abaa031 ---- - tests/ut_dconfig.cpp | 5 +++-- - tests/ut_dconfigfile.cpp | 4 ++-- - 2 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/tests/ut_dconfig.cpp b/tests/ut_dconfig.cpp -index 4cf17b9..7e99d81 100644 ---- a/tests/ut_dconfig.cpp -+++ b/tests/ut_dconfig.cpp -@@ -29,6 +29,9 @@ - - DCORE_USE_NAMESPACE - -+static constexpr char const *APP_ID = "tests"; -+static constexpr char const *FILE_NAME = "example"; -+ - class ut_DConfig : public testing::Test - { - protected: -@@ -50,8 +53,6 @@ protected: - static EnvGuard backendType; - static EnvGuard fileBackendLocalPerfix; - static FileCopyGuard *metaGuard; -- static constexpr char const *APP_ID = "tests"; -- static constexpr char const *FILE_NAME = "example"; - }; - EnvGuard ut_DConfig::fileBackendLocalPerfix; - EnvGuard ut_DConfig::backendType; -diff --git a/tests/ut_dconfigfile.cpp b/tests/ut_dconfigfile.cpp -index 253fcd8..c3c156d 100644 ---- a/tests/ut_dconfigfile.cpp -+++ b/tests/ut_dconfigfile.cpp -@@ -29,6 +29,8 @@ - - DCORE_USE_NAMESPACE - -+static constexpr char const *LocalPrefix = "/tmp/example"; -+ - class ut_DConfigFile : public testing::Test - { - protected: -@@ -42,8 +44,6 @@ protected: - } - virtual void TearDown() override; - -- static constexpr char const *LocalPrefix = "/tmp/example"; -- - const char *APP_ID = "org.foo.appid"; - const char *FILE_NAME = "org.foo.name"; - QString metaPath = QString("%1/opt/apps/%2/files/schemas/configs").arg(LocalPrefix, APP_ID); --- -2.20.1 - diff --git a/README.en.md b/README.en.md deleted file mode 100644 index b3d509c2831a68fdc9a2273aca51ae56146f31bd..0000000000000000000000000000000000000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# dtkcore - -#### Description -dtkcore - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.md b/README.md deleted file mode 100644 index cc231656e9f7fa530878a1cefdaee32d1a1099f8..0000000000000000000000000000000000000000 --- a/README.md +++ /dev/null @@ -1,37 +0,0 @@ -# dtkcore - -#### 介绍 -dtkcore - -#### 软件架构 -软件架构说明 - - -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request - - -#### 码云特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目 -5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/dtkcore-5.5.19.tar.gz b/dtkcore-5.5.19.tar.gz deleted file mode 100644 index ed9efc7f1056fbb60a2a46ac71c468cb67e6c366..0000000000000000000000000000000000000000 Binary files a/dtkcore-5.5.19.tar.gz and /dev/null differ diff --git a/dtkcore-5.5.35.tar.gz b/dtkcore-5.5.35.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..9b3562483968414dafa7207d37fddcce65ac8f2b Binary files /dev/null and b/dtkcore-5.5.35.tar.gz differ diff --git a/dtkcore.spec b/dtkcore.spec index f637f20af1474002afd97163aced8fc49b16def8..cd90b48ae8d6ea5b1085a26d4b5c7350545c09d5 100644 --- a/dtkcore.spec +++ b/dtkcore.spec @@ -1,24 +1,20 @@ Name: dtkcore -Version: 5.5.19 +Version: 5.5.35 Release: 1 Summary: Deepin tool kit core modules License: LGPLv3+ URL: https://github.com/linuxdeepin/dtkcore -%if 0%{?fedora} -Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -%else Source0: %{name}-%{version}.tar.gz -%endif -patch0: 0001-fix-ut-link-error-in-dtk.patch BuildRequires: gcc-c++ -BuildRequires: annobin +#BuildRequires: annobin BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(gsettings-qt) BuildRequires: gtest-devel BuildRequires: qt5-qttools-devel BuildRequires: dtkcommon-devel BuildRequires: qt5-qtbase-private-devel +BuildRequires: make # since f30 Obsoletes: deepin-tool-kit <= 0.3.3 @@ -65,7 +61,6 @@ export PATH=%{_qt5_bindir}:$PATH %{_libexecdir}/dtk5/dtk-translate.py %{_libexecdir}/dtk5/deepin-os-release %{_bindir}/qdbusxml2cpp-fix -%exclude %{_libexecdir}/dtk5/__pycache__ %files devel %doc doc/Specification.md @@ -78,6 +73,9 @@ export PATH=%{_qt5_bindir}:$PATH %{_libdir}/lib%{name}.so %changelog +* Tue Jun 18 2024 lvgenggeng - 5.5.35-1 +- update: upgrade to version 5.5.35 + * Wed Mar 22 2023 liweiganga - 5.5.19-1 - update: update to 5.5.19