diff --git a/0001-fix-ut-link-error-in-dtk.patch b/0001-fix-ut-link-error-in-dtk.patch new file mode 100644 index 0000000000000000000000000000000000000000..b12c50bffb3e76ddd246bc656f84842fd3dae75f --- /dev/null +++ b/0001-fix-ut-link-error-in-dtk.patch @@ -0,0 +1,64 @@ +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/dtkcore-5.5.19.tar.gz b/dtkcore-5.5.19.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..ed9efc7f1056fbb60a2a46ac71c468cb67e6c366 Binary files /dev/null and b/dtkcore-5.5.19.tar.gz differ diff --git a/dtkcore.spec b/dtkcore.spec index d2e8685cfeb3db3f429533023a2f5b831c234198..f637f20af1474002afd97163aced8fc49b16def8 100644 --- a/dtkcore.spec +++ b/dtkcore.spec @@ -1,19 +1,24 @@ Name: dtkcore -Version: 5.4.11.2 -Release: 2 +Version: 5.5.19 +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}.orig.tar.xz +Source0: %{name}-%{version}.tar.gz %endif +patch0: 0001-fix-ut-link-error-in-dtk.patch + BuildRequires: gcc-c++ BuildRequires: annobin BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(gsettings-qt) BuildRequires: gtest-devel +BuildRequires: qt5-qttools-devel +BuildRequires: dtkcommon-devel +BuildRequires: qt5-qtbase-private-devel # since f30 Obsoletes: deepin-tool-kit <= 0.3.3 @@ -28,6 +33,7 @@ Deepin tool kit core modules. %package devel Summary: Development package for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: dtkcommon-devel Requires: qt5-qtbase-devel%{?_isa} %description devel @@ -52,20 +58,19 @@ export PATH=%{_qt5_bindir}:$PATH %files %doc README.md %license LICENSE -%{_libdir}/lib%{name}.so.5* +%{_libdir}/lib%{name}.so* %dir %{_libexecdir}/dtk5/ %{_libexecdir}/dtk5/dtk-settings %{_libexecdir}/dtk5/dtk-license.py %{_libexecdir}/dtk5/dtk-translate.py %{_libexecdir}/dtk5/deepin-os-release -%{_datadir}/glib-2.0/schemas/* +%{_bindir}/qdbusxml2cpp-fix +%exclude %{_libexecdir}/dtk5/__pycache__ %files devel %doc doc/Specification.md %{_includedir}/libdtk-*/ -%{_qt5_archdatadir}/mkspecs/features/*.prf %{_qt5_archdatadir}/mkspecs/modules/*.pri -%{_libdir}/cmake/Dtk/ %{_libdir}/cmake/DtkCore/ %{_libdir}/cmake/DtkCMake/ %{_libdir}/cmake/DtkTools/ @@ -73,6 +78,9 @@ export PATH=%{_qt5_bindir}:$PATH %{_libdir}/lib%{name}.so %changelog +* Wed Mar 22 2023 liweiganga - 5.5.19-1 +- update: update to 5.5.19 + * Thu Jul 28 2022 liweiganga - 5.4.11.2-2 - fix install conflict diff --git a/dtkcore_5.4.11.2.orig.tar.xz b/dtkcore_5.4.11.2.orig.tar.xz deleted file mode 100644 index e84351daac521ea3e48bf213b2a16b8982fd35bc..0000000000000000000000000000000000000000 Binary files a/dtkcore_5.4.11.2.orig.tar.xz and /dev/null differ