!12 [sync] PR-11: upgrade to version 5.5.35
From: @openeuler-sync-bot Reviewed-by: @leeffo Signed-off-by: @leeffo
This commit is contained in:
commit
cbf8cc32db
@ -1,64 +0,0 @@
|
|||||||
From 90e010a7bafa442e46d19a6dc6a8b02d3cebce31 Mon Sep 17 00:00:00 2001
|
|
||||||
From: zorowk <pengwenhao@uniontech.com>
|
|
||||||
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 <pengwenhao@uniontech.com>
|
|
||||||
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
|
|
||||||
|
|
||||||
Binary file not shown.
BIN
dtkcore-5.5.35.tar.gz
Normal file
BIN
dtkcore-5.5.35.tar.gz
Normal file
Binary file not shown.
14
dtkcore.spec
14
dtkcore.spec
@ -1,24 +1,20 @@
|
|||||||
Name: dtkcore
|
Name: dtkcore
|
||||||
Version: 5.5.19
|
Version: 5.5.35
|
||||||
Release: 1
|
Release: 1
|
||||||
Summary: Deepin tool kit core modules
|
Summary: Deepin tool kit core modules
|
||||||
License: LGPLv3+
|
License: LGPLv3+
|
||||||
URL: https://github.com/linuxdeepin/dtkcore
|
URL: https://github.com/linuxdeepin/dtkcore
|
||||||
%if 0%{?fedora}
|
|
||||||
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
|
|
||||||
%else
|
|
||||||
Source0: %{name}-%{version}.tar.gz
|
Source0: %{name}-%{version}.tar.gz
|
||||||
%endif
|
|
||||||
patch0: 0001-fix-ut-link-error-in-dtk.patch
|
|
||||||
|
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: annobin
|
#BuildRequires: annobin
|
||||||
BuildRequires: pkgconfig(Qt5Core)
|
BuildRequires: pkgconfig(Qt5Core)
|
||||||
BuildRequires: pkgconfig(gsettings-qt)
|
BuildRequires: pkgconfig(gsettings-qt)
|
||||||
BuildRequires: gtest-devel
|
BuildRequires: gtest-devel
|
||||||
BuildRequires: qt5-qttools-devel
|
BuildRequires: qt5-qttools-devel
|
||||||
BuildRequires: dtkcommon-devel
|
BuildRequires: dtkcommon-devel
|
||||||
BuildRequires: qt5-qtbase-private-devel
|
BuildRequires: qt5-qtbase-private-devel
|
||||||
|
BuildRequires: make
|
||||||
|
|
||||||
# since f30
|
# since f30
|
||||||
Obsoletes: deepin-tool-kit <= 0.3.3
|
Obsoletes: deepin-tool-kit <= 0.3.3
|
||||||
@ -65,7 +61,6 @@ export PATH=%{_qt5_bindir}:$PATH
|
|||||||
%{_libexecdir}/dtk5/dtk-translate.py
|
%{_libexecdir}/dtk5/dtk-translate.py
|
||||||
%{_libexecdir}/dtk5/deepin-os-release
|
%{_libexecdir}/dtk5/deepin-os-release
|
||||||
%{_bindir}/qdbusxml2cpp-fix
|
%{_bindir}/qdbusxml2cpp-fix
|
||||||
%exclude %{_libexecdir}/dtk5/__pycache__
|
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%doc doc/Specification.md
|
%doc doc/Specification.md
|
||||||
@ -78,6 +73,9 @@ export PATH=%{_qt5_bindir}:$PATH
|
|||||||
%{_libdir}/lib%{name}.so
|
%{_libdir}/lib%{name}.so
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jul 24 2023 leeffo <liweiganga@uniontech.com> - 5.5.35-1
|
||||||
|
- update: upgrade to version 5.5.35
|
||||||
|
|
||||||
* Wed Mar 22 2023 liweiganga <liweiganga@uniontech.com> - 5.5.19-1
|
* Wed Mar 22 2023 liweiganga <liweiganga@uniontech.com> - 5.5.19-1
|
||||||
- update: update to 5.5.19
|
- update: update to 5.5.19
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user