From 3d400c1103d7f703e7114aeb175a7e249e5f1f0f Mon Sep 17 00:00:00 2001 From: Jaiden Riordan Date: Fri, 17 Oct 2025 21:34:37 -0500 Subject: [PATCH 01/10] bump for xfce --- ultramarine/release/ultramarine-release.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ultramarine/release/ultramarine-release.spec b/ultramarine/release/ultramarine-release.spec index 000821d0..924cbfc7 100644 --- a/ultramarine/release/ultramarine-release.spec +++ b/ultramarine/release/ultramarine-release.spec @@ -52,7 +52,7 @@ Summary: Ultramarine Linux release files Name: ultramarine-release Version: %{dist_version} -Release: 16%{?dist} +Release: 17%{?dist} License: MIT Source0: LICENSE URL: https://ultramarine-linux.org From 2f7eca08374c0e2fab63116685de27fed1cdcdd5 Mon Sep 17 00:00:00 2001 From: lea Date: Fri, 17 Oct 2025 20:17:32 -0700 Subject: [PATCH 02/10] fix: put compat package into line with other subpackages (#203) --- ultramarine/backgrounds/ultramarine-backgrounds.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ultramarine/backgrounds/ultramarine-backgrounds.spec b/ultramarine/backgrounds/ultramarine-backgrounds.spec index 417200ba..77951c27 100644 --- a/ultramarine/backgrounds/ultramarine-backgrounds.spec +++ b/ultramarine/backgrounds/ultramarine-backgrounds.spec @@ -3,7 +3,7 @@ Name: ultramarine-backgrounds Version: %(echo %ver | sed 's/-/~/g') -Release: 1%{?dist} +Release: 2%{?dist} BuildArch: noarch # details for the artworks' licenses can be seen in the COPYING file License: CC-BY-SA 4.0 and CC0 @@ -54,10 +54,8 @@ The desktop-backgrounds-kde package sets default background in the KDE Plasma de %package compat Summary: Compatibility package for ultramarine-backgrounds Requires: ultramarine-backgrounds-common = %{version}-%{release} -Provides: desktop-backgrounds-compat = %{version}-%{release} +Provides: system-backgrounds-compat = %{version}-%{release} License: CC0 -Obsoletes: desktop-backgrounds-compat = 40.0.0-1 -Conflicts: desktop-backgrounds-compat %description compat The desktop-backgrounds-compat package contains compatibility symlinks for other desktop environments. From 4e9d85666dd185d6291219da69389facc8a1e110 Mon Sep 17 00:00:00 2001 From: lea Date: Fri, 17 Oct 2025 20:31:17 -0700 Subject: [PATCH 03/10] chore(taidan): bump to 0.1.29 --- ultramarine/taidan/taidan.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ultramarine/taidan/taidan.spec b/ultramarine/taidan/taidan.spec index cf871000..9e406aa0 100644 --- a/ultramarine/taidan/taidan.spec +++ b/ultramarine/taidan/taidan.spec @@ -1,5 +1,5 @@ Name: taidan -Version: 0.1.28 +Version: 0.1.29 Release: 1%?dist Summary: Out-Of-Box-Experience (OOBE) and Welcome App SourceLicense: GPL-3.0-or-later AND GPL-2.0-or-later From 86db5d3779da27ac5a324d62a6d29233d5e48d4a Mon Sep 17 00:00:00 2001 From: lea Date: Fri, 17 Oct 2025 20:57:12 -0700 Subject: [PATCH 04/10] fix(backgrounds): also provide desktop-backgrounds-compat --- ultramarine/backgrounds/ultramarine-backgrounds.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ultramarine/backgrounds/ultramarine-backgrounds.spec b/ultramarine/backgrounds/ultramarine-backgrounds.spec index 77951c27..d9cdcf76 100644 --- a/ultramarine/backgrounds/ultramarine-backgrounds.spec +++ b/ultramarine/backgrounds/ultramarine-backgrounds.spec @@ -3,7 +3,7 @@ Name: ultramarine-backgrounds Version: %(echo %ver | sed 's/-/~/g') -Release: 2%{?dist} +Release: 3%{?dist} BuildArch: noarch # details for the artworks' licenses can be seen in the COPYING file License: CC-BY-SA 4.0 and CC0 @@ -55,6 +55,7 @@ The desktop-backgrounds-kde package sets default background in the KDE Plasma de Summary: Compatibility package for ultramarine-backgrounds Requires: ultramarine-backgrounds-common = %{version}-%{release} Provides: system-backgrounds-compat = %{version}-%{release} +Provides: desktop-backgrounds-compat = %{version}-%{release} License: CC0 %description compat From 4c8c55e2751176e21e6176a708b54006640b49ca Mon Sep 17 00:00:00 2001 From: lea Date: Fri, 17 Oct 2025 21:09:23 -0700 Subject: [PATCH 05/10] fix(backgrounds): conflicts backgrounds --- ultramarine/backgrounds/ultramarine-backgrounds.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ultramarine/backgrounds/ultramarine-backgrounds.spec b/ultramarine/backgrounds/ultramarine-backgrounds.spec index d9cdcf76..ac6fabe1 100644 --- a/ultramarine/backgrounds/ultramarine-backgrounds.spec +++ b/ultramarine/backgrounds/ultramarine-backgrounds.spec @@ -3,7 +3,7 @@ Name: ultramarine-backgrounds Version: %(echo %ver | sed 's/-/~/g') -Release: 3%{?dist} +Release: 4%{?dist} BuildArch: noarch # details for the artworks' licenses can be seen in the COPYING file License: CC-BY-SA 4.0 and CC0 @@ -56,6 +56,7 @@ Summary: Compatibility package for ultramarine-backgrounds Requires: ultramarine-backgrounds-common = %{version}-%{release} Provides: system-backgrounds-compat = %{version}-%{release} Provides: desktop-backgrounds-compat = %{version}-%{release} +Conflicts: desktop-backgrounds-compat License: CC0 %description compat From 7f3b52950e400ddea853f2484094da5faeb7b4b0 Mon Sep 17 00:00:00 2001 From: lea Date: Fri, 17 Oct 2025 21:16:34 -0700 Subject: [PATCH 06/10] no need --- ultramarine/backgrounds/ultramarine-backgrounds.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ultramarine/backgrounds/ultramarine-backgrounds.spec b/ultramarine/backgrounds/ultramarine-backgrounds.spec index ac6fabe1..493c5ef1 100644 --- a/ultramarine/backgrounds/ultramarine-backgrounds.spec +++ b/ultramarine/backgrounds/ultramarine-backgrounds.spec @@ -3,7 +3,7 @@ Name: ultramarine-backgrounds Version: %(echo %ver | sed 's/-/~/g') -Release: 4%{?dist} +Release: 5%{?dist} BuildArch: noarch # details for the artworks' licenses can be seen in the COPYING file License: CC-BY-SA 4.0 and CC0 @@ -56,7 +56,6 @@ Summary: Compatibility package for ultramarine-backgrounds Requires: ultramarine-backgrounds-common = %{version}-%{release} Provides: system-backgrounds-compat = %{version}-%{release} Provides: desktop-backgrounds-compat = %{version}-%{release} -Conflicts: desktop-backgrounds-compat License: CC0 %description compat From f409b7dc6567b90c570e86dbb3c86a810cb82916 Mon Sep 17 00:00:00 2001 From: lea Date: Sat, 18 Oct 2025 12:11:20 -0700 Subject: [PATCH 07/10] chore: bump xfce config --- ultramarine/release/ultramarine-release.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ultramarine/release/ultramarine-release.spec b/ultramarine/release/ultramarine-release.spec index 924cbfc7..26128b44 100644 --- a/ultramarine/release/ultramarine-release.spec +++ b/ultramarine/release/ultramarine-release.spec @@ -5,7 +5,7 @@ %global codename heart_of_gold %define dist_version 42 -%define xfce_conf_commit d2ecec2c00250224d7762c6a2b7e15fbc8621783 +%define xfce_conf_commit 0406ea1b394c825e4eeceded407ff51e535cd72e %define anywhere_conf_commit 240cd1e95d5abb7bbea4cefbe19d328fd6bacac7 @@ -52,7 +52,7 @@ Summary: Ultramarine Linux release files Name: ultramarine-release Version: %{dist_version} -Release: 17%{?dist} +Release: 18%{?dist} License: MIT Source0: LICENSE URL: https://ultramarine-linux.org From ac81825c4e70822e338dc9ec20adce938868b339 Mon Sep 17 00:00:00 2001 From: lea Date: Sat, 18 Oct 2025 18:15:22 -0700 Subject: [PATCH 08/10] fix: add jxl variants --- .../backgrounds/ultramarine-backgrounds.spec | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/ultramarine/backgrounds/ultramarine-backgrounds.spec b/ultramarine/backgrounds/ultramarine-backgrounds.spec index 493c5ef1..f59c2485 100644 --- a/ultramarine/backgrounds/ultramarine-backgrounds.spec +++ b/ultramarine/backgrounds/ultramarine-backgrounds.spec @@ -3,7 +3,7 @@ Name: ultramarine-backgrounds Version: %(echo %ver | sed 's/-/~/g') -Release: 5%{?dist} +Release: 6%{?dist} BuildArch: noarch # details for the artworks' licenses can be seen in the COPYING file License: CC-BY-SA 4.0 and CC0 @@ -154,6 +154,25 @@ compat_link $DEFAULT_DARK_WALL images/default-dark-5_4.png compat_link $DEFAULT_DARK_WALL images/default-dark-16_9.png compat_link $DEFAULT_DARK_WALL images/default-dark-16_10.png +# HACK(42): Remove in 43 once we make JXL the new default format for wallpapers +# We need JXL for the default wallpaper, for now, for XFCE +# see: https://src.fedoraproject.org/rpms/desktop-backgrounds/blob/rawhide/f/desktop-backgrounds.spec#_214 +(cd %{buildroot}%{_datadir}/backgrounds/images; + convert default.png \ + -alpha off default.jxl + convert default-5_4.png \ + -alpha off default-5_4.jxl + convert default-16_9.jxl \ + -alpha off default-16_9.jxl + convert default-16_10.jxl \ + -alpha off default-16_10.jxl +) + +# Hopefully no XML required for the JXL variant +ln -rsf "%{buildroot}%{_datadir}/backgrounds/images/default.jxl" "%{buildroot}%{_datadir}/backgrounds/default.png" +ln -rsf "%{buildroot}%{_datadir}/backgrounds/images/default-dark.jxl" "%{buildroot}%{_datadir}/backgrounds/default-dark.png" +# END HACK + %files %license COPYING @@ -176,6 +195,8 @@ compat_link $DEFAULT_DARK_WALL images/default-dark-16_10.png %{_datadir}/backgrounds/default.png %{_datadir}/backgrounds/default-dark.png %{_datadir}/backgrounds/default.xml +%{_datadir}/backgrounds/default.jxl +%{_datadir}/backgrounds/default-dark.jxl %changelog From 35d66dd10e95d00806765e73cbd5d3fe9f91c82f Mon Sep 17 00:00:00 2001 From: lea Date: Sat, 18 Oct 2025 18:18:19 -0700 Subject: [PATCH 09/10] add ImageMagick to build --- ultramarine/backgrounds/ultramarine-backgrounds.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ultramarine/backgrounds/ultramarine-backgrounds.spec b/ultramarine/backgrounds/ultramarine-backgrounds.spec index f59c2485..eedda6ac 100644 --- a/ultramarine/backgrounds/ultramarine-backgrounds.spec +++ b/ultramarine/backgrounds/ultramarine-backgrounds.spec @@ -11,7 +11,7 @@ Summary: Ultramarine Linux backgrounds Provides: desktop-backgrounds = %{version}-%{release} Requires: /usr/bin/ln Recommends: ultramarine-backgrounds-compat = %{version}-%{release} -BuildRequires: make +BuildRequires: make ImageMagick # licensing information Source0: https://github.com/Ultramarine-Linux/backgrounds/archive/refs/tags/%ver.tar.gz #Source1: 30_default_backgrounds.gschema.override From 4fef0e7320c80311722b960b734b8ef389e5f9a9 Mon Sep 17 00:00:00 2001 From: lea Date: Sat, 18 Oct 2025 18:21:59 -0700 Subject: [PATCH 10/10] oopsies --- ultramarine/backgrounds/ultramarine-backgrounds.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ultramarine/backgrounds/ultramarine-backgrounds.spec b/ultramarine/backgrounds/ultramarine-backgrounds.spec index eedda6ac..49abbd27 100644 --- a/ultramarine/backgrounds/ultramarine-backgrounds.spec +++ b/ultramarine/backgrounds/ultramarine-backgrounds.spec @@ -162,15 +162,15 @@ compat_link $DEFAULT_DARK_WALL images/default-dark-16_10.png -alpha off default.jxl convert default-5_4.png \ -alpha off default-5_4.jxl - convert default-16_9.jxl \ + convert default-16_9.png \ -alpha off default-16_9.jxl - convert default-16_10.jxl \ + convert default-16_10.png \ -alpha off default-16_10.jxl ) # Hopefully no XML required for the JXL variant -ln -rsf "%{buildroot}%{_datadir}/backgrounds/images/default.jxl" "%{buildroot}%{_datadir}/backgrounds/default.png" -ln -rsf "%{buildroot}%{_datadir}/backgrounds/images/default-dark.jxl" "%{buildroot}%{_datadir}/backgrounds/default-dark.png" +ln -rsf "%{buildroot}%{_datadir}/backgrounds/images/default.jxl" "%{buildroot}%{_datadir}/backgrounds/default.jxl" +ln -rsf "%{buildroot}%{_datadir}/backgrounds/images/default-dark.jxl" "%{buildroot}%{_datadir}/backgrounds/default-dark.jxl" # END HACK %files