Hello community, here is the log from the commit of package deepin-editor for openSUSE:Factory checked in at 2020-06-25 15:08:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/deepin-editor (Old) and /work/SRC/openSUSE:Factory/.deepin-editor.new.3060 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-editor" Thu Jun 25 15:08:14 2020 rev:3 rq:816913 version:1.2.9 Changes: -------- --- /work/SRC/openSUSE:Factory/deepin-editor/deepin-editor.changes 2019-07-21 11:35:21.588765810 +0200 +++ /work/SRC/openSUSE:Factory/.deepin-editor.new.3060/deepin-editor.changes 2020-06-25 15:09:28.181749658 +0200 @@ -1,0 +2,6 @@ +Thu Jun 25 02:48:37 UTC 2020 - Hillwood Yang <[email protected]> + +- Add deepin-editor-Qt-5_15.patch + * Support Qt 5.15 + +------------------------------------------------------------------- New: ---- deepin-editor-Qt-5_15.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deepin-editor.spec ++++++ --- /var/tmp/diff_new_pack.6xmExK/_old 2020-06-25 15:09:30.525757013 +0200 +++ /var/tmp/diff_new_pack.6xmExK/_new 2020-06-25 15:09:30.529757026 +0200 @@ -1,7 +1,7 @@ # # spec file for package deepin-editor # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,9 +22,11 @@ Summary: A text editor for the Deepin environment License: GPL-3.0-or-later Group: Productivity/Text/Editors -Url: https://github.com/linuxdeepin/deepin-editor +URL: https://github.com/linuxdeepin/deepin-editor Source0: https://github.com/linuxdeepin/deepin-editor/archive/%{version}/%{name}-%{version}.tar.gz Source1: https://raw.githubusercontent.com/linuxdeepin/deepin-icon-theme/master/deepin/apps/256/%{name}.svg +# PATCH-FIX-UPSTEAM deepin-editor-qt-5_15.patch [email protected] - Support Qt 5.15 +Patch0: %{name}-Qt-5_15.patch BuildRequires: fdupes BuildRequires: hicolor-icon-theme BuildRequires: libQt5Gui-private-headers-devel @@ -49,11 +51,14 @@ %prep %setup +%if 0%{?suse_version} > 1500 +%patch0 -p1 +%endif sed -i 's/lrelease/lrelease-qt5/g' translate_generation.sh %build %cmake -make %{?_smp_mflags} +%make_build %install %cmake_install ++++++ deepin-editor-Qt-5_15.patch ++++++ diff -Nur deepin-editor-1.2.9/src/jumplinebar.cpp deepin-editor-1.2.9-new/src/jumplinebar.cpp --- deepin-editor-1.2.9/src/jumplinebar.cpp 2019-06-11 17:03:48.000000000 +0800 +++ deepin-editor-1.2.9-new/src/jumplinebar.cpp 2020-06-25 10:54:09.358941794 +0800 @@ -24,6 +24,7 @@ #include "jumplinebar.h" #include <QDebug> +#include <QPainterPath> JumpLineBar::JumpLineBar(QWidget *parent) : QWidget(parent) diff -Nur deepin-editor-1.2.9/src/thememodule/themepanel.cpp deepin-editor-1.2.9-new/src/thememodule/themepanel.cpp --- deepin-editor-1.2.9/src/thememodule/themepanel.cpp 2019-06-11 17:03:48.000000000 +0800 +++ deepin-editor-1.2.9-new/src/thememodule/themepanel.cpp 2020-06-25 10:43:11.199045484 +0800 @@ -23,6 +23,7 @@ #include <QScroller> #include <QVBoxLayout> #include <QPainter> +#include <QPainterPath> #include <QTimer> ThemePanel::ThemePanel(QWidget *parent) diff -Nur deepin-editor-1.2.9/src/utils.h deepin-editor-1.2.9-new/src/utils.h --- deepin-editor-1.2.9/src/utils.h 2019-06-11 17:03:48.000000000 +0800 +++ deepin-editor-1.2.9-new/src/utils.h 2020-06-25 10:41:24.975089100 +0800 @@ -24,6 +24,7 @@ #include <QKeyEvent> #include <QObject> #include <QPainter> +#include <QPainterPath> #include <QString> #include <QImage>
