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/build.yml b/.github/workflows/build.yml index 7bd55ee66b..57e2db4159 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,16 +5,41 @@ on: packages: description: "Packages to Build" required: true + custom_builder: + description: "Custom Builder" + required: false + default: "" + architecture: + description: "Architecture" + required: false + default: all + type: string + + jobs: parse: outputs: pkgs: ${{ steps.parsing.outputs.pkgs }} + builder: ${{ inputs.custom_builder }} + arch: ${{ steps.parsing.outputs.arch }} runs-on: "ubuntu-latest" steps: - name: Parse Input id: parsing - run: echo "${{ inputs.packages }}" | sed 's/ /\n/g' | sed 's/$/\//g' | jq -R . | jq -s . | jq -c . | sed 's/^/pkgs=/' >> $GITHUB_OUTPUT + run: | + echo "${{ inputs.packages }}" | sed 's/ /\n/g' | sed 's/$/\//g' | jq -R . | jq -s . | jq -c . | sed 's/^/pkgs=/' >> $GITHUB_OUTPUT + echo "builder=${{ inputs.custom_builder }}" >> $GITHUB_OUTPUT + arch="${{ inputs.architecture }}" + # Convert to json array using jq + # if arch is not all, convert to array + if [ "$arch" != "all" ]; then + # jq, array with single element as string + arch=$(echo $arch | sed 's/,/\n/g') + echo "arch=$(echo $arch | jq -Rs 'split("\n")' | jq 'map(select(length > 0))' | jq -c .)" >> $GITHUB_OUTPUT + else + echo "arch=$(echo '["aarch64", "x86_64"]' | jq -c .)" >> $GITHUB_OUTPUT + fi build: needs: parse @@ -22,9 +47,9 @@ jobs: matrix: pkg: ${{ fromJson(needs.parse.outputs.pkgs) }} version: ["rawhide"] - arch: ["x86_64", "aarch64"] + arch: ${{ fromJson(needs.parse.outputs.arch) }} fail-fast: false - runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }} + runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || needs.parse.outputs.builder && needs.parse.outputs.builder || '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..4b6992eed3 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 @@ -20,9 +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 -%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/authy/update.rhai b/anda/apps/authy/update.rhai.bak similarity index 100% rename from anda/apps/authy/update.rhai rename to anda/apps/authy/update.rhai.bak diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 1fb4ee5952..9a76f05835 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.452 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..edbc8423c2 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.452 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..a67cf4660d 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.59 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..ea29f2a0f4 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.94 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..e2783b150e 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.94 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..1570a72461 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.59 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..5dc79eb34f --- /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.%shortcommit +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-engine +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 71ec62669a..dc91477437 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit 76ad8efe39260db9880bca5dc0055f317ffbbfed +%global commit 202ecc17af01407e7ed230b395c17a2038c339d4 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20240521 +%global commit_date 20240714 %global ver v0.38.0 Name: mpv-nightly diff --git a/anda/apps/mugshot/anda.hcl b/anda/apps/mugshot/anda.hcl new file mode 100644 index 0000000000..1e55c9ee9f --- /dev/null +++ b/anda/apps/mugshot/anda.hcl @@ -0,0 +1,6 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "mugshot.spec" + } +} diff --git a/anda/apps/mugshot/mugshot.spec b/anda/apps/mugshot/mugshot.spec new file mode 100644 index 0000000000..7e7435fddb --- /dev/null +++ b/anda/apps/mugshot/mugshot.spec @@ -0,0 +1,62 @@ +%global app org.bluesabre.Mugshot +%global _description %{expand: +Mugshot is a lightweight user configuration utility for Linux designed for simplicity and ease of +use. Quickly update your personal profile and sync your updates across applications.} + + +Name: python-mugshot +Version: 0.4.3 +Release: 1%?dist +Summary: User Management Utility for Linux +License: GPL-3.0 +URL: https://github.com/bluesabre/mugshot +Source0: %url/archive/refs/tags/mugshot-%version.tar.gz +BuildArch: noarch +BuildRequires: python3-devel +BuildRequires: python3-pip +BuildRequires: python3-distutils-extra +BuildRequires: python3-wheel +BuildRequires: python3-setuptools +BuildRequires: glib2 +BuildRequires: desktop-file-utils +BuildRequires: libappstream-glib + +%description %_description + +%package -n mugshot +Requires: util-linux-user +Requires: python3-cairo +Requires: python3-pexpect +Requires: python3-gobject +Summary: User Management Utility for Linux + +%description -n mugshot %_description + +%prep +%autosetup -n mugshot-mugshot-%version + +%build +%pyproject_wheel + +%install +%pyproject_install +%pyproject_save_files -L 'mugshot*' +install -Dm644 data/glib-2.0/schemas/%{lower:%app}.gschema.xml %buildroot%_datadir/glib-2.0/schemas/ + +%find_lang mugshot + +%check +#pyproject_check_import +desktop-file-validate %buildroot%_datadir/applications/%app.desktop +appstream-util validate-relax --nonet %buildroot%_metainfodir/mugshot.appdata.xml + +%files -n mugshot -f %{pyproject_files} -f mugshot.lang +%doc README.md NEWS +%license COPYING +%_bindir/mugshot +%_datadir/glib-2.0/schemas/%{lower:%app}.gschema.xml +%_datadir/applications/%app.desktop +%_datadir/mugshot/ +%_metainfodir/mugshot.appdata.xml +%_mandir/man1/mugshot.1.gz +%_iconsdir/hicolor/*/apps/mugshot.svg diff --git a/anda/apps/mugshot/update.rhai b/anda/apps/mugshot/update.rhai new file mode 100644 index 0000000000..c788e84035 --- /dev/null +++ b/anda/apps/mugshot/update.rhai @@ -0,0 +1,3 @@ +let v = gh("bluesabre/mugshot"); +v.crop(8); +rpm.version(v); diff --git a/anda/apps/sccache/rust-sccache.spec b/anda/apps/sccache/rust-sccache.spec index e904ea2d04..23b76b4dd2 100644 --- a/anda/apps/sccache/rust-sccache.spec +++ b/anda/apps/sccache/rust-sccache.spec @@ -1,4 +1,4 @@ -# Generated by rust2rpm 25 +# Generated by rust2rpm 26 %bcond_with check # aarch64 dist is not available %ifarch aarch64 @@ -13,8 +13,8 @@ %global crate sccache Name: rust-sccache -Version: 0.8.0 -Release: 1%?dist +Version: 0.8.1 +Release: %autorelease Summary: Ccache-like tool License: Apache-2.0 @@ -89,17 +89,6 @@ use the "default" feature of the "%{crate}" crate. %package -n %{name}+all-devel Summary: %{summary} BuildArch: noarch -Provides: crate(sccache/all) = 0.7.4 -Requires: cargo -Requires: crate(sccache) = 0.7.4 -Requires: crate(sccache/azure) = 0.7.4 -Requires: crate(sccache/dist-client) = 0.7.4 -Requires: crate(sccache/gcs) = 0.7.4 -Requires: crate(sccache/gha) = 0.7.4 -Requires: crate(sccache/memcached) = 0.7.4 -Requires: crate(sccache/redis) = 0.7.4 -Requires: crate(sccache/s3) = 0.7.4 -Requires: crate(sccache/webdav) = 0.7.4 %description -n %{name}+all-devel %{_description} @@ -112,9 +101,6 @@ use the "all" feature of the "%{crate}" crate. %package -n %{name}+azure-devel Summary: %{summary} BuildArch: noarch -Provides: crate(sccache/azure) = 0.7.4 -Requires: cargo -Requires: crate(sccache) = 0.7.4 %description -n %{name}+azure-devel %{_description} @@ -127,9 +113,6 @@ use the "azure" feature of the "%{crate}" crate. %package -n %{name}+dist-client-devel Summary: %{summary} BuildArch: noarch -Provides: crate(sccache/dist-client) = 0.7.4 -Requires: cargo -Requires: crate(sccache) = 0.7.4 %description -n %{name}+dist-client-devel %{_description} @@ -138,13 +121,10 @@ use the "dist-client" feature of the "%{crate}" crate. %files -n %{name}+dist-client-devel %ghost %{crate_instdir}/Cargo.toml -%if %{with dist_server} + %package -n %{name}+dist-server-devel Summary: %{summary} BuildArch: noarch -Provides: crate(sccache/dist-server) = 0.7.4 -Requires: cargo -Requires: crate(sccache) = 0.7.4 %description -n %{name}+dist-server-devel %{_description} @@ -157,11 +137,6 @@ use the "dist-server" feature of the "%{crate}" crate. %package -n %{name}+dist-tests-devel Summary: %{summary} BuildArch: noarch -Provides: crate(sccache/dist-tests) = 0.7.4 -Requires: cargo -Requires: crate(sccache) = 0.7.4 -Requires: crate(sccache/dist-client) = 0.7.4 -Requires: crate(sccache/dist-server) = 0.7.4 %description -n %{name}+dist-tests-devel %{_description} @@ -170,15 +145,10 @@ use the "dist-tests" feature of the "%{crate}" crate. %files -n %{name}+dist-tests-devel %ghost %{crate_instdir}/Cargo.toml -%endif + %package -n %{name}+flate2-devel Summary: %{summary} BuildArch: noarch -Provides: crate(sccache/flate2) = 0.7.4 -Requires: (crate(flate2) >= 1.0.0 with crate(flate2) < 2.0.0~) -Requires: (crate(flate2/rust_backend) >= 1.0.0 with crate(flate2/rust_backend) < 2.0.0~) -Requires: cargo -Requires: crate(sccache) = 0.7.4 %description -n %{name}+flate2-devel %{_description} @@ -191,9 +161,6 @@ use the "flate2" feature of the "%{crate}" crate. %package -n %{name}+gcs-devel Summary: %{summary} BuildArch: noarch -Provides: crate(sccache/gcs) = 0.7.4 -Requires: cargo -Requires: crate(sccache) = 0.7.4 %description -n %{name}+gcs-devel %{_description} @@ -206,10 +173,6 @@ use the "gcs" feature of the "%{crate}" crate. %package -n %{name}+gha-devel Summary: %{summary} BuildArch: noarch -Provides: crate(sccache/gha) = 0.7.4 -Requires: cargo -Requires: crate(sccache) = 0.7.4 -Requires: crate(sccache/opendal) = 0.7.4 %description -n %{name}+gha-devel %{_description} @@ -219,14 +182,21 @@ use the "gha" feature of the "%{crate}" crate. %files -n %{name}+gha-devel %ghost %{crate_instdir}/Cargo.toml +%package -n %{name}+http-body-util-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+http-body-util-devel %{_description} + +This package contains library source intended for building other packages which +use the "http-body-util" feature of the "%{crate}" crate. + +%files -n %{name}+http-body-util-devel +%ghost %{crate_instdir}/Cargo.toml + %package -n %{name}+hyper-devel Summary: %{summary} BuildArch: noarch -Provides: crate(sccache/hyper) = 0.7.4 -Requires: (crate(hyper/default) >= 0.14.27 with crate(hyper/default) < 0.15.0~) -Requires: (crate(hyper/server) >= 0.14.27 with crate(hyper/server) < 0.15.0~) -Requires: cargo -Requires: crate(sccache) = 0.7.4 %description -n %{name}+hyper-devel %{_description} @@ -236,13 +206,21 @@ use the "hyper" feature of the "%{crate}" crate. %files -n %{name}+hyper-devel %ghost %{crate_instdir}/Cargo.toml +%package -n %{name}+hyper-util-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+hyper-util-devel %{_description} + +This package contains library source intended for building other packages which +use the "hyper-util" feature of the "%{crate}" crate. + +%files -n %{name}+hyper-util-devel +%ghost %{crate_instdir}/Cargo.toml + %package -n %{name}+jwt-devel Summary: %{summary} BuildArch: noarch -Provides: crate(sccache/jwt) = 0.7.4 -Requires: (crate(jsonwebtoken/default) >= 8.0.0 with crate(jsonwebtoken/default) < 9.0.0~) -Requires: cargo -Requires: crate(sccache) = 0.7.4 %description -n %{name}+jwt-devel %{_description} @@ -255,10 +233,6 @@ use the "jwt" feature of the "%{crate}" crate. %package -n %{name}+libmount-devel Summary: %{summary} BuildArch: noarch -Provides: crate(sccache/libmount) = 0.7.4 -Requires: (crate(libmount/default) >= 0.1.10 with crate(libmount/default) < 0.2.0~) -Requires: cargo -Requires: crate(sccache) = 0.7.4 %description -n %{name}+libmount-devel %{_description} @@ -271,11 +245,6 @@ use the "libmount" feature of the "%{crate}" crate. %package -n %{name}+memcached-devel Summary: %{summary} BuildArch: noarch -Provides: crate(sccache/memcached) = 0.7.4 -Requires: (crate(opendal/default) >= 0.40.0 with crate(opendal/default) < 0.41.0~) -Requires: (crate(opendal/services-memcached) >= 0.40.0 with crate(opendal/services-memcached) < 0.41.0~) -Requires: cargo -Requires: crate(sccache) = 0.7.4 %description -n %{name}+memcached-devel %{_description} @@ -288,9 +257,6 @@ use the "memcached" feature of the "%{crate}" crate. %package -n %{name}+native-zlib-devel Summary: %{summary} BuildArch: noarch -Provides: crate(sccache/native-zlib) = 0.7.4 -Requires: cargo -Requires: crate(sccache) = 0.7.4 %description -n %{name}+native-zlib-devel %{_description} @@ -303,10 +269,6 @@ use the "native-zlib" feature of the "%{crate}" crate. %package -n %{name}+nix-devel Summary: %{summary} BuildArch: noarch -Provides: crate(sccache/nix) = 0.7.4 -Requires: (crate(nix/default) >= 0.26.2 with crate(nix/default) < 0.27.0~) -Requires: cargo -Requires: crate(sccache) = 0.7.4 %description -n %{name}+nix-devel %{_description} @@ -319,10 +281,6 @@ use the "nix" feature of the "%{crate}" crate. %package -n %{name}+opendal-devel Summary: %{summary} BuildArch: noarch -Provides: crate(sccache/opendal) = 0.7.4 -Requires: (crate(opendal/default) >= 0.40.0 with crate(opendal/default) < 0.41.0~) -Requires: cargo -Requires: crate(sccache) = 0.7.4 %description -n %{name}+opendal-devel %{_description} @@ -335,10 +293,6 @@ use the "opendal" feature of the "%{crate}" crate. %package -n %{name}+openssl-devel Summary: %{summary} BuildArch: noarch -Provides: crate(sccache/openssl) = 0.7.4 -Requires: (crate(openssl/default) >= 0.10.55 with crate(openssl/default) < 0.11.0~) -Requires: cargo -Requires: crate(sccache) = 0.7.4 %description -n %{name}+openssl-devel %{_description} @@ -348,16 +302,21 @@ use the "openssl" feature of the "%{crate}" crate. %files -n %{name}+openssl-devel %ghost %{crate_instdir}/Cargo.toml +%package -n %{name}+oss-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+oss-devel %{_description} + +This package contains library source intended for building other packages which +use the "oss" feature of the "%{crate}" crate. + +%files -n %{name}+oss-devel +%ghost %{crate_instdir}/Cargo.toml + %package -n %{name}+redis-devel Summary: %{summary} BuildArch: noarch -Provides: crate(sccache/redis) = 0.7.4 -Requires: (crate(opendal/default) >= 0.40.0 with crate(opendal/default) < 0.41.0~) -Requires: (crate(opendal/services-redis) >= 0.40.0 with crate(opendal/services-redis) < 0.41.0~) -Requires: (crate(opendal/services-redis-rustls) >= 0.40.0 with crate(opendal/services-redis-rustls) < 0.41.0~) -Requires: cargo -Requires: crate(sccache) = 0.7.4 -Requires: crate(sccache/url) = 0.7.4 %description -n %{name}+redis-devel %{_description} @@ -370,10 +329,6 @@ use the "redis" feature of the "%{crate}" crate. %package -n %{name}+reqsign-devel Summary: %{summary} BuildArch: noarch -Provides: crate(sccache/reqsign) = 0.7.4 -Requires: (crate(reqsign/default) >= 0.14.1 with crate(reqsign/default) < 0.15.0~) -Requires: cargo -Requires: crate(sccache) = 0.7.4 %description -n %{name}+reqsign-devel %{_description} @@ -386,15 +341,6 @@ use the "reqsign" feature of the "%{crate}" crate. %package -n %{name}+reqwest-devel Summary: %{summary} BuildArch: noarch -Provides: crate(sccache/reqwest) = 0.7.4 -Requires: (crate(reqwest/blocking) >= 0.11.0 with crate(reqwest/blocking) < 0.12.0~) -Requires: (crate(reqwest/default) >= 0.11.0 with crate(reqwest/default) < 0.12.0~) -Requires: (crate(reqwest/json) >= 0.11.0 with crate(reqwest/json) < 0.12.0~) -Requires: (crate(reqwest/rustls-tls) >= 0.11.0 with crate(reqwest/rustls-tls) < 0.12.0~) -Requires: (crate(reqwest/stream) >= 0.11.0 with crate(reqwest/stream) < 0.12.0~) -Requires: (crate(reqwest/trust-dns) >= 0.11.0 with crate(reqwest/trust-dns) < 0.12.0~) -Requires: cargo -Requires: crate(sccache) = 0.7.4 %description -n %{name}+reqwest-devel %{_description} @@ -407,11 +353,6 @@ use the "reqwest" feature of the "%{crate}" crate. %package -n %{name}+rouille-devel Summary: %{summary} BuildArch: noarch -Provides: crate(sccache/rouille) = 0.7.4 -Requires: (crate(rouille) >= 3.6.0 with crate(rouille) < 4.0.0~) -Requires: (crate(rouille/ssl) >= 3.6.0 with crate(rouille/ssl) < 4.0.0~) -Requires: cargo -Requires: crate(sccache) = 0.7.4 %description -n %{name}+rouille-devel %{_description} @@ -424,11 +365,6 @@ use the "rouille" feature of the "%{crate}" crate. %package -n %{name}+s3-devel Summary: %{summary} BuildArch: noarch -Provides: crate(sccache/s3) = 0.7.4 -Requires: cargo -Requires: crate(sccache) = 0.7.4 -Requires: crate(sccache/opendal) = 0.7.4 -Requires: crate(sccache/reqsign) = 0.7.4 %description -n %{name}+s3-devel %{_description} @@ -441,10 +377,6 @@ use the "s3" feature of the "%{crate}" crate. %package -n %{name}+sha2-devel Summary: %{summary} BuildArch: noarch -Provides: crate(sccache/sha2) = 0.7.4 -Requires: (crate(sha2/default) >= 0.10.6 with crate(sha2/default) < 0.11.0~) -Requires: cargo -Requires: crate(sccache) = 0.7.4 %description -n %{name}+sha2-devel %{_description} @@ -457,10 +389,6 @@ use the "sha2" feature of the "%{crate}" crate. %package -n %{name}+syslog-devel Summary: %{summary} BuildArch: noarch -Provides: crate(sccache/syslog) = 0.7.4 -Requires: (crate(syslog/default) >= 6.0.0 with crate(syslog/default) < 7.0.0~) -Requires: cargo -Requires: crate(sccache) = 0.7.4 %description -n %{name}+syslog-devel %{_description} @@ -470,29 +398,9 @@ use the "syslog" feature of the "%{crate}" crate. %files -n %{name}+syslog-devel %ghost %{crate_instdir}/Cargo.toml -%{dnl ## BEGIN: multiline comment -%package -n %{name}+trust-dns-resolver-devel -Summary: %{summary} -BuildArch: noarch -Provides: crate(sccache/trust-dns-resolver) = 0.7.4 -Requires: cargo -Requires: crate(sccache) = 0.7.4 - -%description -n %{name}+trust-dns-resolver-devel %{_description} - -This package contains library source intended for building other packages which -use the "trust-dns-resolver" feature of the "%{crate}" crate. - -%files -n %{name}+trust-dns-resolver-devel -%ghost %{crate_instdir}/Cargo.toml -} ## END OF multiline comment - %package -n %{name}+unstable-devel Summary: %{summary} BuildArch: noarch -Provides: crate(sccache/unstable) = 0.7.4 -Requires: cargo -Requires: crate(sccache) = 0.7.4 %description -n %{name}+unstable-devel %{_description} @@ -505,10 +413,6 @@ use the "unstable" feature of the "%{crate}" crate. %package -n %{name}+url-devel Summary: %{summary} BuildArch: noarch -Provides: crate(sccache/url) = 0.7.4 -Requires: (crate(url/default) >= 2.0.0 with crate(url/default) < 3.0.0~) -Requires: cargo -Requires: crate(sccache) = 0.7.4 %description -n %{name}+url-devel %{_description} @@ -521,9 +425,6 @@ use the "url" feature of the "%{crate}" crate. %package -n %{name}+vendored-openssl-devel Summary: %{summary} BuildArch: noarch -Provides: crate(sccache/vendored-openssl) = 0.7.4 -Requires: cargo -Requires: crate(sccache) = 0.7.4 %description -n %{name}+vendored-openssl-devel %{_description} @@ -536,10 +437,6 @@ use the "vendored-openssl" feature of the "%{crate}" crate. %package -n %{name}+version-compare-devel Summary: %{summary} BuildArch: noarch -Provides: crate(sccache/version-compare) = 0.7.4 -Requires: (crate(version-compare/default) >= 0.1.1 with crate(version-compare/default) < 0.2.0~) -Requires: cargo -Requires: crate(sccache) = 0.7.4 %description -n %{name}+version-compare-devel %{_description} @@ -552,10 +449,6 @@ use the "version-compare" feature of the "%{crate}" crate. %package -n %{name}+webdav-devel Summary: %{summary} BuildArch: noarch -Provides: crate(sccache/webdav) = 0.7.4 -Requires: cargo -Requires: crate(sccache) = 0.7.4 -Requires: crate(sccache/opendal) = 0.7.4 %description -n %{name}+webdav-devel %{_description} diff --git a/anda/apps/sccache/sccache-fix-metadata-auto.diff b/anda/apps/sccache/sccache-fix-metadata-auto.diff index 180e3bf4f9..f5e1e6d2aa 100644 --- a/anda/apps/sccache/sccache-fix-metadata-auto.diff +++ b/anda/apps/sccache/sccache-fix-metadata-auto.diff @@ -1,6 +1,6 @@ ---- sccache-0.7.6/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ sccache-0.7.6/Cargo.toml 2024-02-02T06:05:53.548100+00:00 -@@ -378,11 +378,3 @@ +--- sccache-0.8.1/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ sccache-0.8.1/Cargo.toml 2024-07-10T16:31:31.705674+00:00 +@@ -403,13 +403,3 @@ [target."cfg(unix)".dependencies.daemonize] version = "0.5" @@ -11,4 +11,6 @@ - "handleapi", - "stringapiset", - "winnls", +- "processenv", +- "std", -] 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/elementary-sideload/elementary-sideload.spec b/anda/desktops/elementary/elementary-sideload/elementary-sideload.spec index 020a57a470..e7fb07e03c 100644 --- a/anda/desktops/elementary/elementary-sideload/elementary-sideload.spec +++ b/anda/desktops/elementary/elementary-sideload/elementary-sideload.spec @@ -3,8 +3,8 @@ Name: elementary-sideload Summary: Sideload flatpaks on Pantheon -Version: 6.2.1 -Release: 1%{?dist} +Version: 6.2.2 +Release: 1%?dist License: GPL-3.0-or-later URL: https://github.com/elementary/sideload 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/anda.hcl b/anda/desktops/elementary/pantheon-tweaks/anda.hcl deleted file mode 100644 index 2196ed54d6..0000000000 --- a/anda/desktops/elementary/pantheon-tweaks/anda.hcl +++ /dev/null @@ -1,5 +0,0 @@ -project pkg { - rpm { - spec = "pantheon-tweaks.spec" - } -} diff --git a/anda/desktops/elementary/pantheon-tweaks/pantheon-tweaks.spec b/anda/desktops/elementary/pantheon-tweaks/pantheon-tweaks.spec deleted file mode 100644 index 51dc48a032..0000000000 --- a/anda/desktops/elementary/pantheon-tweaks/pantheon-tweaks.spec +++ /dev/null @@ -1,37 +0,0 @@ -Name: pantheon-tweaks -Version: 2.0.0 -Release: 1%?dist -Summary: A system settings panel for the Pantheon desktop environment -License: GPL-3.0 -URL: https://github.com/pantheon-tweaks/pantheon-tweaks -Source0: %{url}/archive/refs/tags/%{version}.tar.gz -BuildRequires: vala switchboard-devel pkgconfig(gee-0.8) pkgconfig(glib-2.0) -BuildRequires: granite-devel >= 6.0.0 pkgconfig(gtk+-3.0) meson vala -Requires: gtk3 granite - -%description -A system settings panel for the Pantheon Desktop that -lets you easily and safely customise your desktop's appearance. - -%prep -%autosetup - -%build -%meson -%meson_build - -%install -%meson_install - -%files -%doc README.md -%license COPYING -/usr/lib64/switchboard/personal/libpantheon-tweaks.so -%{_datadir}/icons/hicolor/32x32/categories/preferences-desktop-tweaks.svg -%{_datadir}/locale/*/LC_MESSAGES/pantheon-tweaks-plug.mo -%{_datadir}/metainfo/pantheon-tweaks.metainfo.xml - - -%changelog -* Tue Jan 17 2023 windowsboy111 - 1.0.4-1 -- Initial package diff --git a/anda/desktops/elementary/pantheon-tweaks/update.rhai b/anda/desktops/elementary/pantheon-tweaks/update.rhai deleted file mode 100644 index feadafd1ef..0000000000 --- a/anda/desktops/elementary/pantheon-tweaks/update.rhai +++ /dev/null @@ -1 +0,0 @@ -rpm.version(gh("pantheon-tweaks/pantheon-tweaks")); 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..3e7f2802ea 100644 --- a/anda/desktops/elementary/switchboard-plug-tweaks/switchboard-plug-tweaks.spec +++ b/anda/desktops/elementary/switchboard-plug-tweaks/switchboard-plug-tweaks.spec @@ -2,16 +2,20 @@ %global plug_type personal %global plug_name pantheon-tweaks +%global app io.github.pantheon_tweaks.pantheon-tweaks Name: switchboard-plug-tweaks Summary: Switchboard Tweaks Plug -Version: 2.0.0 -Release: 1%?dist +Version: 2.0.2 +Release: 2%?dist License: GPL-3.0-or-later URL: https://github.com/pantheon-tweaks/pantheon-tweaks Source0: %{url}/archive/%{version}/%{plug_name}-%{version}.tar.gz +Provides: pantheon-tweaks = %version-%release +Obsoletes: pantheon-tweaks < 2.0.2-2 + BuildRequires: gcc BuildRequires: gettext BuildRequires: libappstream-glib @@ -22,7 +26,7 @@ BuildRequires: pkgconfig(gee-0.8) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(granite) >= 6.0.0 BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(switchboard-2.0) +BuildRequires: pkgconfig(switchboard-3) Requires: switchboard%{?_isa} @@ -63,28 +67,22 @@ de trabalho. %install %meson_install -%find_lang %{plug_name}-plug +%find_lang %{plug_name} # remove the specified stock icon from metainfo (invalid in libappstream-glib) -sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{plug_name}.metainfo.xml +sed -i '/icon type="stock"/d' %buildroot%_metainfodir/%app.metainfo.xml %check -appstream-util validate-relax --nonet \ - %{buildroot}/%{_datadir}/metainfo/%{plug_name}.metainfo.xml +appstream-util validate-relax --nonet %buildroot%_metainfodir/%app.metainfo.xml -%files -f %{plug_name}-plug.lang +%files -f %{plug_name}.lang %license COPYING %doc README.md %doc AUTHORS %doc CONTRIBUTORS -%{_libdir}/switchboard/%{plug_type}/lib%{plug_name}.so - -%{_datadir}/metainfo/%{plug_name}.metainfo.xml -%{_datadir}/icons/hicolor/*/categories/preferences-*.svg - - -%changelog -* Sat Oct 15 2022 windowsboy111 -- Repackaged for Terra +%_bindir/pantheon-tweaks +%_datadir/applications/%app.desktop +%_iconsdir/hicolor/*/apps/%app.svg +%_metainfodir/io.github.pantheon_tweaks.pantheon-tweaks.metainfo.xml 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..40fd250938 100644 --- a/anda/desktops/elementary/switchboard-plug-wacom/switchboard-plug-wacom.spec +++ b/anda/desktops/elementary/switchboard-plug-wacom/switchboard-plug-wacom.spec @@ -4,11 +4,11 @@ %global plug_type hardware %global plug_name wacom -%global plug_rdnn io.elementary.switchboard.wacom +%global plug_rdnn io.elementary.settings.wacom 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 @@ -25,7 +25,7 @@ BuildRequires: pkgconfig(libwacom) BuildRequires: pkgconfig(gudev-1.0) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xi) -BuildRequires: switchboard-devel +BuildRequires: pkgconfig(switchboard-3) Requires: switchboard%{?_isa} Supplements: switchboard%{?_isa} @@ -45,22 +45,18 @@ Supplements: switchboard%{?_isa} %install %meson_install -%find_lang %{plug_name}-plug +%find_lang %{plug_rdnn} %check appstream-util validate-relax --nonet \ - %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml + %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml -%files -f %{plug_name}-plug.lang +%files -f %{plug_rdnn}.lang %doc README.md %license COPYING -%{_libdir}/switchboard/%{plug_type}/lib%{plug_name}.so +%{_libdir}/switchboard-3/%{plug_type}/lib%{plug_name}.so -%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml - -%changelog -* Tue Jun 13 2023 windowsboy111 - 1.0.1-1 -- Initial package. +%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml 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 58986db949..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 d1d57b7d01d33d1afd3c6ba867d420c72c468b2d +%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-app-launch/lomiri-app-launch.spec b/anda/desktops/lomiri-unity/lomiri-app-launch/lomiri-app-launch.spec index c3b609e136..956b8a30aa 100644 --- a/anda/desktops/lomiri-unity/lomiri-app-launch/lomiri-app-launch.spec +++ b/anda/desktops/lomiri-unity/lomiri-app-launch/lomiri-app-launch.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-app-launch -%global commit 99fa99c6e8af868f64dbfdb973eebeb2ca3ad14a +%global commit af441bdb31bb76b207119a8c91eef3fa93c0c078 %forgemeta Name: lomiri-app-launch 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-schemas/lomiri-schemas.spec b/anda/desktops/lomiri-unity/lomiri-schemas/lomiri-schemas.spec index b52ec8bf6b..d865bdefab 100644 --- a/anda/desktops/lomiri-unity/lomiri-schemas/lomiri-schemas.spec +++ b/anda/desktops/lomiri-unity/lomiri-schemas/lomiri-schemas.spec @@ -1,10 +1,10 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-schemas -%global commit 6acdde9e890685bd5a5d6fbd4446d9e8b3e6c698 +%global commit 814c0b16b3753fef918bfe624710cb4809a690fa %forgemeta Name: lomiri-schemas -Version: 0.1.4 -Release: 1%{?dist} +Version: 0.1.5 +Release: 1%?dist Summary: Configuration schemas for lomiri License: LGPL-2.0-or-later URL: https://gitlab.com/ubports/development/core/lomiri-schemas 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..72e93f586d 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,9 +1,9 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings -%global commit 557b09902c59eae015767367ef5a97c5c47b67fb +%global commit b24c149b46e31c693c28978028493630bc86c799 %forgemeta Name: lomiri-system-settings -Version: 1.1.0 +Version: 1.2.0 Release: 1%?dist Summary: The system settings application for Lomiri License: GPLv3 diff --git a/anda/desktops/lomiri-unity/lomiri-ui-toolkit/lomiri-ui-toolkit.spec b/anda/desktops/lomiri-unity/lomiri-ui-toolkit/lomiri-ui-toolkit.spec index 655cd9ba3f..7fac90dc39 100644 --- a/anda/desktops/lomiri-unity/lomiri-ui-toolkit/lomiri-ui-toolkit.spec +++ b/anda/desktops/lomiri-unity/lomiri-ui-toolkit/lomiri-ui-toolkit.spec @@ -1,10 +1,10 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri-ui-toolkit -%global commit 28178b0be8fc2c66934da155dee1c6238ecc98c0 +%global commit 8f490672f9853278b0aec6435a68d56b9eaf8207 %forgemeta Name: lomiri-ui-toolkit -Version: 1.3.5012 -Release: 1%{?dist} +Version: 1.3.5100 +Release: 1%?dist Summary: QML components to ease the creation of beautiful applications in QML for Lomiri License: LGPL-3.0 diff --git a/anda/desktops/lomiri-unity/lomiri-ui-toolkit/update.rhai b/anda/desktops/lomiri-unity/lomiri-ui-toolkit/update.rhai index 57f833b80f..7b8f49ae38 100644 --- a/anda/desktops/lomiri-unity/lomiri-ui-toolkit/update.rhai +++ b/anda/desktops/lomiri-unity/lomiri-ui-toolkit/update.rhai @@ -1,4 +1,5 @@ rpm.version(gitlab_tag("19057685")); if rpm.changed() { - rpm.global("commit", gitlab_commit("19057685")); + rpm.global("commit", gitlab_commit("19057685", "main")); + rpm.release(); } 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 36d31d3af9..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.1 +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..ce8ee77548 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.91.1.24193 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..a7a721c352 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.2 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..104c1cd2f3 --- /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("\nversion = \"([.\\d]+)\"\n", gh_rawfile("zed-industries/zed", "main", "crates/zed/Cargo.toml"), 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..a17dfec8da --- /dev/null +++ b/anda/devs/zed/preview/update.rhai @@ -0,0 +1,14 @@ +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 + tag.crop(1); // remove "v" + rpm.global("ver", tag); + break; + if rpm.changed() { + rpm.release(); + } +} diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec new file mode 100644 index 0000000000..45bf534d43 --- /dev/null +++ b/anda/devs/zed/preview/zed-preview.spec @@ -0,0 +1,91 @@ +%bcond_without check +%global debug_package %{nil} +%global ver 0.144.2 + +%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-engine +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/devs/zed/stable/anda.hcl b/anda/devs/zed/stable/anda.hcl new file mode 100644 index 0000000000..1291962830 --- /dev/null +++ b/anda/devs/zed/stable/anda.hcl @@ -0,0 +1,8 @@ +project pkg { + rpm { + spec = "zed.spec" + } + labels { + large = 1 + } +} diff --git a/anda/devs/zed/stable/update.rhai b/anda/devs/zed/stable/update.rhai new file mode 100644 index 0000000000..86949414fa --- /dev/null +++ b/anda/devs/zed/stable/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("zed-industries/zed")); diff --git a/anda/devs/zed/stable/v0.143.6.tar.gz b/anda/devs/zed/stable/v0.143.6.tar.gz new file mode 100644 index 0000000000..79541bec59 Binary files /dev/null and b/anda/devs/zed/stable/v0.143.6.tar.gz differ diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec new file mode 100644 index 0000000000..22549b080a --- /dev/null +++ b/anda/devs/zed/stable/zed.spec @@ -0,0 +1,93 @@ +%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 + +Name: zed +Version: 0.143.7 +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/refs/tags/v%{version}.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-engine +BuildRequires: libzstd-devel +BuildRequires: perl-FindBin +BuildRequires: perl-IPC-Cmd +BuildRequires: perl-File-Compare +BuildRequires: perl-File-Copy +BuildRequires: perl-lib +BuildRequires: vulkan-loader +BuildRequires: libcurl-devel + +%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}-%{version} -p1 +%cargo_prep_online + +export DO_STARTUP_NOTIFY="true" +export APP_ID="%app_id" +export APP_ICON="%app_id" +export APP_NAME="Zed Editor" +export APP_CLI="zed" +export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed from Terra." +export ZED_RELEASE_CHANNEL=stable +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 from Terra." +echo "stable" > 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.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..4c166d516e 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.16.0 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/manrope/update.rhai b/anda/fonts/manrope/update.rhai.bak similarity index 100% rename from anda/fonts/manrope/update.rhai rename to anda/fonts/manrope/update.rhai.bak 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 c4a087484d..53120c2047 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.713.0 %global debug_package %{nil} %define __strip /bin/true Name: osu-lazer -Version: 2024.521.2 +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 265ebaeb42..56dbed40cd 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 0ecdceccd2ea7432ae6810a7e41afe848ccc452f +%global commit 2df5d4012c3822171172ca380d2429e5d836aaf4 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f -%global quazip_commit 6117161af08e366c37499895b00ef62f93adc345 -%global tomlplusplus_commit 7eb2ffcc09f8e9890dc0b77ff8ab00fc53b1f2b8 -%global commit_date 20240521 +%global commit_date 20240714 %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..abaa049d6a 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.13.1 Release: 1%?dist Summary: The Crystal Programming Language License: Apache-2.0 diff --git a/anda/langs/crystal/crystal/update.rhai b/anda/langs/crystal/crystal/update.rhai index 06671bca2e..f42bf45c60 100644 --- a/anda/langs/crystal/crystal/update.rhai +++ b/anda/langs/crystal/crystal/update.rhai @@ -1,2 +1,9 @@ -let html = get("https://crystal-lang.org/"); -rpm.version(find("Latest release: (.+?)", html, 1)) +let v = gh("crystal-lang/crystal"); +let url = `https://github.com/crystal-lang/crystal/releases/download/${v}/crystal-${v}-1-linux-x86_64-bundled.tar.gz`; +try { + find(url, get(`https://github.com/crystal-lang/crystal/releases/tag/${v}`), 0); + rpm.version(v); +} except { + print(`crystal: ${v} (waiting for bundle)`); + terminate(); +} 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/albius/anda.hcl b/anda/langs/go/albius/anda.hcl index c7692fe7ce..6620202780 100644 --- a/anda/langs/go/albius/anda.hcl +++ b/anda/langs/go/albius/anda.hcl @@ -2,4 +2,7 @@ project pkg { rpm { spec = "albius.spec" } + labels { + nightly = 1 + } } diff --git a/anda/langs/go/albius/update.rhai b/anda/langs/go/albius/update.rhai index 87582dfdbd..7bb7a31024 100644 --- a/anda/langs/go/albius/update.rhai +++ b/anda/langs/go/albius/update.rhai @@ -1 +1,7 @@ -rpm.version(gh("Vanilla-OS/Albius")); +if filters.contains("nightly") { + rpm.global("commit", gh_commit("Vanilla-OS/Albius")); + if rpm.changed() { + rpm.global("commit_date", date()); + rpm.release(); + } +} 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 7a30c879b7..fce3fc1e08 100644 --- a/anda/langs/kotlin/kotlin-native/kotlin-native.spec +++ b/anda/langs/kotlin/kotlin-native/kotlin-native.spec @@ -9,7 +9,7 @@ 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/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 d621182a56..5316b31c93 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 b838d3ece1e8530f355b5078b2daa96ac01acab5 +%global commit f6aeca5765bb48abc6efbe35e4ea6accf127d072 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global ver 2.1.1 -%global commit_date 20240521 +%global ver 2.1.9 +%global commit_date 20240713 %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/pillow-heif/anda.hcl b/anda/langs/python/pillow-heif/anda.hcl new file mode 100644 index 0000000000..257479e388 --- /dev/null +++ b/anda/langs/python/pillow-heif/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "python3-pillow-heif.spec" + } +} diff --git a/anda/langs/python/pillow-heif/python3-pillow-heif.spec b/anda/langs/python/pillow-heif/python3-pillow-heif.spec new file mode 100644 index 0000000000..2390b8a1b4 --- /dev/null +++ b/anda/langs/python/pillow-heif/python3-pillow-heif.spec @@ -0,0 +1,115 @@ +%global py3_incdir %(RPM_BUILD_ROOT= %{python3} -Ic 'import sysconfig; print(sysconfig.get_path("include"))') + +%global srcname pillow-heif + +# Dependencies are missing to build the documentation +%bcond_with doc + +Name: python-%{srcname} +Version: 0.17.0 +Release: 0%{?dist} +Summary: Python library for working with HEIF images and plugin for Pillow + +License: BSD-3-Clause +URL: https://github.com/bigcat88/pillow_heif +Source0: https://github.com/bigcat88/pillow_heif/archive/refs/tags/v%{version}/pillow-heif-%{version}.tar.gz +Source1: test.py + +BuildRequires: gcc +BuildRequires: python%{python3_pkgversion}-pytest +BuildRequires: python%{python3_pkgversion} +BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: python%{python3_pkgversion}-setuptools +BuildRequires: python%{python3_pkgversion}-pillow-devel +BuildRequires: libheif-devel +%if %{with doc} +BuildRequires: make +BuildRequires: python%{python3_pkgversion}-sphinx +BuildRequires: python%{python3_pkgversion}-sphinx-copybutton +BuildRequires: python%{python3_pkgversion}-sphinx-issues +BuildRequires: python%{python3_pkgversion}-sphinx_rtd_theme +%endif + +%description +Python library for working with HEIF images and plugin for Pillow + +There are two subpackages: devel (development) and doc (documentation). + +%package -n python%{python3_pkgversion}-%{srcname} +Summary: Python library for working with HEIF images and plugin for Pillow +Requires: python%{python3_pkgversion}-pillow +Requires: libheif +%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}} + +%description -n python%{python3_pkgversion}-%{srcname} +Python library for working with HEIF images and plugin for Pillow + +There are two subpackages: devel (development) and doc (documentation). + +%package -n python%{python3_pkgversion}-%{srcname}-devel +Summary: Development files for %{srcname} +Requires: python%{python3_pkgversion}-devel, libheif-devel +Requires: python%{python3_pkgversion}-%{srcname}%{?_isa} = %{version}-%{release} +%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}-devel} + +%description -n python%{python3_pkgversion}-%{srcname}-devel +Development files for %{srcname}. + + +%package -n python%{python3_pkgversion}-%{srcname}-doc +Summary: Documentation for %{srcname} +BuildArch: noarch +Requires: python%{python3_pkgversion}-%{srcname} = %{version}-%{release} +%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}-doc} + +%description -n python%{python3_pkgversion}-%{srcname}-doc +Documentation for %{srcname}. + + +%prep +%autosetup -p1 -n pillow_heif-%{version} + + +%build +# Native build +%py3_build + +# Doc build +%if %{with doc} +PYTHONPATH=$(echo $PWD/build/lib.linux-*) make -C docs html BUILDDIR=_build_py3 SPHINXBUILD=sphinx-build-%python3_version +rm -f docs/_build_py3/html/.buildinfo +%endif + + +%install +# Native build +%py3_install + +%check +# Check Python 3 modules +cp %{SOURCE1} $(echo $PWD/build/lib.linux-*)/ +pushd build/lib.linux-* +PYTHONPATH=$PWD %{__python3} test.py +pytest pillow_heif && echo "Test done" +popd + +%files -n python%{python3_pkgversion}-%{srcname} +%doc README.md CHANGELOG.md +%license LICENSE.txt +%{python3_sitearch}/pillow_heif/ +%{python3_sitearch}/pillow_heif-%{version}-py%{python3_version}.egg-info/ +%{python3_sitearch}/_pillow_heif.*.so + +%files -n python%{python3_pkgversion}-%{srcname}-devel + +%if %{with doc} +%files -n python%{python3_pkgversion}-%{srcname}-doc +%doc docs/_build_py3/html +%endif + +%changelog +* Wed Jul 10 2024 Trung Lê <8@tle.id.au> - 0.17.0-0 +- New upstream release + +* Thu Jun 27 2024 Trung Lê <8@tle.id.au> - 0.16.0-1 +- Initial RPM package diff --git a/anda/langs/python/pillow-heif/test.py b/anda/langs/python/pillow-heif/test.py new file mode 100644 index 0000000000..099f11044d --- /dev/null +++ b/anda/langs/python/pillow-heif/test.py @@ -0,0 +1,2 @@ +import pillow_heif; +print(pillow_heif.libheif_info()); diff --git a/anda/langs/python/pillow-heif/update.rhai b/anda/langs/python/pillow-heif/update.rhai new file mode 100644 index 0000000000..6db9721b57 --- /dev/null +++ b/anda/langs/python/pillow-heif/update.rhai @@ -0,0 +1 @@ +rpm.version(pypi("pillow-heif")); 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..57d53f2a54 100644 --- a/anda/langs/python/ruff/python3-ruff.spec +++ b/anda/langs/python/ruff/python3-ruff.spec @@ -1,12 +1,12 @@ %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 URL: https://beta.ruff.rs/ -Source0: https://github.com/astral-sh/ruff/archive/refs/tags/v%{version}.tar.gz +Source0: https://github.com/astral-sh/ruff/archive/refs/tags/%{version}.tar.gz BuildRequires: python3-installer python3-pip maturin cargo Provides: python3.11dist(ruff) = %{version} 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..00078064f3 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.7.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..e79e271cde 100644 --- a/anda/langs/rust/nushell/nushell.spec +++ b/anda/langs/rust/nushell/nushell.spec @@ -1,22 +1,23 @@ Name: nushell -Version: 0.93.0 +Version: 0.95.0 Release: 1%?dist Summary: A new type of shell License: MIT URL: https://www.nushell.sh/ -Source0: https://github.com/nushell/nushell/archive/refs/tags/%version.tar.gz -BuildRequires: anda-srpm-macros rust-packaging openssl-devel +BuildRequires: anda-srpm-macros rust-packaging git-core +BuildRequires: openssl-devel-engine Requires: glibc openssl zlib %description %summary. %prep -%autosetup +rm -rf ./* +git clone https://github.com/nushell/nushell -b %version --depth 1 . %cargo_prep_online %build -%{cargo_build -f extra,dataframe} --workspace +%{cargo_build} --workspace %install mkdir -p %buildroot%_bindir diff --git a/anda/langs/rust/oxipng/oxipng-fix-metadata-auto.diff b/anda/langs/rust/oxipng/oxipng-fix-metadata-auto.diff index e4fde1a2c2..5e4fb32163 100644 --- a/anda/langs/rust/oxipng/oxipng-fix-metadata-auto.diff +++ b/anda/langs/rust/oxipng/oxipng-fix-metadata-auto.diff @@ -1,16 +1,16 @@ ---- oxipng-9.0.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ oxipng-9.0.0/Cargo.toml 2023-10-30T06:36:01.294365+00:00 -@@ -116,7 +116,6 @@ +--- oxipng-9.1.2/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ oxipng-9.1.2/Cargo.toml 2024-07-13T07:08:09.478330+00:00 +@@ -150,7 +150,6 @@ [features] binary = [ - "clap", -- "glob", - "env_logger", + "dep:clap", +- "dep:glob", + "dep:env_logger", ] default = [ -@@ -133,13 +132,10 @@ - ] - sanity-checks = ["image"] +@@ -169,13 +168,10 @@ + sanity-checks = ["dep:image"] + zopfli = ["dep:zopfli"] -[target."cfg(windows)".dependencies.glob] -version = "0.3.1" diff --git a/anda/langs/rust/oxipng/rust-oxipng.spec b/anda/langs/rust/oxipng/rust-oxipng.spec index 35635f792c..aaa8bf1f3d 100644 --- a/anda/langs/rust/oxipng/rust-oxipng.spec +++ b/anda/langs/rust/oxipng/rust-oxipng.spec @@ -1,11 +1,13 @@ -# Generated by rust2rpm 25 +# Generated by rust2rpm 26 %bcond_without check +# don't mangle shebangs +%global __brp_mangle_shebangs %{nil} %global crate oxipng Name: rust-oxipng -Version: 9.1.1 -Release: 1%?dist +Version: 9.1.2 +Release: %autorelease Summary: Lossless PNG compression optimizer License: MIT @@ -77,42 +79,6 @@ use the "binary" feature of the "%{crate}" crate. %files -n %{name}+binary-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+clap-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+clap-devel %{_description} - -This package contains library source intended for building other packages which -use the "clap" feature of the "%{crate}" crate. - -%files -n %{name}+clap-devel -%ghost %{crate_instdir}/Cargo.toml - -%package -n %{name}+crossbeam-channel-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+crossbeam-channel-devel %{_description} - -This package contains library source intended for building other packages which -use the "crossbeam-channel" feature of the "%{crate}" crate. - -%files -n %{name}+crossbeam-channel-devel -%ghost %{crate_instdir}/Cargo.toml - -%package -n %{name}+env_logger-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+env_logger-devel %{_description} - -This package contains library source intended for building other packages which -use the "env_logger" feature of the "%{crate}" crate. - -%files -n %{name}+env_logger-devel -%ghost %{crate_instdir}/Cargo.toml - %package -n %{name}+filetime-devel Summary: %{summary} BuildArch: noarch @@ -137,18 +103,6 @@ use the "freestanding" feature of the "%{crate}" crate. %files -n %{name}+freestanding-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+image-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+image-devel %{_description} - -This package contains library source intended for building other packages which -use the "image" feature of the "%{crate}" crate. - -%files -n %{name}+image-devel -%ghost %{crate_instdir}/Cargo.toml - %package -n %{name}+parallel-devel Summary: %{summary} BuildArch: noarch @@ -161,18 +115,6 @@ use the "parallel" feature of the "%{crate}" crate. %files -n %{name}+parallel-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+rayon-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+rayon-devel %{_description} - -This package contains library source intended for building other packages which -use the "rayon" feature of the "%{crate}" crate. - -%files -n %{name}+rayon-devel -%ghost %{crate_instdir}/Cargo.toml - %package -n %{name}+sanity-checks-devel Summary: %{summary} BuildArch: noarch 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/apparmor/apparmor.spec b/anda/lib/apparmor/apparmor.spec index 0f2fb2c1be..aea1c5c9e9 100644 --- a/anda/lib/apparmor/apparmor.spec +++ b/anda/lib/apparmor/apparmor.spec @@ -3,7 +3,7 @@ %bcond_with tests Name: apparmor -Version: 4.0.0~alpha3 +Version: 4.0.1 Release: 2%{?dist} Summary: AppArmor userspace components @@ -11,8 +11,8 @@ Summary: AppArmor userspace components %global normver %(echo %version | sed 's/~/-/') License: GPL-2.0 -URL: https://launchpad.net/apparmor -Source0: %{url}/%{baseversion}/%normver/+download/%{name}-%{version}.tar.gz +URL: https://gitlab.com/apparmor/apparmor +Source0: %url/-/archive/v%version/apparmor-v%version.tar.gz Source1: apparmor.preset Patch01: 0001-fix-avahi-daemon-authselect-denial-in-fedora.patch @@ -32,6 +32,7 @@ BuildRequires: gettext BuildRequires: pam-devel BuildRequires: httpd-devel BuildRequires: systemd-rpm-macros +BuildRequires: autoconf-archive BuildRequires: gawk BuildRequires: which %if %{with tests} @@ -138,7 +139,7 @@ confinement policies when running virtual hosts in the webserver by using the changehat abilities exposed through libapparmor. %prep -%autosetup -p1 -n %{name}-%{version} +%autosetup -p1 -n %name-v%version sed -i 's/@VERSION@/%normver/g' libraries/libapparmor/swig/python/setup.py.in sed -i 's/${VERSION}/%normver/g' utils/Makefile @@ -265,7 +266,6 @@ make -C utils check %doc parser/README %doc parser/*.[1-9].html %doc common/apparmor.css -%doc parser/techdoc.pdf %{_sbindir}/apparmor_parser %{_bindir}/aa-enabled %{_bindir}/aa-exec @@ -276,8 +276,8 @@ make -C utils check %{_presetdir}/70-apparmor.preset %{_prefix}/lib/apparmor %dir %{_sysconfdir}/apparmor +%config(noreplace) %{_sysconfdir}/apparmor.d/ %config(noreplace) %{_sysconfdir}/apparmor/parser.conf -%{_sharedstatedir}/apparmor %{_mandir}/man1/aa-enabled.1.gz %{_mandir}/man1/aa-exec.1.gz %{_mandir}/man1/aa-features-abi.1.gz diff --git a/anda/lib/apparmor/update.rhai b/anda/lib/apparmor/update.rhai index 74a3f5d8b4..f8d282a3d5 100644 --- a/anda/lib/apparmor/update.rhai +++ b/anda/lib/apparmor/update.rhai @@ -1,4 +1 @@ -let html = get("https://launchpad.net/apparmor"); -let v = find("Latest version is ([\\d.\\w\\-]+)", html, 1); -v.replace('-', '~'); -rpm.version(v); +rpm.version(gitlab_tag("4484878")); 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..9010b99461 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 cb164927417f22811c74cd8678ed4a5ab7cb80ba +%global ver 1.8.33 %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..8a3d3b8216 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.8 Release: 1%?dist Summary: The reference implementation of Sass, written in Dart License: MIT diff --git a/anda/system/avstplg/avstplg.spec b/anda/system/avstplg/avstplg.spec index c5bd26eec6..4c5b15e060 100644 --- a/anda/system/avstplg/avstplg.spec +++ b/anda/system/avstplg/avstplg.spec @@ -1,5 +1,5 @@ -%global commit 7cb289b6466b662fdf9f7d7ccc9f3c08a7dc0cac -%global commit_date 20240219 +%global commit e1176e63ccbee51ab59fdb8afaed2bf5af8427d1 +%global commit_date 20240711 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global debug_package %{nil} %define __os_install_post %{nil} @@ -13,8 +13,8 @@ Summary: Set of tools designed to help develop and debug software and fir URL: https://github.com/thesofproject/avsdk Source0: https://github.com/thesofproject/avsdk/archive/%commit/avsdk-%commit.tar.gz -Requires: dotnet-runtime-6.0 -BuildRequires: dotnet-sdk-6.0 make +Requires: dotnet-runtime-8.0 +BuildRequires: dotnet-sdk-8.0 make %description Set of tools designed to help develop and debug software and firmware on Intel platforms with AudioDSP onboard. diff --git a/anda/system/cros-keyboard-map/cros-keyboard-map.spec b/anda/system/cros-keyboard-map/cros-keyboard-map.spec index ff4a2c9467..4b8c2f7801 100644 --- a/anda/system/cros-keyboard-map/cros-keyboard-map.spec +++ b/anda/system/cros-keyboard-map/cros-keyboard-map.spec @@ -1,5 +1,5 @@ -%global commit 1889baff16c08ddf2382d95ca18caa37001d5971 -%global commit_date 20240418 +%global commit 5f56dd60b256061a036e5f5b494da570a299cdee +%global commit_date 20240708 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global debug_package %{nil} %define __os_install_post %{nil} diff --git a/anda/system/limine/limine.spec b/anda/system/limine/limine.spec index 8c34365102..fc19d9cf02 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.10.2 Release: 1%?dist Summary: Modern, advanced, portable, multiprotocol bootloader License: BSD-2-Clause diff --git a/anda/system/nvidia-patch/anda.hcl b/anda/system/nvidia-patch/anda.hcl index afb6eef2a1..96eebb3875 100644 --- a/anda/system/nvidia-patch/anda.hcl +++ b/anda/system/nvidia-patch/anda.hcl @@ -1,6 +1,8 @@ project "pkg" { rpm { spec = "nvidia-patch.spec" - nightly = "1" } + labels { + nightly = "1" + } } \ No newline at end of file diff --git a/anda/system/nvidia-patch/nvidia-patch.spec b/anda/system/nvidia-patch/nvidia-patch.spec index e8f83e7901..fd5a2efb02 100644 --- a/anda/system/nvidia-patch/nvidia-patch.spec +++ b/anda/system/nvidia-patch/nvidia-patch.spec @@ -1,7 +1,7 @@ %global debug_package %{nil} -%global commit 564c0661a942f7163cb2cfa6cb1b14b4bcff3a30 +%global commit 87fe7b874b3db1489d7313c667130ef22c445bd7 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20240218 +%global commit_date 20240711 %global patches %{_datadir}/src/nvidia-patch diff --git a/anda/system/submarine/submarine.spec b/anda/system/submarine/submarine.spec index d20fb4a0c9..f6efb37fee 100644 --- a/anda/system/submarine/submarine.spec +++ b/anda/system/submarine/submarine.spec @@ -3,14 +3,18 @@ %elifarch aarch64 %global arch arm64 %endif +# do not strip binaries +%define __strip /bin/true +%define debug_package %{nil} + Name: submarine Version: 0.2.1 -Release: 1%?dist +Release: 2%?dist Summary: Experimental bootloader for ChomeOS's depthcharge License: GPL-3.0 URL: https://github.com/FyraLabs/submarine -BuildRequires: make gcc flex bison elfutils-devel parted vboot-utils golang xz bc openssl-devel git depthcharge-tools +BuildRequires: make gcc flex bison elfutils-devel parted vboot-utils golang xz bc openssl-devel git depthcharge-tools uboot-tools %description An experimental bootloader for ChomeOS's depthcharge. @@ -20,18 +24,33 @@ Submarine provides a minimal Linux environmemt that lives in a small partition (or a different system if you're brave.) %prep -go install github.com/u-root/u-root@v0.11.0 -git clone --recurse-submodules --shallow-submodules -b v%version %url . +git clone --recurse-submodules --shallow-submodules -b v%version %url %{name}-build + +pushd %{name}-build/u-root +go install +popd + %build +pushd %{name}-build export PATH=$PATH:$HOME/go/bin %make_build %arch +popd %install +pushd %{name}-build mkdir -p %buildroot/boot %buildroot%_datadir/submarine install -Dm644 build/submarine-*.kpart %buildroot%_datadir/submarine/ +# Symlink the installed kpart to just submarine.kpart +pushd %buildroot%_datadir/submarine/ +find . -name 'submarine-*.kpart' -exec ln -srf {} submarine.kpart \; +popd + install -Dm644 build/submarine-*.bin %buildroot%_datadir/submarine/ +popd + %files %_datadir/submarine/submarine-*.kpart +%_datadir/submarine/submarine.kpart %_datadir/submarine/submarine-*.bin 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/mock-configs/terra-mock-configs.spec b/anda/terra/mock-configs/terra-mock-configs.spec index 07bc92a70d..dfe9dfc468 100644 --- a/anda/terra/mock-configs/terra-mock-configs.spec +++ b/anda/terra/mock-configs/terra-mock-configs.spec @@ -1,5 +1,5 @@ Name: terra-mock-configs -Version: 8 +Version: 9 Release: 1%{?dist} Summary: Mock configs for Terra repos diff --git a/anda/terra/mock-configs/terra.tpl b/anda/terra/mock-configs/terra.tpl index 388665c78a..e3edff879b 100644 --- a/anda/terra/mock-configs/terra.tpl +++ b/anda/terra/mock-configs/terra.tpl @@ -4,6 +4,7 @@ config_opts['macros']['%dist'] = '.fc{{ releasever }}' config_opts['chroot_setup_cmd'] = 'install @buildsys-build' config_opts['package_manager'] = 'dnf5' config_opts['extra_chroot_dirs'] = [ '/run/lock', ] +config_opts['bootstrap_image'] = 'registry.fedoraproject.org/fedora:{{ releasever }}' config_opts['mirrored'] = True config_opts['plugin_conf']['root_cache_enable'] = True config_opts['plugin_conf']['yum_cache_enable'] = True 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/google-black-cursor-theme/anda.hcl b/anda/themes/google-black-cursor-theme/anda.hcl new file mode 100644 index 0000000000..9a2117139d --- /dev/null +++ b/anda/themes/google-black-cursor-theme/anda.hcl @@ -0,0 +1,6 @@ +project pkg { + arches = ["x86_64"] + rpm { + spec = "google-black-cursor-theme.spec" + } +} diff --git a/anda/themes/google-black-cursor-theme/google-black-cursor-theme.spec b/anda/themes/google-black-cursor-theme/google-black-cursor-theme.spec new file mode 100644 index 0000000000..b295bf9866 --- /dev/null +++ b/anda/themes/google-black-cursor-theme/google-black-cursor-theme.spec @@ -0,0 +1,36 @@ +Name: google-black-cursor-theme +Version: 2.0.0 +Release: 1%{?dist} +URL: https://github.com/ful1e5/Google_Cursor +Source0: %{url}/releases/download/v%{version}/GoogleDot-Black.tar.gz +Source1: https://raw.githubusercontent.com/ful1e5/Google_Cursor/v%{version}/README.md +Source2: https://raw.githubusercontent.com/ful1e5/Google_Cursor/v%{version}/LICENSE +License: GPL-3.0 +Summary: An opensource cursor theme inspired by Google. +BuildArch: noarch +BuildRequires: rpm_macro(fdupes) + +%description +An opensource cursor theme inspired by Google. + +%prep +tar xf %{SOURCE0} + +%build + +%install +mkdir -p %{buildroot}/%{_datadir}/icons/ +mv Google* %{buildroot}/%{_datadir}/icons/ +mkdir -p %{buildroot}/%{_datadir}/{doc,licenses}/%{name}/ +cp %{SOURCE1} %{buildroot}/%{_datadir}/doc/%{name}/README.md +cp %{SOURCE2} %{buildroot}/%{_datadir}/licenses/%{name}/LICENSE +%fdupes %buildroot%_datadir/icons/ + +%files +%doc README.md +%license LICENSE +%{_datadir}/icons/Google* + +%changelog +* Tue May 21 2024 matteodev8 - 2.0.0 +- Initial package (mostly copied from bibata-cursor-theme) diff --git a/anda/themes/google-black-cursor-theme/update.rhai b/anda/themes/google-black-cursor-theme/update.rhai new file mode 100644 index 0000000000..59fa4b884f --- /dev/null +++ b/anda/themes/google-black-cursor-theme/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("ful1e5/Google_Cursor")); 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..6e1fc78db9 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.9.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..31202e3967 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.2.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/gcm-core/gcm-core.spec b/anda/tools/gcm-core/gcm-core.spec index 838de50c32..730137c0b3 100644 --- a/anda/tools/gcm-core/gcm-core.spec +++ b/anda/tools/gcm-core/gcm-core.spec @@ -6,7 +6,7 @@ %global forgeurl https://github.com/GitCredentialManager/git-credential-manager Name: gcm-core -Version: 2.5.0 +Version: 2.5.1 %forgemeta Release: 1%?dist Summary: Secure, cross-platform Git credential storage diff --git a/anda/tools/open-in-mpv/anda.hcl b/anda/tools/open-in-mpv/anda.hcl new file mode 100644 index 0000000000..84ff0a97ff --- /dev/null +++ b/anda/tools/open-in-mpv/anda.hcl @@ -0,0 +1,5 @@ +project pkg { + rpm { + spec = "open-in-mpv.spec" + } +} diff --git a/anda/tools/open-in-mpv/open-in-mpv.spec b/anda/tools/open-in-mpv/open-in-mpv.spec new file mode 100644 index 0000000000..bc44c62b06 --- /dev/null +++ b/anda/tools/open-in-mpv/open-in-mpv.spec @@ -0,0 +1,44 @@ +#%global debug_package %{nil} + +Name: open-in-mpv +Version: 2.2.2 +Release: 1%?dist +Summary: CLI component of open-in-mpv browser extension + +License: MIT +URL: https://github.com/Baldomo/open-in-mpv +Source0: https://github.com/Baldomo/open-in-mpv/archive/refs/tags/v%{version}.tar.gz + +ExclusiveArch: %{golang_arches} + +BuildRequires: go-rpm-macros +BuildRequires: git +BuildRequires: elfutils + +%description +This is a simple web extension (for Chrome and Firefox) which helps open any video in the currently open tab in the mpv player. + +The extension itself shares a lot of code with the one from the awesome iina, while the (bare) native binary is written in Go (this is a rewrite from C++). + +%prep +%autosetup -p1 + +%build +make build/linux/open-in-mpv + +%install +install -Dm755 build/linux/open-in-mpv %{buildroot}%{_bindir}/open-in-mpv +install -Dm644 scripts/open-in-mpv.desktop %{buildroot}%{_datarootdir}/applications/open-in-mpv.desktop + +%post +update-desktop-database %{_datarootdir}/applications +xdg-mime default open-in-mpv.desktop x-scheme-handler/mpv + +%files +%license LICENSE +%doc README.md +%{_bindir}/open-in-mpv +%{_datarootdir}/applications/open-in-mpv.desktop + +%changelog +%autochangelog diff --git a/anda/tools/open-in-mpv/update.rhai b/anda/tools/open-in-mpv/update.rhai new file mode 100644 index 0000000000..9a8dbd2d7e --- /dev/null +++ b/anda/tools/open-in-mpv/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("Baldomo/open-in-mpv")); 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/umstellar/update.rhai b/anda/tools/umstellar/update.rhai index 2dbdd2f889..617caa459b 100644 --- a/anda/tools/umstellar/update.rhai +++ b/anda/tools/umstellar/update.rhai @@ -1 +1,3 @@ -rpm.version("pypi_version", gh("Ultramarine-Linux/stellar")); +let v = gh("Ultramarine-Linux/stellar"); +v.crop(1); // remove "v" prefix +rpm.global("pypi_version", v); diff --git a/anda/tools/yt-dlp/yt-dlp-nightly.spec b/anda/tools/yt-dlp/yt-dlp-nightly.spec index 50847e9359..6d985eda87 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 4ccd73fea0f6f4be343e1ec7f22dd03799addcf8 +%global commit 4cd41469243624d90b7a2009b95cbe0609343efe %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20240521 -%global ver 2024.04.09 +%global commit_date 20240714 +%global ver 2024.07.09 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 + +