Compare commits

..

No commits in common. "05b76522809af6dd0e98cff95fd0b44a5c42b755" and "b64504517c0e2d53a8a1432f035e54c16c99b75f" have entirely different histories.

5 changed files with 10 additions and 84 deletions

View File

@ -1,41 +0,0 @@
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

Binary file not shown.

BIN
deepin-draw-5.8.0.58.tar.gz Normal file

Binary file not shown.

View File

@ -1,74 +1,45 @@
Name: deepin-draw
Version: 5.10.6
Release: 2
Version: 5.8.0.58
Release: 1
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: cmake
BuildRequires: gcc-c++
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
BuildRequires: gcc-c++ qt5-devel
BuildRequires: dtkwidget-devel pkgconfig(dtkgui) pkgconfig(libexif)
BuildRequires: dtkcore-devel freeimage-devel libXext-devel
%description
%{summary}.
%prep
%autosetup -p1
%autosetup
%build
# help find (and prefer) qt5 utilities, e.g. qmake, lrelease
export PATH=%{_qt5_bindir}:$PATH
mkdir build && pushd build
%cmake -DCMAKE_BUILD_TYPE=Release -DAPP_VERSION=%{version} -DVERSION=%{version} ../
%qmake_qt5 ../ VERSION=%{version} DEFINES+="VERSION=%{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}/application/x-ddf.xml
%{_datadir}/mime/packages/deepin-draw.xml
%{_datadir}/mime/application/x-ddf.xml
%{_datadir}/mime/packages/*.xml
%changelog
* 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
* Sat May 08 2021 weidong <weidong@uniontech.com> - 5.8.0.58-1
- Initial package.

View File

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