Merge branch 'f40' into pr/custom-builder-f40

Signed-off-by: Cappy Ishihara <[email protected]>

.github/workflows/build.yml

@@ -16,6 +16,7 @@ on:
         type: string
 
 
+
 jobs:
   parse:
     outputs:

anda/apps/discord-canary-openasar/discord-canary-openasar.spec

@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
 
 Name:           discord-canary-openasar
-Version:        0.0.444
+Version:        0.0.446
 Release:        1%?dist
 Summary:        A snappier Discord rewrite with features like further customization and theming
 License:        MIT AND https://discord.com/terms

anda/apps/discord-canary/discord-canary.spec

@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
 
 Name:           discord-canary
-Version:        0.0.444
+Version:        0.0.446
 Release:        1%?dist
 Summary:        Free Voice and Text Chat for Gamers
 URL:            discord.com

anda/apps/discord-openasar/discord-openasar.spec

@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
 
 Name:           discord-openasar
-Version:        0.0.58
+Version:        0.0.59
 Release:        1%?dist
 Summary:        A snappier Discord rewrite with features like further customization and theming
 License:        MIT AND https://discord.com/terms

anda/apps/discord/discord.spec

@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
 
 Name:			discord
-Version:		0.0.58
+Version:		0.0.59
 Release:		1%?dist
 Summary:		Free Voice and Text Chat for Gamers
 URL:			https://discord.com

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

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 <[email protected]> - 6.0.2-1
-- Repackaged for Terra
+%{_datadir}/vala/vapi/%{name}-3.deps
+%{_datadir}/vala/vapi/%{name}-3.vapi

anda/devs/codium-marketplace/anda.hcl

@@ -0,0 +1,6 @@
+project pkg {
+    arches = ["x86_64"]
+    rpm {
+        spec = "codium-marketplace.spec"
+    }
+}

anda/devs/codium-marketplace/codium-marketplace.spec

@@ -0,0 +1,47 @@
+# 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.
+
+%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",/' \
+    -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
+
+%files
+/tmp/terra-codium-marketplace-dummy-file

anda/devs/codium/codium.spec

@@ -12,7 +12,7 @@
 %endif
 
 Name:			codium
-Version:		1.90.2.24171
+Version:		1.91.0.24190
 Release:		1%?dist
 Summary:		Code editing. Redefined.
 License:		MIT

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
 

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

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
 

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

anda/system/submarine/submarine.spec

@@ -3,14 +3,18 @@
 %elifarch aarch64
 %global arch arm64
 %endif
+# do not strip binaries
+%define __strip /bin/true
+%define debug_package %{nil}
+
 
 Name:			submarine
 Version:		0.2.1
-Release:		1%?dist
+Release:		2%?dist
 Summary:		Experimental bootloader for ChomeOS's depthcharge
 License:		GPL-3.0
 URL:			https://github.com/FyraLabs/submarine
-BuildRequires:	make gcc flex bison elfutils-devel parted vboot-utils golang xz bc openssl-devel git depthcharge-tools
+BuildRequires:	make gcc flex bison elfutils-devel parted vboot-utils golang xz bc openssl-devel git depthcharge-tools uboot-tools
 
 %description
 An experimental bootloader for ChomeOS's depthcharge.
@@ -20,18 +24,27 @@ Submarine provides a minimal Linux environmemt that lives in a small partition
 (or a different system if you're brave.)
 
 %prep
-go install github.com/u-root/[email protected]
 git clone --recurse-submodules --shallow-submodules -b v%version %url .
 
+pushd u-root
+go install
+popd
+
 %build
 export PATH=$PATH:$HOME/go/bin
 %make_build %arch
 
 %install
 mkdir -p %buildroot/boot %buildroot%_datadir/submarine
 install -Dm644 build/submarine-*.kpart %buildroot%_datadir/submarine/
+# Symlink the installed kpart to just submarine.kpart
+pushd %buildroot%_datadir/submarine/
+find . -name 'submarine-*.kpart' -exec ln -srf {} submarine.kpart \;
+popd
+
 install -Dm644 build/submarine-*.bin %buildroot%_datadir/submarine/
 
 %files
 %_datadir/submarine/submarine-*.kpart
+%_datadir/submarine/submarine.kpart
 %_datadir/submarine/submarine-*.bin

anda/terra/mock-configs/terra-mock-configs.spec

@@ -1,5 +1,5 @@
 Name:           terra-mock-configs
-Version:        7
+Version:        9
 Release:        1%{?dist}
 Summary:        Mock configs for Terra repos
 

anda/terra/mock-configs/terra.tpl

@@ -4,6 +4,7 @@ config_opts['macros']['%dist'] = '.fc{{ releasever }}'
 config_opts['chroot_setup_cmd'] = 'install @buildsys-build'
 config_opts['package_manager'] = 'dnf5'
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
+config_opts['bootstrap_image'] = 'registry.fedoraproject.org/fedora:{{ releasever }}'
 config_opts['mirrored'] = True
 config_opts['plugin_conf']['root_cache_enable'] = True
 config_opts['plugin_conf']['yum_cache_enable'] = True

anda/themes/google-black-cursor-theme/anda.hcl

@@ -0,0 +1,6 @@
+project pkg {
+	arches = ["x86_64"]
+	rpm {
+		spec = "google-black-cursor-theme.spec"
+	}
+}

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 <[email protected]> - 2.0.0
+- Initial package (mostly copied from bibata-cursor-theme)

anda/themes/google-black-cursor-theme/update.rhai

@@ -0,0 +1 @@
+rpm.version(gh("ful1e5/Google_Cursor"));

anda/tools/open-in-mpv/anda.hcl

@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "open-in-mpv.spec"
+	}
+}

anda/tools/open-in-mpv/open-in-mpv.spec

@@ -0,0 +1,44 @@
+#%global debug_package %{nil}
+
+Name:           open-in-mpv
+Version:        2.2.2
+Release:        1%?dist
+Summary:        CLI component of open-in-mpv browser extension
+
+License:        MIT
+URL:            https://github.com/Baldomo/open-in-mpv
+Source0:        https://github.com/Baldomo/open-in-mpv/archive/refs/tags/v%{version}.tar.gz
+
+ExclusiveArch:  %{golang_arches}
+
+BuildRequires:  go-rpm-macros
+BuildRequires:  git
+BuildRequires:  elfutils
+
+%description
+This is a simple web extension (for Chrome and Firefox) which helps open any video in the currently open tab in the mpv player.
+
+The extension itself shares a lot of code with the one from the awesome iina, while the (bare) native binary is written in Go (this is a rewrite from C++).
+
+%prep
+%autosetup -p1
+
+%build
+make build/linux/open-in-mpv
+
+%install
+install -Dm755 build/linux/open-in-mpv %{buildroot}%{_bindir}/open-in-mpv
+install -Dm644 scripts/open-in-mpv.desktop %{buildroot}%{_datarootdir}/applications/open-in-mpv.desktop
+
+%post
+update-desktop-database %{_datarootdir}/applications
+xdg-mime default open-in-mpv.desktop x-scheme-handler/mpv
+
+%files
+%license LICENSE
+%doc README.md
+%{_bindir}/open-in-mpv
+%{_datarootdir}/applications/open-in-mpv.desktop
+
+%changelog
+%autochangelog

anda/tools/open-in-mpv/update.rhai

@@ -0,0 +1 @@
+rpm.version(gh("Baldomo/open-in-mpv"));