From 5f3d13ccef380898fdc6d256f8a5e003da572c8a Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Wed, 3 Jul 2024 13:24:37 -0700 Subject: [PATCH 01/10] add: codium-marketplace (#1410) (#1417) (cherry picked from commit fe3a5a9df25add1b6f2c370d241c659d93a3af25) Co-authored-by: madomado --- anda/devs/codium-marketplace/anda.hcl | 6 +++ .../codium-marketplace.spec | 40 +++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 anda/devs/codium-marketplace/anda.hcl create mode 100644 anda/devs/codium-marketplace/codium-marketplace.spec diff --git a/anda/devs/codium-marketplace/anda.hcl b/anda/devs/codium-marketplace/anda.hcl new file mode 100644 index 0000000000..119f7784c2 --- /dev/null +++ b/anda/devs/codium-marketplace/anda.hcl @@ -0,0 +1,6 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "codium-marketplace.spec" + } +} diff --git a/anda/devs/codium-marketplace/codium-marketplace.spec b/anda/devs/codium-marketplace/codium-marketplace.spec new file mode 100644 index 0000000000..bf33068b8e --- /dev/null +++ b/anda/devs/codium-marketplace/codium-marketplace.spec @@ -0,0 +1,40 @@ +# ref: https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=vscodium-marketplace + +Name: codium-marketplace +Version: 1.65.0 +Release: 1%?dist +Summary: Enable vscode marketplace in vscodium +License: MIT +BuildArch: noarch +URL: https://marketplace.visualstudio.com/vscode +Requires: codium sed + +%description +This package replaces the default marketplace (https://open-vsx.org/) +to the official one used by vscode. + +%posttrans +if [ $1 -gt 1 ]; then # update/install + sed -i -e 's/^[[:blank:]]*"serviceUrl":.*/ "serviceUrl": "https:\/\/marketplace.visualstudio.com\/_apis\/public\/gallery",/' \ + -e '/^[[:blank:]]*"cacheUrl/d' \ + -e '/^[[:blank:]]*"serviceUrl/a\ "cacheUrl": "https:\/\/vscode.blob.core.windows.net\/gallery\/index",' \ + -e 's/^[[:blank:]]*"itemUrl":.*/ "itemUrl": "https:\/\/marketplace.visualstudio.com\/items"/' \ + -e '/^[[:blank:]]*"linkProtectionTrustedDomains/d' \ + /usr/share/codium/resources/app/product.json || true +fi + +%preun +sed -i -e 's/^[[:blank:]]*"serviceUrl":.*/ "serviceUrl": "https:\/\/open-vsx.org\/vscode\/gallery",/' \ + -e '/^[[:blank:]]*"cacheUrl/d' \ + -e 's/^[[:blank:]]*"itemUrl":.*/ "itemUrl": "https:\/\/open-vsx.org\/vscode\/item"/' \ + -e '/^[[:blank:]]*"linkProtectionTrustedDomains/d' \ + -e '/^[[:blank:]]*"documentationUrl/i\ "linkProtectionTrustedDomains": ["https://open-vsx.org"],' \ + /usr/share/codium/resources/app/product.json || true + +%triggerin -- codium +sed -i -e 's/^[[:blank:]]*"serviceUrl":.*/ "serviceUrl": "https:\/\/marketplace.visualstudio.com\/_apis\/public\/gallery",/' \ + -e '/^[[:blank:]]*"cacheUrl/d' \ + -e '/^[[:blank:]]*"serviceUrl/a\ "cacheUrl": "https:\/\/vscode.blob.core.windows.net\/gallery\/index",' \ + -e 's/^[[:blank:]]*"itemUrl":.*/ "itemUrl": "https:\/\/marketplace.visualstudio.com\/items"/' \ + -e '/^[[:blank:]]*"linkProtectionTrustedDomains/d' \ + /usr/share/codium/resources/app/product.json || true From 2102e5e4694cde06619fd0ac12b3de805fa9417d Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Wed, 3 Jul 2024 22:51:41 -0700 Subject: [PATCH 02/10] fix: switchboard (#1413) (#1421) (cherry picked from commit 3a0d36ec645413e453040829ef85737cd8f3f2b4) Co-authored-by: madomado --- .../elementary/switchboard/switchboard.spec | 33 ++++++++----------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/anda/desktops/elementary/switchboard/switchboard.spec b/anda/desktops/elementary/switchboard/switchboard.spec index cd3a9bbe41..41dad281da 100644 --- a/anda/desktops/elementary/switchboard/switchboard.spec +++ b/anda/desktops/elementary/switchboard/switchboard.spec @@ -1,5 +1,5 @@ %global srcname switchboard -%global appname io.elementary.switchboard +%global appname io.elementary.settings Name: switchboard Summary: Modular Desktop Settings Hub @@ -16,12 +16,10 @@ BuildRequires: libappstream-glib BuildRequires: meson BuildRequires: vala -BuildRequires: pkgconfig(gee-0.8) -BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(granite) >= 5.4.0 -BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(libhandy-1) >= 0.83.0 -BuildRequires: fdupes +BuildRequires: pkgconfig(granite-7) +BuildRequires: pkgconfig(gtk4) +BuildRequires: pkgconfig(libadwaita-1) +BuildRequires: fdupes sassc Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -92,7 +90,7 @@ appstream-util validate-relax --nonet \ %{_datadir}/applications/%{appname}.desktop %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml -%{_datadir}/icons/hicolor/*/apps/%{appname}.svg +%{_iconsdir}/hicolor/*/apps/%{appname}.svg %{_datadir}/metainfo/%{appname}.appdata.xml %files libs @@ -102,19 +100,14 @@ appstream-util validate-relax --nonet \ %dir %{_libdir}/%{name} %dir %{_libdir}/%{name}/* -%{_libdir}/lib%{name}-2.0.so.0 -%{_libdir}/lib%{name}-2.0.so.2.0 +%{_libdir}/lib%{name}-3.so.0 +%{_libdir}/lib%{name}-3.so.2.0 %files devel -%{_includedir}/%{name}-2.0/ +%{_includedir}/%{name}-3/ -%{_libdir}/lib%{name}-2.0.so -%{_libdir}/pkgconfig/%{name}-2.0.pc +%{_libdir}/lib%{name}-3.so +%{_libdir}/pkgconfig/%{name}-3.pc -%{_datadir}/vala/vapi/%{name}-2.0.deps -%{_datadir}/vala/vapi/%{name}-2.0.vapi - - -%changelog -* Sat Oct 15 2022 windowsboy111 - 6.0.2-1 -- Repackaged for Terra +%{_datadir}/vala/vapi/%{name}-3.deps +%{_datadir}/vala/vapi/%{name}-3.vapi From 566771779705699f067dc2d78a9b652c973326d2 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Thu, 4 Jul 2024 01:20:26 -0700 Subject: [PATCH 03/10] fix: codium-marketplace (#1422) (#1424) * add: codium-marketplace * arches * fix: codium-marketplace --------- Signed-off-by: madomado (cherry picked from commit 810d59fa9414adf8c3d9f5a0df6c70f2864c3bfa) Co-authored-by: madomado --- anda/devs/codium-marketplace/codium-marketplace.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/anda/devs/codium-marketplace/codium-marketplace.spec b/anda/devs/codium-marketplace/codium-marketplace.spec index bf33068b8e..fba321e07f 100644 --- a/anda/devs/codium-marketplace/codium-marketplace.spec +++ b/anda/devs/codium-marketplace/codium-marketplace.spec @@ -13,6 +13,10 @@ Requires: codium sed This package replaces the default marketplace (https://open-vsx.org/) to the official one used by vscode. +%install +touch dummy +install -Dm644 dummy %buildroot/tmp/terra-codium-marketplace-dummy-file + %posttrans if [ $1 -gt 1 ]; then # update/install sed -i -e 's/^[[:blank:]]*"serviceUrl":.*/ "serviceUrl": "https:\/\/marketplace.visualstudio.com\/_apis\/public\/gallery",/' \ @@ -38,3 +42,6 @@ sed -i -e 's/^[[:blank:]]*"serviceUrl":.*/ "serviceUrl": "https:\/\/marketpla -e 's/^[[:blank:]]*"itemUrl":.*/ "itemUrl": "https:\/\/marketplace.visualstudio.com\/items"/' \ -e '/^[[:blank:]]*"linkProtectionTrustedDomains/d' \ /usr/share/codium/resources/app/product.json || true + +%files +/tmp/terra-codium-marketplace-dummy-file \ No newline at end of file From 6c07c97998bf76c4bd7367814e9e81f12a85e985 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 4 Jul 2024 17:55:56 +0000 Subject: [PATCH 04/10] bump: vencord-desktop --- anda/apps/vencord-desktop/vencord-desktop.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/apps/vencord-desktop/vencord-desktop.spec b/anda/apps/vencord-desktop/vencord-desktop.spec index d235730d7d..c6ebbd97dc 100644 --- a/anda/apps/vencord-desktop/vencord-desktop.spec +++ b/anda/apps/vencord-desktop/vencord-desktop.spec @@ -6,7 +6,7 @@ Name: vencord-desktop Provides: VencordDesktop = %{version}-%{release} -Version: 1.5.2 +Version: 1.5.3 Release: 1%?dist License: GPL-3.0 Summary: Vesktop is a cross platform desktop app aiming to give you a snappier Discord experience with Vencord pre-installed From 9fadc9fdd3067a5758193f04d921b42cf0eeef2c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 5 Jul 2024 04:20:41 +0000 Subject: [PATCH 05/10] bump: osu-lazer --- anda/games/osu-lazer/osu-lazer.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/osu-lazer/osu-lazer.spec b/anda/games/osu-lazer/osu-lazer.spec index 36b34cb86b..6902b830db 100644 --- a/anda/games/osu-lazer/osu-lazer.spec +++ b/anda/games/osu-lazer/osu-lazer.spec @@ -1,4 +1,4 @@ -%define osuresver 2024.622.0 +%define osuresver 2024.705.0 %global debug_package %{nil} %define __strip /bin/true From b4dc43d28d3cd4705b4fcb9b6d0906f6158f38eb Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 5 Jul 2024 13:39:13 +0000 Subject: [PATCH 06/10] bump: ruff --- anda/langs/python/ruff/python3-ruff.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/python/ruff/python3-ruff.spec b/anda/langs/python/ruff/python3-ruff.spec index 2d5969d30d..22c8156465 100644 --- a/anda/langs/python/ruff/python3-ruff.spec +++ b/anda/langs/python/ruff/python3-ruff.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: python3-ruff -Version: 0.5.0 +Version: 0.5.1 Release: 1%?dist Summary: An extremely fast Python linter, written in Rust License: MIT From e5970bd3a03c8c6cb2d923efb5938080b6b23eea Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Fri, 5 Jul 2024 21:55:09 -0700 Subject: [PATCH 07/10] add: google-black-cursor-theme (#1274) (#1431) * Added Google Dot Black cursors * changed name * Fixed name (again) (cherry picked from commit 9d93a71c723fa0c07eed290a66194c24f453898a) Co-authored-by: Matteo --- .../themes/google-black-cursor-theme/anda.hcl | 6 ++++ .../google-black-cursor-theme.spec | 36 +++++++++++++++++++ .../google-black-cursor-theme/update.rhai | 1 + 3 files changed, 43 insertions(+) create mode 100644 anda/themes/google-black-cursor-theme/anda.hcl create mode 100644 anda/themes/google-black-cursor-theme/google-black-cursor-theme.spec create mode 100644 anda/themes/google-black-cursor-theme/update.rhai diff --git a/anda/themes/google-black-cursor-theme/anda.hcl b/anda/themes/google-black-cursor-theme/anda.hcl new file mode 100644 index 0000000000..9a2117139d --- /dev/null +++ b/anda/themes/google-black-cursor-theme/anda.hcl @@ -0,0 +1,6 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "google-black-cursor-theme.spec" + } +} diff --git a/anda/themes/google-black-cursor-theme/google-black-cursor-theme.spec b/anda/themes/google-black-cursor-theme/google-black-cursor-theme.spec new file mode 100644 index 0000000000..b295bf9866 --- /dev/null +++ b/anda/themes/google-black-cursor-theme/google-black-cursor-theme.spec @@ -0,0 +1,36 @@ +Name: google-black-cursor-theme +Version: 2.0.0 +Release: 1%{?dist} +URL: https://github.com/ful1e5/Google_Cursor +Source0: %{url}/releases/download/v%{version}/GoogleDot-Black.tar.gz +Source1: https://raw.githubusercontent.com/ful1e5/Google_Cursor/v%{version}/README.md +Source2: https://raw.githubusercontent.com/ful1e5/Google_Cursor/v%{version}/LICENSE +License: GPL-3.0 +Summary: An opensource cursor theme inspired by Google. +BuildArch: noarch +BuildRequires: rpm_macro(fdupes) + +%description +An opensource cursor theme inspired by Google. + +%prep +tar xf %{SOURCE0} + +%build + +%install +mkdir -p %{buildroot}/%{_datadir}/icons/ +mv Google* %{buildroot}/%{_datadir}/icons/ +mkdir -p %{buildroot}/%{_datadir}/{doc,licenses}/%{name}/ +cp %{SOURCE1} %{buildroot}/%{_datadir}/doc/%{name}/README.md +cp %{SOURCE2} %{buildroot}/%{_datadir}/licenses/%{name}/LICENSE +%fdupes %buildroot%_datadir/icons/ + +%files +%doc README.md +%license LICENSE +%{_datadir}/icons/Google* + +%changelog +* Tue May 21 2024 matteodev8 - 2.0.0 +- Initial package (mostly copied from bibata-cursor-theme) diff --git a/anda/themes/google-black-cursor-theme/update.rhai b/anda/themes/google-black-cursor-theme/update.rhai new file mode 100644 index 0000000000..59fa4b884f --- /dev/null +++ b/anda/themes/google-black-cursor-theme/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("ful1e5/Google_Cursor")); From 87f0ad37240a0b067987e746c261321dab0e7ddc Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sat, 6 Jul 2024 19:14:12 +0000 Subject: [PATCH 08/10] bump: limine --- anda/system/limine/limine.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/system/limine/limine.spec b/anda/system/limine/limine.spec index 33f329fa6c..c5cc7c4bc2 100644 --- a/anda/system/limine/limine.spec +++ b/anda/system/limine/limine.spec @@ -1,5 +1,5 @@ Name: limine -Version: 7.9.1 +Version: 7.9.2 Release: 1%?dist Summary: Modern, advanced, portable, multiprotocol bootloader License: BSD-2-Clause From eb52b1588e47b73c1d56a1d81cf3f4e929d168b8 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 7 Jul 2024 02:59:31 +0000 Subject: [PATCH 09/10] bump: maturin --- anda/langs/rust/maturin/rust-terra-maturin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/rust/maturin/rust-terra-maturin.spec b/anda/langs/rust/maturin/rust-terra-maturin.spec index 9d80a663be..00078064f3 100644 --- a/anda/langs/rust/maturin/rust-terra-maturin.spec +++ b/anda/langs/rust/maturin/rust-terra-maturin.spec @@ -2,7 +2,7 @@ %global crate maturin Name: rust-terra-maturin -Version: 1.6.0 +Version: 1.7.0 Release: 1%?dist Summary: Build and publish crates with pyo3, rust-cpython and cffi bindings as well as rust binaries as python packages From 42ccbc766530da8bfdd8cd72d2c9445e6a3578c4 Mon Sep 17 00:00:00 2001 From: Cappy Ishihara Date: Sun, 7 Jul 2024 14:26:02 +0700 Subject: [PATCH 10/10] ci: custom runner option for custom build workflow call (#1419) --- .github/workflows/build.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d6d79000df..d3e4956962 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,11 +5,16 @@ on: packages: description: "Packages to Build" required: true + custom_builder: + description: "Custom Builder" + required: false + default: "" jobs: parse: outputs: pkgs: ${{ steps.parsing.outputs.pkgs }} + builder: ${{ inputs.custom_builder }} runs-on: "ubuntu-latest" steps: - name: Parse Input @@ -22,9 +27,9 @@ jobs: matrix: pkg: ${{ fromJson(needs.parse.outputs.pkgs) }} version: ["40"] - arch: ["x86_64", "aarch64"] + arch: ${{ output.builder == "x86-64-lg" && ["x86_64"] || ["x86_64", "aarch64"] }} fail-fast: false - runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }} + runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || output.builder && output.builder || 'ubuntu-latest' }} container: image: ghcr.io/terrapkg/builder:f${{ matrix.version }} options: --cap-add=SYS_ADMIN --privileged