!16 [sync] PR-15: 修复coredump问题

From: @openeuler-sync-bot 
Reviewed-by: @ut-layne-yang 
Signed-off-by: @ut-layne-yang

0001-fix-coredump-in-clearChildLayout-function.patch

@@ -0,0 +1,41 @@
+From 669ef44f4f9ee32336b34eaa3b31869ce8a5bfc7 Mon Sep 17 00:00:00 2001
+From: lvgenggeng <lvgenggeng@uniontech.com>
+Date: Wed, 11 Dec 2024 19:44:05 +0800
+Subject: [PATCH 1/1] fix coredump in clearChildLayout function
+
+Signed-off-by: lvgenggeng <lvgenggeng@uniontech.com>
+---
+ .../private/cattributemanagerwgt.cpp              | 15 +++++----------
+ 1 file changed, 5 insertions(+), 10 deletions(-)
+
+diff --git a/src/frame/AttributesWidgets/private/cattributemanagerwgt.cpp b/src/frame/AttributesWidgets/private/cattributemanagerwgt.cpp
+index e706984..0adaab5 100644
+--- a/src/frame/AttributesWidgets/private/cattributemanagerwgt.cpp
++++ b/src/frame/AttributesWidgets/private/cattributemanagerwgt.cpp
+@@ -161,18 +161,13 @@ Qt::Alignment CExpWgt::widgetAlignInWindow(const QWidget *w)
+ 
+ void CExpWgt::clearChildLayout()
+ {
+-    for (int i = 0; i < _pCenterLay->count();) {
+-        auto item = _pCenterLay->itemAt(i);
+-
+-        if (item->layout() != nullptr) {
+-            delete item->layout();
+-        } else if (item->widget() != nullptr) {
+-            if (qobject_cast<CSpline *>(item->widget()) != nullptr) {
+-                item->widget()->deleteLater();
+-            }
++    while (_pCenterLay->count() > 0) {
++        QLayoutItem *pItem = _pCenterLay->takeAt(0);
++        if (nullptr != pItem) {
++            delete pItem;
+         }
+-        _pCenterLay->takeAt(i);
+     }
++
+     foreach (auto p, _splines) {
+         p->deleteLater();
+     }
+-- 
+2.20.1
+

deepin-draw.spec

@@ -1,45 +1,74 @@
 Name:           deepin-draw
-Version:        5.8.0.58
+Version:        5.10.6
-Release:        1
+Release:        2
 Summary:        A lightweight drawing tool for Linux Deepin
 License:        GPLv3+
 URL:            https://github.com/linuxdeepin/%{name}
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
+Patch1:         0001-fix-coredump-in-clearChildLayout-function.patch
 
-BuildRequires: gcc-c++ qt5-devel
+BuildRequires:  cmake
-BuildRequires: dtkwidget-devel pkgconfig(dtkgui) pkgconfig(libexif)
+BuildRequires:  gcc-c++
-BuildRequires: dtkcore-devel freeimage-devel libXext-devel
+BuildRequires:  freeimage-devel
+BuildRequires:  dtkcore-devel
+BuildRequires:  dtkwidget-devel
+BuildRequires:  pkgconfig(libexif)
+BuildRequires:  pkgconfig(xcb-aux)
+BuildRequires:  pkgconfig(Qt5)
+BuildRequires:  pkgconfig(Qt5DBus)
+BuildRequires:  pkgconfig(Qt5Gui)
+BuildRequires:  pkgconfig(Qt5Svg)
+BuildRequires:  pkgconfig(Qt5Multimedia)
+BuildRequires:  pkgconfig(Qt5X11Extras)
+BuildRequires:  qt5-linguist
+BuildRequires:  desktop-file-utils
+
+Requires:       dde-qt5integration
+Recommends:     deepin-manual
 
 %description
 %{summary}.
 
 %prep
-%autosetup
+%autosetup -p1
 
 %build
 # help find (and prefer) qt5 utilities, e.g. qmake, lrelease
 export PATH=%{_qt5_bindir}:$PATH
 mkdir build && pushd build
-%qmake_qt5 ../ VERSION=%{version}  DEFINES+="VERSION=%{version}"
+%cmake -DCMAKE_BUILD_TYPE=Release -DAPP_VERSION=%{version} -DVERSION=%{version}  ../
 %make_build
 popd
 
 %install
 %make_install -C build INSTALL_ROOT="%buildroot"
 
+%check
+desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
+
 %files
 %doc README.md
 %license LICENSE
 %{_bindir}/%{name}
 %{_datadir}/%{name}/
+%{_datadir}/deepin-manual/manual-assets/application/%{name}/
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/dbus-1/services/com.deepin.Draw.service
 %{_datadir}/icons/deepin/apps/scalable/%{name}.svg
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 %{_datadir}/%{name}/translations/*.qm
-%{_datadir}/mime/application/x-ddf.xml
+%{_datadir}/application/x-ddf.xml
-%{_datadir}/mime/packages/*.xml
+%{_datadir}/mime/packages/deepin-draw.xml
 
 %changelog
-* Sat May  08 2021 weidong <weidong@uniontech.com> - 5.8.0.58-1
+* Wed Dec 11 2024 lvgenggeng <lvgenggeng@uniontech.com> - 5.10.6-2
+- fix: fix coredump in clearChildLayout function
+
+* Wed May 17 2023 leeffo <liweiganga@uniontech.com> - 5.10.6-1
+- update to 5.10.6
+
+* Tue Jul 19 2022 loong_C <loong_c@yeah.net> - 5.9.9-1
+- update to 5.9.9
+
+* Sat May 08 2021 weidong <weidong@uniontech.com> - 5.8.0.58-1
 - Initial package.

deepin-draw.yaml

@@ -0,0 +1,4 @@
+version_control: github
+src_repo: linuxdeepin/deepin-draw
+tag_prefix: ""
+separator: "."