Skip to content

Commit

Permalink
Merge branch 'frawhide' into mado/rename/mesa
Browse files Browse the repository at this point in the history
  • Loading branch information
madonuko committed Dec 10, 2024
2 parents 8bd6cfc + bf0383e commit 9b8800b
Show file tree
Hide file tree
Showing 80 changed files with 1,258 additions and 175 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/update-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,10 @@ jobs:
git config --global --add safe.directory "$GITHUB_WORKSPACE"
- name: Run Update
run: anda update -vv --filters updbranch=1 --labels branch=${{ matrix.branch }}
run: |
nbranch="${{ matrix.branch }}"
[ "$nbranch" = 'frawhide' ] && nbranch='f42'
anda update -vv --filters updbranch=1 --labels branch=${{ matrix.branch }},nbranch=$nbranch
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
RUST_BACKTRACE: full
Expand Down
8 changes: 4 additions & 4 deletions anda/apps/anki-bin/anki-bin.spec
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
%global xurl https://files.pythonhosted.org/packages/51/5f/6f52b958fe38a36a0799c01fbd56a742ebdfcf41f89438dbee998b8ce692/anki-24.06.3-cp39-abi3-manylinux_2_28_x86_64.whl
%global aurl https://files.pythonhosted.org/packages/df/bb/b0bfbc6a06a598b0b614d18dd8c4f40827828649f9742f1f44a4e44d6a2c/anki-24.06.3-cp39-abi3-manylinux_2_31_aarch64.whl
%global qurl https://files.pythonhosted.org/packages/21/2a/d8e22a9521be04ef29a30d21a2c3008783ab03b6f07cc14696a040f747a4/aqt-24.06.3-py3-none-any.whl
%global xurl https://files.pythonhosted.org/packages/ef/fa/6c86371d0e3b71129d2a79e63fc3fdc17733c9ebbf77345c62caad8c9fca/anki-24.11-cp39-abi3-manylinux_2_28_x86_64.whl
%global aurl https://files.pythonhosted.org/packages/58/6e/9f2d4853a83e57cea48ccae3bc2d887bf7c0550042185e156bab23f524bf/anki-24.11-cp39-abi3-manylinux_2_31_aarch64.whl
%global qurl https://files.pythonhosted.org/packages/40/3c/b70ef91f1dad8248332971c0cbb2922277512789cadc33cb16233e360a56/aqt-24.11-py3-none-any.whl

Name: anki-bin
Version: 24.06.3
Version: 24.11
Release: 1%?dist
Summary: Flashcard program for using space repetition learning (Installed with wheel)
License: AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
Expand Down
2 changes: 1 addition & 1 deletion anda/apps/anki-qt5/anki-qt5.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: anki-qt5
Version: 24.06.3
Version: 24.11
Release: 1%?dist
Summary: Flashcard program for using space repetition learning
License: AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
Expand Down
3 changes: 2 additions & 1 deletion anda/apps/anki/anki.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: anki
Version: 24.06.3
Version: 24.11
Release: 1%?dist
Summary: Flashcard program for using space repetition learning
License: AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
Expand Down Expand Up @@ -30,6 +30,7 @@ git checkout %{version}
%build
export RELEASE=1
export PYTHONPATH=%_libdir/python3/dist-packages
cargo update
mold -run ./tools/build


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

Name: discord-canary-openasar
Version: 0.0.528
Version: 0.0.536
Release: 1%?dist
Summary: A snappier Discord rewrite with features like further customization and theming
License: MIT AND https://discord.com/terms
Expand Down
2 changes: 1 addition & 1 deletion anda/apps/discord-canary/discord-canary.spec
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

Name: discord-canary
Version: 0.0.528
Version: 0.0.536
Release: 1%?dist
Summary: Free Voice and Text Chat for Gamers
URL: discord.com
Expand Down
2 changes: 1 addition & 1 deletion anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

Name: discord-ptb-openasar
Version: 0.0.118
Version: 0.0.121
Release: 1%?dist
Summary: A snappier Discord rewrite with features like further customization and theming
License: MIT AND https://discord.com/terms
Expand Down
2 changes: 1 addition & 1 deletion anda/apps/discord-ptb/discord-ptb.spec
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

Name: discord-ptb
Version: 0.0.118
Version: 0.0.121
Release: 1%?dist
Summary: Free Voice and Text Chat for Gamers.
URL: https://discord.com
Expand Down
4 changes: 2 additions & 2 deletions anda/apps/envision/envision.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
%global commit e514e5500837f588dcadfe9e98f2fb9e59898ef8
%global commit_date 20241128
%global commit 380f800fa8569c98c4a8e52f58212b4f1550aa57
%global commit_date 20241209
%global shortcommit %(c=%{commit}; echo ${c:0:7})

Name: envision
Expand Down
2 changes: 1 addition & 1 deletion anda/apps/komikku/komikku.spec
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
%global pure_protobuf_version 2.0.0

Name: komikku
Version: 1.64.0
Version: 1.65.0
%forgemeta
Release: 1%?dist
Summary: A manga reader for GNOME
Expand Down
4 changes: 2 additions & 2 deletions anda/apps/legcord/nightly/legcord-nightly.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
%global commit f2a66c2859de0b0384b8c7cad6c21adad1750d75
%global commit_date 20241127
%global commit 554537cda42c4f172aaf893a26f007f1d5094d9e
%global commit_date 20241201
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%define debug_package %nil

Expand Down
6 changes: 5 additions & 1 deletion anda/apps/legcord/stable/legcord.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
%define debug_package %nil

# Exclude private libraries
%global __requires_exclude libffmpeg.so
%global __provides_exclude_from %{_datadir}/(armcord|legcord)/.*\\.so

Name: legcord
Version: 1.0.5
Release: 1%?dist
Expand All @@ -26,7 +30,7 @@ while keeping everything lightweight.

cat <<EOF > legcord.desktop
[Desktop Entry]
Name=LegCord
Name=Legcord
Comment=%summary
GenericName=Internet Messenger
Type=Application
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 4ff9f50b6b76bb6ccd008710d8d7a76b4750d249
%global commit 8eea5902baeaadf40cc3956edba9e3e17f9d9a3f
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global commit_date 20241128
%global commit_date 20241209
%global ver 0.39.0

Name: mpv-nightly
Expand Down
68 changes: 68 additions & 0 deletions anda/apps/ruffle/rs.ruffle.Ruffle.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
[Desktop Entry]
Type=Application
Name[ar]=رَفل
Name[cs]=Ruffle
Name[es]=Ruffle
Name[fr]=Ruffle
Name[ja]=Ruffle
Name[ko]=Ruffle
Name[nl]=Ruffle
Name[pl]=Ruffle
Name[pt_BR]=Ruffle
Name[pt_PT]=Ruffle
Name[ru]=Ruffle
Name[tr]=Ruffle
Name[uk]=Ruffle
Name[zh_CN]=Ruffle
Name[zh_TW]=Ruffle
Name=Ruffle
GenericName[ar]=مشغل الفلاش
GenericName[cs]=Flash přehrávač
GenericName[es]=Reproductor de Flash
GenericName[fr]=Lecteur Flash
GenericName[ja]=Flashプレイヤー
GenericName[ko]=플래시 플레이어
GenericName[nl]=Flash-speler
GenericName[pl]=Odtwarzacz Flash
GenericName[pt_PT]=Leitor Flash
GenericName[tr]=Flash Oynatıcı
GenericName[zh_CN]=Flash 播放器
GenericName[zh_TW]=Flash 播放器
GenericName=Flash Player
Comment[ar]=شغِّل أفلام وألعاب الفلاش
Comment[cs]=Hrajte Flash hry a přehrajte filmy
Comment[es]=Jugar juegos y ver películas de Flash
Comment[fr]=Jouez à des jeux et regardez des animations en Flash
Comment[ja]=Flashゲームと動画を再生します
Comment[ko]=플래시 게임 & 영상 재생
Comment[nl]=Speel Flash spellen & animaties
Comment[pl]=Graj w gry i odtwarzaj filmy Flash
Comment[pt_BR]=Reproduza jogos e filmes Flash
Comment[pt_PT]=Jogar jogos Flash e reproduzir filmes
Comment[ru]=Проигрывайте Flash-игры и ролики
Comment[tr]=Flash oyunları ve filmleri oynat
Comment[uk]=Відтворюйте Flash ігри та фільми
Comment[zh_CN]=播放 Flash 游戏和动画
Comment[zh_TW]=播放 Flash 遊戲和動畫
Comment=Play Flash games & movies
Icon=rs.ruffle.Ruffle
Exec=ruffle_desktop %u
MimeType=application/x-shockwave-flash;application/vnd.adobe.flash.movie
Categories=AudioVideo;Player;Graphics;Viewer;VectorGraphics;Game
Keywords[ar]=الفلاش;swf;مشغل;محاكي;رَسْت
Keywords[cs]=flash;swf;přehrávač;emulátor;rust
Keywords[de]=flash;swf;spieler;emulator;rust
Keywords[es]=flash;swf;reproductor;emulador;rust
Keywords[fr]=flash;swf;lecteur;émulateur;rust
Keywords[it]=flash;swf;riproduttore;emulatore;rust
Keywords[ja]=flash;swf;プレイヤー;エミュレーター;rust
Keywords[ko]=플래시;swf;플레이어;에뮬레이터;rust
Keywords[nl]=flash;swf;speler;emulator;rust
Keywords[pl]=flash;swf;odtwarzacz;emulator;rust
Keywords[pt_PT]=flash;swf;leitor;emulador;rust
Keywords[ru]=flash;swf;прои́грыватель;эмуля́тор;rust
Keywords[tr]=flash;swf;oynatıcı;öykünücü;rust
Keywords[uk]=flash;swf;програвач;емулятор;rust
Keywords[zh_CN]=flash;swf;播放器;模拟器;rust
Keywords[zh_TW]=flash;swf;播放器;模擬器;rust
Keywords=flash;swf;player;emulator;rust
5 changes: 3 additions & 2 deletions anda/apps/ruffle/ruffle-nightly.spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%global ver 2024-11-28
%global ver 2024-12-09
%global goodver %(echo %ver | sed 's/-//g')
%global __brp_mangle_shebangs %{nil}
%bcond_without mold
Expand All @@ -14,6 +14,7 @@ Summary: A Flash Player emulator written in Rust
License: Apache-2.0 OR MIT
URL: https://ruffle.rs/
Source0: https://github.com/ruffle-rs/ruffle/archive/refs/tags/nightly-%ver.tar.gz
Source1: rs.ruffle.Ruffle.desktop
Provides: ruffle
BuildRequires: cargo-rpm-macros >= 24
BuildRequires: anda-srpm-macros mold
Expand Down Expand Up @@ -47,7 +48,7 @@ Packager: madonuko <[email protected]>
cd desktop
%cargo_install
install -Dm644 packages/linux/rs.ruffle.Ruffle.svg %buildroot%_iconsdir/hicolor/scalable/apps/rs.ruffle.Ruffle.svg
install -Dm644 packages/linux/rs.ruffle.Ruffle.desktop %buildroot%_datadir/applications/rs.ruffle.Ruffle.desktop
install -Dm644 -t %{buildroot}/usr/share/applications %{SOURCE1}
install -Dm644 packages/linux/rs.ruffle.Ruffle.metainfo.xml %buildroot%_metainfodir/rs.ruffle.Ruffle.metainfo.xml

%changelog
Expand Down
2 changes: 1 addition & 1 deletion anda/apps/vencord-desktop/vencord-desktop.spec
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

Name: vencord-desktop
Provides: VencordDesktop = %{version}-%{release}
Version: 1.5.3
Version: 1.5.4
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
Expand Down
50 changes: 50 additions & 0 deletions anda/apps/woeusb-ng/WoeUSB-ng.spec
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
Name: WoeUSB-ng
Version: 0.2.12
Release: 1%?dist
Summary: Simple tool that enable you to create your own usb stick with Windows installer
License: GPL-3.0-only
Requires: parted dosfstools ntfsprogs p7zip p7zip-plugins xdg-utils grub2-tools
URL: https://github.com/WoeUSB/WoeUSB-ng
Source: https://github.com/WoeUSB/WoeUSB-ng/archive/refs/tags/v%version.tar.gz
Patch0: https://patch-diff.githubusercontent.com/raw/WoeUSB/WoeUSB-ng/pull/79.patch
BuildArch: noarch
BuildRequires: python3-devel python3-installer

%global _description %{expand:
WoeUSB-ng is a simple tool that enable you to create your own usb stick windows installer from an iso image or a real DVD. This is a rewrite of original WoeUSB.}

%description %_description

%prep
%autosetup -p1


%generate_buildrequires
%pyproject_buildrequires


%build
%pyproject_wheel


%install
%pyproject_install
%pyproject_save_files WoeUSB
install -Dpm644 miscellaneous/WoeUSB-ng.desktop %buildroot%_datadir/applications/WoeUSB-ng.desktop
install -Dpm644 miscellaneous/com.github.woeusb.woeusb-ng.policy %buildroot%_datadir/polkit-1/actions/com.github.woeusb.woeusb-ng.policy


%check
#pyproject_check_import


%files -f %{pyproject_files}
%_bindir/woeusb
%_bindir/woeusbgui
%_datadir/applications/WoeUSB-ng.desktop
%_iconsdir/hicolor/scalable/apps/woeusb-logo.png
%_datadir/polkit-1/actions/com.github.woeusb.woeusb-ng.policy


%changelog
%autochangelog
5 changes: 5 additions & 0 deletions anda/apps/woeusb-ng/anda.hcl
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
project pkg {
rpm {
spec = "WoeUSB-ng.spec"
}
}
1 change: 1 addition & 0 deletions anda/apps/woeusb-ng/update.rhai
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
rpm.version(gh_tag("WoeUSB/WoeUSB-ng"));
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
%global forgeurl https://github.com/KDE/latte-dock/

%global commit fecbc680a65f86db43c8771f74c538c323e443fc
%global commit 56a0b8d34f0dedab4f8e185a96e34eb2c840e67c
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global commit_date %(date '+%Y%m%d')
%global snapshot_info %{commit_date}.%{shortcommit}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
%global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings
%global commit a86f14ca52d1751f2f46ca9ee26e291fbfdca9a1
%global commit 8b2db99640801101a1df36b5cb026056f2ed2602
%forgemeta

Name: lomiri-system-settings
Expand Down
4 changes: 2 additions & 2 deletions anda/devs/flow/flow-control-nightly.spec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
%global commit b0a1b80acbcb5f7483789ea8545912f8eb3edd85
%global commit dbc4707001be477c227229f6f9dec46bbe4bb666
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global commit_date 20241126
%global commit_date 20241207

Name: flow-control-nightly
Version: %commit_date.%shortcommit
Expand Down
6 changes: 3 additions & 3 deletions anda/devs/zed/nightly/zed-nightly.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%global commit 04ff9f060cf9eeb3b848c858f80d6c882bb5cc20
%global commit bf1525588dfba78491b0647a2102a54cd3212c62
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global commit_date 20241128
%global ver 0.165.0
%global commit_date 20241209
%global ver 0.166.0

%bcond_with check

Expand Down
2 changes: 1 addition & 1 deletion anda/devs/zed/preview/zed-preview.spec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
%bcond_with check

%global ver 0.164.0-pre
%global ver 0.165.3-pre
# Exclude input files from mangling
%global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$
# Use Mold as the linker
Expand Down
2 changes: 1 addition & 1 deletion anda/devs/zed/stable/zed.spec
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
%global app_id dev.zed.Zed

Name: zed
Version: 0.163.2
Version: 0.164.2
Release: 1%?dist
Summary: Zed is a high-performance, multiplayer code editor

Expand Down
5 changes: 5 additions & 0 deletions anda/devs/zsh-autocomplete/anda.hcl
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
project pkg {
rpm {
spec = "zsh-autocomplete.spec"
}
}
1 change: 1 addition & 0 deletions anda/devs/zsh-autocomplete/update.rhai
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
rpm.version(gh("marlonrichert/zsh-autocomplete"));
31 changes: 31 additions & 0 deletions anda/devs/zsh-autocomplete/zsh-autocomplete.spec
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
%define debug_package %nil

Name: zsh-autocomplete
Version: 24.09.04
Release: 1%?dist
Summary: Real-time type-ahead completion for Zsh
License: MIT
URL: https://github.com/marlonrichert/zsh-autocomplete
Source0: %url/archive/refs/tags/%version.tar.gz
Packager: madonuko <[email protected]>

%description
This plugin for Zsh adds real-time type-ahead autocompletion to your command
line, similar to what you find desktop apps. While you type on the command
line, available completions are listed automatically; no need to press any
keyboard shortcuts. Press Tab to insert the top completion or ↓ to select a
different one.

%prep
%autosetup

%build

%install
install -Dpm644 zsh-autocomplete.plugin.zsh -t %buildroot%_datadir/zsh-autocomplete/
mv Completions Functions %buildroot%_datadir/zsh-autocomplete/

%files
%doc README.md
%license LICENSE
%_datadir/zsh-autocomplete/
2 changes: 1 addition & 1 deletion anda/docker/moby-buildx/moby-buildx.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%define debug_package %nil

Name: moby-buildx
Version: 0.19.1
Version: 0.19.2
Release: 1%?dist
Summary: Docker CLI plugin for extended build capabilities with BuildKit

Expand Down
Loading

0 comments on commit 9b8800b

Please sign in to comment.