From 6074f737aeeafffe9174482e01ee28f8a4d7459a Mon Sep 17 00:00:00 2001 From: liweiganga Date: Wed, 30 Nov 2022 15:51:58 +0800 Subject: [PATCH] fix issue:#I5XSWB --- 0001-fix-issue-I5XSWB.patch | 34 ++++++++++++++++++++++++++++++++++ dde-control-center.spec | 7 ++++++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 0001-fix-issue-I5XSWB.patch diff --git a/0001-fix-issue-I5XSWB.patch b/0001-fix-issue-I5XSWB.patch new file mode 100644 index 0000000..6638372 --- /dev/null +++ b/0001-fix-issue-I5XSWB.patch @@ -0,0 +1,34 @@ +From 1c86a6d1610dcf9207a2a6d0618628d94f90572c Mon Sep 17 00:00:00 2001 +From: leeffo +Date: Wed, 30 Nov 2022 14:39:17 +0800 +Subject: [PATCH] fix issue:#I5XSWB + +--- + src/frame/window/modules/systeminfo/nativeinfowidget.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/frame/window/modules/systeminfo/nativeinfowidget.cpp b/src/frame/window/modules/systeminfo/nativeinfowidget.cpp +index 41ad410..3ff687d 100644 +--- a/src/frame/window/modules/systeminfo/nativeinfowidget.cpp ++++ b/src/frame/window/modules/systeminfo/nativeinfowidget.cpp +@@ -87,7 +87,7 @@ void NativeInfoWidget::initWidget() + m_version = new TitleValueItem(); + //~ contents_path /systeminfo/About This PC + m_version->setTitle(tr("Edition:")); +- m_version->setValue("1010e"); ++ m_version->setValue(m_model->version()); + m_type = new TitleValueItem(); + //~ contents_path /systeminfo/About This PC + m_type->setTitle(tr("Type:")); +@@ -185,7 +185,7 @@ void NativeInfoWidget::setVersionNumber(const QString &type) + + void NativeInfoWidget::setEdition(const QString &edition) + { +- m_version->setValue("1010e"); ++ m_version->setValue(edition); + } + + void NativeInfoWidget::setType(const QString &type) +-- +2.20.1 + diff --git a/dde-control-center.spec b/dde-control-center.spec index d8b171d..584f7f6 100644 --- a/dde-control-center.spec +++ b/dde-control-center.spec @@ -1,11 +1,12 @@ Name: dde-control-center Version: 5.3.0.54.4 -Release: 2 +Release: 3 Summary: New control center for Linux Deepin License: GPLv3 URL: https://github.com/linuxdeepin/%{name} Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz Patch0: modify-QPainterPath-error.patch +Patch1: 0001-fix-issue-I5XSWB.patch BuildRequires: gcc-c++ BuildRequires: desktop-file-utils @@ -47,6 +48,7 @@ BuildArch: noarch %prep %setup -q -n %{name}-%{version} %patch0 -p1 +%patch1 -p1 sed -i 's|lrelease|lrelease-qt5|' translate_generation.sh sed -i -E '/add_compile_definitions/d' CMakeLists.txt @@ -83,6 +85,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||: %{_libdir}/cmake/DdeControlCenter/ %changelog +* Wed Nov 30 2022 liweiganga - 5.3.0.54.4-3 +- fix issue I5XSWB + * Sun Jan 30 2022 liweigang - 5.3.0.54.4-2 - fix build error -- Gitee