From 8bce063836b55be8b788aa5d800ebd466d8e5813 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BE=AF=E7=BA=A2=E5=8B=8B?= Date: Tue, 16 Apr 2024 14:38:03 +0800 Subject: [PATCH] kylin-music: fix null pointer widgets error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 侯红勋 (cherry picked from commit cdf66f438d8a04a7c0a518db313364d753da1c31) --- ...-music-fix-null-pointer-widget-error.patch | 49 +++++++++++++++++++ kylin-music.spec | 7 ++- 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 0001-kylin-music-fix-null-pointer-widget-error.patch diff --git a/0001-kylin-music-fix-null-pointer-widget-error.patch b/0001-kylin-music-fix-null-pointer-widget-error.patch new file mode 100644 index 0000000..150dab3 --- /dev/null +++ b/0001-kylin-music-fix-null-pointer-widget-error.patch @@ -0,0 +1,49 @@ +From a2aa3aacc458cf3fa23bbe5b928233cdc51612fa Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=E4=BE=AF=E7=BA=A2=E5=8B=8B?= +Date: Tue, 16 Apr 2024 13:54:44 +0800 +Subject: [PATCH] kylin-music: fix null pointer widget error +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: 侯红勋 +--- + UI/player/searchresult.cpp | 4 ++-- + UI/player/searchresult.h | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/UI/player/searchresult.cpp b/UI/player/searchresult.cpp +index a8946c3..8f56e05 100644 +--- a/UI/player/searchresult.cpp ++++ b/UI/player/searchresult.cpp +@@ -85,10 +85,10 @@ SearchResult::SearchResult(QWidget *parent) : QWidget(parent) + + vlayout->addWidget(m_MusicLabel, 1); + vlayout->addWidget(m_MusicView, 0); +- vlayout->addWidget(m_SingerFrame); ++ //vlayout->addWidget(m_SingerFrame); + vlayout->addWidget(m_SingerLabel, 1); + vlayout->addWidget(m_SingerView, 0); +- vlayout->addWidget(m_AlbumFrame); ++ //vlayout->addWidget(m_AlbumFrame); + vlayout->addWidget(m_AlbumLabel, 1); + vlayout->addWidget(m_AlbumView, 0); + +diff --git a/UI/player/searchresult.h b/UI/player/searchresult.h +index 6427af5..8f54373 100644 +--- a/UI/player/searchresult.h ++++ b/UI/player/searchresult.h +@@ -84,8 +84,8 @@ private: + + int m_CurrentIndex = -1; + int m_Count = 0; +- QFrame *m_SingerFrame = nullptr; +- QFrame *m_AlbumFrame = nullptr; ++ //QFrame *m_SingerFrame = nullptr; ++ //QFrame *m_AlbumFrame = nullptr; + + SearchEdit *m_searchEdit = nullptr; + +-- +2.43.0 + diff --git a/kylin-music.spec b/kylin-music.spec index 8408573..6027918 100644 --- a/kylin-music.spec +++ b/kylin-music.spec @@ -1,6 +1,6 @@ Name: kylin-music Version: 1.1.3 -Release: 4 +Release: 5 Summary: kylin-music License: GPL-3.0-or-later and MIT URL: https://github.com/UbuntuKylin/kylin-music @@ -10,6 +10,7 @@ patch0: 0001-fix-compile-error-of-kylin-music.patch patch1: 0002-modify-version-is-error.patch Patch2: kylin-music-1.1.3_kylin_fix_install_the_repair_file_in_the_bin_directory.patch Patch3: 0001-kylin-music-fix-wrong-mouse-style-of-some-title-bar-.patch +Patch4: 0001-kylin-music-fix-null-pointer-widget-error.patch BuildRequires: qt5-qtbase-devel BuildRequires: qtchooser @@ -36,6 +37,7 @@ kylin-music %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build export PATH=%{_qt5_bindir}:$PATH @@ -80,6 +82,9 @@ cp -r %{_builddir}/%{name}-%{version}/data/kylin-music %{buildroot}/usr/share/ky %{_datadir}/kylin-user-guide/data/guide/* %changelog +* Tue Apr 16 2024 houhongxun - 1.1.3-5 +- add Patch4: 0001-kylin-music-fix-null-pointer-widget-error.patch + * Mon Apr 15 2024 houhongxun - 1.1.3-4 - add Patch3: 0001-kylin-music-fix-wrong-mouse-style-of-some-title-bar-.patch