!18 update to 5.9.23

From: @leeffo 
Reviewed-by: @HelloWorld_lvcongqing 
Signed-off-by: @HelloWorld_lvcongqing
This commit is contained in:
openeuler-ci-bot 2023-04-10 05:44:27 +00:00 committed by Gitee
commit c26e0b58a7
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 15 additions and 10 deletions

View File

@ -1,7 +1,7 @@
From 6373d9af2b9f1660102fa46a139f42ef56f7d330 Mon Sep 17 00:00:00 2001 From 9b2501cd5d5ebc02ca54c9d49dde4a9be91799de Mon Sep 17 00:00:00 2001
From: loong ci <loong_c@yeah.net> From: leeffo <leeffo@yeah.net>
Date: Wed, 27 Jul 2022 09:18:09 +0800 Date: Fri, 31 Mar 2023 11:14:21 +0800
Subject: [PATCH] fix: broken KF5 include path Subject: [PATCH] feat: broken KF5 include path
--- ---
src/editor/dtextedit.cpp | 6 +++--- src/editor/dtextedit.cpp | 6 +++---
@ -9,12 +9,12 @@ Subject: [PATCH] fix: broken KF5 include path
2 files changed, 7 insertions(+), 7 deletions(-) 2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/editor/dtextedit.cpp b/src/editor/dtextedit.cpp diff --git a/src/editor/dtextedit.cpp b/src/editor/dtextedit.cpp
index 64a51e1..3a6ddda 100644 index 0c50ea5..79a0bb7 100644
--- a/src/editor/dtextedit.cpp --- a/src/editor/dtextedit.cpp
+++ b/src/editor/dtextedit.cpp +++ b/src/editor/dtextedit.cpp
@@ -33,9 +33,9 @@ @@ -33,9 +33,9 @@
#include "insertblockbytextcommond.h" #include "insertblockbytextcommond.h"
#include "indenttextcommond.h"
-#include <KF5/KSyntaxHighlighting/definition.h> -#include <KF5/KSyntaxHighlighting/definition.h>
-#include <KF5/KSyntaxHighlighting/syntaxhighlighter.h> -#include <KF5/KSyntaxHighlighting/syntaxhighlighter.h>

View File

@ -1,5 +1,5 @@
%global debug_package %{nil} %global debug_package %{nil}
%define pkgrelease 4 %define pkgrelease 1
%if 0%{?openeuler} %if 0%{?openeuler}
%define specrelease %{pkgrelease} %define specrelease %{pkgrelease}
%else %else
@ -8,13 +8,13 @@
%endif %endif
Name: deepin-editor Name: deepin-editor
Version: 5.9.7 Version: 5.9.23
Release: %{specrelease} Release: %{specrelease}
Summary: Simple editor for Linux Deepin Summary: Simple editor for Linux Deepin
License: GPLv3 License: GPLv3
URL: https://github.com/linuxdeepin/deepin-editor URL: https://github.com/linuxdeepin/deepin-editor
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
Patch0: 0001-fix-broken-KF5-include-path.patch Patch0: 0001-feat-broken-KF5-include-path.patch
BuildRequires: cmake3 BuildRequires: cmake3
BuildRequires: qt5-devel BuildRequires: qt5-devel
@ -38,7 +38,9 @@ BuildRequires: kf5-kcodecs-devel
BuildRequires: kf5-syntax-highlighting-devel BuildRequires: kf5-syntax-highlighting-devel
BuildRequires: gtest-devel BuildRequires: gtest-devel
BuildRequires: gmock-devel BuildRequires: gmock-devel
BuildRequires: dtkcommon-devel
BuildRequires: uchardet-devel
BuildRequires: enca-devel
%description %description
@ -78,6 +80,9 @@ popd
%{_datadir}/deepin-manual/manual-assets/application/deepin-editor/editor/* %{_datadir}/deepin-manual/manual-assets/application/deepin-editor/editor/*
%changelog %changelog
* Fri Mar 31 2023 liweiganga <liweiganga@uniontech.com> - 5.9.23-1
- update: update to 5.9.23
* Thu Mar 16 2023 liweiganga <liweiganga@uniontech.com> - 5.9.7-4 * Thu Mar 16 2023 liweiganga <liweiganga@uniontech.com> - 5.9.7-4
- feat: fix strip - feat: fix strip