Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port various f39 fixes to rawhide #1036

Merged
merged 8 commits into from
Apr 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -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)
## Documentations

* [Contribution Guide](https://developer.fyralabs.com/terra/contributing)
* [FAQ](https://developer.fyralabs.com/terra/faq)
* [Policy](https://developer.fyralabs.com/terra/policy)
4 changes: 2 additions & 2 deletions SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
## 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.
* The severity of the attack.
* 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

Expand Down
4 changes: 2 additions & 2 deletions anda/apps/mpv/mpv-nightly.spec
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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

Expand Down
14 changes: 5 additions & 9 deletions anda/fonts/seto/seto-fonts.spec
Original file line number Diff line number Diff line change
@@ -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


Expand All @@ -14,7 +13,7 @@ BuildArch: noarch


%prep
%setup -q -n setofont
%setup -q -n pkg-seto-fonts-%version

%build

Expand All @@ -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 <[email protected]> - 6.20-2
- Fix install dir.

* Tue Nov 22 2022 windowsboy111 <[email protected]> - 6.20-1
- Initial package
%autochangelog
4 changes: 2 additions & 2 deletions anda/games/prismlauncher-nightly/prismlauncher-nightly.spec
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion anda/langs/crystal/crystal/update.rhai
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
let html = get("https://crystal-lang.org/");
rpm.version(find("Latest release <.+>(.+)</a>", html, 1))
rpm.version(find("Latest release: <strong>(.+?)</strong>", html, 1))
4 changes: 2 additions & 2 deletions anda/langs/nim/nim-nightly/nim-nightly.spec
Original file line number Diff line number Diff line change
@@ -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
Expand Down
25 changes: 25 additions & 0 deletions anda/langs/rust/starship/0001-gix-0.61.1-0.61.0.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From b62e3879abe83e0b879421a023d8e944e31f00cb Mon Sep 17 00:00:00 2001
From: madomado <[email protected]>
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

21 changes: 11 additions & 10 deletions anda/langs/rust/starship/rust-starship.spec
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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

Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions anda/langs/rust/starship/starship-fix-metadata-auto.diff
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
--- 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

-[target."cfg(windows)".dependencies.deelevate]
-version = "0.2.0"
-
-[target."cfg(windows)".dependencies.windows]
-version = "0.48.0"
-version = "0.54.0"
-features = [
- "Win32_Foundation",
- "Win32_UI_Shell",
Expand Down
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions anda/langs/vala/vala-nightly/vala-nightly.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions anda/langs/vala/vala-panel/update.rhai
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
rpm.version(gitlab("6865057"));
11 changes: 6 additions & 5 deletions anda/langs/vala/vala-panel/vala-panel.spec
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
4 changes: 2 additions & 2 deletions anda/lib/tdlib/tdlib-nightly.spec
Original file line number Diff line number Diff line change
@@ -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})

Expand Down
8 changes: 7 additions & 1 deletion anda/terra/srpm-macros/anda-srpm-macros.spec
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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
Expand All @@ -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 <[email protected]> - 0.1.6-1
- Add nim_c, nim_tflags and nim_lflags

* Thu Aug 3 2023 madonuko <[email protected]> - 0.1.4-1
- Add go_build_online and go_prep_online

Expand Down
5 changes: 5 additions & 0 deletions anda/terra/srpm-macros/macros.nim_extra
Original file line number Diff line number Diff line change
@@ -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"
5 changes: 5 additions & 0 deletions anda/tools/gsctool/anda.hcl
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
project pkg {
rpm {
spec = "gsctool.spec"
}
}
Loading
Loading