From eaee9bca742a6118e2ac9c76c03274a54e70713c Mon Sep 17 00:00:00 2001 From: tanyulong2021 Date: Tue, 2 Aug 2022 11:09:37 +0800 Subject: [PATCH] Modify segment fault error --- 0001-Modify-segment-fault-error.patch | 32 +++++++++++++++++++++++++++ ukui-notebook.spec | 8 ++++++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 0001-Modify-segment-fault-error.patch diff --git a/0001-Modify-segment-fault-error.patch b/0001-Modify-segment-fault-error.patch new file mode 100644 index 0000000..eb3f8eb --- /dev/null +++ b/0001-Modify-segment-fault-error.patch @@ -0,0 +1,32 @@ +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/ukui-notebook.spec b/ukui-notebook.spec index 071a8cb..50f4998 100644 --- a/ukui-notebook.spec +++ b/ukui-notebook.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: ukui-notebook Version: 3.1.0 -Release: 2 +Release: 3 Summary: A component of the ukui desktop environment that provides convenient text License: GPL-2+ URL: http://www.ukui.org @@ -25,12 +25,15 @@ BuildRequires: libXinerama-devel BuildRequires: libXcursor-devel BuildRequires: ukui-sidebar +patch0: 0001-Modify-segment-fault-error.patch + %description A component of the ukui desktop environment that provides convenient text recording and flexible interface display %prep %setup -q +%patch0 -p1 %build mkdir build && cd build @@ -57,6 +60,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/ukui-notebook/ukui-notebook_zh_CN.qm %changelog +* Tue Aug 02 2022 tanyulong - 3.1.0-3 +- Modify segment fault error + * Fri Apr 15 2022 tanyulong - 3.1.0-2 - rebuild and remove %if macro