diff --git a/0001-Modify-segment-fault-error.patch b/0001-Modify-segment-fault-error.patch deleted file mode 100644 index eb3f8eb..0000000 --- a/0001-Modify-segment-fault-error.patch +++ /dev/null @@ -1,32 +0,0 @@ -From cce9dba895a6169740f0ddce64ea2b69adae4c67 Mon Sep 17 00:00:00 2001 -From: tanyulong2021 -Date: Tue, 2 Aug 2022 11:06:57 +0800 -Subject: [PATCH] Modify segment fault error - ---- - src/setFontColorPage.cpp | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/setFontColorPage.cpp b/src/setFontColorPage.cpp -index 0377c66..e8b2c05 100644 ---- a/src/setFontColorPage.cpp -+++ b/src/setFontColorPage.cpp -@@ -86,11 +86,11 @@ void SetFontColor::setColor() - QString currentTheme = styleSettings->get(MODE_QT_KEY).toString(); - if(currentTheme == "ukui-default" || currentTheme == "ukui-white" - || currentTheme == "ukui-light" || currentTheme == "ukui"){ -- color[9]="background:rgba(0,0,0,1);"; -- list_page[9]->ui->label->setStyleSheet(color[9]+"border-radius:3px;"); -+ color[8]="background:rgba(0,0,0,1);"; -+ list_page[8]->ui->label->setStyleSheet(color[8]+"border-radius:3px;"); - }else if(currentTheme == "ukui-dark" || currentTheme == "ukui-black"){ -- color[9]="background:rgba(255,255,255,1);"; -- list_page[9]->ui->label->setStyleSheet(color[9]+"border-radius:3px;"); -+ color[8]="background:rgba(255,255,255,1);"; -+ list_page[8]->ui->label->setStyleSheet(color[8]+"border-radius:3px;"); - } - } - }); --- -2.33.0 - diff --git a/0002-Correct-typos-error-in-headerbar.cpp.patch b/0002-Correct-typos-error-in-headerbar.cpp.patch deleted file mode 100644 index 4e44511..0000000 --- a/0002-Correct-typos-error-in-headerbar.cpp.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 3327a4ac08288aa99914c962f4f9fd418798b188 Mon Sep 17 00:00:00 2001 -From: tanyulong2021 -Date: Tue, 2 Aug 2022 11:32:22 +0800 -Subject: [PATCH] Correct typos error in headerbar.cpp - ---- - src/headerbar.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/headerbar.cpp b/src/headerbar.cpp -index d87a849..970cd2d 100644 ---- a/src/headerbar.cpp -+++ b/src/headerbar.cpp -@@ -119,8 +119,8 @@ int HeaderBarStyle::pixelMetric(QStyle::PixelMetric metric, const QStyleOption * - - void HeaderBarStyle::drawComplexControl(QStyle::ComplexControl control, const QStyleOptionComplex *option, QPainter *painter, const QWidget *widget) const - { -- //This is a "lie". We want to use instant popup menu for tool button, and we aslo -- //want use popup menu style with this tool button, so we change the related flags -+ //This is a "lie". We want to use instant popup menu for tool button, and we also -+ //want to use popup menu style with this tool button, so we change the related flags - //to draw in our expected. - if (control == CC_ToolButton) { - QStyleOptionToolButton button = *qstyleoption_cast(option); --- -2.33.0 - diff --git a/0003-Modified-to-operate-font-style-only-when-selected.patch b/0003-Modified-to-operate-font-style-only-when-selected.patch deleted file mode 100644 index 7f6a0e0..0000000 --- a/0003-Modified-to-operate-font-style-only-when-selected.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 1b7d49654623f68942e94789946414b17836f4d6 Mon Sep 17 00:00:00 2001 -From: tanyulong2021 -Date: Wed, 3 Aug 2022 15:22:07 +0800 -Subject: [PATCH] Modified to operate font style only when selected - ---- - src/editPage.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/editPage.cpp b/src/editPage.cpp -index 6315c18..de64389 100755 ---- a/src/editPage.cpp -+++ b/src/editPage.cpp -@@ -385,7 +385,7 @@ void Edit_page::mergeFormatOnWordOrSelection(const QTextCharFormat &format) - { - QTextCursor cursor = ui->textEdit->textCursor(); - if (!cursor.hasSelection()) { -- cursor.select(QTextCursor::WordUnderCursor); -+ // cursor.select(QTextCursor::WordUnderCursor); - } - cursor.mergeCharFormat(format); - ui->textEdit->mergeCurrentCharFormat(format); --- -2.33.0 - diff --git a/ukui-notebook-3.1.0.tar.gz b/ukui-notebook-3.1.0.tar.gz deleted file mode 100644 index da946ef..0000000 Binary files a/ukui-notebook-3.1.0.tar.gz and /dev/null differ diff --git a/ukui-notebook-3.1.1.tar.gz b/ukui-notebook-3.1.1.tar.gz new file mode 100644 index 0000000..7962b92 Binary files /dev/null and b/ukui-notebook-3.1.1.tar.gz differ diff --git a/ukui-notebook.spec b/ukui-notebook.spec index 05d6a00..d6866bb 100644 --- a/ukui-notebook.spec +++ b/ukui-notebook.spec @@ -1,6 +1,6 @@ Name: ukui-notebook -Version: 3.1.0 -Release: 6 +Version: 3.1.1 +Release: 1 Summary: A component of the ukui desktop environment that provides convenient text License: GPL-2+ URL: http://www.ukui.org @@ -22,20 +22,12 @@ BuildRequires: pkgconf BuildRequires: libXrandr-devel BuildRequires: libXinerama-devel BuildRequires: libXcursor-devel -BuildRequires: ukui-sidebar - -patch0: 0001-Modify-segment-fault-error.patch -patch1: 0002-Correct-typos-error-in-headerbar.cpp.patch -patch2: 0003-Modified-to-operate-font-style-only-when-selected.patch %description A component of the ukui desktop environment that provides convenient text recording and flexible interface display %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build mkdir build && cd build @@ -58,10 +50,14 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/ukui-notebook-server %{_datadir}/applications/ukui-notebook.desktop %{_datadir}/dbus-1/services/org.ukui.note.service -%{_datadir}/ukui-notebook/ukui-notebook_tr.qm -%{_datadir}/ukui-notebook/ukui-notebook_zh_CN.qm +%{_datadir}/ukui-notebook/ +%{_datadir}/kylin-user-guide/data/guide/ukui-notebook/ + %changelog +* Tue Mar 14 2023 peijiankang - 3.1.1-1 +- update version to 3.1.1 + * Wed Feb 08 2023 peijiankang - 3.1.0-6 - add build debuginfo and debugsource