From b564a6ac25226dfdb11ac6392eb0eabe9e380b6f Mon Sep 17 00:00:00 2001 From: lw520203 <1823363429@qq.com> Date: Thu, 6 Mar 2025 06:49:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=89=E8=A3=85=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E6=A1=8C=E9=9D=A2=E5=9B=BE=E6=A0=87=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 0018-fix-calamares-desktop-icon-show.patch | 125 +++++++++++++++++++++ calamares.spec | 6 +- 2 files changed, 130 insertions(+), 1 deletion(-) create mode 100644 0018-fix-calamares-desktop-icon-show.patch diff --git a/0018-fix-calamares-desktop-icon-show.patch b/0018-fix-calamares-desktop-icon-show.patch new file mode 100644 index 0000000..d5ed030 --- /dev/null +++ b/0018-fix-calamares-desktop-icon-show.patch @@ -0,0 +1,125 @@ +From baf553873c1af10bc52d029ac8f007550c57e987 Mon Sep 17 00:00:00 2001 +From: lw520203 <1823363429@qq.com> +Date: Wed, 5 Mar 2025 18:35:42 +0800 +Subject: [PATCH] fix calamares desktop icon show + +--- + 0001-.patch | 61 +++++++++++++++++++++++++++++++++++++++++++++++ + calamares.desktop | 10 ++++---- + 2 files changed, 66 insertions(+), 5 deletions(-) + create mode 100644 0001-.patch + +diff --git a/0001-.patch b/0001-.patch +new file mode 100644 +index 000000000..be0fee174 +--- /dev/null ++++ b/0001-.patch +@@ -0,0 +1,61 @@ ++From 864d96882a270ec9fb906551417e2456654c29f6 Mon Sep 17 00:00:00 2001 ++From: lw520203 <1823363429@qq.com> ++Date: Wed, 5 Mar 2025 18:22:09 +0800 ++Subject: [PATCH] =?UTF-8?q?-=E5=AE=89=E8=A3=85=E5=B7=A5=E5=85=B7=E6=A1=8C?= ++ =?UTF-8?q?=E9=9D=A2=E5=9B=BE=E6=A0=87=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= ++ =?UTF-8?q?=E4=BF=AE=E8=AE=A2?= ++MIME-Version: 1.0 ++Content-Type: text/plain; charset=UTF-8 ++Content-Transfer-Encoding: 8bit ++ ++--- ++ calamares.desktop | 10 +++++----- ++ 1 file changed, 5 insertions(+), 5 deletions(-) ++ ++diff --git a/calamares.desktop b/calamares.desktop ++index b0d6c2753..81b5812aa 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=/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=/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=/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=/usr/share/calamares/branding/default/openEuler-icon.png ++ GenericName[zh_TW]=系統安裝程式 ++ Comment[zh_TW]=Calamares ── 系統安裝程式 ++-- ++2.46.0 ++ +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 e7f5c44..b503541 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-calamares-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 calamares desktop icon show + * Mon Mar 10 2025 Li Zixin <2271170409@qq.com> - 3.3.7-7 - Devstation fix timezone and release problem -- Gitee