diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 89a2d0c225..a75ea47b81 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,7 +1,9 @@ # Contributing -First of all, thanks for being interested in contributing to Terra! If you have any questions about contributing, please contact us on [Discord](https://discord.gg/5fdPuxTg5Q). Since we use a GitHub Wiki for [documention](https://github.com/terrapkg/packages/wiki), our guidelines may be found there. See the links below: +First of all, thanks for being interested in contributing to Terra! If you have any questions about contributing, please contact us on [Discord](https://discord.gg/5fdPuxTg5Q). -* [Contribution Guide](https://github.com/terrapkg/packages/wiki/Contribute) -* [FAQ](https://github.com/terrapkg/packages/wiki/FAQ) -* [Policy](https://github.com/terrapkg/packages/wiki/Policy) \ No newline at end of file +## Documentations + +* [Contribution Guide](https://developer.fyralabs.com/terra/contributing) +* [FAQ](https://developer.fyralabs.com/terra/faq) +* [Policy](https://developer.fyralabs.com/terra/policy) diff --git a/SECURITY.md b/SECURITY.md index fc927d4dfb..d7f99168c9 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -3,7 +3,7 @@ ## Our Process Fyra Labs is committed to ensuring user security and privacy. -As such, we constantly try our best to ensure that our infrastructure and process are secure, which you may read about in our [FAQ](https://github.com/terrapkg/packages/wiki/FAQ#technical-details). +As such, we constantly try our best to ensure that our infrastructure and process are secure, which you may read about in our [FAQ](https://developer.fyralabs.com/terra/faq#technical-details). As a part of Fyra Labs's transparency measures, we will publicize details of any known breaches. This information will include, but will not be limited to: * Affected users, infrastructure, and data. @@ -11,7 +11,7 @@ As a part of Fyra Labs's transparency measures, we will publicize details of any * An in-depth explanation of how the breach occurred, including relevant security vulnerabilities. * How Fyra Labs will better protect user data in the future, ensuring our commitment to security and privacy. -We will publish these updates on our [Twitter](https://twitter.com/TeamFyraLabs) and [Discord](https://discord.gg/5fdPuxTg5Q). +We will publish these updates on our [Twitter](https://twitter.com/TeamFyraLabs), [Fedi](https://fedi.fyralabs.com/@hq), and [Discord](https://discord.gg/5fdPuxTg5Q). ## Reporting a Vulnerability diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index a70281ecd9..9957ff05aa 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit a46ce9e28cd97f7280c085649a79f85aa1d0fe70 +%global commit fe1de116f36be40d65b5a41674fa42667daf1f04 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20240325 +%global commit_date 20240402 %global ver v0.37.0 Name: mpv-nightly diff --git a/anda/desktops/gnome/gnome-shell-extension-pop-shell/terra-gnome-shell-extension-pop-shell.spec b/anda/desktops/gnome/gnome-shell-extension-pop-shell/terra-gnome-shell-extension-pop-shell.spec index 362f8608a1..586928afa6 100644 --- a/anda/desktops/gnome/gnome-shell-extension-pop-shell/terra-gnome-shell-extension-pop-shell.spec +++ b/anda/desktops/gnome/gnome-shell-extension-pop-shell/terra-gnome-shell-extension-pop-shell.spec @@ -1,13 +1,13 @@ # from Fedora upstream %global extension pop-shell %global uuid %{extension}@system76.com -%global commit 9a30c5bd49c373896410852d6477596ac4c43bd3 +%global commit 9418d0a9af7c9b30b61ac3eeb5ca432a3ad3e651 %global shortcommit %{lua:print(macros.commit:sub(1,7))} -%global commit_date 240218 +%global commit_date 20240401 %global ver 1.2.0 Name: terra-gnome-shell-extension-%{extension} -Version: %{ver}^%{shortcommit} +Version: %{ver}^%commit_date.%{shortcommit} Release: 1%?dist Summary: GNOME Shell extension for advanced tiling window management License: GPL-3.0-only diff --git a/anda/desktops/mate/indicators/datetime/ayatana-indicator-datetime.spec b/anda/desktops/mate/indicators/datetime/ayatana-indicator-datetime.spec index 6b8cbc33ab..9700919e63 100644 --- a/anda/desktops/mate/indicators/datetime/ayatana-indicator-datetime.spec +++ b/anda/desktops/mate/indicators/datetime/ayatana-indicator-datetime.spec @@ -1,6 +1,6 @@ Name: ayatana-indicator-datetime Summary: A GTK implementation of the StatusNotifierItem Specification -Version: 23.10.1 +Version: 24.2.0 Release: 1%{?dist} License: GPL-3.0 URL: https://github.com/AyatanaIndicators/ayatana-indicator-datetime @@ -38,7 +38,7 @@ Unity7 desktop and Lomiri desktop. %build %cmake -DENABLE_LOMIRI_FEATURES=ON \ - -DENABLE_TESTS=ON \ + -DENABLE_TESTS=OFF\ -DENABLE_COVERAGE=OFF \ %cmake_build diff --git a/anda/fonts/seto/seto-fonts.spec b/anda/fonts/seto/seto-fonts.spec index 3365601eeb..8f4f33653d 100644 --- a/anda/fonts/seto/seto-fonts.spec +++ b/anda/fonts/seto/seto-fonts.spec @@ -1,11 +1,10 @@ Name: seto-fonts Version: 6.20 -Release: 2%?dist +Release: 3%?dist URL: https://setofont.osdn.jp/ -Source0: https://osdn.net/frs/redir.php?m=nchc&f=setofont%2F61995%2Fsetofont_v_6_20.zip +Source0: https://github.com/terrapkg/pkg-seto-fonts/archive/refs/tags/%version.tar.gz License: OFL-1.1 Summary: A handwritten font that contains kanji up to JIS 4th level and difficult kanji -BuildRequires: unzip BuildArch: noarch @@ -14,7 +13,7 @@ BuildArch: noarch %prep -%setup -q -n setofont +%setup -q -n pkg-seto-fonts-%version %build @@ -25,11 +24,8 @@ install -Dm644 *.ttf %buildroot/%_datadir/fonts/%name/ %files %doc readme.txt +%license LICENSE.md %_datadir/fonts/%name/ %changelog -* Sun Jun 18 2023 windowsboy111 - 6.20-2 -- Fix install dir. - -* Tue Nov 22 2022 windowsboy111 - 6.20-1 -- Initial package +%autochangelog diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index f48a233d6f..36d1b70788 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,13 +1,13 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit df0280f52b68f4352d8da711136609c16ce4db7b +%global commit a2d28f6872841d047ce3854365c595ebf941b848 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f %global quazip_commit 6117161af08e366c37499895b00ef62f93adc345 %global tomlplusplus_commit 7eb2ffcc09f8e9890dc0b77ff8ab00fc53b1f2b8 -%global commit_date 20240325 +%global commit_date 20240401 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 diff --git a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec index 6f29e162ca..393e7f9eee 100644 --- a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec +++ b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec @@ -1,13 +1,13 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit df0280f52b68f4352d8da711136609c16ce4db7b +%global commit a2d28f6872841d047ce3854365c595ebf941b848 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f %global quazip_commit 6117161af08e366c37499895b00ef62f93adc345 %global tomlplusplus_commit 7eb2ffcc09f8e9890dc0b77ff8ab00fc53b1f2b8 -%global commit_date 20240325 +%global commit_date 20240401 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_with qt6 diff --git a/anda/langs/crystal/crystal/update.rhai b/anda/langs/crystal/crystal/update.rhai index 8d53b0e749..06671bca2e 100644 --- a/anda/langs/crystal/crystal/update.rhai +++ b/anda/langs/crystal/crystal/update.rhai @@ -1,2 +1,2 @@ let html = get("https://crystal-lang.org/"); -rpm.version(find("Latest release <.+>(.+)", html, 1)) +rpm.version(find("Latest release: (.+?)", html, 1)) diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index 054e300e4b..4045e55fc5 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit 33902d9dbb65fbfdfbd6e3b2a34c6e19eccb762f +%global commit cf00b2fd9e00909ac6368ece9515f0e020d7813d %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.1.1 -%global commit_date 20240322 +%global commit_date 20240330 %global debug_package %nil Name: nim-nighlty diff --git a/anda/langs/rust/starship/0001-gix-0.61.1-0.61.0.patch b/anda/langs/rust/starship/0001-gix-0.61.1-0.61.0.patch new file mode 100644 index 0000000000..5d61cce573 --- /dev/null +++ b/anda/langs/rust/starship/0001-gix-0.61.1-0.61.0.patch @@ -0,0 +1,25 @@ +From b62e3879abe83e0b879421a023d8e944e31f00cb Mon Sep 17 00:00:00 2001 +From: madomado +Date: Mon, 25 Mar 2024 18:33:25 +0800 +Subject: [PATCH] gix 0.61.1 -> 0.61.0 + +--- + Cargo.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Cargo.toml b/Cargo.toml +index d98ba90..c3059c9 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -82,7 +82,7 @@ version = "1.0.4" + version = "0.4.3" + + [dependencies.gix] +-version = "0.61.1" ++version = "0.61.0" + features = [ + "max-performance-safe", + "revision", +-- +2.44.0 + diff --git a/anda/langs/rust/starship/rust-starship.spec b/anda/langs/rust/starship/rust-starship.spec index abf70a9f4e..ed1d750aa8 100644 --- a/anda/langs/rust/starship/rust-starship.spec +++ b/anda/langs/rust/starship/rust-starship.spec @@ -1,21 +1,20 @@ -%global debug_package %{nil} -# Generated by rust2rpm 24 -%bcond_without check +# Generated by rust2rpm 26 +#bcond_without check %global crate starship Name: rust-starship -Version: 1.18.1 +Version: 1.18.2 Release: 1%?dist Summary: Minimal, blazing-fast, and infinitely customizable prompt for any shell! ☄🌌️ License: ISC URL: https://crates.io/crates/starship Source: %{crates_source} -# Automatically generated patch to strip foreign dependencies -Patch: starship-fix-metadata-auto.diff +# Automatically generated patch to strip dependencies and normalize metadata +Patch0: starship-fix-metadata-auto.diff -BuildRequires: rust-packaging >= 21 +BuildRequires: cargo-rpm-macros >= 24 BuildRequires: anda-srpm-macros BuildRequires: cmake BuildRequires: pkgconfig @@ -29,11 +28,13 @@ shell! ☄🌌️.} %package -n %{crate} Summary: %{summary} +License: ISC %description -n %{crate} %{_description} %files -n %{crate} %license LICENSE +#license LICENSE.dependencies %doc README.md %{_bindir}/starship @@ -170,14 +171,14 @@ use the "starship-battery" feature of the "%{crate}" crate. %ghost %{crate_instdir}/Cargo.toml %prep -%autosetup -n %{crate}-%{version_no_tilde} -p1 +%autosetup -n %{crate}-%{version} -p1 %cargo_prep_online %build -%cargo_build +%{cargo_build} %install -%cargo_install +%{cargo_install} %if %{with check} %check diff --git a/anda/langs/rust/starship/starship-fix-metadata-auto.diff b/anda/langs/rust/starship/starship-fix-metadata-auto.diff index d44038cc99..a3d883dfd4 100644 --- a/anda/langs/rust/starship/starship-fix-metadata-auto.diff +++ b/anda/langs/rust/starship/starship-fix-metadata-auto.diff @@ -1,6 +1,6 @@ ---- starship-1.14.2/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ starship-1.14.2/Cargo.toml 2023-04-25T12:48:23.509565+00:00 -@@ -254,18 +254,3 @@ +--- starship-1.18.1/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ starship-1.18.1/Cargo.toml 2024-03-24T13:14:24.022475+00:00 +@@ -263,18 +263,3 @@ ] default-features = false @@ -8,7 +8,7 @@ -version = "0.2.0" - -[target."cfg(windows)".dependencies.windows] --version = "0.48.0" +-version = "0.54.0" -features = [ - "Win32_Foundation", - "Win32_UI_Shell", diff --git a/anda/langs/vala/vala-language-server-nightly/vala-language-server-nightly.spec b/anda/langs/vala/vala-language-server-nightly/vala-language-server-nightly.spec index f3ce8c1bee..4dd93a8131 100644 --- a/anda/langs/vala/vala-language-server-nightly/vala-language-server-nightly.spec +++ b/anda/langs/vala/vala-language-server-nightly/vala-language-server-nightly.spec @@ -1,9 +1,9 @@ %global real_name vala-language-server -%global commit 0b020298aa3dafacd2f6633533ca91fba5698340 +%global commit a49292758922160244d1842cdcba0a5154d1cb27 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20240323 +%global commit_date 20240330 %global snapshot_info %{commit_date}.%{shortcommit} %global verrel 0.48.7 diff --git a/anda/langs/vala/vala-nightly/vala-nightly.spec b/anda/langs/vala/vala-nightly/vala-nightly.spec index 6b0172d65c..a0ed0b85f5 100644 --- a/anda/langs/vala/vala-nightly/vala-nightly.spec +++ b/anda/langs/vala/vala-nightly/vala-nightly.spec @@ -3,11 +3,11 @@ %global priority 90 %global real_name vala -%global commit 933eb2d0e41bb7fdc4fe5fc01a03254965990f3e +%global commit 86984c59734f975c9778251dddf80d247ade28a7 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global repo https://gitlab.gnome.org/GNOME/%{real_name}.git -%global commit_date 20240218 +%global commit_date 20240327 %global snapshot_info %{commit_date}.%{shortcommit} Name: vala-nightly diff --git a/anda/langs/vala/vala-panel/update.rhai b/anda/langs/vala/vala-panel/update.rhai new file mode 100644 index 0000000000..c8febf8b70 --- /dev/null +++ b/anda/langs/vala/vala-panel/update.rhai @@ -0,0 +1 @@ +rpm.version(gitlab("6865057")); diff --git a/anda/langs/vala/vala-panel/vala-panel.spec b/anda/langs/vala/vala-panel/vala-panel.spec index 43e5868d87..fbfc716872 100644 --- a/anda/langs/vala/vala-panel/vala-panel.spec +++ b/anda/langs/vala/vala-panel/vala-panel.spec @@ -1,10 +1,9 @@ +Name: vala-panel +Version: 24.03 %global forgeurl https://gitlab.com/vala-panel-project/vala-panel -%global commit ead4e7a36b0e4b0a2ac43c5d9ca17eb753461afe %forgemeta -Name: vala-panel -Version: 0.5.0 -Release: 2%?dist +Release: 1%?dist License: LGPL-3.0-or-later Summary: This package provides Application Menu plugin for vala-panel Group: System/GUI/Other @@ -38,7 +37,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %forgeautosetup %build -%meson -Dwnck=enabled -Dplatforms='layer-shell,x11' +%meson -Dwnck=enabled -Dplatforms='wayland,x11' %meson_build %install @@ -73,6 +72,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.valapanel.applica %{_datadir}/vala-panel/applets/*.plugin %dir %{_datadir}/vala-panel/images %{_datadir}/vala-panel/images/background.png +%{_libdir}/girepository-1.0/ValaPanel-%version.typelib %files devel %doc README.md @@ -82,6 +82,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.valapanel.applica %{_libdir}/libvalapanel.so %{_libdir}/pkgconfig/vala-panel.pc %{_datadir}/vala/vapi/vala-panel.* +%{_datadir}/gir-1.0/ValaPanel-%version.gir %changelog %autochangelog diff --git a/anda/lib/tdlib/tdlib-nightly.spec b/anda/lib/tdlib/tdlib-nightly.spec index 0e643993f4..6f9593b014 100644 --- a/anda/lib/tdlib/tdlib-nightly.spec +++ b/anda/lib/tdlib/tdlib-nightly.spec @@ -1,5 +1,5 @@ -%global commit 586bc784138042d2710168cd0b29f5dd6d415f45 -%global ver 1.8.26 +%global commit d7203eb719304866a7eb7033ef03d421459335b8 +%global ver 1.8.27 %global commit_date 20240219 %global shortcommit %(c=%{commit}; echo ${c:0:7}) diff --git a/anda/terra/srpm-macros/anda-srpm-macros.spec b/anda/terra/srpm-macros/anda-srpm-macros.spec index a26d89a92f..a70153f249 100644 --- a/anda/terra/srpm-macros/anda-srpm-macros.spec +++ b/anda/terra/srpm-macros/anda-srpm-macros.spec @@ -1,5 +1,5 @@ Name: anda-srpm-macros -Version: 0.1.5 +Version: 0.1.6 Release: 1%{?dist} Summary: SRPM macros for extra Fedora packages @@ -9,6 +9,7 @@ Source0: macros.cargo_extra Source1: macros.caching Source2: macros.anda Source3: macros.go_extra +Source4: macros.nim_extra Recommends: rust-packaging Requires: git-core @@ -28,15 +29,20 @@ install -D -p -m 0644 -t %{buildroot}%{_rpmmacrodir} %{SOURCE0} install -D -p -m 0644 -t %{buildroot}%{_rpmmacrodir} %{SOURCE1} install -D -p -m 0644 -t %{buildroot}%{_rpmmacrodir} %{SOURCE2} install -D -p -m 0644 -t %{buildroot}%{_rpmmacrodir} %{SOURCE3} +install -D -p -m 0644 -t %{buildroot}%{_rpmmacrodir} %{SOURCE4} %files %{_rpmmacrodir}/macros.cargo_extra %{_rpmmacrodir}/macros.caching %{_rpmmacrodir}/macros.anda %{_rpmmacrodir}/macros.go_extra +%{_rpmmacrodir}/macros.nim_extra %changelog +* Wed Mar 13 2024 madonuko - 0.1.6-1 +- Add nim_c, nim_tflags and nim_lflags + * Thu Aug 3 2023 madonuko - 0.1.4-1 - Add go_build_online and go_prep_online diff --git a/anda/terra/srpm-macros/macros.nim_extra b/anda/terra/srpm-macros/macros.nim_extra new file mode 100644 index 0000000000..69a43becb7 --- /dev/null +++ b/anda/terra/srpm-macros/macros.nim_extra @@ -0,0 +1,5 @@ +%nim_tflags %(echo "%?build_cflags -fPIE" | sed "s/-O2/-Ofast/g" | sed "s/-Wall//g") + +%nim_lflags %?build_ldflags -pie + +%nim_c -d:release -t:"%nim_tflags" -l:"%nim_lflags" diff --git a/anda/tools/gsctool/anda.hcl b/anda/tools/gsctool/anda.hcl new file mode 100644 index 0000000000..af03f6660f --- /dev/null +++ b/anda/tools/gsctool/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "gsctool.spec" + } +} diff --git a/anda/tools/gsctool/gsctool.spec b/anda/tools/gsctool/gsctool.spec new file mode 100644 index 0000000000..8aeddd4282 --- /dev/null +++ b/anda/tools/gsctool/gsctool.spec @@ -0,0 +1,40 @@ +%define commit c060a44d085fefabd414a026dc3177533f20f0f3 +%define shortcommit %(c=%{commit}; echo ${c:0:12}) +Name: gsctool +Version: git+%{shortcommit} +Release: 1%{?dist} +Summary: Chromium OS EC utilities + +License: BSD-3-Clause +URL: https://chromium.googlesource.com/chromiumos/platform/ec +Source0: https://chromium.googlesource.com/chromiumos/platform/ec/+archive/%{commit}.tar.gz#/%{name}-git+%{commit}.tar.gz + +BuildRequires: pkgconfig +BuildRequires: pkgconfig(libusb-1.0) +BuildRequires: pkgconfig(openssl) +BuildRequires: gcc + +%description +Chromium OS EC utilities + +%prep +%autosetup -c + +%build +ls +pushd extra/usb_updater +%make_build + + +%install +pushd extra/usb_updater +install -D -m 755 gsctool %{buildroot}%{_bindir}/gsctool + + +%files +%{_bindir}/gsctool + + +%changelog +* Wed Mar 27 2024 Cappy Ishihara +- initial release diff --git a/anda/tools/yt-dlp/yt-dlp-nightly.spec b/anda/tools/yt-dlp/yt-dlp-nightly.spec index d74f8b3340..f5986ae417 100644 --- a/anda/tools/yt-dlp/yt-dlp-nightly.spec +++ b/anda/tools/yt-dlp/yt-dlp-nightly.spec @@ -1,7 +1,7 @@ #bcond_without tests -%global commit e5d4f11104ce7ea1717a90eea82c0f7d230ea5d5 +%global commit c59de48e2bb4c681b03b93b584a05f52609ce4a0 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20240325 +%global commit_date 20240402 %global ver 2024.03.10 Name: yt-dlp-nightly