!16 update: update to 5.7.28

From: @leeffo 
Reviewed-by: @HelloWorld_lvcongqing 
Signed-off-by: @HelloWorld_lvcongqing
This commit is contained in:
openeuler-ci-bot 2023-05-25 08:44:33 +00:00 committed by Gitee
commit 100183e046
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 24 additions and 57 deletions

1
.gitattributes vendored Normal file
View File

@ -0,0 +1 @@
deepin-manual-5.7.28.tar.gz filter=lfs diff=lfs merge=lfs -text

View File

@ -1,39 +0,0 @@
From 95f2520afea8ec1f27cfb96b95fa4d67bcb93a5e Mon Sep 17 00:00:00 2001
From: leeffo <leeffo@yeah.net>
Date: Fri, 10 Feb 2023 10:55:23 +0800
Subject: [PATCH] feat: add include QPainterPath
---
src/view/widget/search_button.cpp | 2 ++
src/view/widget/search_completion_delegate.cpp | 2 ++
2 files changed, 4 insertions(+)
diff --git a/src/view/widget/search_button.cpp b/src/view/widget/search_button.cpp
index 94081d4..4f64755 100644
--- a/src/view/widget/search_button.cpp
+++ b/src/view/widget/search_button.cpp
@@ -29,6 +29,8 @@
#include <DLog>
+#include <QPainterPath>
+
DWIDGET_USE_NAMESPACE
namespace dman {
diff --git a/src/view/widget/search_completion_delegate.cpp b/src/view/widget/search_completion_delegate.cpp
index 2cdd0ac..d2ae1d9 100644
--- a/src/view/widget/search_completion_delegate.cpp
+++ b/src/view/widget/search_completion_delegate.cpp
@@ -8,6 +8,8 @@
#include <DStyleHelper>
#include <DApplicationHelper>
+#include <QPainterPath>
+
SearchCompletionDelegate::SearchCompletionDelegate(QAbstractItemView *parent)
:DStyledItemDelegate(parent)
, m_parentView(parent)
--
2.20.1

Binary file not shown.

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:209369160052eb80ba9f47a2ce216fb9c9d4c1a8968c10b5f781654572bdab77
size 535828480

View File

@ -2,14 +2,14 @@
%global debug_package %{nil}
%global _unpackaged_files_terminate_build 0
Name: deepin-manual
Version: 5.6.7
Release: 8
Version: 5.7.28
Release: 1
Summary: Manual is designed to help users learn the operating system and its applications, providing specific instructions and function descriptions.
License: GPLv3
URL: https://uos-packages.deepin.com/uos/pool/main/d/deepin-manual/
Source0: https://github.com/linuxdeepin/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
Patch9000: 0001-feat-add-include-QPainterPath.patch
#Patch9000: 0001-feat-add-include-QPainterPath.patch
BuildRequires: cmake
BuildRequires: dtkcore-devel
@ -21,6 +21,9 @@ BuildRequires: qt5-qtwebchannel
BuildRequires: qt5-qtwebchannel-devel
BuildRequires: qt5-qtwebengine-devel
BuildRequires: qt5-qtwebengine
BuildRequires: gtest-devel
BuildRequires: gmock-devel
BuildRequires: qt5-qtbase-private-devel
Requires: qt5-qtwebengine
%description
@ -29,13 +32,14 @@ Manual is designed to help users learn the operating system and its applications
%prep
%setup -q
%patch9000 -p1
#%%patch9000 -p1
# fix strip
sed -i 's|gc-sections"|gc-sections -s"|' src/CMakeLists.txt
%build
export PATH=$PATH:/usr/lib64/qt5/bin
# cmake_minimum_required version is too high
%cmake
%make_build
@ -43,25 +47,23 @@ export PATH=$PATH:/usr/lib64/qt5/bin
%make_install INSTALL_ROOT=%{buildroot}
%files
/usr/bin/dman
/usr/bin/dman-search
/usr/share/applications/deepin-manual.desktop
/usr/share/dbus-1/services/com.deepin.Manual.Open.service
/usr/share/dbus-1/services/com.deepin.Manual.Search.service
/usr/share/deepin-manual/dman
/usr/share/deepin-manual/web_dist/index.css
/usr/share/deepin-manual/web_dist/index.html
/usr/share/deepin-manual/web_dist/index.js
/usr/share/deepin-manual/web_dist/qwebchannel.js
/usr/share/icons/hicolor/scalable/apps/deepin-manual.svg
%exclude /usr/share/deepin-manual/manual-assets/professional/*
/usr/share/deepin-manual/translations/*
/usr/share/deepin-manual/manual-assets/server/*
%{_bindir}/dman
%{_bindir}/dmanHelper
%{_datadir}/applications/deepin-manual.desktop
%{_datadir}/dbus-1/services/com.deepin.Manual.Open.service
%{_datadir}/dbus-1/services/com.deepin.Manual.Search.service
%{_datadir}/%{name}/web_dist/
%{_datadir}/icons/hicolor/scalable/apps/deepin-manual.svg
%{_datadir}/%{name}/translations/*
%{_datadir}/%{name}/manual-assets/server/*
%license LICENSE
%doc README.md
%changelog
* Fri Mar 31 2023 liweiganga <liweiganga@uniontech.com> - 5.7.28-1
- update: update to 5.7.28
* Wed Mar 15 2023 liweiganga <liweiganga@uniontech.com> - 5.6.7-8
- feat: fix strip