!8 fix: broken KF5 include path
From: @loong-C Reviewed-by: @yeqinglong01 Signed-off-by: @yeqinglong01
This commit is contained in:
commit
e54c4ebd4a
43
0001-fix-broken-KF5-include-path.patch
Normal file
43
0001-fix-broken-KF5-include-path.patch
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
From 969abdfd29d2b87aa13f19838b7603b05960594e Mon Sep 17 00:00:00 2001
|
||||||
|
From: loong ci <loong_c@yeah.net>
|
||||||
|
Date: Tue, 9 Aug 2022 14:39:13 +0800
|
||||||
|
Subject: [PATCH] fix broken KF5 include path
|
||||||
|
|
||||||
|
---
|
||||||
|
src/dtextedit.cpp | 6 +++---
|
||||||
|
src/dtextedit.h | 2 +-
|
||||||
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/dtextedit.cpp b/src/dtextedit.cpp
|
||||||
|
index 1236b05..71a4e06 100644
|
||||||
|
--- a/src/dtextedit.cpp
|
||||||
|
+++ b/src/dtextedit.cpp
|
||||||
|
@@ -30,9 +30,9 @@
|
||||||
|
#include "showflodcodewidget.h"
|
||||||
|
|
||||||
|
|
||||||
|
-#include <KF5/KSyntaxHighlighting/definition.h>
|
||||||
|
-#include <KF5/KSyntaxHighlighting/syntaxhighlighter.h>
|
||||||
|
-#include <KF5/KSyntaxHighlighting/theme.h>
|
||||||
|
+#include <KSyntaxHighlighting/definition.h>
|
||||||
|
+#include <KSyntaxHighlighting/syntaxhighlighter.h>
|
||||||
|
+#include <KSyntaxHighlighting/theme.h>
|
||||||
|
|
||||||
|
#include <QAbstractTextDocumentLayout>
|
||||||
|
#include <QTextDocumentFragment>
|
||||||
|
diff --git a/src/dtextedit.h b/src/dtextedit.h
|
||||||
|
index 1bed580..2580979 100644
|
||||||
|
--- a/src/dtextedit.h
|
||||||
|
+++ b/src/dtextedit.h
|
||||||
|
@@ -23,7 +23,7 @@
|
||||||
|
#ifndef TEXTEDIT_H
|
||||||
|
#define TEXTEDIT_H
|
||||||
|
|
||||||
|
-#include <KF5/KSyntaxHighlighting/repository.h>
|
||||||
|
+#include <KSyntaxHighlighting/repository.h>
|
||||||
|
#include "uncommentselection.h"
|
||||||
|
#include "linenumberarea.h"
|
||||||
|
#include "bookmarkwidget.h"
|
||||||
|
--
|
||||||
|
2.20.1
|
||||||
|
|
||||||
@ -1,10 +1,11 @@
|
|||||||
Name: deepin-editor
|
Name: deepin-editor
|
||||||
Version: 5.6.28
|
Version: 5.6.28
|
||||||
Release: 1
|
Release: 2
|
||||||
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
|
||||||
|
|
||||||
BuildRequires: cmake3
|
BuildRequires: cmake3
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
@ -30,7 +31,7 @@ BuildRequires: cmake(KF5SyntaxHighlighting)
|
|||||||
%{summary}.
|
%{summary}.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%autosetup -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# help find (and prefer) qt5 utilities, e.g. qmake, lrelease
|
# help find (and prefer) qt5 utilities, e.g. qmake, lrelease
|
||||||
@ -55,6 +56,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop ||:
|
|||||||
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
|
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Aug 09 2022 liweiganga <liweiganga@uniontech.com> - 5.6.28-2
|
||||||
|
- fix: broken KF5 include path
|
||||||
|
|
||||||
* Mon Jul 12 2021 weidong <weidong@uniontech.com> - 5.6.28-1
|
* Mon Jul 12 2021 weidong <weidong@uniontech.com> - 5.6.28-1
|
||||||
- Update 5.6.28
|
- Update 5.6.28
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user