From 83ad495a8a043bc46c21ff99a9de90a19e4ce81d Mon Sep 17 00:00:00 2001 From: madomado Date: Sat, 3 Jun 2023 18:50:42 +0800 Subject: [PATCH] chore: sync with Terra 38 (#496) * fix: elementary-videos * chore: more sync? --- .../elementary-videos/elementary-videos.spec | 4 +- .../prismlauncher-nightly.spec | 2 +- .../prismlauncher-qt5-nightly.spec | 2 +- .../golang-github-xyproto-gendesk.spec | 2 +- anda/lib/tdlib/tdlib-nightly.spec | 2 +- anda/rust/maturin/anda.hcl | 2 +- anda/rust/maturin/rust-terra-maturin.spec | 389 ++++++++++++++++++ anda/themes/fluent-icon-theme/anda.hcl | 6 + .../fluent-icon-theme/fluent-icon-theme.spec | 33 ++ anda/themes/fluent-icon-theme/update.rhai | 3 + anda/themes/fluent-theme/anda.hcl | 6 + anda/themes/fluent-theme/fluent-theme.spec | 38 ++ anda/themes/fluent-theme/update.rhai | 3 + 13 files changed, 485 insertions(+), 7 deletions(-) create mode 100644 anda/rust/maturin/rust-terra-maturin.spec create mode 100644 anda/themes/fluent-icon-theme/anda.hcl create mode 100644 anda/themes/fluent-icon-theme/fluent-icon-theme.spec create mode 100644 anda/themes/fluent-icon-theme/update.rhai create mode 100644 anda/themes/fluent-theme/anda.hcl create mode 100644 anda/themes/fluent-theme/fluent-theme.spec create mode 100644 anda/themes/fluent-theme/update.rhai diff --git a/anda/desktops/elementary/elementary-videos/elementary-videos.spec b/anda/desktops/elementary/elementary-videos/elementary-videos.spec index 6f5d165817..f45775c168 100644 --- a/anda/desktops/elementary/elementary-videos/elementary-videos.spec +++ b/anda/desktops/elementary/elementary-videos/elementary-videos.spec @@ -56,7 +56,7 @@ desktop-file-validate \ %{buildroot}/%{_datadir}/applications/%{appname}.desktop appstream-util validate-relax --nonet \ - %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml + %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml %files -f %{appname}.lang @@ -68,7 +68,7 @@ appstream-util validate-relax --nonet \ %{_datadir}/applications/%{appname}.desktop %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml %{_datadir}/icons/hicolor/*/apps/%{appname}.svg -%{_datadir}/metainfo/%{appname}.appdata.xml +%{_datadir}/metainfo/%{appname}.metainfo.xml %changelog diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index 70fe4d5a37..fc412fce32 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,6 +1,6 @@ %global real_name prismlauncher -%global commit 1840505a0f887ebfc2c719113873ea3345b133fb +%global commit 954d4d701a136e79c25b58f9680d26a555a6e6fe %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 2203af7eeb48c45398139b583615134efd8d407f %global quazip_commit 6117161af08e366c37499895b00ef62f93adc345 diff --git a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec index c8a7ee3439..c21c2f34eb 100644 --- a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec +++ b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec @@ -1,6 +1,6 @@ %global real_name prismlauncher -%global commit 1840505a0f887ebfc2c719113873ea3345b133fb +%global commit 954d4d701a136e79c25b58f9680d26a555a6e6fe %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 2203af7eeb48c45398139b583615134efd8d407f %global quazip_commit 6117161af08e366c37499895b00ef62f93adc345 diff --git a/anda/go/gendesk/golang-github-xyproto-gendesk.spec b/anda/go/gendesk/golang-github-xyproto-gendesk.spec index 0303ceccf5..a5b5d27ea4 100644 --- a/anda/go/gendesk/golang-github-xyproto-gendesk.spec +++ b/anda/go/gendesk/golang-github-xyproto-gendesk.spec @@ -17,7 +17,7 @@ of information.} %global godocs README.md Name: gendesk -Release: 1%{?dist} +Release: %autorelease Summary: :herb: Generate .desktop files and download .png icons by specifying a minimum of information License: BSD-3-Clause diff --git a/anda/lib/tdlib/tdlib-nightly.spec b/anda/lib/tdlib/tdlib-nightly.spec index 86c6c4948a..cf6e7b6171 100644 --- a/anda/lib/tdlib/tdlib-nightly.spec +++ b/anda/lib/tdlib/tdlib-nightly.spec @@ -1,4 +1,4 @@ -%global commit 4580cfc23b577f93dadd1ebab6f1bf9d90ff86dd +%global commit 75e00df016445330bfd591c415d5f390e518397e %global ver 1.8.14 Name: tdlib-nightly Version: %ver^%commit diff --git a/anda/rust/maturin/anda.hcl b/anda/rust/maturin/anda.hcl index 413a17552e..6152003a22 100644 --- a/anda/rust/maturin/anda.hcl +++ b/anda/rust/maturin/anda.hcl @@ -1,5 +1,5 @@ project pkg { rpm { - spec = "rust-maturin.spec" + spec = "rust-terra-maturin.spec" } } diff --git a/anda/rust/maturin/rust-terra-maturin.spec b/anda/rust/maturin/rust-terra-maturin.spec new file mode 100644 index 0000000000..273d423cbe --- /dev/null +++ b/anda/rust/maturin/rust-terra-maturin.spec @@ -0,0 +1,389 @@ +# Generated by rust2rpm 24 +%global crate maturin + +Name: rust-terra-maturin +Version: 1.0.1 +Release: 1%{?dist} +Summary: Build and publish crates with pyo3, rust-cpython and cffi bindings as well as rust binaries as python packages + +License: MIT OR Apache-2.0 +URL: https://crates.io/crates/maturin +Source: %{crates_source} + +BuildRequires: pkgconfig anda-srpm-macros cargo-rpm-macros >= 24 +Conflicts: rust-maturin + +%global _description %{expand: +Build and publish crates with pyo3, rust-cpython and cffi bindings as +well as rust binaries as python packages.} + +%description %{_description} + +%package -n terra-%{crate} +Summary: %{summary} +Conflicts: %crate + +%description -n terra-%{crate} %{_description} + +%files -n terra-%{crate} +%license license-apache +%license license-mit +%doc Changelog.md +%doc Code-of-Conduct.md +%doc README.md +%{_bindir}/maturin + +%package devel +Summary: %{summary} +BuildArch: noarch + +%description devel %{_description} + +This package contains library source intended for building other packages which +use the "%{crate}" crate. + +%files devel +%{crate_instdir}/ + +%package -n %{name}+default-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+default-devel %{_description} + +This package contains library source intended for building other packages which +use the "default" feature of the "%{crate}" crate. + +%files -n %{name}+default-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+bytesize-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+bytesize-devel %{_description} + +This package contains library source intended for building other packages which +use the "bytesize" feature of the "%{crate}" crate. + +%files -n %{name}+bytesize-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+cargo-xwin-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+cargo-xwin-devel %{_description} + +This package contains library source intended for building other packages which +use the "cargo-xwin" feature of the "%{crate}" crate. + +%files -n %{name}+cargo-xwin-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+cargo-zigbuild-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+cargo-zigbuild-devel %{_description} + +This package contains library source intended for building other packages which +use the "cargo-zigbuild" feature of the "%{crate}" crate. + +%files -n %{name}+cargo-zigbuild-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+cli-completion-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+cli-completion-devel %{_description} + +This package contains library source intended for building other packages which +use the "cli-completion" feature of the "%{crate}" crate. + +%files -n %{name}+cli-completion-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+configparser-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+configparser-devel %{_description} + +This package contains library source intended for building other packages which +use the "configparser" feature of the "%{crate}" crate. + +%files -n %{name}+configparser-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+console-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+console-devel %{_description} + +This package contains library source intended for building other packages which +use the "console" feature of the "%{crate}" crate. + +%files -n %{name}+console-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+cross-compile-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+cross-compile-devel %{_description} + +This package contains library source intended for building other packages which +use the "cross-compile" feature of the "%{crate}" crate. + +%files -n %{name}+cross-compile-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+dialoguer-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+dialoguer-devel %{_description} + +This package contains library source intended for building other packages which +use the "dialoguer" feature of the "%{crate}" crate. + +%files -n %{name}+dialoguer-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+faster-tests-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+faster-tests-devel %{_description} + +This package contains library source intended for building other packages which +use the "faster-tests" feature of the "%{crate}" crate. + +%files -n %{name}+faster-tests-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+full-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+full-devel %{_description} + +This package contains library source intended for building other packages which +use the "full" feature of the "%{crate}" crate. + +%files -n %{name}+full-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+human-panic-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+human-panic-devel %{_description} + +This package contains library source intended for building other packages which +use the "human-panic" feature of the "%{crate}" crate. + +%files -n %{name}+human-panic-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+keyring-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+keyring-devel %{_description} + +This package contains library source intended for building other packages which +use the "keyring" feature of the "%{crate}" crate. + +%files -n %{name}+keyring-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+log-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+log-devel %{_description} + +This package contains library source intended for building other packages which +use the "log" feature of the "%{crate}" crate. + +%files -n %{name}+log-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+minijinja-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+minijinja-devel %{_description} + +This package contains library source intended for building other packages which +use the "minijinja" feature of the "%{crate}" crate. + +%files -n %{name}+minijinja-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+multipart-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+multipart-devel %{_description} + +This package contains library source intended for building other packages which +use the "multipart" feature of the "%{crate}" crate. + +%files -n %{name}+multipart-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+native-tls-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+native-tls-devel %{_description} + +This package contains library source intended for building other packages which +use the "native-tls" feature of the "%{crate}" crate. + +%files -n %{name}+native-tls-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+password-storage-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+password-storage-devel %{_description} + +This package contains library source intended for building other packages which +use the "password-storage" feature of the "%{crate}" crate. + +%files -n %{name}+password-storage-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+rustls-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+rustls-devel %{_description} + +This package contains library source intended for building other packages which +use the "rustls" feature of the "%{crate}" crate. + +%files -n %{name}+rustls-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+scaffolding-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+scaffolding-devel %{_description} + +This package contains library source intended for building other packages which +use the "scaffolding" feature of the "%{crate}" crate. + +%files -n %{name}+scaffolding-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+tracing-subscriber-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+tracing-subscriber-devel %{_description} + +This package contains library source intended for building other packages which +use the "tracing-subscriber" feature of the "%{crate}" crate. + +%files -n %{name}+tracing-subscriber-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+upload-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+upload-devel %{_description} + +This package contains library source intended for building other packages which +use the "upload" feature of the "%{crate}" crate. + +%files -n %{name}+upload-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+ureq-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+ureq-devel %{_description} + +This package contains library source intended for building other packages which +use the "ureq" feature of the "%{crate}" crate. + +%files -n %{name}+ureq-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+url-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+url-devel %{_description} + +This package contains library source intended for building other packages which +use the "url" feature of the "%{crate}" crate. + +%files -n %{name}+url-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+wild-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+wild-devel %{_description} + +This package contains library source intended for building other packages which +use the "wild" feature of the "%{crate}" crate. + +%files -n %{name}+wild-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+xwin-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+xwin-devel %{_description} + +This package contains library source intended for building other packages which +use the "xwin" feature of the "%{crate}" crate. + +%files -n %{name}+xwin-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+zig-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+zig-devel %{_description} + +This package contains library source intended for building other packages which +use the "zig" feature of the "%{crate}" crate. + +%files -n %{name}+zig-devel +%ghost %{crate_instdir}/Cargo.toml + +%prep +%autosetup -n %{crate}-%{version_no_tilde} -p1 +%cargo_prep_online + +%build +cargo add time -F macros +%cargo_build + +%install +%cargo_install + +%if %{with check} +%check +%cargo_test +%endif + +%changelog +%autochangelog diff --git a/anda/themes/fluent-icon-theme/anda.hcl b/anda/themes/fluent-icon-theme/anda.hcl new file mode 100644 index 0000000000..7a434d7fbc --- /dev/null +++ b/anda/themes/fluent-icon-theme/anda.hcl @@ -0,0 +1,6 @@ +project "pkg" { + arches = ["x86_64"] + rpm { + spec = "fluent-icon-theme.spec" + } +} diff --git a/anda/themes/fluent-icon-theme/fluent-icon-theme.spec b/anda/themes/fluent-icon-theme/fluent-icon-theme.spec new file mode 100644 index 0000000000..7bd199d783 --- /dev/null +++ b/anda/themes/fluent-icon-theme/fluent-icon-theme.spec @@ -0,0 +1,33 @@ +%global tag 2023-02-01 + +Name: fluent-icon-theme +Version: 20230201 +Release: 1%{?dist} +Summary: Fluent icon theme for linux desktops. + +License: GPL-3.0 +URL: https://github.com/vinceliuice/Fluent-icon-theme/ +Source0: %{url}/archive/refs/tags/%{tag}.tar.gz + +BuildArch: noarch +BuildRequires: gtk-update-icon-cache + +%description +Fluent icon theme for linux desktops. + +%prep +%autosetup -n Fluent-icon-theme-%{tag} + +%install +mkdir -p %{buildroot}%{_datadir}/themes +./install.sh -r -a -d %{buildroot}%{_datadir}/icons + +%files +%license COPYING +%doc README.md + +%{_datadir}/icons/Fluent*/ + +%changelog +* Thu Jun 01 2023 Lleyton Gray - 20230201-1 +- Initial Package diff --git a/anda/themes/fluent-icon-theme/update.rhai b/anda/themes/fluent-icon-theme/update.rhai new file mode 100644 index 0000000000..6ddfd46585 --- /dev/null +++ b/anda/themes/fluent-icon-theme/update.rhai @@ -0,0 +1,3 @@ +let release = gh("vinceliuice/Fluent-icon-theme"); +rpm.global("tag", release); +rpm.version(sub("-", "", release)); diff --git a/anda/themes/fluent-theme/anda.hcl b/anda/themes/fluent-theme/anda.hcl new file mode 100644 index 0000000000..57b9032005 --- /dev/null +++ b/anda/themes/fluent-theme/anda.hcl @@ -0,0 +1,6 @@ +project "pkg" { + arches = ["x86_64"] + rpm { + spec = "fluent-theme.spec" + } +} diff --git a/anda/themes/fluent-theme/fluent-theme.spec b/anda/themes/fluent-theme/fluent-theme.spec new file mode 100644 index 0000000000..e3545902b3 --- /dev/null +++ b/anda/themes/fluent-theme/fluent-theme.spec @@ -0,0 +1,38 @@ +%global tag 2022-12-15 + +Name: fluent-theme +Version: 20221215 +Release: 1%{?dist} +Summary: Fluent is a Fluent design theme for GNOME/GTK based desktop environments. + +License: GPL-3.0 +URL: https://github.com/vinceliuice/Fluent-gtk-theme +Source0: https://github.com/vinceliuice/Fluent-gtk-theme/archive/refs/tags/%{tag}.tar.gz + +BuildArch: noarch +BuildRequires: sassc + +Requires: gtk-murrine-engine + +%description +Fluent is a Fluent design theme for GNOME/GTK based desktop environments. + +%prep +%autosetup -n Fluent-gtk-theme-%{tag} + +%build +./parse-sass.sh + +%install +mkdir -p %{buildroot}%{_datadir}/themes +./install.sh --tweaks round -d %{buildroot}%{_datadir}/themes + +%files +%license COPYING +%doc README.md + +%{_datadir}/themes/Fluent*/ + +%changelog +* Thu Jun 01 2023 Lleyton Gray - 20221215-1 +- Initial Package diff --git a/anda/themes/fluent-theme/update.rhai b/anda/themes/fluent-theme/update.rhai new file mode 100644 index 0000000000..0c988ca6af --- /dev/null +++ b/anda/themes/fluent-theme/update.rhai @@ -0,0 +1,3 @@ +let release = gh("vinceliuice/Fluent-gtk-theme"); +rpm.global("tag", release); +rpm.version(sub("-", "", release));