diff --git a/0018-fix-desktop-icon-show.patch b/0018-fix-desktop-icon-show.patch new file mode 100644 index 0000000000000000000000000000000000000000..34abc9ee25ab4f2418e7a49c760a5d754f169d62 --- /dev/null +++ b/0018-fix-desktop-icon-show.patch @@ -0,0 +1,56 @@ +From 2cf8070d333fbadecd5b94da06ad7432ebaeba94 Mon Sep 17 00:00:00 2001 +From: lw520203 <1823363429@qq.com> +Date: Thu, 6 Mar 2025 08:28:38 +0800 +Subject: [PATCH] fix desktop-icon-show + +--- + calamares.desktop | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/calamares.desktop b/calamares.desktop +index b0d6c2753..072a4e2c9 100644 +--- a/calamares.desktop ++++ b/calamares.desktop +@@ -7,7 +7,7 @@ Keywords=calamares;system;installer; + TryExec=calamares + Exec=sh -c "pkexec calamares -style Adwaita" + Comment=Calamares — System Installer +-Icon=/usr/share/applications/openEuler.png ++Icon=/usr/share/calamares/branding/default/openEuler-icon.png + Terminal=false + StartupNotify=true + Categories=Qt;System; +@@ -66,7 +66,7 @@ Icon[el]=calamares + GenericName[el]=Εγκατάσταση συστήματος + Comment[el]=Calamares — Εγκατάσταση συστήματος + Name[en_GB]=Install System +-Icon[en_GB]=/usr/share/applications/openEuler.png ++Icon[en_GB]=/usr/share/calamares/branding/default/openEuler-icon.png + GenericName[en_GB]=System Installer + Comment[en_GB]=Calamares — System Installer + Name[eo]=Instali Sistemo +@@ -226,7 +226,7 @@ Icon[tr_TR]=calamares + GenericName[tr_TR]=Sistem Yükleyici + Comment[tr_TR]=Calamares — Sistem Yükleyici + Name[uk]=Встановити Систему +-Icon[uk]=/usr/share/applications/openEuler.png ++Icon[uk]=/usr/share/calamares/branding/default/openEuler-icon.png + GenericName[uk]=Встановлювач системи + Comment[uk]=Calamares - Встановлювач системи + Name[vi]=Cài đặt hệ thống +@@ -234,10 +234,10 @@ Icon[vi]=calamares + GenericName[vi]=Bộ cài đặt hệ thống + Comment[vi]=Calamares — Bộ cài đặt hệ thống + Name[zh_CN]=安装系统 +-Icon[zh_CN]=/usr/share/applications/openEuler.png ++Icon[zh_CN]=/usr/share/calamares/branding/default/openEuler-icon.png + GenericName[zh_CN]=系统安装程序 + Comment[zh_CN]=Calamares — 系统安装程序 + Name[zh_TW]=安裝系統 +-Icon[zh_TW]=/usr/share/applications/openEuler.png ++Icon[zh_TW]=/usr/share/calamares/branding/default/openEuler-icon.png + GenericName[zh_TW]=系統安裝程式 + Comment[zh_TW]=Calamares ── 系統安裝程式 +-- +2.46.0 + diff --git a/calamares.spec b/calamares.spec index e7f5c44bad3159f94a41c90f99c46e6e20b57ec3..4a07c7ceb9e2a36f8be6b9b241246403e4462622 100644 --- a/calamares.spec +++ b/calamares.spec @@ -2,7 +2,7 @@ Name: calamares Version: 3.3.7 -Release: 7 +Release: 8 Summary: Installer from a live CD/DVD/USB to disk License: GPL-3.0-or-later @@ -59,6 +59,7 @@ Patch13: 0014-setRepoSource.patch Patch14: 0015-requireDiskScan.patch Patch15: 0016-DevStation-25.03-add-dependency.patch Patch16: 0017-Devstation-25.03-fix-timezoneErrors.patch +Patch17: 0018-fix-desktop-icon-show.patch # Calamares is only supported where live images (and GRUB) are. (#1171380) # This list matches the arches where grub2-efi is used to boot the system @@ -351,6 +352,9 @@ cd %{_builddir} || exit 0 rm -rf %{buildroot} %changelog +* Wed Mar 12 2025 Liu Wang <1823363429@qq.com> - 3.3.7-8 +- Fix desktop icon show + * Mon Mar 10 2025 Li Zixin <2271170409@qq.com> - 3.3.7-7 - Devstation fix timezone and release problem