diff --git a/0000-fix-theme-set-metacity-theme-when-user-change-theme-2028295d.patch b/0000-fix-theme-set-metacity-theme-when-user-change-theme-2028295d.patch deleted file mode 100644 index 9fccd9f20e4e2047ecfaa31b9347bd4f0754dbdf..0000000000000000000000000000000000000000 --- a/0000-fix-theme-set-metacity-theme-when-user-change-theme-2028295d.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 2028295df5882c450820d8f7d1f9463d28a7e8f8 Mon Sep 17 00:00:00 2001 -From: yuanxing -Date: Thu, 25 Nov 2021 15:44:45 +0800 -Subject: [PATCH] fix(theme):set metacity theme when user change theme -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- 当用户切换主题时设置窗口主题 ---- - src/pages/theme/themes.cpp | 2 ++ - translations/kiran-cpanel-appearance.zh_CN.ts | 7 +++---- - 2 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/src/pages/theme/themes.cpp b/src/pages/theme/themes.cpp -index d737cfe..9c6e8f1 100644 ---- a/src/pages/theme/themes.cpp -+++ b/src/pages/theme/themes.cpp -@@ -316,6 +316,8 @@ void Themes::createThemeWidget() - return; - if (!AppearanceGlobalInfo::instance()->setTheme(APPEARANCE_THEME_TYPE_GTK, theme)) - return; -+ if (!AppearanceGlobalInfo::instance()->setTheme(APPEARANCE_THEME_TYPE_METACITY, theme)) -+ return; - KLOG_INFO() << "set themes successful:" << theme; - }); - } -diff --git a/translations/kiran-cpanel-appearance.zh_CN.ts b/translations/kiran-cpanel-appearance.zh_CN.ts -index 1dd67ca..24a99f0 100644 ---- a/translations/kiran-cpanel-appearance.zh_CN.ts -+++ b/translations/kiran-cpanel-appearance.zh_CN.ts -@@ -73,9 +73,8 @@ - 等宽字体设置 - - -- - None -- 暂无 -+ 暂无 - - - -@@ -173,14 +172,14 @@ - - QObject - -- -+ - - - Failed - 失败 - - -- -+ - Set font failed! - 设置字体失败! - --- -2.27.0 - diff --git a/0001-fix-build-fix-incomplete-type-class-QPainterPath-bui.patch b/0001-fix-build-fix-incomplete-type-class-QPainterPath-bui.patch deleted file mode 100644 index bf11428354dffaee98a2c17d3ee52fa1ba880ccf..0000000000000000000000000000000000000000 --- a/0001-fix-build-fix-incomplete-type-class-QPainterPath-bui.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 61f05899fdcf418a718aa44d5b97c9b6f8b4e852 Mon Sep 17 00:00:00 2001 -From: kylinsecos_admin -Date: Mon, 24 Jan 2022 09:57:14 +0800 -Subject: [PATCH] fix(build): fix incomplete type 'class QPainterPath' build - ---- - src/pages/wallpaper/widget/preview-label.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/pages/wallpaper/widget/preview-label.cpp b/src/pages/wallpaper/widget/preview-label.cpp -index c134997..566dec1 100644 ---- a/src/pages/wallpaper/widget/preview-label.cpp -+++ b/src/pages/wallpaper/widget/preview-label.cpp -@@ -17,6 +17,7 @@ - #include - #include - #include -+#include - #include "../wallpaper-def.h" - - PreviewLabel::PreviewLabel(int wallpaperType, QString imgPath, QWidget *parent) : QLabel(parent) --- -1.8.3.1 - diff --git a/kiran-cpanel-appearance-2.2.0.tar.gz b/kiran-cpanel-appearance-2.2.0.tar.gz deleted file mode 100644 index 75a981a7906fb523f2a9cc2b44decefe9a2321f2..0000000000000000000000000000000000000000 Binary files a/kiran-cpanel-appearance-2.2.0.tar.gz and /dev/null differ diff --git a/kiran-cpanel-appearance-2.2.1.tar.gz b/kiran-cpanel-appearance-2.2.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..9718afc82a0ce909f354ccd76a340869ee5a4f55 Binary files /dev/null and b/kiran-cpanel-appearance-2.2.1.tar.gz differ diff --git a/kiran-cpanel-appearance.spec b/kiran-cpanel-appearance.spec index 562cb1f21f5b2097298f62c2b2ae89922600e143..409ec04117a860330426d48120a162f00f503607 100644 --- a/kiran-cpanel-appearance.spec +++ b/kiran-cpanel-appearance.spec @@ -1,14 +1,12 @@ Name: kiran-cpanel-appearance -Version: 2.2.0 -Release: 2.kb3 +Version: 2.2.1 +Release: 3 Summary: This program provide personalized settings for wallpaper, theme and font. Group: System Environment/Base License: Mulan PSL v2 URL: http://gitlab.kylinos.com.cn/os/kiran-cpanel-appearance Source0: %{name}-%{version}.tar.gz -Patch1001: 0000-fix-theme-set-metacity-theme-when-user-change-theme-2028295d.patch -Patch1002: 0001-fix-build-fix-incomplete-type-class-QPainterPath-bui.patch BuildRequires: qt5-qtsvg-devel BuildRequires: cmake @@ -32,6 +30,7 @@ Requires: kiran-session-daemon >= 2.0.7 Requires: kiran-log-qt5 Requires: kiran-cpanel-launcher Requires: libXcursor +Requires: gtk-update-icon-cache %description This program provide personalized settings for wallpaper, theme and font. @@ -71,8 +70,23 @@ fi rm -rf %{buildroot} %changelog +* Tue Mar 01 2022 longcheng - 2.2.1-3 +- KYOS-B: Add Requires gtk-update-icon-cache + +* Sat Feb 26 2022 longcheng - 2.2.1-2 +- KYOS-R: rebuild for KY3.4-3-LS-dev + +* Sat Feb 26 2022 longcheng - 2.2.1-1 +- KYOS-B: fix build error in KY3.4-3-LS + +* Thu Feb 24 2022 chendingjian - 2.2.0-3 +- rebuild for KY3.4-MATE-modules-dev + +* Thu Feb 17 2022 yuanxing - 2.2.0-2.kb4 +- KYOS-F: seach other image with appoint icon name when iconname.format don't exit in Adwaita (#48450) + * Mon Jan 24 2022 longcheng - 2.2.0-2.kb3 -- KYOS-B: fix compilation errors on OpenEuler +- KYOS-B: fix compilation errors on OpenEuler (#49472) * Wed Jan 12 2022 caoyuanji - 2.2.0-2.kb2 - rebuild for KY3.4-5-KiranUI-2.2