diff --git a/0024-add-mcp-server-dependency.patch b/0024-add-mcp-server-dependency.patch index e67250cd9d431e53abb14b67de042a5ac0e8ee2d..d3dd6d7ae82030dd7174d981fdcf0f1e69737b08 100644 --- a/0024-add-mcp-server-dependency.patch +++ b/0024-add-mcp-server-dependency.patch @@ -20,7 +20,7 @@ index 40b1ac6d7..52a96336a 100644 # screenshot: ":/images/Plasma.png" - id: gnome - packages: [ checkpolicy, dejavu-fonts, liberation-fonts, gnome-shell, gnome-session, gnome-terminal, gnome-software, gnome-menus, nautilus, xdg-utils, google-droid-sans-fonts, google-noto-fonts-common, google-noto-sans-arabic-vf-fonts, google-noto-sans-armenian-vf-fonts, google-noto-sans-bengali-vf-fonts, google-noto-sans-canadian-aboriginal-vf-fonts, google-noto-sans-cherokee-vf-fonts, google-noto-sans-devanagari-vf-fonts, google-noto-sans-ethiopic-vf-fonts, google-noto-sans-georgian-vf-fonts, google-noto-sans-hebrew-vf-fonts, google-noto-sans-kannada-vf-fonts, google-noto-sans-khmer-vf-fonts, google-noto-sans-lao-vf-fonts, google-noto-sans-math-fonts, google-noto-sans-mono-vf-fonts, google-noto-sans-sinhala-vf-fonts, google-noto-sans-symbols2-fonts, google-noto-sans-symbols-vf-fonts, google-noto-sans-tamil-vf-fonts, google-noto-sans-thaana-vf-fonts, google-noto-sans-thai-vf-fonts, google-noto-sans-vf-fonts, google-noto-serif-armenian-vf-fonts, google-noto-serif-ethiopic-vf-fonts, google-noto-serif-georgian-vf-fonts, google-noto-serif-gujarati-vf-fonts, google-noto-serif-gurmukhi-vf-fonts, google-noto-serif-hebrew-vf-fonts, google-noto-serif-kannada-vf-fonts, google-noto-serif-khmer-vf-fonts, google-noto-serif-lao-vf-fonts, google-noto-serif-sinhala-vf-fonts, google-noto-serif-tamil-vf-fonts, google-noto-serif-thai-vf-fonts, google-noto-serif-vf-fonts, gdm, ibus-libpinyin, webp-pixbuf-loader, firefox, devstation-config, wqy-zenhei-fonts, oeDevPlugin, rust-cbindgen, polkit-qt5-1, polkit-qt5-1-devel, oedp, kernel-extra-modules, epkg, euler-copilot-shell, vscodium, oegitext, kf5-kcalendarcore-devel, kf5-kcalendarcore, rust-ripgrep, xorg-x11-drv-*, linux-firmware-iwlwifi, linux-firmware-mediatek, gnome-keyring, gnome-keyring-pam, linux-firmware-ath, linux-firmware-cypress, linux-firmware-libertas, linux-firmware-mrvl, linux-firmware-netronome, linux-firmware-ti-connectivity, gnome-shell-extension-dash-to-dock, git, thunderbird, autogen, ntp, timedatex, chrony, gnome-user-docs, gnome-doc-utils, yelp-tools] -+ packages: [ checkpolicy, dejavu-fonts, liberation-fonts, gnome-shell, gnome-session, gnome-terminal, gnome-software, gnome-menus, nautilus, xdg-utils, google-droid-sans-fonts, google-noto-fonts-common, google-noto-sans-arabic-vf-fonts, google-noto-sans-armenian-vf-fonts, google-noto-sans-bengali-vf-fonts, google-noto-sans-canadian-aboriginal-vf-fonts, google-noto-sans-cherokee-vf-fonts, google-noto-sans-devanagari-vf-fonts, google-noto-sans-ethiopic-vf-fonts, google-noto-sans-georgian-vf-fonts, google-noto-sans-hebrew-vf-fonts, google-noto-sans-kannada-vf-fonts, google-noto-sans-khmer-vf-fonts, google-noto-sans-lao-vf-fonts, google-noto-sans-math-fonts, google-noto-sans-mono-vf-fonts, google-noto-sans-sinhala-vf-fonts, google-noto-sans-symbols2-fonts, google-noto-sans-symbols-vf-fonts, google-noto-sans-tamil-vf-fonts, google-noto-sans-thaana-vf-fonts, google-noto-sans-thai-vf-fonts, google-noto-sans-vf-fonts, google-noto-serif-armenian-vf-fonts, google-noto-serif-ethiopic-vf-fonts, google-noto-serif-georgian-vf-fonts, google-noto-serif-gujarati-vf-fonts, google-noto-serif-gurmukhi-vf-fonts, google-noto-serif-hebrew-vf-fonts, google-noto-serif-kannada-vf-fonts, google-noto-serif-khmer-vf-fonts, google-noto-serif-lao-vf-fonts, google-noto-serif-sinhala-vf-fonts, google-noto-serif-tamil-vf-fonts, google-noto-serif-thai-vf-fonts, google-noto-serif-vf-fonts, gdm, ibus-libpinyin, webp-pixbuf-loader, firefox, devstation-config, wqy-zenhei-fonts, oeDevPlugin, rust-cbindgen, polkit-qt5-1, polkit-qt5-1-devel, oedp, kernel-extra-modules, epkg, euler-copilot-shell, vscodium, oegitext, kf5-kcalendarcore-devel, kf5-kcalendarcore, rust-ripgrep, xorg-x11-drv-*, linux-firmware-iwlwifi, linux-firmware-mediatek, gnome-keyring, gnome-keyring-pam, linux-firmware-ath, linux-firmware-cypress, linux-firmware-libertas, linux-firmware-mrvl, linux-firmware-netronome, linux-firmware-ti-connectivity, gnome-shell-extension-dash-to-dock, git, thunderbird, autogen, ntp, timedatex, chrony, gnome-user-docs, gnome-doc-utils, yelp-tools, roo-code, uv, python3-mcp, euler-copilot-web, euler-copilot-desktop] ++ packages: [ checkpolicy, dejavu-fonts, liberation-fonts, gnome-shell, gnome-session, gnome-terminal, gnome-software, gnome-menus, nautilus, xdg-utils, google-droid-sans-fonts, google-noto-fonts-common, google-noto-sans-arabic-vf-fonts, google-noto-sans-armenian-vf-fonts, google-noto-sans-bengali-vf-fonts, google-noto-sans-canadian-aboriginal-vf-fonts, google-noto-sans-cherokee-vf-fonts, google-noto-sans-devanagari-vf-fonts, google-noto-sans-ethiopic-vf-fonts, google-noto-sans-georgian-vf-fonts, google-noto-sans-hebrew-vf-fonts, google-noto-sans-kannada-vf-fonts, google-noto-sans-khmer-vf-fonts, google-noto-sans-lao-vf-fonts, google-noto-sans-math-fonts, google-noto-sans-mono-vf-fonts, google-noto-sans-sinhala-vf-fonts, google-noto-sans-symbols2-fonts, google-noto-sans-symbols-vf-fonts, google-noto-sans-tamil-vf-fonts, google-noto-sans-thaana-vf-fonts, google-noto-sans-thai-vf-fonts, google-noto-sans-vf-fonts, google-noto-serif-armenian-vf-fonts, google-noto-serif-ethiopic-vf-fonts, google-noto-serif-georgian-vf-fonts, google-noto-serif-gujarati-vf-fonts, google-noto-serif-gurmukhi-vf-fonts, google-noto-serif-hebrew-vf-fonts, google-noto-serif-kannada-vf-fonts, google-noto-serif-khmer-vf-fonts, google-noto-serif-lao-vf-fonts, google-noto-serif-sinhala-vf-fonts, google-noto-serif-tamil-vf-fonts, google-noto-serif-thai-vf-fonts, google-noto-serif-vf-fonts, gdm, ibus-libpinyin, webp-pixbuf-loader, firefox, devstation-config, wqy-zenhei-fonts, oeDevPlugin, rust-cbindgen, polkit-qt5-1, polkit-qt5-1-devel, oedp, kernel-extra-modules, epkg, euler-copilot-shell, vscodium, oegitext, kf5-kcalendarcore-devel, kf5-kcalendarcore, rust-ripgrep, xorg-x11-drv-*, linux-firmware-iwlwifi, linux-firmware-mediatek, gnome-keyring, gnome-keyring-pam, linux-firmware-ath, linux-firmware-cypress, linux-firmware-libertas, linux-firmware-mrvl, linux-firmware-netronome, linux-firmware-ti-connectivity, gnome-shell-extension-dash-to-dock, git, thunderbird, autogen, ntp, timedatex, chrony, gnome-user-docs, gnome-doc-utils, yelp-tools, roo-code, uv, python3-mcp] name: DevStation name[zh]: DevStation description: GNU Networked Object Modeling Environment Desktop diff --git a/0026-fix-ppt-picture-show-issue-and-set-release-version.patch b/0026-fix-ppt-picture-show-issue-and-set-release-version.patch new file mode 100644 index 0000000000000000000000000000000000000000..9b3e807e1d67fd9fe7bacfb983d7a036248463e8 --- /dev/null +++ b/0026-fix-ppt-picture-show-issue-and-set-release-version.patch @@ -0,0 +1,91 @@ +From bc26e3276a6e82b6e523d1af5837cb725dfba2c3 Mon Sep 17 00:00:00 2001 +From: lw520203 <1823363429@qq.com> +Date: Sat, 3 May 2025 10:02:09 +0800 +Subject: [PATCH] resolve PPT pictures show issue + +--- + src/branding/default/branding.desc | 8 ++++---- + src/branding/default/show.qml | 24 +++++++++++------------- + 2 files changed, 15 insertions(+), 17 deletions(-) + +diff --git a/src/branding/default/branding.desc b/src/branding/default/branding.desc +index 2a9f640dd..91542662f 100644 +--- a/src/branding/default/branding.desc ++++ b/src/branding/default/branding.desc +@@ -123,10 +123,10 @@ navigation: widget + strings: + productName: @OS_VERSION@ + shortProductName: Generic +- version: 24.09 +- shortVersion: 24.09 +- versionedName: openEuler-25.03 +- shortVersionedName: openEuler 25.03 ++ version: @OS_VERSION@ ++ shortVersion: @OS_VERSION@ ++ versionedName: @OS_VERSION@ ++ shortVersionedName: @OS_VERSION@ + bootloaderEntryName: openEuler + productUrl: https://openeuler.org/ + supportUrl: null +diff --git a/src/branding/default/show.qml b/src/branding/default/show.qml +index f91d520cd..4551a8838 100644 +--- a/src/branding/default/show.qml ++++ b/src/branding/default/show.qml +@@ -14,6 +14,7 @@ import calamares.slideshow 1.0; + Presentation + { + id: presentation ++ anchors.fill: parent + + function nextSlide() { + console.log("QML Component (default slideshow) Next slide"); +@@ -29,36 +30,33 @@ Presentation + } + + Slide { +- id: slide1 ++ id: slide1 ++ anchors.fill: parent + Image { + id: background1 + source: "Slide1.png" +- width: 980; height: 980 +- fillMode: Image.PreserveAspectFit +- anchors.horizontalCenter:parent.horizontalCenter +- y:parent.height / 2 - height / 2 -25 ++ fillMode: Image.Stretch ++ anchors.fill: parent + } + } + Slide { + id: slide2 ++ anchors.fill: parent + Image { + id: background2 + source: "Slide2.png" +- width: 980; height: 980 +- fillMode: Image.PreserveAspectFit +- anchors.horizontalCenter:parent.horizontalCenter +- y:parent.height / 2 - height / 2 -25 ++ fillMode: Image.Stretch ++ anchors.fill: parent + } + } + Slide { + id: slide3 ++ anchors.fill: parent + Image { + id: background3 + source: "Slide3.png" +- width: 980; height: 980 +- fillMode: Image.PreserveAspectFit +- anchors.horizontalCenter:parent.horizontalCenter +- y:parent.height / 2 - height / 2 -25 ++ fillMode: Image.Stretch ++ anchors.fill: parent + } + } + // When this slideshow is loaded as a V1 slideshow, only +-- +2.46.0 + diff --git a/calamares.spec b/calamares.spec index d1dcf6753b7009f47f641ed65baf28db877927d4..d5bc4bcc1e9c4e0989135bb2ce0b1185338c7491 100644 --- a/calamares.spec +++ b/calamares.spec @@ -2,7 +2,7 @@ Name: calamares Version: 3.3.7 -Release: 17 +Release: 18 Summary: Installer from a live CD/DVD/USB to disk License: GPL-3.0-or-later @@ -67,6 +67,7 @@ Patch21: 0022-add-gnome-user-docs-dependency.patch Patch22: 0023-add-module-dependency.patch Patch23: 0024-add-mcp-server-dependency.patch Patch24: 0025-get-os-release-version.patch +Patch25: 0026-fix-ppt-picture-show-issue-and-set-release-version.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 @@ -359,6 +360,9 @@ cd %{_builddir} || exit 0 rm -rf %{buildroot} %changelog +* Thu Jun 05 2025 Liu Wang <1823363429@qq.com> - 3.3.7-18 +- Delete euler-copilot server and get all release version + * Wed Jun 04 2025 Liu Wang <1823363429@qq.com> - 3.3.7-17 - Get os release version