From beef653f72071f30d3c5ee76dee439144d41b30d Mon Sep 17 00:00:00 2001 From: Gareth Widlansky <101901964+gerblesh@users.noreply.github.com> Date: Sat, 12 Apr 2025 04:14:26 +0000 Subject: [PATCH] switch helium and hydrogen to proper naming (#2058) (#4299) (cherry picked from commit 15c4ad3494a0b2c7d790a6a5c423368e9308bd8a) # Conflicts: # anda/lib/libhelium/libhelium.spec # anda/themes/helium-gtk-theme/helium-gtk-theme.spec Co-authored-by: Jaiden Riordan --- anda/themes/tau-helium/anda.hcl | 6 - anda/themes/tau-helium/tau-helium.spec | 184 --------------------- anda/themes/tau-helium/update.rhai | 1 - anda/themes/tau-hydrogen/anda.hcl | 6 - anda/themes/tau-hydrogen/tau-hydrogen.spec | 40 ----- anda/themes/tau-hydrogen/update.rhai | 1 - comps.xml | 4 +- 7 files changed, 2 insertions(+), 240 deletions(-) delete mode 100644 anda/themes/tau-helium/anda.hcl delete mode 100644 anda/themes/tau-helium/tau-helium.spec delete mode 100644 anda/themes/tau-helium/update.rhai delete mode 100644 anda/themes/tau-hydrogen/anda.hcl delete mode 100644 anda/themes/tau-hydrogen/tau-hydrogen.spec delete mode 100644 anda/themes/tau-hydrogen/update.rhai diff --git a/anda/themes/tau-helium/anda.hcl b/anda/themes/tau-helium/anda.hcl deleted file mode 100644 index a415f2f5ef..0000000000 --- a/anda/themes/tau-helium/anda.hcl +++ /dev/null @@ -1,6 +0,0 @@ -project pkg { - arches = ["x86_64"] - rpm { - spec = "tau-helium.spec" - } -} diff --git a/anda/themes/tau-helium/tau-helium.spec b/anda/themes/tau-helium/tau-helium.spec deleted file mode 100644 index ec964d20be..0000000000 --- a/anda/themes/tau-helium/tau-helium.spec +++ /dev/null @@ -1,184 +0,0 @@ -%global ver 1.8.23 - -Summary: tauOS GTK/GNOME Shell Themes -Name: tau-helium -Version: %(echo %ver | sed 's/-/./g') -Release: 1%{?dist} -License: GPL-3.0 -URL: https://github.com/tau-OS/tau-helium -Source0: https://github.com/tau-OS/tau-helium/archive/refs/tags/%{ver}.tar.gz -BuildArch: noarch -BuildRequires: sass -BuildRequires: meson -BuildRequires: ninja-build -BuildRequires: fdupes - -%description -A set of GTK/GNOME Shell Themes for tauOS - -%prep -%autosetup -n tau-helium-%{ver} - -%build -%meson -%meson_build - -%install -# Install licenses -mkdir -p licenses -%meson_install -%fdupes %buildroot%_datadir/themes/ - -%files -%license LICENSE -%doc README.md -%{_datadir}/themes/Helium/* -%{_datadir}/themes/Helium-dark/* - -%changelog -* Fri Dec 02 2022 root - 1.1.25-1 -- new version - -* Fri Dec 02 2022 root - 1.1.24-1 -- new version - -* Fri Dec 02 2022 root - 1.1.23-1 -- new version - -* Fri Nov 25 2022 root - 1.1.22-1 -- new version - -* Fri Nov 18 2022 Lleyton Gray - 1.1.21-1 -- new version - -* Fri Nov 18 2022 Lleyton Gray - 1.1.20-1 -- new version - -* Thu Nov 17 2022 root - 1.1.19-1 -- new version - -* Sun Nov 13 2022 root - 1.1.18-1 -- new version - -* Fri Nov 11 2022 Lleyton Gray - 1.1.17-1 -- new version - -* Fri Nov 11 2022 Lleyton Gray - 1.1.17-1 -- new version - -* Wed Jun 22 2022 Lains - 1.1-52 -- Theme freeze exception for 1.1. -- Slight differences for themes. - -* Wed Jun 22 2022 Lains - 1.1-49 -- Theme freeze exception for 1.1. -- Merge of GNOME Shell themes. - -* Mon May 30 2022 Lains - 1.1-42 -- Theme freeze exception for 1.1. -- An adventure in coloring happened. - -* Mon May 30 2022 Lains - 1.1-32 -- Theme freeze exception for 1.1. -- Add missing tauOS HIG css classes helpers. - -* Sun May 29 2022 Lains - 1.1-30 -- Theme freeze exception for 1.1. -- Remove GTK3 theme creep and also the tauos specific stylings. - -* Fri May 27 2022 Lains - 1.1-28 -- Theme freeze exception for 1.1. -- Fixed borders on GTK3. - -* Thu May 26 2022 Lains - 1.1-27 -- Actual Theme freeze for 1.1. -- Added missing tau-specific widget theming. - -* Wed May 25 2022 Lains - 1.1-26 -- Theme freeze for 1.1. - -* Wed May 25 2022 Lains - 1.1-25 -- Make switches not as wacky in size. - -* Tue May 24 2022 Lains - 1.1-23 -- Accessibility-driven design on entries and switches. - -* Tue May 24 2022 Lains - 1.1-22 -- Missed some stuff that was breaking the theme. - -* Mon May 23 2022 Lains - 1.1-21 -- Reintroduce some stuff otherwise theme breaks on GTK3. - -* Sun May 22 2022 Lains - 1.1-20 -- Remove platform-specific css classes and things -- Focus only on tau HIG and basic GTK theming. - -* Sat May 21 2022 Lains - 1.1-19 -- Fix typography in general, again. - -* Fri May 20 2022 Lains - 1.1-18 -- Fix typography in general. - -* Fri May 20 2022 Lains - 1.1-17 -- Fix bg color in Helium-dark GNOME Shell. - -* Thu May 19 2022 Lains - 1.1-16 -- Fix more oops. - -* Thu May 19 2022 Lains - 1.1-15 -- Fix some oops. - -* Wed May 18 2022 Lains - 1.1-14 -- Bring in the tauOS HIG widgetry and stuff. - -* Tue May 17 2022 Lains - 1.1-13 -- Make the dark theme content block color not too stark. - -* Mon May 16 2022 Lains - 1.1-12 -- Finalize and fix inconsistencies in the Helium GNOME Shell themes - -* Sun May 15 2022 Lains - 1.1-11 -- Fix Helium Light GNOME Shell theme - -* Fri May 13 2022 Lains - 1.1-10 -- Refine some GTK stuff - -* Tue May 10 2022 Lains - 1.1-9 -- Refine some GTK stuff - -* Tue May 10 2022 Lains - 1.1-8 -- Finish GTK4 theme - -* Mon May 9 2022 Lains - 1.1-7 -- Start GTK4 theme - -* Mon May 9 2022 Lains - 1.1-6 -- More improvements in styling - -* Mon May 9 2022 Lains - 1.1-5 -- Improvements in styling to match Shell with GTK theme - -* Mon May 9 2022 Lains - 1.1-4 -- GNOME shell theme wasn't being installed - -* Sun May 8 2022 Lains - 1.1-3 -- Perhaps this is needed - -* Sun May 8 2022 Lains - 1.1-2 -- Let's roll our own gtk theme - -* Wed May 4 2022 Lains - 1.1-1.7.2 -- Get Helium GNOME Shell theme here - -* Tue May 3 2022 Lains - 1.1-1.7.1 -- Get Helium GNOME Shell theme here - -* Thu Apr 21 2022 Jamie Murphy - 1.1-1.7 -- Update adw-gtk3 to v1.7 -- Update Build System - -* Thu Apr 7 2022 Jamie Murphy - 1.1-2 -- Add accent colours - -* Thu Apr 7 2022 Jamie Murphy - 1.1-1 -- Initial Release diff --git a/anda/themes/tau-helium/update.rhai b/anda/themes/tau-helium/update.rhai deleted file mode 100644 index c3700bc01a..0000000000 --- a/anda/themes/tau-helium/update.rhai +++ /dev/null @@ -1 +0,0 @@ -rpm.global("ver", gh("tau-OS/tau-helium")); diff --git a/anda/themes/tau-hydrogen/anda.hcl b/anda/themes/tau-hydrogen/anda.hcl deleted file mode 100644 index 08b5fd16c9..0000000000 --- a/anda/themes/tau-hydrogen/anda.hcl +++ /dev/null @@ -1,6 +0,0 @@ -project pkg { - arches = ["x86_64"] - rpm { - spec = "tau-hydrogen.spec" - } -} diff --git a/anda/themes/tau-hydrogen/tau-hydrogen.spec b/anda/themes/tau-hydrogen/tau-hydrogen.spec deleted file mode 100644 index 397cdc274b..0000000000 --- a/anda/themes/tau-hydrogen/tau-hydrogen.spec +++ /dev/null @@ -1,40 +0,0 @@ -Summary: tauOS Icon Theme -Name: tau-hydrogen -Version: 1.0.16 -Release: 1%?dist -License: GPL-3.0 -URL: https://github.com/tau-OS/tau-hydrogen -Source0: https://github.com/tau-OS/tau-hydrogen/archive/refs/tags/%{version}.tar.gz -BuildArch: noarch -BuildRequires: meson -BuildRequires: ninja-build -BuildRequires: librsvg2-tools -BuildRequires: xcursorgen -BuildRequires: fdupes - -%description -Hydrogen is the default icon theme in tauOS - -%prep -%autosetup -n tau-hydrogen-%{version} - -%build -%meson -%meson_build - -%install -# Install licenses -mkdir -p licenses -%meson_install -%fdupes %buildroot%_datadir - -%files -%license LICENSE -%doc README.md -%{_datadir}/icons/Hydrogen/* -%{_datadir}/gimp/2.0/palettes/Helium.gpl -%{_datadir}/inkscape/palettes/Helium.gpl - -%changelog -* Sun Nov 20 2022 Lleyton Gray - 1.0.1 -- Terra Release diff --git a/anda/themes/tau-hydrogen/update.rhai b/anda/themes/tau-hydrogen/update.rhai deleted file mode 100644 index 7adc5651ad..0000000000 --- a/anda/themes/tau-hydrogen/update.rhai +++ /dev/null @@ -1 +0,0 @@ -rpm.version(gh("tau-OS/tau-hydrogen")); diff --git a/comps.xml b/comps.xml index ce2e57b525..f342006245 100644 --- a/comps.xml +++ b/comps.xml @@ -9,8 +9,8 @@ true libhelium - tau-helium - tau-hydrogen + helium-gtk-theme + hydrogen-icon-theme