diff --git a/.backportrc.json b/.backportrc.json index 1a999fa4f8..1c7b5305f4 100644 --- a/.backportrc.json +++ b/.backportrc.json @@ -2,7 +2,7 @@ "repoOwner": "terrapkg", "repoName": "packages", "resetAuthor": true, - "targetBranchChoices": ["f38", "f39", "f40", "frawhide"], + "targetBranchChoices": ["f39", "f40", "frawhide"], "branchLabelMapping": { "^sync-(.+)$": "$1" } diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 97bdb28677..67cfb1eb56 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -ARG VARIANT="38" +ARG VARIANT="rawhide" FROM fedora:${VARIANT} RUN useradd -m vscode diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 8deec02a20..ed271bdb32 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,7 +2,7 @@ "name": "Fedora", "build": { "dockerfile": "Dockerfile", - "args": { "VARIANT": "38" } + "args": { "VARIANT": "rawhide" } }, "remoteUser": "vscode", "runArgs": [ diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index 2a708eec34..f18136ffb5 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -42,7 +42,7 @@ jobs: pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }} version: ["rawhide"] fail-fast: false - runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }} + runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || matrix.pkg.labels['large'] && 'x86-64-lg' || 'ubuntu-latest' }} container: image: ghcr.io/terrapkg/builder:f${{ matrix.version}} options: --cap-add=SYS_ADMIN --privileged diff --git a/.github/workflows/update-comps.yml b/.github/workflows/update-comps.yml index 5be8e2e8bd..40c20d9c2a 100644 --- a/.github/workflows/update-comps.yml +++ b/.github/workflows/update-comps.yml @@ -4,9 +4,8 @@ on: push: branches: - frawhide + - f40 - f39 - - f38 - - f37 paths: - comps.xml workflow_dispatch: diff --git a/.github/workflows/update-nightly.yml b/.github/workflows/update-nightly.yml index e8d3e05499..3496031287 100644 --- a/.github/workflows/update-nightly.yml +++ b/.github/workflows/update-nightly.yml @@ -46,7 +46,6 @@ jobs: git add * git commit -S -a -m "$msg" } - copy_over f38 || true copy_over f39 || true copy_over f40 || true git push -u origin --all diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 9ee672acc3..47f81d5820 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -47,7 +47,6 @@ jobs: git add * git commit -S -a -m "$msg" } - copy_over f38 || true copy_over f39 || true copy_over f40 || true git push -u origin --all diff --git a/README.md b/README.md index 56f67cb2af..986554e572 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ # Terra Sources -[![Repository status](https://repology.org/badge/repository-big/terra_38.svg?header=Terra+38)](https://repology.org/repository/terra_38) [![Repository status](https://repology.org/badge/repository-big/terra_39.svg?header=Terra+39)](https://repology.org/repository/terra_39) [![Repository status](https://repology.org/badge/repository-big/terra_40.svg?header=Terra+40)](https://repology.org/repository/terra_40) [![Repository status](https://repology.org/badge/repository-big/terra_rawhide.svg?header=Terra+Rawhide)](https://repology.org/repository/terra_rawhide) @@ -12,7 +11,7 @@ This monorepo contains the package manifests for all packages in Terra. ## Installation ```bash -sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra.repo +sudo dnf install --repofrompath 'terra,https://repos.fyralabs.com/terra$releasever' --setopt='terra.gpgkey=https://repos.fyralabs.com/terra$releasever/key.asc' terra-release ``` You should also install the `terra-release` package so that when our infrastructure has any migrations, you can be assured that your Terra installation will still work as-is. diff --git a/anda/apps/anki-bin/anki-bin.spec b/anda/apps/anki-bin/anki-bin.spec index 33d9aa88a0..b440a8f11e 100644 --- a/anda/apps/anki-bin/anki-bin.spec +++ b/anda/apps/anki-bin/anki-bin.spec @@ -1,5 +1,5 @@ Name: anki-bin -Version: 24.04.1 +Version: 24.06.3 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 diff --git a/anda/apps/anki-qt5/anki-qt5.spec b/anda/apps/anki-qt5/anki-qt5.spec index 3383013886..ba360e8da8 100644 --- a/anda/apps/anki-qt5/anki-qt5.spec +++ b/anda/apps/anki-qt5/anki-qt5.spec @@ -1,5 +1,5 @@ Name: anki-qt5 -Version: 24.04.1 +Version: 24.06.3 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 @@ -22,7 +22,7 @@ Anki is based on a theory called spaced repetition. %prep git clone https://github.com/ankitects/anki . git checkout %version -%patch1 -p1 +%patch 1 -p1 # See https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=anki-qt5 diff --git a/anda/apps/anki/anki.spec b/anda/apps/anki/anki.spec index aa5d65b9b2..96fdfbd925 100644 --- a/anda/apps/anki/anki.spec +++ b/anda/apps/anki/anki.spec @@ -1,5 +1,5 @@ Name: anki -Version: 24.04.1 +Version: 24.06.3 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 @@ -20,8 +20,10 @@ phrases in a foreign language) as easily, quickly and efficiently as possible. Anki is based on a theory called spaced repetition. %prep +rm -rf * git clone https://github.com/ankitects/anki . git checkout %{version} +%patch 0 -p1 # See https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=anki diff --git a/anda/apps/armcord-bin/armcord-bin.spec b/anda/apps/armcord-bin/armcord-bin.spec index 7a221da990..4c1cfa9459 100644 --- a/anda/apps/armcord-bin/armcord-bin.spec +++ b/anda/apps/armcord-bin/armcord-bin.spec @@ -26,6 +26,7 @@ Source2: https://raw.githubusercontent.com/ArmCord/ArmCord/v%version/README.md Requires: electron xdg-utils ExclusiveArch: x86_64 aarch64 armv7l Conflicts: armcord +BuildRequires: add-determinism %description ArmCord is a custom client designed to enhance your Discord experience diff --git a/anda/apps/armcord/armcord.spec b/anda/apps/armcord/armcord.spec index 68d6b62828..7779369ac8 100644 --- a/anda/apps/armcord/armcord.spec +++ b/anda/apps/armcord/armcord.spec @@ -9,7 +9,7 @@ URL: https://github.com/ArmCord/ArmCord Group: Applications/Internet Source1: launch.sh Requires: electron xdg-utils -BuildRequires: nodejs-npm git +BuildRequires: nodejs-npm git add-determinism Conflicts: armcord-bin BuildArch: noarch @@ -18,6 +18,7 @@ ArmCord is a custom client designed to enhance your Discord experience while keeping everything lightweight. %prep +rm -rf * git clone %url . git checkout v%version diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 1fb4ee5952..0402c7fef7 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/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.396 +Version: 0.0.444 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 902b5bee50..d7119922f4 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.396 +Version: 0.0.444 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com diff --git a/anda/apps/discord-openasar/discord-openasar.spec b/anda/apps/discord-openasar/discord-openasar.spec index 5337ed5681..75bb5c5301 100644 --- a/anda/apps/discord-openasar/discord-openasar.spec +++ b/anda/apps/discord-openasar/discord-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-openasar -Version: 0.0.54 +Version: 0.0.58 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec b/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec index f059ad6d89..46928b4adb 100644 --- a/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec +++ b/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-ptb-openasar -Version: 0.0.85 +Version: 0.0.93 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-ptb/discord-ptb.spec b/anda/apps/discord-ptb/discord-ptb.spec index afbd2dfbcc..a131b05038 100644 --- a/anda/apps/discord-ptb/discord-ptb.spec +++ b/anda/apps/discord-ptb/discord-ptb.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-ptb -Version: 0.0.85 +Version: 0.0.93 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers. URL: https://discord.com diff --git a/anda/apps/discord/discord.spec b/anda/apps/discord/discord.spec index 0a7e24472e..7d402e9983 100644 --- a/anda/apps/discord/discord.spec +++ b/anda/apps/discord/discord.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord -Version: 0.0.54 +Version: 0.0.58 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: https://discord.com diff --git a/anda/apps/envision/anda.hcl b/anda/apps/envision/anda.hcl new file mode 100644 index 0000000000..f32f6eeee0 --- /dev/null +++ b/anda/apps/envision/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "envision.spec" + } +} diff --git a/anda/apps/envision/envision.spec b/anda/apps/envision/envision.spec new file mode 100644 index 0000000000..08f604b2cf --- /dev/null +++ b/anda/apps/envision/envision.spec @@ -0,0 +1,46 @@ +%global commit 6cf5e40b96d1cbd99a3cfcef1f03899356e79448 +%global commit_date 20240703 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) + +Name: envision +Version: %commit_date.%commit +Release: 1%?dist +Summary: UI for building, configuring and running Monado, the open source OpenXR runtime +License: AGPL-3.0-or-later +URL: https://gitlab.com/gabmus/envision/ +Source0: %url/-/archive/%commit/envision-%commit.tar.gz +BuildRequires: meson ninja-build cargo +BuildRequires: pkgconfig(glib-2.0) >= 2.66 +BuildRequires: pkgconfig(gio-2.0) >= 2.66 +BuildRequires: pkgconfig(gtk4) >= 4.10.0 +BuildRequires: pkgconfig(vte-2.91-gtk4) >= 0.72.0 +BuildRequires: pkgconfig(libadwaita-1) +BuildRequires: pkgconfig(libusb-1.0) +BuildRequires: openssl-devel +BuildRequires: libappstream-glib +BuildRequires: desktop-file-utils +BuildRequires: glib2-devel +Recommends: android-tools + +%description +%summary. + +%prep +%autosetup -n envision-%commit + +%build +%meson +%meson_build + +%install +%meson_install + +%files +%doc README.md +%license LICENSE +%_bindir/envision +%_datadir/applications/org.gabmus.envision.desktop +%_datadir/envision/ +%_iconsdir/hicolor/scalable/apps/org.gabmus.envision.svg +%_iconsdir/hicolor/symbolic/apps/org.gabmus.envision-symbolic.svg +%_metainfodir/org.gabmus.envision.appdata.xml diff --git a/anda/apps/envision/update.rhai b/anda/apps/envision/update.rhai new file mode 100644 index 0000000000..6de2eb33ce --- /dev/null +++ b/anda/apps/envision/update.rhai @@ -0,0 +1,5 @@ +rpm.global("commit", gitlab_commit("gitlab.com", "46446166", "main")); +if rpm.changed() { + rpm.global("commit_date", date()); + rpm.release(); +} diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index b1f047d7e3..83eb51ea71 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit e6e0aaa6c6bfa781b1da00553bec2b0df979a079 +%global commit e07470adc2d144da8d1096e3ca1df8053e70966a %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20240520 +%global commit_date 20240705 %global ver v0.38.0 Name: mpv-nightly diff --git a/anda/apps/sccache/rust-sccache.spec b/anda/apps/sccache/rust-sccache.spec index e904ea2d04..3111ff65b7 100644 --- a/anda/apps/sccache/rust-sccache.spec +++ b/anda/apps/sccache/rust-sccache.spec @@ -13,7 +13,7 @@ %global crate sccache Name: rust-sccache -Version: 0.8.0 +Version: 0.8.1 Release: 1%?dist Summary: Ccache-like tool diff --git a/anda/apps/vencord-desktop/vencord-desktop.spec b/anda/apps/vencord-desktop/vencord-desktop.spec index d235730d7d..c6ebbd97dc 100644 --- a/anda/apps/vencord-desktop/vencord-desktop.spec +++ b/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 diff --git a/anda/apps/voicevox/voicevox.spec b/anda/apps/voicevox/voicevox.spec index 219fbd17cc..647a305bfa 100644 --- a/anda/apps/voicevox/voicevox.spec +++ b/anda/apps/voicevox/voicevox.spec @@ -1,6 +1,6 @@ %global nodev 20.12.2 %global npmv 10.5.0 -%global ver 0.19.1 +%global ver 0.19.2 %define debug_package %nil %global _build_id_links none diff --git a/anda/desktops/elementary/elementary-calculator/elementary-calculator.spec b/anda/desktops/elementary/elementary-calculator/elementary-calculator.spec index 22b802a20c..963637b0bb 100644 --- a/anda/desktops/elementary/elementary-calculator/elementary-calculator.spec +++ b/anda/desktops/elementary/elementary-calculator/elementary-calculator.spec @@ -3,8 +3,8 @@ Name: elementary-calculator Summary: Calculator app designed for elementary -Version: 2.0.3 -Release: 1%{?dist} +Version: 8.0.0 +Release: 1%?dist License: GPL-3.0-or-later URL: https://github.com/elementary/%{srcname} diff --git a/anda/desktops/elementary/elementary-capnet-assist/elementary-capnet-assist.spec b/anda/desktops/elementary/elementary-capnet-assist/elementary-capnet-assist.spec index 161398c650..6b0927c5e2 100644 --- a/anda/desktops/elementary/elementary-capnet-assist/elementary-capnet-assist.spec +++ b/anda/desktops/elementary/elementary-capnet-assist/elementary-capnet-assist.spec @@ -3,8 +3,8 @@ Name: elementary-capnet-assist Summary: Captive Portal Assistant for elementary -Version: 2.4.4 -Release: 2%{?dist} +Version: 8.0.0 +Release: 1%?dist License: GPL-3.0-or-later URL: https://github.com/elementary/capnet-assist @@ -21,10 +21,13 @@ BuildRequires: pkgconfig(gcr-ui-3) BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gobject-2.0) -BuildRequires: pkgconfig(granite) +BuildRequires: pkgconfig(granite-7) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libhandy-1) >= 1.0.0 BuildRequires: pkgconfig(webkit2gtk-4.1) +BuildRequires: pkgconfig(gcr-4) +BuildRequires: pkgconfig(libadwaita-1) +BuildRequires: pkgconfig(webkitgtk-6.0) BuildRequires: fdupes Requires: NetworkManager diff --git a/anda/desktops/elementary/elementary-photos/elementary-photos.spec b/anda/desktops/elementary/elementary-photos/elementary-photos.spec index 8d533c0138..f70987ce23 100644 --- a/anda/desktops/elementary/elementary-photos/elementary-photos.spec +++ b/anda/desktops/elementary/elementary-photos/elementary-photos.spec @@ -5,16 +5,13 @@ Name: elementary-photos Summary: Photo manager and viewer from elementary -Version: 2.8.0 -Release: 2%?dist +Version: 8.0.0 +Release: 1%?dist License: LGPL-2.0-or-later URL: https://github.com/elementary/photos Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz -# RIP the publishing plugins (sorry for the "wide" patch, having issues with just the relevant commits) -Patch0: https://github.com/elementary/photos/compare/7261606a05d1f41116aba5c86b62d1f739419ed1..09e55943b266bc2861b913251cb834169d81743e.patch - BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: libappstream-glib @@ -22,6 +19,7 @@ BuildRequires: meson >= 0.46.0 BuildRequires: vala BuildRequires: fdupes BuildRequires: git-core +BuildRequires: cmake BuildRequires: pkgconfig(gee-0.8) >= 0.8.5 BuildRequires: pkgconfig(geocode-glib-2.0) @@ -43,6 +41,8 @@ BuildRequires: pkgconfig(libhandy-1) BuildRequires: pkgconfig(libraw) >= 0.13.2 BuildRequires: pkgconfig(libwebp) >= 0.4.4 BuildRequires: pkgconfig(sqlite3) >= 3.5.9 +BuildRequires: pkgconfig(libportal) +BuildRequires: pkgconfig(libportal-gtk3) Requires: hicolor-icon-theme @@ -53,7 +53,6 @@ Foundation. %prep %autosetup -n %{srcname}-%{version} -N -git apply %PATCH0 # The .patch file has Git binary patches, so we need to apply it manually with Git %build @@ -75,10 +74,10 @@ desktop-file-validate \ %{buildroot}/%{_datadir}/applications/%{appname}.desktop desktop-file-validate \ - %{buildroot}/%{_datadir}/applications/%{appname}-viewer.desktop + %{buildroot}/%{_datadir}/applications/%{appname}.viewer.desktop appstream-util validate-relax --nonet \ - %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml + %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml %files -f %{appname}.lang @@ -92,11 +91,11 @@ appstream-util validate-relax --nonet \ %{_libexecdir}/%{appname}/ %{_datadir}/applications/%{appname}.desktop -%{_datadir}/applications/%{appname}-viewer.desktop +%{_datadir}/applications/%{appname}.viewer.desktop %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml %{_datadir}/icons/hicolor/*/apps/%{appname}.svg -%{_datadir}/icons/hicolor/*/apps/%{appname}-viewer.svg -%{_datadir}/metainfo/%{appname}.appdata.xml +%{_datadir}/icons/hicolor/*/apps/%{appname}.viewer.svg +%{_datadir}/metainfo/%{appname}.metainfo.xml %changelog diff --git a/anda/desktops/elementary/elementary-shortcut-overlay/elementary-shortcut-overlay.spec b/anda/desktops/elementary/elementary-shortcut-overlay/elementary-shortcut-overlay.spec index f33c3c6803..818a8e5d62 100644 --- a/anda/desktops/elementary/elementary-shortcut-overlay/elementary-shortcut-overlay.spec +++ b/anda/desktops/elementary/elementary-shortcut-overlay/elementary-shortcut-overlay.spec @@ -3,8 +3,8 @@ Name: elementary-shortcut-overlay Summary: Native, OS-wide shortcut overlay -Version: 2.0.1 -Release: %autorelease +Version: 8.0.0 +Release: 1%?dist License: GPL-3.0 URL: https://github.com/elementary/shortcut-overlay @@ -49,7 +49,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 @@ -59,7 +59,7 @@ appstream-util validate-relax --nonet \ %{_bindir}/%{appname} %{_datadir}/applications/%{appname}.desktop -%{_datadir}/metainfo/%{appname}.appdata.xml +%{_datadir}/metainfo/%{appname}.metainfo.xml %changelog diff --git a/anda/desktops/elementary/pantheon-agent-polkit/pantheon-agent-polkit.spec b/anda/desktops/elementary/pantheon-agent-polkit/pantheon-agent-polkit.spec index 609db115e2..82359f738f 100644 --- a/anda/desktops/elementary/pantheon-agent-polkit/pantheon-agent-polkit.spec +++ b/anda/desktops/elementary/pantheon-agent-polkit/pantheon-agent-polkit.spec @@ -3,8 +3,8 @@ Name: pantheon-agent-polkit Summary: Pantheon Polkit Agent -Version: 1.0.5 -Release: 1%{?dist} +Version: 8.0.0 +Release: 1%?dist License: LGPL-2.0-or-later URL: https://github.com/elementary/%{name} @@ -18,10 +18,12 @@ BuildRequires: vala >= 0.34.1 BuildRequires: fdupes BuildRequires: pkgconfig(glib-2.0) >= 2.32.0 -BuildRequires: pkgconfig(granite) >= 6.0.0 -BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(polkit-agent-1) BuildRequires: pkgconfig(polkit-gobject-1) +BuildRequires: pkgconfig(libadwaita-1) +BuildRequires: pkgconfig(gobject-2.0) +BuildRequires: pkgconfig(granite-7) +BuildRequires: pkgconfig(gtk4) %description An agent for Polkit authorization designed for Pantheon. @@ -50,7 +52,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 @@ -62,7 +64,7 @@ appstream-util validate-relax --nonet \ %{_libexecdir}/policykit-1-pantheon/ %{_datadir}/applications/%{appname}.desktop -%{_datadir}/metainfo/%{appname}.appdata.xml +%{_datadir}/metainfo/%{appname}.metainfo.xml %changelog diff --git a/anda/desktops/elementary/pantheon-tweaks/pantheon-tweaks.spec b/anda/desktops/elementary/pantheon-tweaks/pantheon-tweaks.spec index 51dc48a032..3252f78cab 100644 --- a/anda/desktops/elementary/pantheon-tweaks/pantheon-tweaks.spec +++ b/anda/desktops/elementary/pantheon-tweaks/pantheon-tweaks.spec @@ -1,5 +1,5 @@ Name: pantheon-tweaks -Version: 2.0.0 +Version: 2.0.2 Release: 1%?dist Summary: A system settings panel for the Pantheon desktop environment License: GPL-3.0 diff --git a/anda/desktops/elementary/switchboard-plug-tweaks/switchboard-plug-tweaks.spec b/anda/desktops/elementary/switchboard-plug-tweaks/switchboard-plug-tweaks.spec index 8570c6a9b3..ed60704818 100644 --- a/anda/desktops/elementary/switchboard-plug-tweaks/switchboard-plug-tweaks.spec +++ b/anda/desktops/elementary/switchboard-plug-tweaks/switchboard-plug-tweaks.spec @@ -5,7 +5,7 @@ Name: switchboard-plug-tweaks Summary: Switchboard Tweaks Plug -Version: 2.0.0 +Version: 2.0.2 Release: 1%?dist License: GPL-3.0-or-later diff --git a/anda/desktops/elementary/switchboard-plug-wacom/switchboard-plug-wacom.spec b/anda/desktops/elementary/switchboard-plug-wacom/switchboard-plug-wacom.spec index 50d1bebff6..13df77eb74 100644 --- a/anda/desktops/elementary/switchboard-plug-wacom/switchboard-plug-wacom.spec +++ b/anda/desktops/elementary/switchboard-plug-wacom/switchboard-plug-wacom.spec @@ -8,7 +8,7 @@ Name: switchboard-plug-wacom Summary: Switchboard Wacom Plug -Version: 1.0.1 +Version: 8.0.0 Release: 1%?dist License: GPL-3.0-or-later diff --git a/anda/desktops/elementary/switchboard/switchboard.spec b/anda/desktops/elementary/switchboard/switchboard.spec index 8e79cfee21..41dad281da 100644 --- a/anda/desktops/elementary/switchboard/switchboard.spec +++ b/anda/desktops/elementary/switchboard/switchboard.spec @@ -1,10 +1,10 @@ %global srcname switchboard -%global appname io.elementary.switchboard +%global appname io.elementary.settings Name: switchboard Summary: Modular Desktop Settings Hub -Version: 6.0.2 -Release: 1%{?dist} +Version: 8.0.0 +Release: 1%?dist License: LGPL-2.0-or-later URL: https://github.com/elementary/%{name} @@ -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 - 6.0.2-1 -- Repackaged for Terra +%{_datadir}/vala/vapi/%{name}-3.deps +%{_datadir}/vala/vapi/%{name}-3.vapi diff --git a/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec b/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec index fcc1431af8..59f5ab8fdd 100644 --- a/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec +++ b/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec @@ -1,6 +1,6 @@ %global forgeurl https://github.com/KDE/latte-dock/ -%global commit 10be08a7940b86d1cdca963a01542c92b064c7bd +%global commit 4f1c08054b1f975176375f615cf9d2470f7ec7ed %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global commit_date %(date '+%Y%m%d') %global snapshot_info %{commit_date}.%{shortcommit} diff --git a/anda/desktops/lomiri-unity/lomiri-download-manager/lomiri-download-manager.spec b/anda/desktops/lomiri-unity/lomiri-download-manager/lomiri-download-manager.spec index 357a12815d..ba57eccb1c 100644 --- a/anda/desktops/lomiri-unity/lomiri-download-manager/lomiri-download-manager.spec +++ b/anda/desktops/lomiri-unity/lomiri-download-manager/lomiri-download-manager.spec @@ -1,9 +1,9 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-download-manager -%global commit 6e4342ae0ef3710343e2dbf0b8da586853625e2e +%global commit 682c4928a91da598767e0be2496d9c35af7db035 %forgemeta Name: lomiri-download-manager -Version: 0.5.2 +Version: 0.1.3 Release: 1%?dist Summary: Upload Download Manager for Lomiri License: LGPLv3 diff --git a/anda/desktops/lomiri-unity/lomiri-download-manager/update.rhai b/anda/desktops/lomiri-unity/lomiri-download-manager/update.rhai index 8afb40a9b2..c472c4a27f 100644 --- a/anda/desktops/lomiri-unity/lomiri-download-manager/update.rhai +++ b/anda/desktops/lomiri-unity/lomiri-download-manager/update.rhai @@ -1,4 +1,4 @@ -let o = get("https://gitlab.com/api/v4/projects/25034025/repository/tags").json_arr()[0]; +let o = get("https://gitlab.com/api/v4/projects/17088252/repository/tags").json_arr()[0]; let f = rpm.f; rpm.version(o.name); // check if changed diff --git a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec index 7ea6a23f21..50dd335fe7 100644 --- a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec +++ b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings -%global commit 557b09902c59eae015767367ef5a97c5c47b67fb +%global commit 1a80200cd84b1b71715f91bf9e278ef46a8cbb6b %forgemeta Name: lomiri-system-settings diff --git a/anda/desktops/mate/indicators/datetime/ayatana-indicator-datetime.spec b/anda/desktops/mate/indicators/datetime/ayatana-indicator-datetime.spec index 9700919e63..3baeddcd5e 100644 --- a/anda/desktops/mate/indicators/datetime/ayatana-indicator-datetime.spec +++ b/anda/desktops/mate/indicators/datetime/ayatana-indicator-datetime.spec @@ -1,7 +1,7 @@ Name: ayatana-indicator-datetime Summary: A GTK implementation of the StatusNotifierItem Specification -Version: 24.2.0 -Release: 1%{?dist} +Version: 24.5.0 +Release: 1%?dist License: GPL-3.0 URL: https://github.com/AyatanaIndicators/ayatana-indicator-datetime Source0: %{url}/archive/refs/tags/%{version}.tar.gz diff --git a/anda/desktops/mate/indicators/messages/ayatana-indicator-messages.spec b/anda/desktops/mate/indicators/messages/ayatana-indicator-messages.spec index 47087b4f63..2e2b00a231 100644 --- a/anda/desktops/mate/indicators/messages/ayatana-indicator-messages.spec +++ b/anda/desktops/mate/indicators/messages/ayatana-indicator-messages.spec @@ -1,7 +1,7 @@ Name: ayatana-indicator-messages Summary: Ayatana Indicator Messages Applet -Version: 23.10.0 -Release: %autorelease +Version: 24.5.0 +Release: 1%?dist License: GPLv3 URL: https://github.com/AyatanaIndicators/ayatana-indicator-messages Source0: %{url}/archive/refs/tags/%{version}.tar.gz diff --git a/anda/desktops/mate/indicators/session/ayatana-indicator-session.spec b/anda/desktops/mate/indicators/session/ayatana-indicator-session.spec index 119c009c38..c35f995bc6 100644 --- a/anda/desktops/mate/indicators/session/ayatana-indicator-session.spec +++ b/anda/desktops/mate/indicators/session/ayatana-indicator-session.spec @@ -1,6 +1,6 @@ Name: ayatana-indicator-session Summary: Ayatana Indicator Session Applet -Version: 24.2.0 +Version: 24.5.0 Release: 1%?dist License: GPL-3.0 URL: https://github.com/AyatanaIndicators/ayatana-indicator-session diff --git a/anda/desktops/mate/indicators/sound/ayatana-indicator-sound.spec b/anda/desktops/mate/indicators/sound/ayatana-indicator-sound.spec index 74482cf134..d4622d8a62 100644 --- a/anda/desktops/mate/indicators/sound/ayatana-indicator-sound.spec +++ b/anda/desktops/mate/indicators/sound/ayatana-indicator-sound.spec @@ -1,6 +1,6 @@ Name: ayatana-indicator-sound Summary: Ayatana Indicator Sound Applet -Version: 24.4.0 +Version: 24.5.0 Release: 1%?dist License: GPLv3 URL: https://github.com/AyatanaIndicators/ayatana-indicator-sound diff --git a/anda/devs/codium-marketplace/anda.hcl b/anda/devs/codium-marketplace/anda.hcl new file mode 100644 index 0000000000..119f7784c2 --- /dev/null +++ b/anda/devs/codium-marketplace/anda.hcl @@ -0,0 +1,6 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "codium-marketplace.spec" + } +} diff --git a/anda/devs/codium-marketplace/codium-marketplace.spec b/anda/devs/codium-marketplace/codium-marketplace.spec new file mode 100644 index 0000000000..fba321e07f --- /dev/null +++ b/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 \ No newline at end of file diff --git a/anda/devs/codium/codium.spec b/anda/devs/codium/codium.spec index f8132a0c45..dba3cf967e 100644 --- a/anda/devs/codium/codium.spec +++ b/anda/devs/codium/codium.spec @@ -12,7 +12,7 @@ %endif Name: codium -Version: 1.89.1.24130 +Version: 1.90.2.24171 Release: 1%?dist Summary: Code editing. Redefined. License: MIT @@ -28,6 +28,8 @@ VSCodium is a new choice of tool that combines the simplicity of a code editor with what developers need for the core edit-build-debug cycle. %prep +mkdir stuff +cd stuff tar xf %SOURCE0 cat < vscodium-bin-uri-handler.desktop @@ -70,6 +72,7 @@ EOF %build %install +cd stuff mkdir -p %buildroot%_datadir/doc/%name/ %buildroot%_datadir/licenses/%name install -Dm644 %SOURCE1 %buildroot%_docdir/%name/ install -Dm644 %SOURCE2 %buildroot%_datadir/licenses/%name/ diff --git a/anda/devs/flutter/flutter.spec b/anda/devs/flutter/flutter.spec index 8301a9e96d..23e2d41f8f 100644 --- a/anda/devs/flutter/flutter.spec +++ b/anda/devs/flutter/flutter.spec @@ -1,5 +1,5 @@ Name: flutter -Version: 3.22.0 +Version: 3.22.2 Release: 1%?dist Summary: SDK for crafting beautiful, fast user experiences from a single codebase License: BSD-3-Clause diff --git a/anda/devs/neovide/neovide.spec b/anda/devs/neovide/neovide.spec index 30ee32999c..ed53686314 100644 --- a/anda/devs/neovide/neovide.spec +++ b/anda/devs/neovide/neovide.spec @@ -1,13 +1,14 @@ %define debug_package %nil Name: neovide -Version: 0.13.0 +Version: 0.13.1 Release: 1%?dist Summary: No Nonsense Neovim Client in Rust License: MIT URL: https://neovide.dev/ Source0: https://github.com/neovide/neovide/archive/refs/tags/%version.tar.gz -Requires: neovim fontconfig freetype libglvnd +Requires: fontconfig freetype libglvnd +Requires: neovim > 0.9.5 BuildRequires: anda-srpm-macros cargo-rpm-macros >= 24 cmake gtk3 python3 SDL2 BuildRequires: fontconfig-devel freetype-devel libX11-xcb libX11-devel libstdc++-static libstdc++-devel ExclusiveArch: x86_64 diff --git a/anda/devs/rgbds/terra-rgbds.spec b/anda/devs/rgbds/terra-rgbds.spec index 1358ce7b15..cea227b557 100644 --- a/anda/devs/rgbds/terra-rgbds.spec +++ b/anda/devs/rgbds/terra-rgbds.spec @@ -1,6 +1,6 @@ Name: terra-rgbds -Version: 0.7.0 -Release: 1%{?dist} +Version: 0.8.0 +Release: 1%?dist Summary: A development package for the Game Boy, including an assembler # See LICENSE for details diff --git a/anda/devs/zed/nightly/anda.hcl b/anda/devs/zed/nightly/anda.hcl new file mode 100644 index 0000000000..e92820997f --- /dev/null +++ b/anda/devs/zed/nightly/anda.hcl @@ -0,0 +1,9 @@ +project pkg { + rpm { + spec = "zed-nightly.spec" + } + labels { + nightly = 1 + large = 1 + } +} diff --git a/anda/devs/zed/nightly/update.rhai b/anda/devs/zed/nightly/update.rhai new file mode 100644 index 0000000000..ac2e45147e --- /dev/null +++ b/anda/devs/zed/nightly/update.rhai @@ -0,0 +1,9 @@ +if filters.contains("nightly") { + rpm.global("commit", gh_commit("zed-industries/zed")); + if rpm.changed() { + let v = find("(\\d+\\.\\d+\\d+\\.\\d+)", find("\nversion = \"(\\d+\\.\\d+\\d+\\.\\d+)\"\n", gh_rawfile("zed-industries/zed", "main", "crates/zed/Cargo.toml"), 1), 1); + rpm.global("ver", v); + rpm.global("commit_date", date()); + rpm.release(); + } +} diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec new file mode 100644 index 0000000000..594e233c84 --- /dev/null +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -0,0 +1,97 @@ +%global commit 0129d4e2506d5ec5e50ef0968382770b9abec390 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commit_date 20240619 +%global ver 0.142.0 + +%bcond_without check + +# Exclude input files from mangling +%global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ + +%global crate zed +%global app_id dev.zed.Zed-Nightly + +Name: zed-nightly +Version: %ver^%commit_date.%shortcommit +Release: 1%?dist +Summary: Zed is a high-performance, multiplayer code editor + +License: MIT +URL: https://zed.dev/ +Source0: https://github.com/zed-industries/zed/archive/%{commit}.zip + +Conflicts: zed +Provides: zed + +BuildRequires: cargo-rpm-macros >= 24 +BuildRequires: anda-srpm-macros +BuildRequires: gcc +BuildRequires: g++ +BuildRequires: clang +BuildRequires: mold +BuildRequires: alsa-lib-devel +BuildRequires: fontconfig-devel +BuildRequires: wayland-devel +BuildRequires: libxkbcommon-x11-devel +BuildRequires: openssl-devel +BuildRequires: libzstd-devel +BuildRequires: perl-FindBin +BuildRequires: perl-IPC-Cmd +BuildRequires: perl-File-Compare +BuildRequires: perl-File-Copy +BuildRequires: perl-lib +BuildRequires: vulkan-loader + +%description +Code at the speed of thought - Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter. + +%prep +%autosetup -n %{crate}-%{commit} -p1 +%cargo_prep_online + +export DO_STARTUP_NOTIFY="true" +export APP_ID="%app_id" +export APP_ICON="%app_id" +export APP_NAME="Zed Nightly" +export APP_CLI="zed" +export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed Nightly from Terra." +export ZED_RELEASE_CHANNEL=nightly +export BRANDING_LIGHT="#e9aa6a" +export BRANDING_DARK="#1a5fb4" + +echo "StartupWMClass=$APP_ID" >> crates/zed/resources/zed.desktop.in +envsubst < "crates/zed/resources/zed.desktop.in" > $APP_ID.desktop # from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=zed-git#n52 + +envsubst < "crates/zed/resources/flatpak/zed.metainfo.xml.in" > $APP_ID.metainfo.xml + +%build +export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed Nightly from Terra." +echo "nightly" > crates/zed/RELEASE_CHANNEL + +%cargo_build -- --package zed --package cli +script/generate-licenses + +%install +install -Dm755 target/rpm/zed %{buildroot}%{_libexecdir}/zed-editor +install -Dm755 target/rpm/cli %{buildroot}%{_bindir}/zed + +install -Dm644 %app_id.desktop %{buildroot}%{_datadir}/applications/%app_id.desktop +install -Dm644 crates/zed/resources/app-icon-nightly.png %{buildroot}%{_datadir}/pixmaps/%app_id.png + +install -Dm644 %app_id.metainfo.xml %{buildroot}%{_metainfodir}/%app_id.metainfo.xml + +%if %{with check} +%check +%cargo_test +%endif + +%files +%{_libexecdir}/zed-editor +%{_bindir}/zed +%{_datadir}/applications/%app_id.desktop +%{_datadir}/pixmaps/%app_id.png +%{_metainfodir}/%app_id.metainfo.xml +%license assets/licenses.md + +%changelog +%autochangelog diff --git a/anda/devs/zed/preview/anda.hcl b/anda/devs/zed/preview/anda.hcl new file mode 100644 index 0000000000..4f9b04a0c5 --- /dev/null +++ b/anda/devs/zed/preview/anda.hcl @@ -0,0 +1,8 @@ +project pkg { + rpm { + spec = "zed-preview.spec" + } + labels { + large = 1 + } +} diff --git a/anda/devs/zed/preview/update.rhai b/anda/devs/zed/preview/update.rhai new file mode 100644 index 0000000000..135a06de91 --- /dev/null +++ b/anda/devs/zed/preview/update.rhai @@ -0,0 +1,10 @@ +let releases = "https://api.github.com/repos/zed-industries/zed/releases".get().json_arr(); +for release in releases { + if !release.prerelease { + continue; + } + let tag = release.tag_name; + tag.pop(4); // remove the "-pre" suffix + rpm.global("ver", tag); + terminate(); +} diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec new file mode 100644 index 0000000000..10973e4736 --- /dev/null +++ b/anda/devs/zed/preview/zed-preview.spec @@ -0,0 +1,91 @@ +%bcond_without check +%global debug_package %{nil} +%global ver 0.142.1 + +%global crate zed +%global app_id dev.zed.Zed-Preview + +Name: zed-preview +Version: %ver +Release: pre1%?dist +Summary: Zed is a high-performance, multiplayer code editor + +License: MIT +URL: https://zed.dev/ +Source0: https://github.com/zed-industries/zed/archive/refs/tags/v%{ver}-pre.tar.gz + +Conflicts: zed +Provides: zed + +BuildRequires: cargo-rpm-macros >= 24 +BuildRequires: anda-srpm-macros +BuildRequires: gcc +BuildRequires: g++ +BuildRequires: clang +BuildRequires: mold +BuildRequires: alsa-lib-devel +BuildRequires: fontconfig-devel +BuildRequires: wayland-devel +BuildRequires: libxkbcommon-x11-devel +BuildRequires: openssl-devel +BuildRequires: libzstd-devel +BuildRequires: perl-FindBin +BuildRequires: perl-IPC-Cmd +BuildRequires: perl-File-Compare +BuildRequires: perl-File-Copy +BuildRequires: perl-lib +BuildRequires: vulkan-loader + +%description +Code at the speed of thought - Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter. + +%prep +%autosetup -n %{crate}-%{ver}-pre -p1 +%cargo_prep_online + +export DO_STARTUP_NOTIFY="true" +export APP_ID="%app_id" +export APP_ICON="%app_id" +export APP_NAME="Zed Preview" +export APP_CLI="zed" +export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed Preview from Terra." +export ZED_RELEASE_CHANNEL=preview +export BRANDING_LIGHT="#99c1f1" +export BRANDING_DARK="#1a5fb4" + +echo "StartupWMClass=$APP_ID" >> crates/zed/resources/zed.desktop.in +envsubst < "crates/zed/resources/zed.desktop.in" > $APP_ID.desktop # from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=zed-git#n52 + +envsubst < "crates/zed/resources/flatpak/zed.metainfo.xml.in" > $APP_ID.metainfo.xml + +%build +export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed Preview from Terra." +echo "preview" > crates/zed/RELEASE_CHANNEL + +%cargo_build -- --package zed --package cli +script/generate-licenses + +%install +install -Dm755 target/rpm/zed %{buildroot}%{_libexecdir}/zed-editor +install -Dm755 target/rpm/cli %{buildroot}%{_bindir}/zed + +install -Dm644 %app_id.desktop %{buildroot}%{_datadir}/applications/%app_id.desktop +install -Dm644 crates/zed/resources/app-icon-preview.png %{buildroot}%{_datadir}/pixmaps/%app_id.png + +install -Dm644 %app_id.metainfo.xml %{buildroot}%{_metainfodir}/%app_id.metainfo.xml + +%if %{with check} +%check +%cargo_test +%endif + +%files +%{_libexecdir}/zed-editor +%{_bindir}/zed +%{_datadir}/applications/%app_id.desktop +%{_datadir}/pixmaps/%app_id.png +%{_metainfodir}/%app_id.metainfo.xml +%license assets/licenses.md + +%changelog +%autochangelog diff --git a/anda/docker/containerd/containerd.spec b/anda/docker/containerd/containerd.spec index 3c2a52d2af..c8a710ae35 100644 --- a/anda/docker/containerd/containerd.spec +++ b/anda/docker/containerd/containerd.spec @@ -7,7 +7,7 @@ # https://github.com/containerd/containerd %global goipath github.com/containerd/containerd -Version: 1.7.17 +Version: 1.7.19 %gometa diff --git a/anda/docker/moby-buildx/moby-buildx.spec b/anda/docker/moby-buildx/moby-buildx.spec index bce437490a..6c738d99f9 100644 --- a/anda/docker/moby-buildx/moby-buildx.spec +++ b/anda/docker/moby-buildx/moby-buildx.spec @@ -1,7 +1,7 @@ %define debug_package %nil Name: moby-buildx -Version: 0.14.0 +Version: 0.15.1 Release: 1%?dist Summary: Docker CLI plugin for extended build capabilities with BuildKit diff --git a/anda/docker/moby-compose/moby-compose.spec b/anda/docker/moby-compose/moby-compose.spec index 5dc39a4191..fe6a4af9d7 100644 --- a/anda/docker/moby-compose/moby-compose.spec +++ b/anda/docker/moby-compose/moby-compose.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: moby-compose -Version: 2.27.0 +Version: 2.28.1 Release: 1%?dist Summary: Define and run multi-container applications with Docker diff --git a/anda/fonts/sarasa-gothic/sarasa-gothic-fonts.spec b/anda/fonts/sarasa-gothic/sarasa-gothic-fonts.spec index 639261c815..1072f6edea 100644 --- a/anda/fonts/sarasa-gothic/sarasa-gothic-fonts.spec +++ b/anda/fonts/sarasa-gothic/sarasa-gothic-fonts.spec @@ -1,5 +1,5 @@ Name: sarasa-gothic-fonts -Version: 1.0.12 +Version: 1.0.15 Release: 1%?dist URL: https://github.com/be5invis/Sarasa-Gothic Source0: %url/releases/download/v%version/Sarasa-TTC-%version.7z diff --git a/anda/games/osu-lazer/osu-lazer.spec b/anda/games/osu-lazer/osu-lazer.spec index 937505fe87..6902b830db 100644 --- a/anda/games/osu-lazer/osu-lazer.spec +++ b/anda/games/osu-lazer/osu-lazer.spec @@ -1,9 +1,9 @@ -%define osuresver 2024.517.0 +%define osuresver 2024.705.0 %global debug_package %{nil} %define __strip /bin/true Name: osu-lazer -Version: 2024.519.1 +Version: 2024.625.2 Release: 1%?dist Summary: The future of osu! and the beginning of an open era! Commonly known by the codename osu!lazer. Pew pew. ExclusiveArch: x86_64 diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index c2e4e5ece2..805c916f56 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,13 +1,11 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit 529dc7c6b71cac4416786bef81399a1aeb23ad7e +%global commit 219de667830f69ad200a84413c0120f526955b10 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f -%global quazip_commit 6117161af08e366c37499895b00ef62f93adc345 -%global tomlplusplus_commit 7eb2ffcc09f8e9890dc0b77ff8ab00fc53b1f2b8 -%global commit_date 20240520 +%global commit_date 20240704 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 @@ -40,8 +38,6 @@ Group: Amusements/Games URL: https://prismlauncher.org/ Source0: https://github.com/PrismLauncher/PrismLauncher/archive/%{commit}/%{real_name}-%{shortcommit}.tar.gz Source1: https://github.com/PrismLauncher/libnbtplusplus/archive/%{libnbtplusplus_commit}/libnbtplusplus-%{libnbtplusplus_commit}.tar.gz -Source2: https://github.com/stachenov/quazip/archive/%{quazip_commit}/quazip-%{quazip_commit}.tar.gz -Source3: https://github.com/marzer/tomlplusplus/archive/%{tomlplusplus_commit}/tomlplusplus-%{tomlplusplus_commit}.tar.gz Patch0: 0001-find-cmark-with-pkgconfig.patch BuildRequires: cmake >= 3.15 @@ -50,6 +46,7 @@ BuildRequires: gcc-c++ BuildRequires: java-17-openjdk-devel BuildRequires: desktop-file-utils BuildRequires: libappstream-glib +BuildRequires: tomlplusplus-devel BuildRequires: cmake(ghc_filesystem) BuildRequires: cmake(Qt%{qt_version}Concurrent) >= %{min_qt_version} BuildRequires: cmake(Qt%{qt_version}Core) >= %{min_qt_version} @@ -58,9 +55,13 @@ BuildRequires: cmake(Qt%{qt_version}Network) >= %{min_qt_version} BuildRequires: cmake(Qt%{qt_version}Test) >= %{min_qt_version} BuildRequires: cmake(Qt%{qt_version}Widgets) >= %{min_qt_version} BuildRequires: cmake(Qt%{qt_version}Xml) >= %{min_qt_version} +BuildRequires: cmake(Qt%{qt_version}NetworkAuth) >= %{min_qt_version} %if %{with qt6} BuildRequires: cmake(Qt6Core5Compat) +BuildRequires: quazip-qt6-devel +%else +BuildRequires: quazip-qt5-devel %endif BuildRequires: pkgconfig(libcmark) @@ -103,13 +104,9 @@ multiple installations of Minecraft at once (Fork of MultiMC) %autosetup -p1 -n PrismLauncher-%{commit} tar -xzf %{SOURCE1} -C libraries -tar -xvf %{SOURCE2} -C libraries -tar -xvf %{SOURCE3} -C libraries -rmdir libraries/{extra-cmake-modules,filesystem,libnbtplusplus,quazip,tomlplusplus,zlib}/ +rmdir libraries/{extra-cmake-modules,filesystem,libnbtplusplus,zlib}/ mv -f libraries/libnbtplusplus-%{libnbtplusplus_commit} libraries/libnbtplusplus -mv -f libraries/quazip-%{quazip_commit} libraries/quazip -mv -f libraries/tomlplusplus-%{tomlplusplus_commit} libraries/tomlplusplus # Do not set RPATH sed -i "s|\$ORIGIN/||" CMakeLists.txt @@ -156,6 +153,9 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt %changelog +* Wed Jun 19 2024 Trung Lê <8 at tle dot id dot au> - 9.0^20240619.8014283-1 +- use system quazip-qt and tomlplusplus + * Wed Jul 26 2023 seth - 8.0^20230726.4f00012-1 - remove terra-fractureiser-detector from recommends, use proper build platform, and add patches for epel/older fedora versions diff --git a/anda/games/prismlauncher/prismlauncher.spec b/anda/games/prismlauncher/prismlauncher.spec index 96030f0795..a0c338278e 100644 --- a/anda/games/prismlauncher/prismlauncher.spec +++ b/anda/games/prismlauncher/prismlauncher.spec @@ -22,8 +22,8 @@ Name: prismlauncher %else Name: prismlauncher-qt5 %endif -Version: 8.3 -Release: 1%?dist +Version: 8.4 +Release: 2%?dist Summary: Minecraft launcher with ability to manage multiple instances # see COPYING.md for more information # each file in the source also contains a SPDX-License-Identifier header that declares its license @@ -46,11 +46,16 @@ BuildRequires: cmake(Qt%{qt_version}Network) >= %{min_qt_version} BuildRequires: cmake(Qt%{qt_version}Test) >= %{min_qt_version} BuildRequires: cmake(Qt%{qt_version}Widgets) >= %{min_qt_version} BuildRequires: cmake(Qt%{qt_version}Xml) >= %{min_qt_version} +BuildRequires: tomlplusplus-devel %if %{with qt6} BuildRequires: cmake(Qt6Core5Compat) +BuildRequires: quazip-qt6-devel +%else +BuildRequires: quazip-qt5-devel %endif + BuildRequires: pkgconfig(libcmark) BuildRequires: pkgconfig(scdoc) BuildRequires: pkgconfig(zlib) @@ -132,6 +137,9 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt %changelog +* Sun Jun 23 2024 Trung Lê <8@tle.id.au> - 8.2-2 +- update to 8.4. Add quazip-qt deps + * Wed Apr 03 2024 seth - 8.2-2 - move JREs to weak deps, add java 21 for snapshots diff --git a/anda/langs/crystal/crystal/crystal.spec b/anda/langs/crystal/crystal/crystal.spec index 8c39e1d934..9ebcf8a289 100644 --- a/anda/langs/crystal/crystal/crystal.spec +++ b/anda/langs/crystal/crystal/crystal.spec @@ -1,7 +1,7 @@ %define debug_package %nil Name: crystal -Version: 1.12.1 +Version: 1.12.2 Release: 1%?dist Summary: The Crystal Programming Language License: Apache-2.0 diff --git a/anda/langs/dart/dart.spec b/anda/langs/dart/dart.spec index cc55812e61..de3968957a 100644 --- a/anda/langs/dart/dart.spec +++ b/anda/langs/dart/dart.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: dart -Version: 3.4.0 +Version: 3.4.4 Release: 1%?dist Summary: The Dart Language License: BSD-3-Clause diff --git a/anda/langs/go/albius/albius.spec b/anda/langs/go/albius/albius.spec index 12350b0e7f..d382a6ad9b 100644 --- a/anda/langs/go/albius/albius.spec +++ b/anda/langs/go/albius/albius.spec @@ -4,7 +4,7 @@ %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: albius -Version: %date.%shortcommit +Version: %commit_date.%shortcommit Release: 1%?dist Summary: A Linux installer backend with support for SquashFS and OCI installations License: GPL-3.0 diff --git a/anda/langs/go/gendesk/golang-github-xyproto-gendesk.spec b/anda/langs/go/gendesk/golang-github-xyproto-gendesk.spec index c8792a89e2..3195bd60da 100644 --- a/anda/langs/go/gendesk/golang-github-xyproto-gendesk.spec +++ b/anda/langs/go/gendesk/golang-github-xyproto-gendesk.spec @@ -27,6 +27,7 @@ License: BSD-3-Clause URL: %{gourl} Source: %{gosource} BuildRequires: git-core gcc +Provides: gendesk %description %{common_description} diff --git a/anda/langs/groovy/groovy-docs/groovy-docs.spec b/anda/langs/groovy/groovy-docs/groovy-docs.spec index d11409087e..e0ba914930 100644 --- a/anda/langs/groovy/groovy-docs/groovy-docs.spec +++ b/anda/langs/groovy/groovy-docs/groovy-docs.spec @@ -1,5 +1,5 @@ Name: groovy-docs -Version: 4.0.21 +Version: 4.0.22 Release: 1%?dist Summary: Documentation for the Groovy programming language URL: https://groovy-lang.org/ diff --git a/anda/langs/groovy/groovy.spec b/anda/langs/groovy/groovy.spec index 147d3c8757..7009e3e8a5 100644 --- a/anda/langs/groovy/groovy.spec +++ b/anda/langs/groovy/groovy.spec @@ -1,5 +1,5 @@ Name: groovy -Version: 4.0.21 +Version: 4.0.22 Release: 1%?dist Summary: A multi-faceted language for the Java platform BuildArch: noarch diff --git a/anda/langs/kotlin/kotlin-native/kotlin-native.spec b/anda/langs/kotlin/kotlin-native/kotlin-native.spec index 40d1c215eb..fce3fc1e08 100644 --- a/anda/langs/kotlin/kotlin-native/kotlin-native.spec +++ b/anda/langs/kotlin/kotlin-native/kotlin-native.spec @@ -2,14 +2,14 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Name: kotlin-native -Version: 1.9.24 +Version: 2.0.0 Release: 1%?dist Summary: LLVM backend for the Kotlin compiler ExclusiveArch: x86_64 License: ASL 2.0 URL: https://kotlinlang.org/docs/reference/native-overview.html -Source0: https://github.com/JetBrains/kotlin/releases/download/v%{version}/kotlin-native-linux-x86_64-%{version}.tar.gz +Source0: https://github.com/JetBrains/kotlin/releases/download/v%version/kotlin-native-prebuilt-linux-x86_64-%version.tar.gz BuildRequires: tar BuildRequires: sed @@ -28,7 +28,7 @@ Kotlin compiler and native implementation of the Kotlin standard library. %prep -tar -xf %{SOURCE0} && cd kotlin-native-linux-x86_64-%{version} +tar -xf %{SOURCE0} && cd kotlin-native-prebuilt-linux-x86_64-%{version} sed -i "s|\(DIR *= *\).*|\1%{_bindir}|" bin/* sed -i "s|\(KONAN_HOME *= *\).*|\1%{_datadir}/%{name}|" bin/* @@ -36,7 +36,7 @@ sed -i "s|\(KONAN_HOME *= *\).*|\1%{_datadir}/%{name}|" bin/* %build %install -rm -rf %{buildroot} && mkdir -p %{buildroot}%{_bindir}/ && cd kotlin-native-linux-x86_64-%{version} +rm -rf %{buildroot} && mkdir -p %{buildroot}%{_bindir}/ && cd kotlin-native-prebuilt-linux-x86_64-%{version} install -m 0755 bin/cinterop %{buildroot}%{_bindir}/ install -m 0755 bin/generate-platform %{buildroot}%{_bindir}/ install -m 0755 bin/jsinterop %{buildroot}%{_bindir}/ @@ -79,65 +79,5 @@ kotlinc-native test.kt -o test %changelog -* Mon Apr 03 2023 Gonçalo Silva -- Update to 1.8.20 -* Thu Feb 02 2023 Gonçalo Silva -- Update to 1.8.10 -* Wed Dec 28 2022 Gonçalo Silva -- Update to 1.8.0 -* Wed Nov 09 2022 Gonçalo Silva -- Update to 1.7.21 -* Thu Sep 29 2022 Gonçalo Silva -- Update to 1.7.20 -* Fri Jul 08 2022 Gonçalo Silva -- Update to 1.7.10 -* Mon Jun 13 2022 Gonçalo Silva -- Update to 1.7.0 -* Mon Jun 13 2022 Gonçalo Silva -- Update to 1.6.21 -* Thu Jun 09 2022 Gonçalo Silva -- Update to 1.7.0 -* Wed Apr 20 2022 Gonçalo Silva -- Update to 1.6.21 -* Mon Apr 04 2022 Gonçalo Silva -- Update to 1.6.20 -* Tue Dec 14 2021 Gonçalo Silva -- Update to 1.6.10 -* Fri Dec 10 2021 Gonçalo Silva -- Update to 1.6.0 -* Mon Nov 29 2021 Gonçalo Silva -- Update to 1.5.32 -* Tue Nov 16 2021 Gonçalo Silva -- Update to 1.6.0 -* Mon Sep 20 2021 Gonçalo Silva -- Update to 1.5.31 -* Tue Aug 24 2021 Gonçalo Silva -- Update to 1.5.30 -* Tue Jul 13 2021 Gonçalo Silva -- Update to 1.5.21 -* Thu Jun 24 2021 Gonçalo Silva -- Update to 1.5.20 -* Mon May 24 2021 Gonçalo Silva -- Update to 1.5.10 -* Wed May 05 2021 Gonçalo Silva -- Update to 1.5.0 -* Tue Mar 30 2021 Gonçalo Silva -- Update to 1.4.32 -* Fri Feb 26 2021 Gonçalo Silva -- Update to 1.4.31 -* Wed Feb 03 2021 Gonçalo Silva -- Update to 1.4.30 -* Mon Jan 18 2021 Gonçalo Silva -- Update to 1.4.30-RC -* Mon Dec 07 2020 Gonçalo Silva -- Update to 1.4.21 -* Thu Nov 19 2020 Gonçalo Silva -- Update to 1.4.20 -* Thu Sep 10 2020 Gonçalo Silva -- Update to 1.4.10 -* Fri Aug 14 2020 Gonçalo Silva -- Update to 1.4.0 -* Sat Apr 18 2020 Gonçalo Silva -- Update to 1.3.72 -* Mon Apr 13 2020 Gonçalo Silva +%autochangelog - Kotlin/Native 1.3.71 diff --git a/anda/langs/kotlin/kotlin/kotlin.spec b/anda/langs/kotlin/kotlin/kotlin.spec index 22b85c4455..f4ae3089a7 100644 --- a/anda/langs/kotlin/kotlin/kotlin.spec +++ b/anda/langs/kotlin/kotlin/kotlin.spec @@ -1,7 +1,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Name: kotlin -Version: 1.9.24 +Version: 2.0.0 Release: 1%?dist Summary: Statically typed programming language diff --git a/anda/langs/nim/dive/anda.hcl b/anda/langs/nim/dive/anda.hcl new file mode 100644 index 0000000000..d6f76e2751 --- /dev/null +++ b/anda/langs/nim/dive/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "umdive.spec" + } +} diff --git a/anda/langs/nim/dive/umdive.spec b/anda/langs/nim/dive/umdive.spec new file mode 100644 index 0000000000..3827284130 --- /dev/null +++ b/anda/langs/nim/dive/umdive.spec @@ -0,0 +1,29 @@ +Name: umdive +Version: 0.1.2 +Release: 1%?dist +Summary: Chroot utility (just like arch-chroot) +License: MIT +URL: https://github.com/Ultramarine-Linux/dive +Source0: %url/archive/refs/tags/v%version.tar.gz +Requires: (%_bindir/chroot or %_sbindir/chroot) +Requires: %_bindir/mount +BuildRequires: anda-srpm-macros nim +Provides: dive = %version-%release + +%description +%summary. + +%prep +%autosetup -n dive-%version + +%build +nimble setup -y +nim c %nim_c src/dive + +%install +install -Dpm755 src/dive %buildroot%_bindir/dive + +%files +%doc README.md +%license LICENSE +%_bindir/dive diff --git a/anda/langs/nim/dive/update.rhai b/anda/langs/nim/dive/update.rhai new file mode 100644 index 0000000000..183a57fe11 --- /dev/null +++ b/anda/langs/nim/dive/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("Ultramarine-Linux/dive")); diff --git a/anda/langs/nim/mkfstab/anda.hcl b/anda/langs/nim/mkfstab/anda.hcl new file mode 100644 index 0000000000..8adec4b82d --- /dev/null +++ b/anda/langs/nim/mkfstab/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "mkfstab.spec" + } +} diff --git a/anda/langs/nim/mkfstab/mkfstab.spec b/anda/langs/nim/mkfstab/mkfstab.spec new file mode 100644 index 0000000000..8073c4ac4c --- /dev/null +++ b/anda/langs/nim/mkfstab/mkfstab.spec @@ -0,0 +1,26 @@ +Name: mkfstab +Version: 0.1.2 +Release: 1%?dist +Summary: An alternative to genfstab: generate output suitable for addition to /etc/fstab +License: MIT +URL: https://github.com/Ultramarine-Linux/mkfstab +Source0: %url/archive/refs/tags/v%version.tar.gz +BuildRequires: nim anda-srpm-macros + +%description +An alternative to genfstab from Arch Linux. This is a dead simple but faster implementation of genfstab. + +%prep +%autosetup + +%build +nimble setup -y +nim c %nim_c src/%name + +%install +install -Dpm755 src/%name %buildroot%_bindir/%name + +%files +%doc README.md +%license LICENSE +%_bindir/%name diff --git a/anda/langs/nim/mkfstab/update.rhai b/anda/langs/nim/mkfstab/update.rhai new file mode 100644 index 0000000000..cc12b58ddb --- /dev/null +++ b/anda/langs/nim/mkfstab/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("Ultramarine-Linux/mkfstab")); diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index 15e336278f..4e1a12e86f 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 b3b26b2e56df580b1a4190fb28ef4e05f0cff514 +%global commit 05df263b84de9008266b3d53e2c28b009890ca61 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.1.1 -%global commit_date 20240518 +%global commit_date 20240704 %global debug_package %nil Name: nim-nightly @@ -109,9 +109,9 @@ mv %buildroot%_bindir/nim %buildroot%_datadir/ ln -s %_datadir/nim/bin/nim %buildroot%_bindir/nim %ifarch x86_64 -mkdir -p %buildroot/%_docdir/%name/html -cp -a doc/html/*.html %buildroot/%_docdir/%name/html/ -cp tools/dochack/dochack.js %buildroot/%_docdir/%name/ +mkdir -p %buildroot/%_docdir/%name/html || true +cp -a doc/html/*.html %buildroot/%_docdir/%name/html/ || true +cp tools/dochack/dochack.js %buildroot/%_docdir/%name/ || true %endif cp -r lib/* %buildroot%_prefix/lib/nim/ diff --git a/anda/langs/nim/nim/nim.spec b/anda/langs/nim/nim/nim.spec index 1feef9bcb6..afe2260a3e 100644 --- a/anda/langs/nim/nim/nim.spec +++ b/anda/langs/nim/nim/nim.spec @@ -2,7 +2,7 @@ %global debug_package %{nil} Name: nim -Version: 2.0.4 +Version: 2.0.8 Release: 1%?dist Summary: Imperative, multi-paradigm, compiled programming language License: MIT and BSD diff --git a/anda/langs/python/mpv/python-mpv.spec b/anda/langs/python/mpv/python-mpv.spec index 0747fad273..9e42548f52 100644 --- a/anda/langs/python/mpv/python-mpv.spec +++ b/anda/langs/python/mpv/python-mpv.spec @@ -1,7 +1,7 @@ %define debug_package %nil Name: python3-mpv -Version: 1.0.6 +Version: 1.0.7 Release: 1%?dist Summary: Python interface to the awesome mpv media player License: GPL-2.0+ OR LGPL-2.1+ diff --git a/anda/langs/python/protobuf/python3-protobuf.spec b/anda/langs/python/protobuf/python3-protobuf.spec index 4260ef3e64..563dafdce4 100644 --- a/anda/langs/python/protobuf/python3-protobuf.spec +++ b/anda/langs/python/protobuf/python3-protobuf.spec @@ -2,7 +2,7 @@ %global pypi_name protobuf Name: python-%{pypi_name} -Version: 5.26.1 +Version: 5.27.2 Release: 1%?dist Summary: Protocol Buffers diff --git a/anda/langs/python/ruff/python3-ruff.spec b/anda/langs/python/ruff/python3-ruff.spec index 71e447dc30..22c8156465 100644 --- a/anda/langs/python/ruff/python3-ruff.spec +++ b/anda/langs/python/ruff/python3-ruff.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: python3-ruff -Version: 0.4.4 +Version: 0.5.1 Release: 1%?dist Summary: An extremely fast Python linter, written in Rust License: MIT diff --git a/anda/langs/rust/bat-extras/bat-extras.spec b/anda/langs/rust/bat-extras/bat-extras.spec index fcd6089128..59cdd8f3a3 100644 --- a/anda/langs/rust/bat-extras/bat-extras.spec +++ b/anda/langs/rust/bat-extras/bat-extras.spec @@ -1,8 +1,8 @@ %define debug_package %{nil} Name: bat-extras -Version: 2024.02.12 -Release: 1%{?dist} +Version: 2024.07.10 +Release: 1%?dist Summary: Bash scripts that integrate bat with various command line tools License: MIT diff --git a/anda/langs/rust/gitoxide/rust-gitoxide.spec b/anda/langs/rust/gitoxide/rust-gitoxide.spec index d69d69c854..f6dad5beec 100644 --- a/anda/langs/rust/gitoxide/rust-gitoxide.spec +++ b/anda/langs/rust/gitoxide/rust-gitoxide.spec @@ -1,10 +1,11 @@ # Generated by rust2rpm 24 %bcond_without check +%global __brp_mangle_shebangs %{nil} %global crate gitoxide Name: rust-gitoxide -Version: 0.35.0 +Version: 0.36.0 Release: 1%?dist Summary: Command-line application for interacting with git repositories diff --git a/anda/langs/rust/maturin/rust-terra-maturin.spec b/anda/langs/rust/maturin/rust-terra-maturin.spec index a69849b411..9d80a663be 100644 --- a/anda/langs/rust/maturin/rust-terra-maturin.spec +++ b/anda/langs/rust/maturin/rust-terra-maturin.spec @@ -2,8 +2,8 @@ %global crate maturin Name: rust-terra-maturin -Version: 1.5.1 -Release: %autorelease +Version: 1.6.0 +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 diff --git a/anda/langs/rust/nushell/nushell.spec b/anda/langs/rust/nushell/nushell.spec index 529cba0ec4..f856f441ba 100644 --- a/anda/langs/rust/nushell/nushell.spec +++ b/anda/langs/rust/nushell/nushell.spec @@ -1,5 +1,5 @@ Name: nushell -Version: 0.93.0 +Version: 0.95.0 Release: 1%?dist Summary: A new type of shell License: MIT @@ -16,7 +16,7 @@ Requires: glibc openssl zlib %cargo_prep_online %build -%{cargo_build -f extra,dataframe} --workspace +%{cargo_build -f extra} --workspace %install mkdir -p %buildroot%_bindir diff --git a/anda/langs/rust/youki/youki.spec b/anda/langs/rust/youki/youki.spec index d459ea9da2..470cf96f8b 100644 --- a/anda/langs/rust/youki/youki.spec +++ b/anda/langs/rust/youki/youki.spec @@ -1,6 +1,6 @@ Name: youki -Version: 0.3.2 -Release: 1%{?dist} +Version: 0.3.3 +Release: 1%?dist Summary: A container runtime written in Rust License: Apache-2.0 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 4dd93a8131..e2ad4311e8 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 a49292758922160244d1842cdcba0a5154d1cb27 +%global commit 31cb5116a4a138365feb709ebb7b8670db604991 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20240330 +%global commit_date 20240605 %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 a3c8e2d6b0..9dcb1ff3d7 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 ed0077a101ddc5abe39045c36f8aeb053e5c34dd +%global commit ee52e5a530bc4ad93a605add9a1ce184de3f0d9c %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global repo https://gitlab.gnome.org/GNOME/%{real_name}.git -%global commit_date 20240520 +%global commit_date 20240702 %global snapshot_info %{commit_date}.%{shortcommit} Name: vala-nightly diff --git a/anda/langs/vala/vala-panel-appmenu/vala-panel-appmenu.spec b/anda/langs/vala/vala-panel-appmenu/vala-panel-appmenu.spec index b79fe6061a..fb9479117d 100644 --- a/anda/langs/vala/vala-panel-appmenu/vala-panel-appmenu.spec +++ b/anda/langs/vala/vala-panel-appmenu/vala-panel-appmenu.spec @@ -1,9 +1,9 @@ %global forgeurl https://gitlab.com/vala-panel-project/vala-panel-appmenu -%global commit bada552e3eb595d7205d3ec69ea2e0162b9cca12 +%global commit 7631683adb35cd4fae387abf7ff1552aab4d2249 %forgemeta Name: vala-panel-appmenu -Version: 24.02 +Version: 24.05 Release: 1%?dist License: LGPL-3.0-or-later Summary: Application Menu plugin for vala-panel @@ -118,9 +118,9 @@ Vala appmenu support for Java Swing applications. %{_datadir}/glib-2.0/schemas/org.valapanel.appmenu.gschema.xml %{_datadir}/vala-panel/applets/org.valapanel.appmenu.plugin %{_datadir}/vala/vapi/appmenu-glib-translator.* -%{_datadir}/gir-1.0/AppmenuGLibTranslator-%version.gir +%{_datadir}/gir-1.0/AppmenuGLibTranslator-*.gir %{_includedir}/appmenu-glib-translator/importer.h -%{_libdir}/girepository-1.0/AppmenuGLibTranslator-%version.typelib +%{_libdir}/girepository-1.0/AppmenuGLibTranslator-*.typelib %{_libdir}/libappmenu-glib-translator.* %files -n vala-panel-appmenu-gtk-module diff --git a/anda/lib/libappimageupdate/libappimageupdate.spec b/anda/lib/libappimageupdate/libappimageupdate.spec index f2be4a8dd8..cb5f2d506f 100644 --- a/anda/lib/libappimageupdate/libappimageupdate.spec +++ b/anda/lib/libappimageupdate/libappimageupdate.spec @@ -23,7 +23,7 @@ BuildRequires: cmake3 BuildRequires: cpr-devel BuildRequires: gcc-c++ BuildRequires: libappimage-devel curl-devel libX11-devel zlib-devel fuse-devel librsvg2-devel cairo-devel git-core -BuildRequires: nlohmann-json-devel +BuildRequires: json-devel BuildRequires: pkgconfig(libgcrypt) BuildRequires: pkgconfig(gpgme) BuildRequires: pkgconfig(Qt5) diff --git a/anda/lib/libhelium/libhelium.spec b/anda/lib/libhelium/libhelium.spec index 4cf0dea68b..6546452a56 100644 --- a/anda/lib/libhelium/libhelium.spec +++ b/anda/lib/libhelium/libhelium.spec @@ -1,6 +1,6 @@ Summary: The Application Framework for tauOS apps Name: libhelium -Version: 1.8.11.1 +Version: 1.8.12 Release: 1%?dist License: GPL-3.0 URL: https://github.com/tau-OS/libhelium diff --git a/anda/lib/libindicator/terra-libindicator.spec b/anda/lib/libindicator/terra-libindicator.spec index 669f39e316..611037c11a 100644 --- a/anda/lib/libindicator/terra-libindicator.spec +++ b/anda/lib/libindicator/terra-libindicator.spec @@ -57,7 +57,7 @@ developing applications that use %{name}-gtk3. %prep %setup -q -c -%patch1 -p1 -b .orig +%patch 1 -p1 -b .orig # Remove all IDO references # This is only needed for tools/indicator-loader.c sed -i '6d' ./Makefile.am diff --git a/anda/lib/nlohmann-json/anda.hcl b/anda/lib/nlohmann-json/anda.hcl deleted file mode 100644 index 90d7b3a597..0000000000 --- a/anda/lib/nlohmann-json/anda.hcl +++ /dev/null @@ -1,5 +0,0 @@ -project pkg { - rpm { - spec = "nlohmann-json.spec" - } -} diff --git a/anda/lib/nlohmann-json/nlohmann-json.spec b/anda/lib/nlohmann-json/nlohmann-json.spec deleted file mode 100644 index ebe2564a1b..0000000000 --- a/anda/lib/nlohmann-json/nlohmann-json.spec +++ /dev/null @@ -1,104 +0,0 @@ -%global debug_package %{nil} - -Name: nlohmann-json -Version: 3.11.3 -Release: 1%{?dist} - -Summary: JSON for Modern C++ (c++11) ("single header file") - - -%define desc %{expand: -There are myriads of JSON libraries out there, and each may even have its -reason to exist. Our class had these design goals: -- intuitive syntax. -- Trivial integration. -- Serious testing} - -License: MIT -Url: https://github.com/nlohmann/json - -Source: https://github.com/nlohmann/json/archive/refs/tags/v%{version}.tar.gz - -BuildRequires: cmake gcc-c++ - -%description -%{desc} - -%package devel -Summary: JSON for Modern C++ (c++11) ("single header file") -Group: Development/C++ - -%description devel -%{desc} - -This package contains the single header C++ file and CMake dependency files. - -%prep -%autosetup -n json-%{version} - -%build -%cmake - - -%install -%cmake_install - -%files devel -%doc README.md -%license LICENSE.MIT -%{_includedir}/nlohmann -%{_datadir}/cmake/nlohmann_json/ -%{_datadir}/pkgconfig/nlohmann_json.pc - -%changelog -* Mon Dec 26 2022 Cappy Ishihara - 3.11.2-1.um37 -- Rebuild for Terra, dependency of libappimageupdate - -* Fri Dec 10 2021 Ilya Kurdyukov 3.10.4-alt1.1 -- Fixed build for Elbrus. - -* Mon Nov 15 2021 Paul Wolneykien 3.10.4-alt1 -- new version 3.10.4 - -* Thu Sep 16 2021 Ivan A. Melnikov 3.10.2-alt2 -- Disable slower tests on %%mips and riscv64 to avoid timeouts. - -* Tue Sep 14 2021 Paul Wolneykien 3.10.2-alt1 -- Updated to v3.10.2. - -* Wed Apr 28 2021 Arseny Maslennikov 3.8.0-alt3.1 -- NMU: spec: adapted to new cmake macros. - -* Thu Sep 10 2020 Ivan A. Melnikov 3.8.0-alt3 -- Skip test-unicode on mips*, as it timeouts. - -* Fri Jul 03 2020 Paul Wolneykien 3.8.0-alt2 -- Added the test data bundle. -- Fix: Run the tests with CMake. -- Skip the cmake_fetch_content test. - -* Thu Jul 02 2020 Paul Wolneykien 3.8.0-alt1 -- Freshed up to v3.8.0. - -* Tue Mar 31 2020 Paul Wolneykien 3.7.2-alt2 -- Run the auto-tests. -- Package CMake dependency files. -- This is now an arch package'nlohmann-json' providing nlohmann-json-devel - and replacing json-cpp. -- Fixed project lincense: MIT. - -* Tue Mar 31 2020 Paul Wolneykien 3.7.2-alt1 -- Upstream version 3.7.2. -- Also install %%_includedir/nlohmann/json.hpp symlink. - -* Mon Nov 26 2018 Pavel Vainerman 3.4.0-alt1 -- new version - -* Sun Mar 19 2017 Pavel Vainerman 2.1.1-alt1 -- new version - -* Tue Nov 08 2016 Pavel Vainerman 2.0.7-alt1 -- new version - -* Sun Oct 30 2016 Pavel Vainerman 2.0.6-alt0.1 -- initial commit diff --git a/anda/lib/nlohmann-json/update.rhai b/anda/lib/nlohmann-json/update.rhai deleted file mode 100644 index 3357c0919d..0000000000 --- a/anda/lib/nlohmann-json/update.rhai +++ /dev/null @@ -1 +0,0 @@ -rpm.version(gh("nlohmann/json")); diff --git a/anda/lib/openh264/anda.hcl b/anda/lib/openh264/anda.hcl index e652be253d..b62df13d06 100644 --- a/anda/lib/openh264/anda.hcl +++ b/anda/lib/openh264/anda.hcl @@ -1,5 +1,5 @@ project pkg { rpm { - spec = "openh264.spec" + spec = "openh264.spec" } } diff --git a/anda/lib/openh264/gst-p-bad-cleanup.sh b/anda/lib/openh264/gst-p-bad-cleanup.sh deleted file mode 100644 index 92211717e0..0000000000 --- a/anda/lib/openh264/gst-p-bad-cleanup.sh +++ /dev/null @@ -1,201 +0,0 @@ -#!/bin/sh - -# Process a gst-plugins-bad tarball to remove -# unwanted GStreamer plugins. -# -# This script here is taken from Fedora gstreamer1-plugins-bad-free repo, with -# only change being openh264 addition. -# -# See https://bugzilla.redhat.com/show_bug.cgi?id=532470 -# for details -# -# Bastien Nocera - 2010 -# - -SOURCE="$1" -NEW_SOURCE=`echo $SOURCE | sed 's/bad-/bad-openh264-/'` -DIRECTORY=`echo $SOURCE | sed 's/\.tar\.xz//'` - -ALLOWED=" -aacparse -accurip -adpcmdec -adpcmenc -aiff -aiffparse -amrparse -asfmux -audiobuffersplit -audiofxbad -audiolatency -audiomixer -audiomixmatrix -audioparsers -audiovisualizers -autoconvert -bayer -camerabin -camerabin2 -cdxaparse -codecalpha -codectimestamper -coloreffects -colorspace -compositor -dataurisrc -dccp -debugutils -dtmf -dvbsubenc -faceoverlay -festival -fieldanalysis -freeverb -freeze -frei0r -gaudieffects -gdp -geometrictransform -h264parse -hdvparse -hls -id3tag -inter -interlace -invtelecine -ivfparse -ivtc -jpegformat -jp2kdecimator -legacyresample -librfb -liveadder -midi -mve -mpegdemux -mpeg4videoparse -mpegpsmux -mpegtsdemux -mpegtsmux -mpegvideoparse -mxf -netsim -nsf -nuvdemux -onvif -openh264 -patchdetect -pcapparse -pnm -proxy -qtmux -rawparse -removesilence -rist -rtmp2 -rtp -rtpmux -rtpvp8 -scaletempo -sdi -sdp -segmentclip -selector -smooth -speed -stereo -subenc -switchbin -timecode -transcode -tta -valve -videofilters -videoframe_audiolevel -videomaxrate -videomeasure -videoparsers -videosignal -vmnc -yadif -y4m -" - -NOT_ALLOWED=" -dvbsuboverlay -dvdspu -real -siren -" - -error() -{ - MESSAGE=$1 - echo $MESSAGE - exit 1 -} - -check_allowed() -{ - MODULE=$1 - for i in $ALLOWED ; do - if test x$MODULE = x$i ; then - return 0; - fi - done - # Ignore errors coming from ext/ directory - # they require external libraries so are ineffective anyway - return 1; -} - -check_not_allowed() -{ - MODULE=$1 - for i in $NOT_ALLOWED ; do - if test x$MODULE = x$i ; then - return 0; - fi - done - return 1; -} - -rm -rf $DIRECTORY -tar xJf $SOURCE || error "Cannot unpack $SOURCE" -pushd $DIRECTORY > /dev/null || error "Cannot open directory \"$DIRECTORY\"" - -unknown="" -for subdir in gst ext sys; do - for dir in $subdir/* ; do - # Don't touch non-directories - if ! [ -d $dir ] ; then - continue; - fi - MODULE=`basename $dir` - if ( check_not_allowed $MODULE ) ; then - echo "**** Removing $MODULE ****" - echo "Removing directory $dir" - rm -r $dir || error "Cannot remove $dir" - echo - elif test $subdir = ext || test $subdir = sys; then - # Ignore library or system non-blacklisted plugins - continue; - elif ! ( check_allowed $MODULE ) ; then - echo "Unknown module in $dir" - unknown="$unknown $dir" - fi - done -done - -echo - -if test "x$unknown" != "x"; then - echo -n "Aborting due to unkown modules: " - echo "$unknown" | sed "s/ /\n /g" - exit 1 -fi - -popd > /dev/null - -tar cJf $NEW_SOURCE $DIRECTORY -echo "$NEW_SOURCE is ready to use" - diff --git a/anda/lib/openh264/hardcode-openh264-dep.patch b/anda/lib/openh264/hardcode-openh264-dep.patch deleted file mode 100644 index fbedcd96e1..0000000000 --- a/anda/lib/openh264/hardcode-openh264-dep.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up gst-plugins-bad-1.18.2/ext/openh264/meson.build.orig gst-plugins-bad-1.18.2/ext/openh264/meson.build ---- gst-plugins-bad-1.18.2/ext/openh264/meson.build.orig 2020-12-06 14:24:13.000000000 +0100 -+++ gst-plugins-bad-1.18.2/ext/openh264/meson.build 2021-02-11 11:48:58.660450319 +0100 -@@ -4,9 +4,7 @@ openh264_sources = [ - 'gstopenh264plugin.c', - ] - --openh264_dep = dependency('openh264', version : '>= 1.3.0', -- required : get_option('openh264'), -- fallback: ['openh264', 'openh264_dep']) -+openh264_dep = cc.find_library('openh264') - - if openh264_dep.found() - gstopenh264 = library('gstopenh264', diff --git a/anda/lib/openh264/openh264.spec b/anda/lib/openh264/openh264.spec index 674488b4b8..27e0bb42c8 100644 --- a/anda/lib/openh264/openh264.spec +++ b/anda/lib/openh264/openh264.spec @@ -2,31 +2,20 @@ %global commit1 e7d30b921df736a1121a0c8e0cf3ab1ce5b8a4b7 %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) -%global openh264_version 2.4.1 -%global gst_version 1.24.3 - Name: openh264 -Version: %{openh264_version} +Version: 2.4.1 # Also bump the Release tag for gstreamer1-plugin-openh264 down below Release: 1%{?dist} Summary: H.264 codec library License: BSD URL: https://www.openh264.org/ -Source0: https://github.com/cisco/openh264/archive/v%{openh264_version}/openh264-%{openh264_version}.tar.gz +Source0: https://github.com/cisco/openh264/archive/v%version/openh264-%version.tar.gz Source1: https://github.com/mozilla/gmp-api/archive/%{commit1}/gmp-api-%{shortcommit1}.tar.gz -# The source is: -# http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-%%{gst_version}.tar.xz -# modified with gst-p-bad-cleanup.sh from SOURCE3 -Source2: gst-plugins-bad-openh264-%{gst_version}.tar.xz -Source3: gst-p-bad-cleanup.sh - -# Don't use pkg-config for finding openh264 as we are building against an in-tree copy -Patch2: hardcode-openh264-dep.patch BuildRequires: gcc-c++ -BuildRequires: gstreamer1-devel >= %{gst_version} -BuildRequires: gstreamer1-plugins-base-devel >= %{gst_version} +BuildRequires: gstreamer1-devel +BuildRequires: gstreamer1-plugins-base-devel BuildRequires: make BuildRequires: meson BuildRequires: nasm @@ -38,7 +27,7 @@ suitable for use in real time applications such as WebRTC. %package devel Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{openh264_version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for @@ -47,7 +36,7 @@ developing applications that use %{name}. %package -n mozilla-openh264 Summary: H.264 codec support for Mozilla browsers -Requires: %{name}%{?_isa} = %{openh264_version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: mozilla-filesystem%{?_isa} %description -n mozilla-openh264 @@ -55,18 +44,6 @@ The mozilla-openh264 package contains a H.264 codec plugin for Mozilla browsers. -%package -n gstreamer1-plugin-openh264 -Version: %{gst_version} -Release: 2%{?dist} -Summary: GStreamer H.264 plugin - -%description -n gstreamer1-plugin-openh264 -GStreamer is a streaming media framework, based on graphs of elements which -operate on media data. - -This package contains the H.264 plugin. - - %prep %setup -q @@ -74,12 +51,6 @@ This package contains the H.264 plugin. tar -xf %{S:1} mv gmp-api-%{commit1} gmp-api -# Extract gst-plugins-bad-free archive -tar -xf %{S:2} -pushd gst-plugins-bad-%{gst_version} -%patch2 -p1 -popd - %build # Update the makefile with our build options @@ -96,20 +67,6 @@ make %{?_smp_mflags} # ... then build the mozilla plugin make plugin %{?_smp_mflags} -# ... and finally build the gstreamer plugin against the previously built -# openh264 libraries -pushd gst-plugins-bad-%{gst_version} -CFLAGS="%{build_cflags} -I`pwd`/../codec/api" \ -CXXFLAGS="%{build_cflags} -I`pwd`/../codec/api" \ -LDFLAGS="%{build_ldflags} -L`pwd`/.." \ -%meson \ - --auto-features=disabled \ - -D package-name="Fedora gstreamer1-plugin-openh264 package" \ - -D package-origin="http://www.openh264.org/" \ - -D openh264=enabled -%meson_build -popd - %install %make_install @@ -133,63 +90,12 @@ EOF # Remove static libraries rm $RPM_BUILD_ROOT%{_libdir}/*.a -# Install the gstreamer plugin -pushd gst-plugins-bad-%{gst_version} -%meson_install - -# Register as an AppStream component to be visible in the software center -# -# NOTE: It would be *awesome* if this file was maintained by the upstream -# project, translated and installed into the right place during `make install`. -# -# See http://www.freedesktop.org/software/appstream/docs/ for more details. -# -mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata -cat > $RPM_BUILD_ROOT%{_datadir}/appdata/gstreamer-openh264.appdata.xml < - - - gstreamer-openh264 - CC0-1.0 - GStreamer Multimedia Codecs - H.264 - Multimedia playback for H.264 - -

- This addon includes a codec for H.264 playback and encoding. -

-

- These codecs can be used to encode and decode media files where the - format is not patent encumbered. -

-

- A codec decodes audio and video for playback or editing and is also - used for transmission or storage. - Different codecs are used in video-conferencing, streaming media and - video editing applications. -

- - http://gstreamer.freedesktop.org/ - https://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer - http://gstreamer.freedesktop.org/documentation/ - http://www.gnome.org/friends/ - - -EOF - -# Remove unwanted gst-plugins-bad files -rm -rf $RPM_BUILD_ROOT%{_bindir}/gst-transcoder-1.0 -rm -rf $RPM_BUILD_ROOT%{_includedir}/gstreamer-1.0/ -rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gstreamer-*.pc -rm -rf $RPM_BUILD_ROOT%{_libdir}/libgst*.so* -rm -rf $RPM_BUILD_ROOT%{_datadir}/gstreamer-1.0/ -popd - %files %license LICENSE %doc README.md %{_libdir}/libopenh264.so.7 -%{_libdir}/libopenh264.so.%{openh264_version} +%{_libdir}/libopenh264.so.%{version} %files devel %{_includedir}/wels/ @@ -204,10 +110,5 @@ popd %{_libdir}/firefox/defaults/pref/gmpopenh264.js %{_libdir}/mozilla/plugins/gmp-gmpopenh264/ -%files -n gstreamer1-plugin-openh264 -%{_datadir}/appdata/*.appdata.xml -%{_libdir}/gstreamer-1.0/libgstopenh264.so - - %changelog %autochangelog diff --git a/anda/lib/openh264/pre.rhai b/anda/lib/openh264/pre.rhai deleted file mode 100644 index 6cfc5a8b63..0000000000 --- a/anda/lib/openh264/pre.rhai +++ /dev/null @@ -1,14 +0,0 @@ -let cwd = "anda/lib/openh264"; -let spec = open_file("anda/lib/openh264/openh264.spec").read_string(); -let gst = find("%global gst_version ([\\d.]+)", spec, 1); -print(`:: found gst version ${gst}`); -let out = sh(`wget https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${gst}.tar.xz`, cwd); -//print(":: wget stdout below"); -//print(out.sh_stdout()); -//print(":: wget stderr below"); -//print(out.sh_stderr()); -out = sh(`sh gst-p-bad-cleanup.sh gst-plugins-bad-${gst}.tar.xz`, cwd); -//print(":: script stdout below"); -//print(out.sh_stdout()); -//print(":: script stderr below"); -//print(out.sh_stderr()); diff --git a/anda/lib/openh264/update.rhai b/anda/lib/openh264/update.rhai index 82c75d7110..49357985c5 100644 --- a/anda/lib/openh264/update.rhai +++ b/anda/lib/openh264/update.rhai @@ -1,6 +1,4 @@ rpm.global("commit1", gh_commit("mozilla/gmp-api")); let h264 = gh("cisco/openh264"); h264.crop(1); -rpm.global("openh264_version", h264); -let html = get("https://gstreamer.freedesktop.org/src/gst-plugins-bad/?C=N;O=D"); -rpm.global("gst_version", find("gst-plugins-bad-([\\d.]+).tar.xz", html, 1)); +rpm.version(h264); diff --git a/anda/lib/placebo/terra-libplacebo.spec b/anda/lib/placebo/terra-libplacebo.spec index b1a7d72480..1d8034b7ce 100644 --- a/anda/lib/placebo/terra-libplacebo.spec +++ b/anda/lib/placebo/terra-libplacebo.spec @@ -1,6 +1,6 @@ Name: terra-libplacebo -Version: 6.338.2 -Release: 1%{?dist} +Version: 7.349.0 +Release: 1%?dist Summary: Reusable library for GPU-accelerated video/image rendering primitives License: LGPLv2+ @@ -68,7 +68,7 @@ developing applications that use %{name}. %files %license LICENSE %doc README.md -%{_libdir}/libplacebo.so.338 +%{_libdir}/libplacebo.so.* %files devel %{_includedir}/* diff --git a/anda/lib/tdlib/tdlib-nightly.spec b/anda/lib/tdlib/tdlib-nightly.spec index 4d5e16d117..d57181c257 100644 --- a/anda/lib/tdlib/tdlib-nightly.spec +++ b/anda/lib/tdlib/tdlib-nightly.spec @@ -1,5 +1,5 @@ -%global commit fd3154b28727df9e66423d64168fab1202d8c849 -%global ver 1.8.29 +%global commit 2820a9d281154fc9fc81fbbae976d20057b8f6b1 +%global ver 1.8.32 %global commit_date 20240219 %global shortcommit %(c=%{commit}; echo ${c:0:7}) diff --git a/anda/misc/sass/sass.spec b/anda/misc/sass/sass.spec index 23dc89fbd6..1c366aaf9a 100644 --- a/anda/misc/sass/sass.spec +++ b/anda/misc/sass/sass.spec @@ -4,7 +4,7 @@ %define _build_id_links none Name: sass -Version: 1.77.2 +Version: 1.77.5 Release: 1%?dist Summary: The reference implementation of Sass, written in Dart License: MIT diff --git a/anda/system/limine/limine.spec b/anda/system/limine/limine.spec index 8c34365102..33f329fa6c 100644 --- a/anda/system/limine/limine.spec +++ b/anda/system/limine/limine.spec @@ -1,5 +1,5 @@ Name: limine -Version: 7.5.1 +Version: 7.9.1 Release: 1%?dist Summary: Modern, advanced, portable, multiprotocol bootloader License: BSD-2-Clause diff --git a/anda/system/uutils-coreutils/uutils-coreutils.spec b/anda/system/uutils-coreutils/uutils-coreutils.spec index 2d116fd4c7..674f97124b 100644 --- a/anda/system/uutils-coreutils/uutils-coreutils.spec +++ b/anda/system/uutils-coreutils/uutils-coreutils.spec @@ -1,7 +1,7 @@ %global coreutils_ver 9.3 Name: uutils-coreutils -Version: 0.0.26 +Version: 0.0.27 Release: 1%?dist Summary: Cross-platform Rust rewrite of the GNU coreutils License: MIT diff --git a/anda/system/xpadneo/io.github.xpadneo.metainfo.xml b/anda/system/xpadneo/io.github.xpadneo.metainfo.xml new file mode 100644 index 0000000000..f11f630d07 --- /dev/null +++ b/anda/system/xpadneo/io.github.xpadneo.metainfo.xml @@ -0,0 +1,26 @@ + + io.github.xpadneo + xpadneo + xpadneo + Advanced Linux Driver for Xbox One Wireless Controller (shipped with Xbox One S) + +

+ Wireless Drivers for the Xbox One and Series S|X controllers. + + Across all models, xpadneo won't support audio features of the controllers because the firmware doesn't support audio in Bluetooth mode. In the future, xpadneo may support audio when USB and dongle support will be added. +

+ + https://atar-axis.github.io/xpadneo/ + CC0-1.0 + + GPL-3.0 + + + Florian Dollinger + + + + + usb:v045Ep02FDd0008dc00dsc00dp00ic03isc00ip00in00 + + \ No newline at end of file diff --git a/anda/system/xpadneo/xpadneo.spec b/anda/system/xpadneo/xpadneo.spec index 7ce203671f..dd1e9c21c0 100644 --- a/anda/system/xpadneo/xpadneo.spec +++ b/anda/system/xpadneo/xpadneo.spec @@ -12,6 +12,7 @@ License: GPL-3.0 URL: https://github.com/atar-axis/xpadneo Source0: %url/archive/v%version/%name-%version.tar.gz Source1: modules-load-d-xpadneo.conf +Source2: io.github.xpadneo.metainfo.xml %global srcname hid-%name @@ -69,6 +70,7 @@ done install -Dm644 hid-xpadneo/etc-modprobe.d/xpadneo.conf %{buildroot}%{_modprobedir}/60-xpadneo.conf install -Dm644 %{SOURCE1} %{buildroot}%{_modulesloaddir}/xpadneo.conf install -Dm644 hid-xpadneo/etc-udev-rules.d/60-xpadneo.rules %{buildroot}%{_udevrulesdir}/60-xpadneo.rules +install -Dm644 %{SOURCE2} %{buildroot}%{_datadir}/metainfo/io.github.xpadneo.metainfo.xml %files %doc NEWS.md docs/README.md docs/CONFIGURATION.md @@ -76,6 +78,7 @@ install -Dm644 hid-xpadneo/etc-udev-rules.d/60-xpadneo.rules %{buildroot}%{_udev %{_modprobedir}/60-xpadneo.conf %{_modulesloaddir}/xpadneo.conf %{_udevrulesdir}/60-xpadneo.rules +%{_datadir}/metainfo/io.github.xpadneo.metainfo.xml %changelog * Wed Oct 12 2022 Jan Drögehoff - 0.9.5-1 diff --git a/anda/terra/srpm-macros/anda-srpm-macros.spec b/anda/terra/srpm-macros/anda-srpm-macros.spec index a70153f249..c5f338c01c 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.6 +Version: 0.1.7 Release: 1%{?dist} Summary: SRPM macros for extra Fedora packages diff --git a/anda/terra/srpm-macros/macros.cargo_extra b/anda/terra/srpm-macros/macros.cargo_extra index c2ca56f1ef..de6d21fc76 100644 --- a/anda/terra/srpm-macros/macros.cargo_extra +++ b/anda/terra/srpm-macros/macros.cargo_extra @@ -30,7 +30,6 @@ verbose = true\ directory = "%{cargo_registry}"\ \ EOF\ -%{__rm} -f Cargo.lock \ %{__rm} -f Cargo.toml.orig \ ) diff --git a/anda/themes/bibata-cursor-theme/bibata-cursor-theme.spec b/anda/themes/bibata-cursor-theme/bibata-cursor-theme.spec index ae68ddda09..8a21b4a597 100644 --- a/anda/themes/bibata-cursor-theme/bibata-cursor-theme.spec +++ b/anda/themes/bibata-cursor-theme/bibata-cursor-theme.spec @@ -1,6 +1,6 @@ Name: bibata-cursor-theme -Version: 2.0.6 -Release: 1%{?dist} +Version: 2.0.7 +Release: 1%?dist URL: https://github.com/ful1e5/Bibata_Cursor Source0: %{url}/releases/download/v%{version}/Bibata.tar.xz Source1: https://raw.githubusercontent.com/ful1e5/Bibata_Cursor/v%{version}/README.md diff --git a/anda/themes/fluent-theme/fluent-theme.spec b/anda/themes/fluent-theme/fluent-theme.spec index 3a5da38c5f..8f0d302773 100644 --- a/anda/themes/fluent-theme/fluent-theme.spec +++ b/anda/themes/fluent-theme/fluent-theme.spec @@ -1,7 +1,7 @@ -%global tag 2024-04-28 +%global tag 2024-06-12 Name: fluent-theme -Version: 20240428 +Version: 20240612 Release: 1%?dist Summary: Fluent design theme for GNOME/GTK based desktop environments diff --git a/anda/themes/tau-helium/tau-helium.spec b/anda/themes/tau-helium/tau-helium.spec index 9e741ff15f..d3b193c8de 100644 --- a/anda/themes/tau-helium/tau-helium.spec +++ b/anda/themes/tau-helium/tau-helium.spec @@ -1,4 +1,4 @@ -%global ver 1.8.10-7 +%global ver 1.8.10-11 Summary: tauOS GTK/GNOME Shell Themes Name: tau-helium diff --git a/anda/themes/tau-hydrogen/tau-hydrogen.spec b/anda/themes/tau-hydrogen/tau-hydrogen.spec index e43c56d992..397cdc274b 100644 --- a/anda/themes/tau-hydrogen/tau-hydrogen.spec +++ b/anda/themes/tau-hydrogen/tau-hydrogen.spec @@ -1,7 +1,7 @@ Summary: tauOS Icon Theme Name: tau-hydrogen -Version: 1.0.14 -Release: 1%{?dist} +Version: 1.0.16 +Release: 1%?dist License: GPL-3.0 URL: https://github.com/tau-OS/tau-hydrogen Source0: https://github.com/tau-OS/tau-hydrogen/archive/refs/tags/%{version}.tar.gz diff --git a/anda/tools/buildsys/anda/rust-anda.spec b/anda/tools/buildsys/anda/rust-anda.spec index 2d09fa4b96..38ab338d32 100644 --- a/anda/tools/buildsys/anda/rust-anda.spec +++ b/anda/tools/buildsys/anda/rust-anda.spec @@ -5,7 +5,7 @@ %global crate anda Name: rust-anda -Version: 0.1.28 +Version: 0.2.0 Release: 1%?dist Summary: Andaman Build toolchain @@ -19,6 +19,8 @@ BuildRequires: rust-packaging >= 21 BuildRequires: anda-srpm-macros BuildRequires: openssl-devel BuildRequires: git-core +BuildRequires: libgit2-devel +BuildRequires: libssh2-devel Requires: mock Requires: rpm-build diff --git a/anda/tools/buildsys/gradle/gradle.spec b/anda/tools/buildsys/gradle/gradle.spec index 88ddfeb6c3..532180dd0e 100644 --- a/anda/tools/buildsys/gradle/gradle.spec +++ b/anda/tools/buildsys/gradle/gradle.spec @@ -1,5 +1,5 @@ Name: gradle -Version: 8.7.0 +Version: 8.8.0 Release: 1%?dist Summary: Powerful build system for the JVM URL: https://gradle.org/ diff --git a/anda/tools/buildsys/katsu/katsu.spec b/anda/tools/buildsys/katsu/katsu.spec index 522f8e0cb4..33af2daea2 100644 --- a/anda/tools/buildsys/katsu/katsu.spec +++ b/anda/tools/buildsys/katsu/katsu.spec @@ -1,13 +1,13 @@ %define debug_package %nil Name: katsu -Version: 0.2.3 +Version: 0.7.0 Release: 1%?dist Summary: The vicious image builder License: MIT URL: https://github.com/FyraLabs/katsu Source0: %url/archive/refs/tags/v%version.tar.gz -Requires: xorriso dracut limine grub2 systemd-devel squashfs-tools +Requires: xorriso dracut limine grub2 systemd-devel squashfs-tools parted gdisk Requires: dracut-live dracut-config-generic dracut-config-rescue grub2-tools-extra dracut-squash BuildRequires: cargo rust-packaging pkgconfig(libudev) clang-devel diff --git a/anda/tools/buildsys/subatomic/subatomic.spec b/anda/tools/buildsys/subatomic/subatomic.spec index 02520cc5f1..6f72eb298e 100644 --- a/anda/tools/buildsys/subatomic/subatomic.spec +++ b/anda/tools/buildsys/subatomic/subatomic.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: subatomic -Version: 0.8.0 +Version: 0.8.1 Release: 1%?dist Summary: A modern package delivery system diff --git a/anda/tools/electron/electron.spec b/anda/tools/electron/electron.spec index 884aca039f..4e0b1a2011 100644 --- a/anda/tools/electron/electron.spec +++ b/anda/tools/electron/electron.spec @@ -12,7 +12,7 @@ %global __provides_exclude_from %{_libdir}/%{name}/.*\\.so Name: electron -Version: 30.0.6 +Version: 31.1.0 Release: 1%?dist Summary: Build cross platform desktop apps with web technologies License: MIT diff --git a/anda/tools/fuc/fuc.spec b/anda/tools/fuc/fuc.spec index 44742bc74c..7ea89be98b 100644 --- a/anda/tools/fuc/fuc.spec +++ b/anda/tools/fuc/fuc.spec @@ -1,7 +1,7 @@ %global debug_package %{nil} Name: fuc -Version: 2.1.0 +Version: 2.2.0 Release: 1%?dist Summary: Modern, performance focused unix commands URL: https://github.com/SUPERCILEX/fuc diff --git a/anda/tools/sops/sops.spec b/anda/tools/sops/sops.spec index 2b5408953d..a7d01ac821 100644 --- a/anda/tools/sops/sops.spec +++ b/anda/tools/sops/sops.spec @@ -1,7 +1,7 @@ %define debug_package %nil Name: sops -Version: 3.8.1 -Release: 1%{?dist} +Version: 3.9.0 +Release: 1%?dist Summary: Simple and flexible tool for managing secrets License: MPL-2.0 URL: https://github.com/getsops/sops diff --git a/anda/tools/yt-dlp/yt-dlp-nightly.spec b/anda/tools/yt-dlp/yt-dlp-nightly.spec index 66fe111e6a..c5d1b72f7d 100644 --- a/anda/tools/yt-dlp/yt-dlp-nightly.spec +++ b/anda/tools/yt-dlp/yt-dlp-nightly.spec @@ -1,8 +1,8 @@ #bcond_without tests -%global commit 3e35aa32c74bc108375be8c8b6b3bfc90dfff1b4 +%global commit 6075a029dba70a89675ae1250e7cdfd91f0eba41 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20240519 -%global ver 2024.04.09 +%global commit_date 20240704 +%global ver 2024.07.02 Name: yt-dlp-nightly Version: %ver^%commit_date.%shortcommit diff --git a/comps.xml b/comps.xml index 70c1d8382c..58fc168b97 100644 --- a/comps.xml +++ b/comps.xml @@ -73,4 +73,16 @@ pantheon-tweaks + + helium + Helium Theme and libhelium + The Application Framework and Theme for tauOS. + false + true + + libhelium + tau-helium + tau-hydrogen + +