Merge branch 'f40' into mado/rebuild/libappimageupdate

fix: zsync2 (#1170 )
* chore(rebuild): zsync2 Signed-off-by: madomado <madonuko@outlook.com> * bump: zsync2 * bump commit to head * disable -Wincompatible-pointer-types Signed-off-by: madomado <madonuko@outlook.com> --------- Signed-off-by: madomado <madonuko@outlook.com>
2026-05-31 09:01:55 +00:00 · 2024-05-07 12:31:20 +08:00 · 2024-05-06 23:24:00 -05:00 · 2024-05-07 03:45:41 +00:00 · 2024-05-07 10:54:48 +08:00 · 2024-05-07 10:34:22 +08:00
350 changed files with 6449 additions and 859 deletions
@@ -0,0 +1,9 @@
+{
+  "repoOwner": "terrapkg",
+  "repoName": "packages",
+  "resetAuthor": true,
+  "targetBranchChoices": ["f38", "f39", "f40", "frawhide"],
+  "branchLabelMapping": {
+    "^sync-(.+)$": "$1"
+  }
+}
@@ -6,13 +6,13 @@ on:
    paths:
      - anda/**
    branches:
-      - f39
+      - f40
  pull_request:
    branches:
-      - f39
+      - f40
  merge_group:
    branches:
-      - f39
+      - f40
  workflow_dispatch:
  workflow_call:

@@ -23,7 +23,7 @@ jobs:
    outputs:
      build_matrix: ${{ steps.generate_build_matrix.outputs.build_matrix }}
    container:
-      image: ghcr.io/terrapkg/builder:f39
+      image: ghcr.io/terrapkg/builder:f40
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Set workspace as safe
@@ -40,7 +40,7 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }}
-        version: ["39"]
+        version: ["40"]
      fail-fast: false
    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
    container:
@@ -54,13 +54,6 @@ jobs:
      - name: Set up git repository
        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"

-      - name: Cache buildroot
-        id: br-cache
-        uses: actions/cache@v3
-        with:
-          path: /var/cache
-          key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}
-
      - name: Include custom build template instead of package default
        run: |
          cp -v anda/terra/mock-configs/terra.tpl /etc/mock/templates/terra.tpl
@@ -7,7 +7,7 @@ jobs:
  bootstrap:
    strategy:
      matrix:
-        version: ["39"]
+        version: ["40"]
        arch: ["x86_64", "aarch64"]
      fail-fast: true
    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
@@ -21,7 +21,7 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(needs.parse.outputs.pkgs) }}
-        version: ["39"]
+        version: ["40"]
        arch: ["x86_64", "aarch64"]
      fail-fast: false
    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
@@ -68,7 +68,6 @@ jobs:
            terra${{ matrix.version }} anda-build/rpm/rpms/*

      - name: Upload source packages to subatomic
-        if: github.event_name == 'push'
        run: |
          subatomic-cli upload --prune \
            --server https://subatomic.fyralabs.com \
@@ -11,7 +11,7 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(inputs.packages) }}
-        version: ["39"]
+        version: ["40"]
      fail-fast: false
    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
    container:
@@ -3,18 +3,18 @@ name: Lint
 on:
  push:
    branches:
-      - f39
+      - f40
  pull_request:
    branches:
-      - f39
+      - f40
  merge_group:
    branches:
-      - f39
+      - f40
 jobs:
  lint:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:f39
+      image: ghcr.io/terrapkg/builder:f40
    steps:
      - name: Checkout repository
        uses: actions/checkout@v3
@@ -0,0 +1,37 @@
+name: Automatic backport/sync action
+
+on:
+  pull_request_target:
+    types: ["labeled", "closed"]
+
+jobs:
+  backport:
+    name: Backport/sync PR
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.merged
+    steps:
+      - name: Install SSH signing key
+        run: |
+          mkdir -p ${{ runner.temp }}
+          echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key
+          chmod 0700 ${{ runner.temp }}/signing_key
+
+      - name: Setup Raboneko Signing
+        run: |
+          git config --global gpg.format "ssh"
+          git config --global user.signingkey "${{ runner.temp }}/signing_key"
+          git config --global commit.gpgsign true
+
+      - name: Backport Action
+        uses: sorenlouv/backport-github-action@v9.3.0
+        with:
+          github_token: ${{ secrets.RABONEKO_BACKPORT_GITHUB_TOKEN }}
+          auto_backport_label_prefix: sync-
+
+      - name: Info log
+        if: ${{ success() }}
+        run: cat ~/.backport/backport.info.log
+
+      - name: Debug log
+        if: ${{ failure() }}
+        run: cat ~/.backport/backport.debug.log
@@ -3,6 +3,7 @@ name: Push comps updates
 on:
  push:
    branches:
+      - f40
      - f39
      - f38
      - f37
@@ -14,7 +15,7 @@ jobs:
  update-comps:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:f39
+      image: ghcr.io/terrapkg/builder:f40
    steps:
      - uses: actions/checkout@v3
      - name: Push to subatomic
@@ -8,7 +8,7 @@ jobs:
  autoupdate:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:f38
+      image: ghcr.io/terrapkg/builder:f40
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
@@ -38,13 +38,16 @@ jobs:
            git config user.signingkey "${{ runner.temp }}/signing_key"
            msg="bump(nightly): $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')"
            git commit -S -a -m "$msg"
-            f37 () {
+            copy_over () {
              git format-patch HEAD^
-              git checkout f37
+              git checkout $1
              git apply *.patch || true
+              rm *.patch
              git add *
              git commit -S -a -m "$msg"
            }
-            f37 || true
+            copy_over f37 || true
+            copy_over f38 || true
+            copy_over frawhide || true
            git push -u origin --all
          fi
@@ -8,7 +8,7 @@ jobs:
  autoupdate:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:f39
+      image: ghcr.io/terrapkg/builder:f40
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
@@ -47,7 +47,9 @@ jobs:
              git add *
              git commit -S -a -m "$msg"
            }
+            copy_over f39 || true
            copy_over f37 || true
            copy_over f38 || true
+            copy_over frawhide || true
            git push -u origin --all
          fi
@@ -1,30 +0,0 @@
-# Repository
-/.github @lleyton 
-/.devcontainer @lleyton 
-/.gitignore @windowsboy111 
-/CODE_OF_CONDUCT.md @lleyton 
-/CONTRIBUTING.md @lleyton 
-/LICENSE @lleyton 
-/README.md @windowsboy111 
-/SECURITY.md @lleyton 
-/anda.hcl @lleyton 
-/comps.xml @lleyton 
-
-# Package maintainers
-/anda/lib/libbismuth @lainsce
-/anda/lib/libhelium @lainsce
-/anda/others/tau-helium @lainsce
-/anda/others/tau-hydrogen @lainsce
-
-/anda/tools/melody @lleyton
-/anda/go/curlie @lleyton
-
-/anda/games/prismlauncher @getchoo
-/anda/games/prismlauncher-nightly @getchoo
-/anda/games/prismlauncher-qt5-nightly @getchoo
-/anda/games/prismlauncher-qt5 @getchoo
-
-/anda/srpm-macros @korewaChino
-/anda/rust/starship @korewaChino
-/anda/rust/zellij @korewaChino
-/anda/audio/distrho @korewaChino
@@ -1,7 +1,7 @@
 # Contributing

-First of all, thanks for being interested in contributing to Terra! If you have any questions about contributing, please contact us on [Discord](https://discord.gg/5fdPuxTg5Q). Since we use a GitHub Wiki for [documention](https://github.com/terrapkg/packages/wiki), our guidelines may be found there. See the links below:
+First of all, thanks for being interested in contributing to Terra! If you have any questions about contributing, please contact us on [Discord](https://discord.gg/5fdPuxTg5Q). Since we use a GitHub Wiki for [documentation](https://developer.fyralabs.com/terra), our guidelines may be found there. See the links below:

-* [Contribution Guide](https://github.com/terrapkg/packages/wiki/Contribute)
-* [FAQ](https://github.com/terrapkg/packages/wiki/FAQ)
-* [Policy](https://github.com/terrapkg/packages/wiki/Policy)
+* [Contribution Guide](https://developer.fyralabs.com/terra/contributing)
+* [FAQ](https://developer.fyralabs.com/terra/faq)
+* [Policy](https://developer.fyralabs.com/terra/policy)
@@ -2,6 +2,8 @@

 [![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)

 Terra is a rolling-release Fedora repository for all the software you need.
 With Terra, you can install the latest packages knowing that quality and security are assured.
@@ -3,7 +3,7 @@
 ## Our Process

 Fyra Labs is committed to ensuring user security and privacy.
-As such, we constantly try our best to ensure that our infrastructure and process are secure, which you may read about in our [FAQ](https://github.com/terrapkg/packages/wiki/FAQ#technical-details).
+As such, we constantly try our best to ensure that our infrastructure and process are secure, which you may read about in our [FAQ](https://developer.fyralabs.com/terra/faq#technical-details).

 As a part of Fyra Labs's transparency measures, we will publicize details of any known breaches. This information will include, but will not be limited to:
 * Affected users, infrastructure, and data.
@@ -11,7 +11,7 @@ As a part of Fyra Labs's transparency measures, we will publicize details of any
 * An in-depth explanation of how the breach occurred, including relevant security vulnerabilities.
 * How Fyra Labs will better protect user data in the future, ensuring our commitment to security and privacy.

-We will publish these updates on our [Twitter](https://twitter.com/TeamFyraLabs) and [Discord](https://discord.gg/5fdPuxTg5Q).
+We will publish these updates on our [Twitter](https://twitter.com/TeamFyraLabs), [Fedi](https://fedi.fyralabs.com/@hq), and [Discord](https://discord.gg/5fdPuxTg5Q).

 ## Reporting a Vulnerability

@@ -1,10 +1,10 @@
 Name:			anki-bin
-Version:		23.10.1
-Release:		1%{?dist}
+Version:		24.04.1
+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
 URL:			https://apps.ankiweb.net/
-BuildRequires:	python3-installer python3.11 rpm_macro(fdupes)
+BuildRequires:	python3-pip rpm_macro(fdupes)
 Requires:		python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-orjson
 Requires:		python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema
 Requires:		python3-flask-cors python3-protobuf python3-requests python3-waitress python3-pyqt6-webengine python3-send2trash
@@ -29,28 +29,33 @@ Anki is based on a theory called spaced repetition.
 %build

 %install
-python3.11 -m installer --destdir="%{buildroot}" %{SOURCE0}
-python3.11 -m installer --destdir="%{buildroot}" %{SOURCE1}
+pip3 install --root=%{buildroot} %SOURCE0 %SOURCE1
 install -Dm755 %{SOURCE2} "%{buildroot}/usr/bin/anki"
 install -Dm644 %{SOURCE3} "%{buildroot}/usr/share/applications/anki.desktop"
 install -Dm644 %{SOURCE4} "%{buildroot}/usr/share/pixmaps/anki.png"
 install -Dm644 %{SOURCE5} "%{buildroot}/%{_datadir}/licenses/%{name}/LICENSE"
 install -Dm644 %{SOURCE6} "%{buildroot}/%{_datadir}/doc/%{name}/README.md"

-%fdupes %_libdir/python*/site-packages/_aqt/data/
+cp -r %buildroot%_libdir/python3*/site-packages/{_aqt,anki*,aqt*} .
+rm -rf %buildroot{%_libdir,/usr/lib}/python3*/site-packages/*
+cp -r ./{_aqt,anki*,aqt*} %buildroot/usr/lib/python3*/site-packages/
+
+rm -rf %buildroot%_bindir/{distro,flask,jsonschema,markdown_py,normalizer,send2trash,waitress-serve}
+
+%fdupes %buildroot%_libdir/python*/site-packages/_aqt/data/


 %files
 %license LICENSE
 %doc README.md
-/usr/bin/anki
-/usr/lib64/python*/site-packages/_aqt/
-/usr/lib64/python*/site-packages/anki-%{version}.dist-info/
-/usr/lib64/python*/site-packages/anki/
-/usr/lib64/python*/site-packages/aqt-%{version}.dist-info/
-/usr/lib64/python*/site-packages/aqt/
-/usr/share/applications/anki.desktop
-/usr/share/pixmaps/anki.png
+%_bindir/anki
+/usr/lib/python*/site-packages/_aqt/
+/usr/lib/python*/site-packages/anki-%{version}.dist-info/
+/usr/lib/python*/site-packages/anki/
+/usr/lib/python*/site-packages/aqt-%{version}.dist-info/
+/usr/lib/python*/site-packages/aqt/
+%_datadir/applications/anki.desktop
+%_datadir/pixmaps/anki.png

 %changelog
 * Fri Nov 10 2023 hazel-bunny <dabiswas112@gmail.com> - 23.10-2
@@ -1,6 +1,6 @@
 Name:           anki-qt5
-Version:        23.10.1
-Release:        1%{?dist}
+Version:        24.04.1
+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
 URL:            https://apps.ankiweb.net/
@@ -1,6 +1,6 @@
 Name:           anki
-Version:        23.10.1
-Release:        1%{?dist}
+Version:        24.04.1
+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
 URL:            https://apps.ankiweb.net/
@@ -14,7 +14,7 @@
 %global __provides_exclude_from %{_datadir}/armcord/.*\\.so

 Name:			armcord-bin
-Version:		3.2.5
+Version:		3.2.6
 Release:		1%{?dist}
 License:		OSL-3.0
 Summary:		Custom lightweight Discord client designed to enhance your experience
@@ -1,7 +1,7 @@
 %define debug_package %nil

 Name:		armcord
-Version:	3.2.5
+Version:	3.2.6
 Release:	1%{?dist}
 License:	OSL-3.0
 Summary:	Custom lightweight Discord client designed to enhance your experience
@@ -6,12 +6,12 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name: authy
-Version: 2.4.2
+Version: 2.5.0
 Release: 1%{?dist}
 Summary: Two factor authentication desktop application
 License: Unlicense
 URL: https://authy.com/
-Source0: https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_22.snap
+Source0: https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_23.snap
 Requires: gtk3
 Requires: nss
 BuildRequires: squashfs-tools desktop-file-utils
@@ -6,8 +6,8 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-canary-openasar
-Version:        0.0.225
-Release:        1%{?dist}
+Version:        0.0.383
+Release:        1%?dist
 Summary:        A snappier Discord rewrite with features like further customization and theming
 License:        MIT AND https://discord.com/terms
 URL:            https://github.com/GooseMod/OpenAsar
@@ -6,8 +6,8 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-canary
-Version:        0.0.225
-Release:        1%{?dist}
+Version:        0.0.383
+Release:        1%?dist
 Summary:        Free Voice and Text Chat for Gamers
 URL:            discord.com
 Source0:        https://dl-canary.discordapp.net/apps/linux/%{version}/discord-canary-%{version}.tar.gz
@@ -6,8 +6,8 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-openasar
-Version:        0.0.38
-Release:        1%{?dist}
+Version:        0.0.53
+Release:        1%?dist
 Summary:        A snappier Discord rewrite with features like further customization and theming
 License:        MIT AND https://discord.com/terms
 URL:            https://github.com/GooseMod/OpenAsar
@@ -6,8 +6,8 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-ptb-openasar
-Version:        0.0.62
-Release:        1%{?dist}
+Version:        0.0.84
+Release:        1%?dist
 Summary:        A snappier Discord rewrite with features like further customization and theming
 License:        MIT AND https://discord.com/terms
 URL:            https://github.com/GooseMod/OpenAsar
@@ -6,8 +6,8 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-ptb
-Version:        0.0.62
-Release:        1%{?dist}
+Version:        0.0.84
+Release:        1%?dist
 Summary:        Free Voice and Text Chat for Gamers.
 URL:            https://discord.com
 Source0:        https://dl-ptb.discordapp.net/apps/linux/%{version}/discord-ptb-%{version}.tar.gz
@@ -6,8 +6,8 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:			discord
-Version:		0.0.38
-Release:		1%{?dist}
+Version:		0.0.53
+Release:		1%?dist
 Summary:		Free Voice and Text Chat for Gamers
 URL:			https://discord.com
 Source0:		https://dl.discordapp.net/apps/linux/%{version}/discord-%{version}.tar.gz
@@ -0,0 +1,5 @@
+project pkg {
+  rpm {
+    spec = "feishin.spec"
+  }
+}
@@ -0,0 +1,69 @@
+%define debug_package %nil
+%global _build_id_links none
+
+# Exclude private libraries
+%global __requires_exclude libffmpeg.so
+%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
+
+Name:			feishin
+Version:		0.7.0
+Release:		1%?dist
+Summary:		A modern self-hosted music player
+License:		GPL-3.0
+URL:			https://github.com/jeffvli/feishin
+Source0:		%url/archive/refs/tags/v%version.tar.gz
+Requires:		fuse mpv
+BuildRequires:	nodejs-npm jq libxcrypt-compat
+
+%description
+%summary.
+
+%prep
+%autosetup
+
+cat package.json | jq '.author += { "email": "jeffvictorli@gmail.com" }' | jq '.build.linux += { "maintainer": "mado@fyralabs.com", "vendor": "Fyra Labs Terra" }' > a
+mv a package.json
+cat package.json
+
+cat<<EOF > feishin.desktop
+[Desktop Entry]
+Type=Application
+Name=Feishin
+Comment=Rewrite of Sonixd
+Exec=/usr/bin/feishin
+Icon=feishin
+Terminal=false
+Categories=Network;Audio;Music
+Keywords=Music;Jellyfin;Audio;Stream;Sonixd
+EOF
+
+%build
+npm install --legacy-peer-deps
+npm run postinstall
+npm run build
+%ifarch x86_64
+
+%define a linux
+%elifarch aarch64
+%define a arm64
+%endif
+
+npx electron-builder --linux dir --%a
+
+%install
+mkdir -p %buildroot%_datadir/{pixmaps,applications} %buildroot%_bindir
+mv release/build/*-unpacked %buildroot%_datadir/feishin
+install -Dm644 assets/icons/icon.png %buildroot%_datadir/pixmaps/feishin.png
+ln -s %_datadir/feishin/feishin %buildroot%_bindir/feishin
+install -Dm644 feishin.desktop %buildroot%_datadir/applications/
+
+%files
+%doc README.md CHANGELOG.md
+%license LICENSE
+%_bindir/feishin
+%_datadir/feishin/
+%_datadir/applications/feishin.desktop
+%_datadir/pixmaps/feishin.png
+
+%changelog
+%autochangelog
@@ -0,0 +1 @@
+rpm.version(gh("jeffvli/feishin"));
@@ -0,0 +1,8 @@
+project pkg {
+  rpm {
+	  spec = "mpv-nightly.spec"
+  }
+  labels {
+    nightly = "1"
+  }
+}
@@ -0,0 +1,230 @@
+%global commit 943a50b300a081bb223325295040846fe435a861
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commit_date 20240504
+%global ver v0.38.0
+
+Name:           mpv-nightly
+Version:        %ver^%commit_date.%shortcommit
+Release:        1%?dist
+
+License:        GPL-2.0-or-later AND LGPL-2.1-or-later
+Summary:        Movie player playing most video formats and DVDs
+URL:            https://mpv.io/
+Source0:        https://github.com/mpv-player/mpv/archive/%commit/mpv-%commit.tar.gz
+Conflicts:		mpv
+
+BuildRequires:  desktop-file-utils
+BuildRequires:  gcc
+BuildRequires:  libappstream-glib
+BuildRequires:  libatomic
+BuildRequires:  meson
+BuildRequires:  python3-docutils
+
+BuildRequires:  perl(Encode)
+BuildRequires:  perl(Math::BigInt)
+BuildRequires:  perl(Math::BigRat)
+BuildRequires:  pkgconfig(alsa)
+BuildRequires:  pkgconfig(caca)
+BuildRequires:  pkgconfig(dvdnav)
+BuildRequires:  pkgconfig(egl)
+BuildRequires:  pkgconfig(ffnvcodec)
+BuildRequires:  pkgconfig(gbm)
+BuildRequires:  pkgconfig(gl)
+BuildRequires:  pkgconfig(jack)
+BuildRequires:  pkgconfig(lcms2)
+BuildRequires:  pkgconfig(libarchive) >= 3.4.0
+BuildRequires:  pkgconfig(libass)
+BuildRequires:  pkgconfig(libavcodec) >= 59.27.100
+BuildRequires:  pkgconfig(libavdevice) >= 58.13.100
+BuildRequires:  pkgconfig(libavfilter) >= 7.110.100
+BuildRequires:  pkgconfig(libavformat) >= 59.24.100
+BuildRequires:  pkgconfig(libavutil) >= 57.24.100
+BuildRequires:  pkgconfig(libbluray)
+BuildRequires:  pkgconfig(libcdio)
+BuildRequires:  pkgconfig(libcdio_paranoia)
+BuildRequires:  pkgconfig(libdrm)
+BuildRequires:  pkgconfig(libjpeg)
+BuildRequires:  pkgconfig(libpipewire-0.3) >= 0.3.19
+BuildRequires:  pkgconfig(libplacebo) >= 6.338.0
+BuildRequires:  pkgconfig(libpulse)
+BuildRequires:  pkgconfig(libswresample) >= 3.9.100
+BuildRequires:  pkgconfig(libswscale) >= 5.9.100
+BuildRequires:  pkgconfig(libva)
+BuildRequires:  pkgconfig(lua-5.1)
+BuildRequires:  pkgconfig(mujs)
+BuildRequires:  pkgconfig(openal)
+BuildRequires:  pkgconfig(rubberband)
+BuildRequires:  pkgconfig(sdl2)
+BuildRequires:  pkgconfig(shaderc)
+BuildRequires:  pkgconfig(uchardet) >= 0.0.5
+BuildRequires:  pkgconfig(vapoursynth)
+BuildRequires:  pkgconfig(vdpau)
+BuildRequires:  pkgconfig(vulkan)
+BuildRequires:  pkgconfig(wayland-client)
+BuildRequires:  pkgconfig(wayland-cursor)
+BuildRequires:  pkgconfig(wayland-egl)
+BuildRequires:  pkgconfig(wayland-protocols)
+BuildRequires:  pkgconfig(wayland-scanner)
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(xdamage)
+BuildRequires:  pkgconfig(xext)
+BuildRequires:  pkgconfig(xinerama)
+BuildRequires:  pkgconfig(xkbcommon)
+BuildRequires:  pkgconfig(xpresent)
+BuildRequires:  pkgconfig(xrandr)
+BuildRequires:  pkgconfig(xscrnsaver)
+BuildRequires:  pkgconfig(xv)
+BuildRequires:  pkgconfig(zimg) >= 2.9
+BuildRequires:  pkgconfig(zlib)
+
+Requires:       hicolor-icon-theme
+Provides:       mplayer-backend
+Recommends:     (yt-dlp or youtube-dl)
+Suggests:       yt-dlp
+
+%description
+Mpv is a movie player based on MPlayer and mplayer2. It supports a wide variety
+of video file formats, audio and video codecs, and subtitle types. Special
+input URL types are available to read input from a variety of sources other
+than disk files. Depending on platform, a variety of different video and audio
+output methods are supported.
+
+Mpv has an OpenGL, Vulkan, and D3D11 based video output that is capable of many
+features loved by videophiles, such as video scaling with popular high quality
+algorithms, color management, frame timing, interpolation, HDR, and more.
+
+While mpv strives for minimalism and provides no real GUI, it has a small
+controller on top of the video for basic control.
+
+Mpv can leverage most hardware decoding APIs on all platforms. Hardware
+decoding can be enabled at runtime on demand.
+
+Powerful scripting capabilities can make the player do almost anything. There
+is a large selection of user scripts on the wiki.
+
+A straightforward C API was designed from the ground up to make mpv usable as
+a library and facilitate easy integration into other applications.
+
+%package libs
+Summary: Dynamic library for Mpv frontends
+
+%description libs
+This package contains the dynamic library libmpv, which provides access to Mpv.
+
+%package devel
+Summary: Development package for libmpv
+Provides: mpv-libs-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: mpv-nightly-libs-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: mpv-libs-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: mpv-nightly-libs-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: mpv-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: mpv-nightly-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description devel
+This package contains development header files and libraries for Mpv.
+
+%prep
+%autosetup -p1 -n mpv-%commit
+sed -e "s|/usr/local/etc|%{_sysconfdir}/mpv|" -i etc/mpv.conf
+
+%build
+%meson --auto-features=auto \
+    -Dalsa=enabled \
+    -Dbuild-date=false \
+    -Dcaca=enabled \
+    -Dcdda=enabled \
+    -Dcplayer=true \
+    -Dcplugins=enabled \
+    -Dcuda-hwaccel=enabled \
+    -Dcuda-interop=enabled \
+    -Ddmabuf-wayland=enabled \
+    -Ddrm=enabled \
+    -Ddvbin=enabled \
+    -Ddvdnav=enabled \
+    -Degl-drm=enabled \
+    -Degl-wayland=enabled \
+    -Degl-x11=enabled \
+    -Degl=enabled \
+    -Dgbm=enabled \
+    -Dgl-x11=enabled \
+    -Dgl=enabled \
+    -Dhtml-build=enabled \
+    -Diconv=enabled \
+    -Djack=enabled \
+    -Djavascript=enabled \
+    -Djpeg=enabled \
+    -Dlcms2=enabled \
+    -Dlibarchive=enabled \
+    -Dlibavdevice=enabled \
+    -Dlibbluray=enabled \
+    -Dlibmpv=true \
+    -Dlua=enabled \
+    -Dmanpage-build=enabled \
+    -Dopenal=enabled \
+    -Dopensles=disabled \
+    -Doss-audio=disabled \
+    -Dpipewire=enabled \
+    -Dplain-gl=enabled \
+    -Dpulse=enabled \
+    -Drubberband=enabled \
+    -Dsdl2-audio=enabled \
+    -Dsdl2-gamepad=enabled \
+    -Dsdl2-video=enabled \
+    -Dsdl2=enabled \
+    -Dsndio=disabled \
+    -Dspirv-cross=disabled \
+    -Duchardet=enabled \
+    -Dvaapi-drm=enabled \
+    -Dvaapi-wayland=enabled \
+    -Dvaapi-x11=enabled \
+    -Dvaapi=enabled \
+    -Dvapoursynth=enabled \
+    -Dvdpau-gl-x11=enabled \
+    -Dvdpau=enabled \
+    -Dvector=enabled \
+    -Dvulkan-interop=disabled \
+    -Dvulkan=enabled \
+    -Dwayland=enabled \
+    -Dwerror=false \
+    -Dx11=enabled \
+    -Dxv=enabled \
+    -Dzimg=enabled \
+    -Dzlib=enabled
+%meson_build
+
+%install
+%meson_install
+
+%check
+appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/mpv.metainfo.xml
+desktop-file-validate %{buildroot}%{_datadir}/applications/mpv.desktop
+
+%files
+%docdir %{_docdir}/mpv/
+%license LICENSE.GPL LICENSE.LGPL Copyright
+%{_docdir}/mpv/
+%{_bindir}/mpv
+%{_datadir}/applications/mpv.desktop
+%dir %{_datadir}/bash-completion/
+%dir %{_datadir}/bash-completion/completions/
+%{_datadir}/bash-completion/completions/mpv
+%{_datadir}/icons/hicolor/*/apps/mpv*.*
+%dir %{_datadir}/zsh/
+%dir %{_datadir}/zsh/site-functions/
+%{_datadir}/zsh/site-functions/_mpv
+%{_mandir}/man1/mpv.*
+%{_metainfodir}/mpv.metainfo.xml
+%dir %{_sysconfdir}/mpv/
+%config(noreplace) %{_sysconfdir}/mpv/encoding-profiles.conf
+
+%files libs
+%license LICENSE.GPL LICENSE.LGPL Copyright
+%{_libdir}/libmpv.so.2{,.*}
+
+%files devel
+%{_includedir}/mpv/
+%{_libdir}/libmpv.so
+%{_libdir}/pkgconfig/mpv.pc
+
+%changelog
+%autochangelog
@@ -0,0 +1,8 @@
+if filters.contains("nightly") {
+	rpm.global("commit", gh_commit("mpv-player/mpv"));
+	if rpm.changed() {
+		rpm.global("ver", gh("mpv-player/mpv"));
+		rpm.global("commit_date", date());
+		rpm.release();
+	}
+}
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "rust-sccache.spec"
+	}
+}
@@ -0,0 +1,599 @@
+# Generated by rust2rpm 25
+%bcond_with check
+# aarch64 dist is not available
+%ifarch aarch64
+%bcond_with dist_server
+%else
+%bcond_without dist_server
+%endif
+
+# Don't mangle shebangs
+%global __brp_mangle_shebangs %{nil}
+
+%global crate sccache
+
+Name:           rust-sccache
+Version:        0.8.0
+Release:        1%?dist
+Summary:        Ccache-like tool
+
+License:        Apache-2.0
+URL:            https://crates.io/crates/sccache
+Source:         %{crates_source}
+# Automatically generated patch to strip dependencies and normalize metadata
+Patch:          sccache-fix-metadata-auto.diff
+
+ExclusiveArch:  %{rust_arches}
+
+BuildRequires:  cargo-rpm-macros >= 24
+BuildRequires:  anda-srpm-macros
+BuildRequires:  openssl-devel
+BuildRequires:  gcc
+BuildRequires:  perl
+BuildRequires:  rust-packaging
+
+%global _description %{expand:
+Sccache is a ccache-like tool. It is used as a compiler wrapper and
+avoids compilation when possible. Sccache has the capability to utilize
+caching in remote storage environments, including various cloud storage
+options, or alternatively, in local storage.}
+
+%description %{_description}
+
+%package     -n %{crate}
+Summary:        %{summary}
+License:        MIT
+
+%description -n %{crate} %{_description}
+
+%files       -n %{crate}
+%license LICENSE
+%doc CODE_OF_CONDUCT.md
+%doc README.md
+%{_bindir}/sccache
+%if %{with dist_server}
+%{_bindir}/sccache-dist
+%endif
+
+%package        devel
+Summary:        %{summary}
+BuildArch:      noarch
+Provides:       crate(sccache) = 0.7.4
+Requires:       cargo
+Requires:       rust >= 1.67.1
+
+%description    devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "%{crate}" crate.
+
+%files          devel
+%{crate_instdir}/
+
+%package     -n %{name}+default-devel
+Summary:        %{summary}
+BuildArch:      noarch
+Provides:       crate(sccache/default) = 0.7.4
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+Requires:       crate(sccache/all) = 0.7.4
+
+%description -n %{name}+default-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "default" feature of the "%{crate}" crate.
+
+%files       -n %{name}+default-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%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}
+
+This package contains library source intended for building other packages which
+use the "all" feature of the "%{crate}" crate.
+
+%files       -n %{name}+all-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%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}
+
+This package contains library source intended for building other packages which
+use the "azure" feature of the "%{crate}" crate.
+
+%files       -n %{name}+azure-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%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}
+
+This package contains library source intended for building other packages which
+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}
+
+This package contains library source intended for building other packages which
+use the "dist-server" feature of the "%{crate}" crate.
+
+%files       -n %{name}+dist-server-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%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}
+
+This package contains library source intended for building other packages which
+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}
+
+This package contains library source intended for building other packages which
+use the "flate2" feature of the "%{crate}" crate.
+
+%files       -n %{name}+flate2-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%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}
+
+This package contains library source intended for building other packages which
+use the "gcs" feature of the "%{crate}" crate.
+
+%files       -n %{name}+gcs-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%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}
+
+This package contains library source intended for building other packages which
+use the "gha" feature of the "%{crate}" crate.
+
+%files       -n %{name}+gha-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}
+
+This package contains library source intended for building other packages which
+use the "hyper" feature of the "%{crate}" crate.
+
+%files       -n %{name}+hyper-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}
+
+This package contains library source intended for building other packages which
+use the "jwt" feature of the "%{crate}" crate.
+
+%files       -n %{name}+jwt-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%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}
+
+This package contains library source intended for building other packages which
+use the "libmount" feature of the "%{crate}" crate.
+
+%files       -n %{name}+libmount-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%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}
+
+This package contains library source intended for building other packages which
+use the "memcached" feature of the "%{crate}" crate.
+
+%files       -n %{name}+memcached-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%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}
+
+This package contains library source intended for building other packages which
+use the "native-zlib" feature of the "%{crate}" crate.
+
+%files       -n %{name}+native-zlib-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%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}
+
+This package contains library source intended for building other packages which
+use the "nix" feature of the "%{crate}" crate.
+
+%files       -n %{name}+nix-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%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}
+
+This package contains library source intended for building other packages which
+use the "opendal" feature of the "%{crate}" crate.
+
+%files       -n %{name}+opendal-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%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}
+
+This package contains library source intended for building other packages which
+use the "openssl" feature of the "%{crate}" crate.
+
+%files       -n %{name}+openssl-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}
+
+This package contains library source intended for building other packages which
+use the "redis" feature of the "%{crate}" crate.
+
+%files       -n %{name}+redis-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%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}
+
+This package contains library source intended for building other packages which
+use the "reqsign" feature of the "%{crate}" crate.
+
+%files       -n %{name}+reqsign-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%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}
+
+This package contains library source intended for building other packages which
+use the "reqwest" feature of the "%{crate}" crate.
+
+%files       -n %{name}+reqwest-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%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}
+
+This package contains library source intended for building other packages which
+use the "rouille" feature of the "%{crate}" crate.
+
+%files       -n %{name}+rouille-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%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}
+
+This package contains library source intended for building other packages which
+use the "s3" feature of the "%{crate}" crate.
+
+%files       -n %{name}+s3-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%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}
+
+This package contains library source intended for building other packages which
+use the "sha2" feature of the "%{crate}" crate.
+
+%files       -n %{name}+sha2-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%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}
+
+This package contains library source intended for building other packages which
+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}
+
+This package contains library source intended for building other packages which
+use the "unstable" feature of the "%{crate}" crate.
+
+%files       -n %{name}+unstable-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%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}
+
+This package contains library source intended for building other packages which
+use the "url" feature of the "%{crate}" crate.
+
+%files       -n %{name}+url-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%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}
+
+This package contains library source intended for building other packages which
+use the "vendored-openssl" feature of the "%{crate}" crate.
+
+%files       -n %{name}+vendored-openssl-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%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}
+
+This package contains library source intended for building other packages which
+use the "version-compare" feature of the "%{crate}" crate.
+
+%files       -n %{name}+version-compare-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%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}
+
+This package contains library source intended for building other packages which
+use the "webdav" feature of the "%{crate}" crate.
+
+%files       -n %{name}+webdav-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%prep
+%autosetup -n %{crate}-%{version} -p1
+%cargo_prep_online
+
+
+%build
+%if %{with dist_server}
+%cargo_build -f dist-server
+%else
+%cargo_build
+%endif
+
+%install
+%if %{with dist_server}
+%cargo_install -f dist-server
+%else
+%cargo_install
+%endif
+
+%if %{with check}
+%check
+%if %{with dist_server}
+%cargo_test -f dist-server
+%else
+%cargo_test
+%endif
+
+%endif
+
+%changelog
+* Mon Dec 18 2023 Cappy Ishihara <cappy@cappuchino.xyz> - 0.7.4-1
+- Initial package
@@ -0,0 +1,14 @@
+--- 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 @@
+ [target."cfg(unix)".dependencies.daemonize]
+ version = "0.5"
+ 
+-[target."cfg(windows)".dependencies.winapi]
+-version = "0.3"
+-features = [
+-    "fileapi",
+-    "handleapi",
+-    "stringapiset",
+-    "winnls",
+-]
@@ -0,0 +1 @@
+rpm.version(crates("sccache"));
@@ -6,8 +6,8 @@

 Name:		vencord-desktop
 Provides:   VencordDesktop = %{version}-%{release}
-Version:	0.4.4
-Release:	1%{?dist}
+Version:	1.5.2
+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
 URL:		https://github.com/Vencord/Vesktop
@@ -1,6 +1,6 @@
-%global nodev 16.17.0
-%global npmv 8.11.0
-%global ver 0.14.10
+%global nodev 20.12.2
+%global npmv 10.5.0
+%global ver 0.19.1
 %define debug_package %nil
 %global _build_id_links none

@@ -1,5 +1,5 @@
 Name:		budgie-extras
-Version:	1.7.1
+Version:	1.8.0
 Release:	1%{?dist}

 License:	GPL-3.0
@@ -1,4 +1,4 @@
-%define _ubuntu_rel 22.10.20220822-0ubuntu4
+%define _ubuntu_rel 22.10.20220822-0ubuntu12
 %global _hardened_build 0

 Name:           compiz9
@@ -3,7 +3,7 @@
 Name:           elementary-appcenter
 Summary:        Software Center from elementary
 Version:        7.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPL-3.0

 Provides:       appcenter = %{version}-%{release}
@@ -12,6 +12,8 @@ Obsoletes:      appcenter < 7.2.1-2
 URL:            https://github.com/elementary/appcenter
 Source0:        %url/archive/%{version}/appcenter-%{version}.tar.gz

+Patch0:         pr2099.patch
+
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
@@ -0,0 +1,311 @@
+commit fce55d9373bfb82953191b32e276a2129ffcb8c1
+Author: Marius Meisenzahl <meisenzahl@users.noreply.github.com>
+Date:   Wed Feb 7 00:14:43 2024 +0100
+
+    Add support for AppStream 1.0 (#2099)
+
+diff --git a/src/Core/FlatpakBackend.vala b/src/Core/FlatpakBackend.vala
+index 98931505..10f2baab 100644
+--- a/src/Core/FlatpakBackend.vala
+++ b/src/Core/FlatpakBackend.vala
+@@ -400,8 +400,13 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
+ 
+         var category_array = new GLib.GenericArray<AppStream.Category> ();
+         category_array.add (category);
+#if HAS_APPSTREAM_1_0
+        AppStream.utils_sort_components_into_categories (user_appstream_pool.get_components ().as_array (), category_array, false);
+        AppStream.utils_sort_components_into_categories (system_appstream_pool.get_components ().as_array (), category_array, false);
+#else
+         AppStream.utils_sort_components_into_categories (user_appstream_pool.get_components (), category_array, false);
+         AppStream.utils_sort_components_into_categories (system_appstream_pool.get_components (), category_array, false);
+#endif
+         components = category.get_components ();
+ 
+         var apps = new Gee.TreeSet<AppCenterCore.Package> ();
+@@ -417,13 +422,21 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
+         var apps = new Gee.TreeSet<AppCenterCore.Package> ();
+         var comps = user_appstream_pool.search (query);
+         if (category == null) {
+#if HAS_APPSTREAM_1_0
+            comps.as_array ().foreach ((comp) => {
+#else
+             comps.foreach ((comp) => {
+#endif
+                 var packages = get_packages_for_component_id (comp.get_id ());
+                 apps.add_all (packages);
+             });
+         } else {
+             var cat_packages = get_applications_for_category (category);
+#if HAS_APPSTREAM_1_0
+            comps.as_array ().foreach ((comp) => {
+#else
+             comps.foreach ((comp) => {
+#endif
+                 var packages = get_packages_for_component_id (comp.get_id ());
+                 foreach (var package in packages) {
+                     if (package in cat_packages) {
+@@ -435,13 +448,21 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
+ 
+         comps = system_appstream_pool.search (query);
+         if (category == null) {
+#if HAS_APPSTREAM_1_0
+            comps.as_array ().foreach ((comp) => {
+#else
+             comps.foreach ((comp) => {
+#endif
+                 var packages = get_packages_for_component_id (comp.get_id ());
+                 apps.add_all (packages);
+             });
+         } else {
+             var cat_packages = get_applications_for_category (category);
+#if HAS_APPSTREAM_1_0
+            comps.as_array ().foreach ((comp) => {
+#else
+             comps.foreach ((comp) => {
+#endif
+                 var packages = get_packages_for_component_id (comp.get_id ());
+                 foreach (var package in packages) {
+                     if (package in cat_packages) {
+@@ -510,7 +531,11 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
+                 continue;
+             }
+ 
+#if HAS_APPSTREAM_1_0
+            if (package.component.get_developer ().get_name () == author) {
+#else
+             if (package.component.developer_name == author) {
+#endif
+                 package_ids.add (package.component.id);
+ 
+                 AppCenterCore.Package? user_package = null;
+@@ -1095,7 +1120,11 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
+             warning ("Errors found in flatpak appdata, some components may be incomplete/missing: %s", e.message);
+         } finally {
+             var comp_validator = ComponentValidator.get_default ();
+#if HAS_APPSTREAM_1_0
+            user_appstream_pool.get_components ().as_array ().foreach ((comp) => {
+#else
+             user_appstream_pool.get_components ().foreach ((comp) => {
+#endif
+                 if (!comp_validator.validate (comp)) {
+                     return;
+                 }
+@@ -1133,7 +1162,11 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
+             warning ("Errors found in flatpak appdata, some components may be incomplete/missing: %s", e.message);
+         } finally {
+             var comp_validator = ComponentValidator.get_default ();
+#if HAS_APPSTREAM_1_0
+            system_appstream_pool.get_components ().as_array ().foreach ((comp) => {
+#else
+             system_appstream_pool.get_components ().foreach ((comp) => {
+#endif
+                 if (!comp_validator.validate (comp)) {
+                     return;
+                 }
+diff --git a/src/Core/Package.vala b/src/Core/Package.vala
+index 0f9a90c4..ed141292 100644
+--- a/src/Core/Package.vala
+++ b/src/Core/Package.vala
+@@ -306,7 +306,11 @@ public class AppCenterCore.Package : Object {
+                 return _author;
+             }
+ 
+#if HAS_APPSTREAM_1_0
+            _author = component.get_developer ().get_name ();
+#else
+             _author = component.developer_name;
+#endif
+ 
+             if (_author == null) {
+                 var project_group = component.project_group;
+@@ -677,7 +681,11 @@ public class AppCenterCore.Package : Object {
+             }
+ 
+             try {
+#if HAS_APPSTREAM_1_0
+                description = AppStream.markup_convert (description, TEXT);
+#else
+                 description = AppStream.markup_convert_simple (description);
+#endif
+             } catch (Error e) {
+                 warning ("Failed to convert description to markup: %s", e.message);
+             }
+@@ -919,7 +927,11 @@ public class AppCenterCore.Package : Object {
+     }
+ 
+     public AppStream.Release? get_newest_release () {
+#if HAS_APPSTREAM_1_0
+        var releases = component.get_releases_plain ().get_entries ();
+#else
+         var releases = component.get_releases ();
+#endif
+         releases.sort_with_data ((a, b) => {
+             if (a.get_version () == null || b.get_version () == null) {
+                 if (a.get_version () != null) {
+diff --git a/src/Core/PackageKitBackend.vala b/src/Core/PackageKitBackend.vala
+index 09da4074..a108831e 100644
+--- a/src/Core/PackageKitBackend.vala
+++ b/src/Core/PackageKitBackend.vala
+@@ -275,7 +275,11 @@ public class AppCenterCore.PackageKitBackend : Backend, Object {
+         } finally {
+             var new_package_list = new Gee.HashMap<string, Package> ();
+             var comp_validator = ComponentValidator.get_default ();
+#if HAS_APPSTREAM_1_0
+            appstream_pool.get_components ().as_array ().foreach ((comp) => {
+#else
+             appstream_pool.get_components ().foreach ((comp) => {
+#endif
+                 if (!comp_validator.validate (comp)) {
+                     return;
+                 }
+@@ -317,7 +321,12 @@ public class AppCenterCore.PackageKitBackend : Backend, Object {
+             component.set_id (id);
+             component.set_origin (Package.APPCENTER_PACKAGE_ORIGIN);
+ 
+-#if HAS_APPSTREAM_0_15
+#if HAS_APPSTREAM_1_0
+            var components = new AppStream.ComponentBox (AppStream.ComponentBoxFlags.NONE);
+            components.add (component);
+
+            appstream_pool.add_components (components);
+#elif HAS_APPSTREAM_0_15
+             var components = new GenericArray<AppStream.Component> ();
+             components.add (component);
+ 
+@@ -430,7 +439,11 @@ public class AppCenterCore.PackageKitBackend : Backend, Object {
+                 break;
+             }
+ 
+#if HAS_APPSTREAM_1_0
+            if (package.component.get_developer ().get_name () == author) {
+#else
+             if (package.component.developer_name == author) {
+#endif
+                 packages.add (package);
+             }
+         }
+@@ -447,7 +460,11 @@ public class AppCenterCore.PackageKitBackend : Backend, Object {
+ 
+         var category_array = new GLib.GenericArray<AppStream.Category> ();
+         category_array.add (category);
+#if HAS_APPSTREAM_1_0
+        AppStream.utils_sort_components_into_categories (appstream_pool.get_components ().as_array (), category_array, true);
+#else
+         AppStream.utils_sort_components_into_categories (appstream_pool.get_components (), category_array, true);
+#endif
+         components = category.get_components ();
+ 
+         var apps = new Gee.TreeSet<AppCenterCore.Package> ();
+@@ -465,7 +482,11 @@ public class AppCenterCore.PackageKitBackend : Backend, Object {
+         var apps = new Gee.TreeSet<AppCenterCore.Package> ();
+         var comps = appstream_pool.search (query);
+         if (category == null) {
+#if HAS_APPSTREAM_1_0
+            comps.as_array ().foreach ((comp) => {
+#else
+             comps.foreach ((comp) => {
+#endif
+                 var package = get_package_for_component_id (comp.get_id ());
+                 if (package != null) {
+                     apps.add (package);
+@@ -473,7 +494,11 @@ public class AppCenterCore.PackageKitBackend : Backend, Object {
+             });
+         } else {
+             var cat_packages = get_applications_for_category (category);
+#if HAS_APPSTREAM_1_0
+            comps.as_array ().foreach ((comp) => {
+#else
+             comps.foreach ((comp) => {
+#endif
+                 var package = get_package_for_component_id (comp.get_id ());
+                 if (package != null && package in cat_packages) {
+                     apps.add (package);
+diff --git a/src/Views/AppInfoView.vala b/src/Views/AppInfoView.vala
+index 5a3a361a..bef37f0e 100644
+--- a/src/Views/AppInfoView.vala
+++ b/src/Views/AppInfoView.vala
+@@ -310,8 +310,16 @@ public class AppCenter.Views.AppInfoView : AppCenter.AbstractAppContainer {
+                 oars_flowbox.add (uncurated);
+             }
+ #endif
+
+#if HAS_APPSTREAM_1_0
+            var active_locale = "en-US";
+            if (package_component.get_context () != null) {
+                active_locale = package_component.get_context ().get_locale () ?? "en-US";
+            }
+#else
+             var active_locale = package_component.get_active_locale ();
+-            if (active_locale != "en_US") {
+#endif
+            if (active_locale != "en_US" && active_locale != "en-US") {
+                 var percent_translated = package_component.get_language (
+                     // Expects language without locale
+                     active_locale.split ("_")[0]
+@@ -492,7 +500,11 @@ public class AppCenter.Views.AppInfoView : AppCenter.AbstractAppContainer {
+             }
+         }
+ 
+#if HAS_APPSTREAM_1_0
+        screenshots = package_component.get_screenshots_all ();
+#else
+         screenshots = package_component.get_screenshots ();
+#endif
+ 
+         if (screenshots.length > 0) {
+             screenshot_carousel = new Hdy.Carousel () {
+@@ -1030,7 +1042,11 @@ public class AppCenter.Views.AppInfoView : AppCenter.AbstractAppContainer {
+             get_app_download_size.begin ();
+ 
+             Idle.add (() => {
+#if HAS_APPSTREAM_1_0
+                var releases = package.component.get_releases_plain ().get_entries ();
+#else
+                 var releases = package.component.get_releases ();
+#endif
+ 
+                 foreach (unowned var release in releases) {
+                     if (release.get_version () == null) {
+@@ -1049,7 +1065,11 @@ public class AppCenter.Views.AppInfoView : AppCenter.AbstractAppContainer {
+ 
+                         release_carousel.add (release_row);
+ 
+#if HAS_APPSTREAM_1_0
+                        if (package.installed && AppStream.vercmp_simple (release.get_version (), package.get_version ()) <= 0) {
+#else
+                         if (package.installed && AppStream.utils_compare_versions (release.get_version (), package.get_version ()) <= 0) {
+#endif
+                             break;
+                         }
+                     }
+diff --git a/src/Widgets/ReleaseRow.vala b/src/Widgets/ReleaseRow.vala
+index 3b487914..36fcbc76 100644
+--- a/src/Widgets/ReleaseRow.vala
+++ b/src/Widgets/ReleaseRow.vala
+@@ -116,7 +116,11 @@ public class AppCenter.Widgets.ReleaseRow : Gtk.Box {
+     private string format_release_description (string? description ) {
+         if (description != null) {
+             try {
+#if HAS_APPSTREAM_1_0
+                var markup = AppStream.markup_convert (description, TEXT);
+#else
+                 var markup = AppStream.markup_convert_simple (description);
+#endif
+ 
+                 if (markup.strip () != "") {
+                     return markup;
+diff --git a/src/meson.build b/src/meson.build
+index d3d558ef..df69a0bf 100644
+--- a/src/meson.build
+++ b/src/meson.build
+@@ -78,6 +78,10 @@ if appstream.version().version_compare('>=0.16')
+     args += '--define=HAS_APPSTREAM_0_16'
+ endif
+ 
+if appstream.version().version_compare('>=1.0')
+    args += '--define=HAS_APPSTREAM_1_0'
+endif
+
+ if get_option('packagekit_backend')
+     appcenter_files += files(
+         'Core/PackageKitBackend.vala',
@@ -5,7 +5,7 @@

 Name:           elementary-code
 Summary:        Code editor from elementary
-Version:        7.1.0
+Version:        7.2.0
 Release:        1%{?dist}
 License:        GPL-3.0

@@ -11,7 +11,7 @@ URL:            https://github.com/elementary/greeter
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 Source1:        40-%{appname}.conf

-Patch0:         https://github.com/elementary/greeter/commit/dbd9b6f9701f5992c3b3257c025b9cd80d041cc8.patch
+Patch0:         https://github.com/elementary/greeter/compare/7.0.0..42320c266395606b0c20782603e7407124c3f7a4.patch

 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -36,9 +36,9 @@ BuildRequires:  pkgconfig(granite) >= 5.0
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(libhandy-1)
 BuildRequires:  pkgconfig(liblightdm-gobject-1)
-BuildRequires:  pkgconfig(mutter-clutter-13)
-BuildRequires:  pkgconfig(mutter-cogl-13)
-BuildRequires:  pkgconfig(mutter-cogl-pango-13)
+BuildRequires:  pkgconfig(mutter-clutter-14)
+BuildRequires:  pkgconfig(mutter-cogl-14)
+BuildRequires:  pkgconfig(mutter-cogl-pango-14)
 BuildRequires:  pkgconfig(x11)

 Provides:       pantheon-greeter = %{version}-%{release}
@@ -3,8 +3,8 @@

 Name:           elementary-theme
 Summary:        Elementary GTK+ Stylesheet
-Version:        7.3.0
-Release:        1%{?dist}
+Version:        8.0.0
+Release:        1%?dist
 License:        GPL-3.0

 URL:            https://github.com/elementary/stylesheet
@@ -3,14 +3,16 @@
 Name:           gala
 Summary:        Gala window manager
 Version:        7.1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPL-3.0-or-later
+Epoch:          1

 URL:            https://github.com/elementary/gala
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz

 # patch some default settings to better match Fedora
 Patch0:         0000-Modify-default-settings-for-Fedora.patch
+Patch:          https://github.com/elementary/gala/compare/7.1.3..43d1e6a01b56a84a4e752e1970a35c19402941eb.patch

 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -31,11 +33,13 @@ BuildRequires:  pkgconfig(granite) >= 5.4.0
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(libbamf3)
 BuildRequires:  pkgconfig(libcanberra)
-BuildRequires:  pkgconfig(mutter-clutter-13)
-BuildRequires:  pkgconfig(mutter-cogl-13)
-BuildRequires:  pkgconfig(mutter-cogl-pango-13)
+BuildRequires:  pkgconfig(libhandy-1)
+BuildRequires:  pkgconfig(sqlite3)
+BuildRequires:  pkgconfig(mutter-clutter-14)
+BuildRequires:  pkgconfig(mutter-cogl-14)
+BuildRequires:  pkgconfig(mutter-cogl-pango-14)

-Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+Requires:       %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}

 # gala provides a generic icon (apps/multitasking-view)
 Requires:       hicolor-icon-theme
@@ -61,7 +65,7 @@ This package contains the shared libraries.

 %package        devel
 Summary:        Gala window manager development files
-Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+Requires:       %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}

 %description    devel
 Gala is Pantheon's Window Manager, part of the elementary project.
@@ -85,8 +89,8 @@ This package contains the development headers.


 %check
-desktop-file-validate \
-    %{buildroot}/%{_sysconfdir}/xdg/autostart/gala-daemon.desktop
+%dnl desktop-file-validate \
+%dnl    %{buildroot}/%{_sysconfdir}/xdg/autostart/gala-daemon.desktop

 desktop-file-validate \
    %{buildroot}/%{_datadir}/applications/gala*.desktop
@@ -98,7 +102,7 @@ desktop-file-validate \
 %files -f gala.lang
 %doc README.md
 %license COPYING
-%config(noreplace) %{_sysconfdir}/xdg/autostart/gala-daemon.desktop
+%dnl %config(noreplace) %{_sysconfdir}/xdg/autostart/gala-daemon.desktop

 %{_bindir}/gala
 %{_bindir}/gala-daemon
@@ -5,8 +5,8 @@ apps built for elementary.}

 Name:           granite-7
 Summary:        Elementary companion library for GTK+ and GLib
-Version:        7.4.0
-Release:        1%{?dist}
+Version:        7.5.0
+Release:        1%?dist
 License:        LGPL-3.0-or-later

 URL:            https://github.com/elementary/granite
@@ -82,6 +82,7 @@ desktop-file-validate \

 %{_datadir}/metainfo/granite-7.metainfo.xml
 %{_datadir}/icons/hicolor/*/apps/io.elementary.granite-7.svg
+%{_datadir}/themes/Granite/


 %files devel
@@ -1,5 +1,5 @@
 Name:			pantheon-tweaks
-Version:		1.1.1
+Version:		1.1.2
 Release:		1%{?dist}
 Summary:		A system settings panel for the Pantheon desktop environment
 License:		GPL-3.0
@@ -9,12 +9,14 @@
 Name:           switchboard-plug-about
 Summary:        Switchboard System Information plug
 Version:        6.2.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/switchboard-plug-about
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz

+Patch0:         https://github.com/elementary/switchboard-plug-about/compare/6.2.0..72d7da13da2824812908276751fd3024db2dd0f8.patch
+
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
@@ -8,15 +8,13 @@

 Name:           switchboard-plug-networking
 Summary:        Switchboard Networking plug
-Version:        2.4.4
-Release:        2%{?dist}
+Version:        2.5.0
+Release:        1%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/switchboard-plug-network
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz

-Patch0:         https://github.com/elementary/switchboard-plug-network/pull/357.patch
-
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
@@ -5,7 +5,7 @@

 Name:           switchboard-plug-tweaks
 Summary:        Switchboard Tweaks Plug
-Version:        1.1.1
+Version:        1.1.2
 Release:        1%{?dist}
 License:        GPL-3.0-or-later

@@ -1,5 +0,0 @@
-project pkg {
-	rpm {
-		spec = "switchboard-plug-wallet.spec"
-	}
-}
@@ -1,62 +0,0 @@
-%global __provides_exclude_from ^%{_libdir}/switchboard/.*\\.so$
-
-%global srcname switchboard-plug-wallet
-
-%global plug_type personal
-%global plug_name wallet
-%global plug_rdnn io.elementary.switchboard.wallet
-
-%global commit 50582fc7ee43a4b47647d04786dcf1d0eb45af36
-
-Name:           switchboard-plug-wallet
-Summary:        Switchboard Wallet Plug
-Version:        %(c=%commit; echo ${c:0:7})
-Release:        2%?dist
-License:        GPL-3.0-or-later
-
-URL:            https://github.com/elementary/%name
-Source0:        %url/archive/%version/%srcname-%version.tar.gz
-
-BuildRequires:  libappstream-glib
-BuildRequires:  meson
-BuildRequires:  vala
-BuildRequires:  fdupes
-
-BuildRequires:  pkgconfig(granite) >= 0.5
-BuildRequires:  gtk3-devel
-BuildRequires:  pkgconfig(libsecret-1)
-BuildRequires:  switchboard-devel
-
-Requires:       switchboard%{?_isa}
-Supplements:    switchboard%{?_isa}
-
-%description
-Manage Payment Methods and related settings.
-
-
-%prep
-%autosetup -n %srcname-%commit -p1
-
-
-%build
-%meson
-%meson_build
-
-
-%install
-%meson_install
-%fdupes %buildroot%_datadir/icons/hicolor
-
-
-%files
-%doc README.md
-%license COPYING
-
-%_libdir/switchboard/%plug_type/lib%plug_rdnn.so
-%_datadir/icons/hicolor/*/apps/%plug_rdnn.svg
-%_datadir/locale/*/LC_MESSAGES/%plug_rdnn.mo
-
-
-%changelog
-* Tue Jun 13 2023 windowsboy111 <windowsboy111@fyralabs.com> - bfe73dfb95d9b46a0a34e0db35a178233c8552b0-1
- Initial package.
@@ -1,3 +0,0 @@
-let req = new_req("https://api.github.com/repos/elementary/switchboard-plug-wallet/commits/HEAD");
-req.head("Authorization", `Bearer ${env("GITHUB_TOKEN")}`);
-rpm.global("commit", json(req.get()).sha);
@@ -5,7 +5,7 @@

 Name:           wingpanel-indicator-network
 Summary:        Network Indicator for wingpanel
-Version:        7.0.2
+Version:        7.1.0
 Release:        1%{?dist}
 License:        GPL-3.0-or-later

@@ -6,7 +6,7 @@
 Name:           wingpanel-indicator-session
 Summary:        Session Indicator for wingpanel
 Version:        2.3.1
-Release:        2%{?dist}
+Release:        1%{?dist}
 License:        GPL-2.0-or-later

 URL:            https://github.com/elementary/wingpanel-indicator-session
@@ -9,9 +9,11 @@ Summary:        Stylish top panel
 Version:        3.0.5
 Release:        1%{?dist}
 License:        GPL-2.0-or-later
+Epoch:          1

 URL:            https://github.com/elementary/wingpanel
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
+Patch0:         https://github.com/elementary/wingpanel/compare/3.0.5..5d22d436b45decfb2a50d9a7c27f2c961f1dd39f.patch

 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -21,17 +23,17 @@ BuildRequires:  vala >= 0.24.0

 BuildRequires:  mesa-libEGL-devel

-BuildRequires:  pkgconfig(gala)
+BuildRequires:  pkgconfig(gala) >= 7.1.3-2
 BuildRequires:  pkgconfig(gdk-x11-3.0)
 BuildRequires:  pkgconfig(gee-0.8)
 BuildRequires:  pkgconfig(glib-2.0) >= 2.32
 BuildRequires:  pkgconfig(granite) >= 5.4.0
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.10
-BuildRequires:  pkgconfig(mutter-clutter-13)
-BuildRequires:  pkgconfig(mutter-cogl-13)
-BuildRequires:  pkgconfig(mutter-cogl-pango-13)
+BuildRequires:  pkgconfig(mutter-clutter-14)
+BuildRequires:  pkgconfig(mutter-cogl-14)
+BuildRequires:  pkgconfig(mutter-cogl-pango-14)

-Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+Requires:       %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}

 # wingpanel ayatana appindicator support was abandoned by upstream
 # wingpanel-indicator-ayatana-2.0.3-10.fc32 retired for fedora 33+
@@ -42,6 +44,8 @@ Obsoletes:      wingpanel-indicator-ayatana < 2.0.3-11

 %package        libs
 Summary:        Stylish top panel (shared library)
+Enhances:       %{name} = %{epoch}:%{version}-%{release}
+Enhances:       %{name}-devel = %{epoch}:%{version}-%{release}

 %description    libs %{common_description}

@@ -50,7 +54,7 @@ This package contains the shared library.

 %package        devel
 Summary:        Stylish top panel (development files)
-Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+Requires:       %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}

 %description    devel %{common_description}

@@ -3,7 +3,7 @@

 Name:           gnome-shell-extension-%{extension}
 Version:        2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNOME Shell extension to bring back the app menu
 License:        GPL-3.0-only
 URL:            https://github.com/fthx/appmenu-is-back
@@ -11,8 +11,9 @@ URL:            https://github.com/fthx/appmenu-is-back
 BuildArch:      noarch

 Source0:        https://github.com/fthx/appmenu-is-back/archive/refs/tags/v%{version}.tar.gz
+Patch0:         https://github.com/fthx/appmenu-is-back/commit/c251ff36d226dac679eb745638e3df236d3e1a20.patch

-Requires:       (gnome-shell >= 45~ with gnome-shell < 46~)
+Requires:       (gnome-shell >= 46~ with gnome-shell < 47~)
 Recommends:     gnome-extensions-app

 %description
@@ -30,5 +31,8 @@ install -Dm644 extension.js %{buildroot}%{_datadir}/gnome-shell/extensions/%{uui
 %{_datadir}/gnome-shell/extensions/%{uuid}

 %changelog
+* Mon Apr 1 2024 Lleyton Gray <lleyton@fyralabs.com> - 2-2
+- Patch for GNOME 46 compatibility
+
 * Thu Nov 16 2023 Lleyton Gray <lleyton@fyralabs.com> - 2-1
 - Initial Release
@@ -1,12 +1,13 @@
 # from Fedora upstream
 %global extension   pop-shell
 %global uuid        %{extension}@system76.com
-%global commit      cf3c932b55d5c247906efe9d81f988ee092d9f51
+%global commit      cfa0c55e84b7ce339e5ce83832f76fee17e99d51
 %global shortcommit %{lua:print(macros.commit:sub(1,7))}
+%global commit_date 20240404
 %global ver         1.2.0

 Name:           terra-gnome-shell-extension-%{extension}
-Version:        %{ver}^%{shortcommit}
+Version:        %{ver}^%commit_date.%{shortcommit}
 Release:        1%?dist
 Summary:        GNOME Shell extension for advanced tiling window management
 License:        GPL-3.0-only
@@ -1,4 +1,8 @@
 if filters.contains("nightly") {
-  rpm.global("commit", get("https://api.github.com/repos/pop-os/shell/commits/HEAD").json().sha);
-  rpm.global("ver", gh("pop-os/shell"));
+  rpm.global("commit", gh_commit("pop-os/shell"));
+  if rpm.changed() {
+    rpm.global("ver", gh("pop-os/shell"));
+    rpm.release();
+    rpm.global("commit_date", date());
+  }
 }
@@ -5,7 +5,7 @@

 # https://github.com/FyshOS/fynedesk
 %global goipath         github.com/FyshOS/fynedesk
-Version:                0.3.0
+Version:                0.4.0

 %gometa -f

@@ -17,7 +17,7 @@ A full desktop environment for Linux/Unix using Fyne.}
 %global godocs          AUTHORS README.md CHANGELOG.md

 Name:           %{goname}
-Release:        1%{?dist}
+Release:        1%?dist
 Summary:        A full desktop environment for Linux/Unix using Fyne

 License:        BSD-3-Clause
@@ -1,6 +1,6 @@
 %global forgeurl https://github.com/KDE/latte-dock/

-%global commit 3d26e09efdd94bc7adb308335e421ca3bbe6bf4f
+%global commit 8328f9a6863b4bae48adfdbc29b32b4c571c6530
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global commit_date %(date '+%Y%m%d')
 %global snapshot_info %{commit_date}.%{shortcommit}
@@ -9,7 +9,7 @@ Name:     latte-dock-nightly
 Version:  0.10.0^%{snapshot_info}

 %forgemeta
-Release:  1%{?dist}
+Release:  1%?dist
 Summary:  Latte is a dock based on plasma frameworks
 License:  GPL-2.0-or-later

@@ -1,9 +1,9 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-app-launch
-%global commit 1a7a0ef6a8ab966b664f3515aba539b422f35849
+%global commit 99fa99c6e8af868f64dbfdb973eebeb2ca3ad14a
 %forgemeta

 Name:           lomiri-app-launch
-Version:        0.1.8
+Version:        0.1.9
 Release:        1%{?dist}
 Summary:        Provides the Lomiri App Launch user space daemon
 License:        GPL-3.0
@@ -1,10 +1,10 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-download-manager
-%global commit 2c7d6921ac56862c197958f4e5c31aa76a1a50e1
+%global commit 682c4928a91da598767e0be2496d9c35af7db035
 %forgemeta

 Name:       lomiri-download-manager
-Version:    0.1.2
-Release:    %autorelease
+Version:    0.1.3
+Release:    1%{?dist}
 Summary:    Upload Download Manager for Lomiri
 License:    LGPLv3
 URL:        https://gitlab.com/ubports/development/core/lomiri-download-manager
@@ -23,6 +23,7 @@ BuildRequires: qt5-qtdeclarative-devel
 BuildRequires: pkgconfig(dbus-1)
 BuildRequires: pkgconfig(libglog)
 BuildRequires: pkgconfig(liblomiri-api)
+BuildRequires: pkgconfig(systemd)
 BuildRequires: fdupes

 %description
@@ -60,7 +61,7 @@ sed -e "s/-Werror//g" -i CMakeLists.txt

 %files -f %{name}.lang
 %license COPYING
-%config %{_sysconfdir}/dbus-1/system.d/*.conf
+%config /usr/etc/dbus-1/system.d/*.conf
 %{_bindir}/lomiri-*
 %{_userunitdir}/*.service
 %{_libdir}/liblomiri-download-manager-client.so.*
@@ -0,0 +1,7 @@
+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
+if rpm.f != f {
+	rpm.global("commit", o.commit.id);
+}
@@ -1,10 +1,10 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-indicator-network
-%global commit 7d0fd44108cfb74da3fcb26e7de07f7610302f5c
+%global commit a4522caf548d7e7f63f98f9e5c98314ee8d4c8fb
 %forgemeta

 Name:       lomiri-indicator-network
-Version:    1.0.1
-Release:    %autorelease
+Version:    1.0.2
+Release:    1%{?dist}
 Summary:    The Network indicator for Ubuntu Touch
 License:    GPL-3.0 AND LGPL-3.0
 URL:        https://gitlab.com/ubports/development/core/lomiri-indicator-network
@@ -30,6 +30,7 @@ BuildRequires: pkgconfig(libgmenuharness)
 BuildRequires: pkgconfig(ofono)
 BuildRequires: pkgconfig(qofono-qt5)
 BuildRequires: pkgconfig(lomiri-url-dispatcher)
+BuildRequires: pkgconfig(systemd)
 Requires:      gmenuharness

 %description
@@ -64,7 +65,7 @@ The %{name}-doc package contains documentation files for %{name}.
 %files -f %{name}.lang
 %doc README.md
 %license COPYING COPYING.LGPL
-%config %{_sysconfdir}/xdg/autostart/lomiri-indicator-network.desktop
+%config /usr/etc/xdg/autostart/lomiri-indicator-network.desktop
 %{_userunitdir}/*.service
 %{_libdir}/liblomiri-connectivity-qt1.so.*
 %dir %{_qt5_qmldir}/Lomiri/Connectivity
@@ -91,10 +92,7 @@ The %{name}-doc package contains documentation files for %{name}.
 %{_libdir}/pkgconfig/lomiri-connectivity-qt1.pc

 %files doc
-%dir %{_docdir}/lomiri-connectivity-doc
-%{_docdir}/lomiri-connectivity-doc/cpp/
-%{_docdir}/lomiri-connectivity-doc/dbus/
-%{_docdir}/lomiri-connectivity-doc/qml/
+%{_docdir}/lomiri-indicator-network

 %changelog
 %autochangelog
@@ -1,10 +1,10 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-schemas
-%global commit fed68d63df86c0b39654b66c31e02be25018f5f1
+%global commit 6acdde9e890685bd5a5d6fbd4446d9e8b3e6c698
 %forgemeta

 Name:       lomiri-schemas
-Version:    0.1.3
-Release:    %autorelease
+Version:    0.1.4
+Release:    1%{?dist}
 Summary:    Configuration schemas for lomiri
 License:    LGPL-2.0-or-later
 URL:        https://gitlab.com/ubports/development/core/lomiri-schemas
@@ -1,10 +1,10 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-settings-components
-%global commit a2ce1155d385218a4b493f801867a45d2a41df02
+%global commit 2bd84b9a59563dce7a791e0c882e2533ecdd4812
 %forgemeta

 Name:       lomiri-settings-components
-Version:    1.1.0
-Release:    %autorelease
+Version:    1.1.1
+Release:    1%{?dist}
 Summary:    The system settings components for Lomiri
 License:    GPLv3 AND LGPLv3
 URL:        https://gitlab.com/ubports/development/core/lomiri-settings-components
@@ -1,5 +1,5 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings
-%global commit 7c7e9ff47a02ca94ef58eb8982334abd420dd99c
+%global commit 30d9df926b6837b139990a622d39171ea42c9017
 %forgemeta

 Name:       lomiri-system-settings
@@ -10,7 +10,6 @@ License:    GPLv3
 URL:        https://gitlab.com/ubports/development/core/lomiri-system-settings
 Source0:    %{url}/-/archive/%commit/lomiri-system-settings-%commit.tar.gz
 Patch0:     https://sources.debian.org/data/main/l/lomiri-system-settings/1.0.1-2/debian/patches/1001_use-maliit-keyboard-for-language-plugin.patch
-Patch1:     https://sources.debian.org/data/main/l/lomiri-system-settings/1.0.1-2/debian/patches/2001_disable-current-language-switching.patch

 BuildRequires: cmake
 BuildRequires: gcc-c++
@@ -1,9 +1,9 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-ui-toolkit
-%global commit b8655ed86ca64361c23220047d921c338c9dc852
+%global commit 454d980c352f3cea725458ff8a3d04ae686d2a96
 %forgemeta

 Name:           lomiri-ui-toolkit
-Version:        1.3.5011
+Version:        1.3.5012
 Release:        1%{?dist}
 Summary:        QML components to ease the creation of beautiful applications in QML for Lomiri

@@ -1,2 +1,4 @@
-rpm.version(get("https://gitlab.com/api/v4/projects/19057685/repository/tags").json_arr()[0].name);
-rpm.global("commit", get("https://gitlab.com/api/v4/projects/19057685/repository/commits").json_arr()[0].id);
+rpm.version(gitlab_tag("19057685"));
+if rpm.changed() {
+	rpm.global("commit", gitlab_commit("19057685"));
+}
@@ -1,5 +1,5 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-url-dispatcher
-%global commit 1ac312239a088e5a797b786a22bec42cb0037039
+%global commit 6b6f2277e2a63fe0893c1fddd1cc75da5da87eb7
 %forgemeta

 Name:           lomiri-url-dispatcher
@@ -1,2 +1,4 @@
-rpm.version(get("https://gitlab.com/api/v4/projects/17424894/repository/tags").json_arr()[0].name);
-rpm.global("commit", get("https://gitlab.com/api/v4/projects/17424894/repository/commits").json_arr()[0].id);
+rpm.version(gitlab_tag("17424894"));
+if rpm.changed() {
+	rpm.global("commit", get("https://gitlab.com/api/v4/projects/17424894/repository/commits").json_arr()[0].id);
+}
@@ -1,9 +1,9 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri
-%global commit 162f530aa3b816ba1bdd7cc7ba029b271c72d878
+%global commit 426b9f3436938f149490cee340e1fab79ee7b650
 %forgemeta

 Name:          lomiri
-Version:       0.1.4
+Version:       0.2.1
 Release:       1%{?dist}
 Summary:       A convergent desktop environment by Ubports

@@ -1,3 +1,4 @@
-let o = get("https://gitlab.com/api/v4/projects/25716028/repository/tags").json_arr()[0];
-rpm.version(o.name);
-rpm.global("commit", get("https://gitlab.com/api/v4/projects/25716028/repository/commits").json_arr()[0].id);
+rpm.version(gitlab_tag("25716028"));
+if rpm.changed() {
+	rpm.global("commit", get("https://gitlab.com/api/v4/projects/25716028/repository/commits").json_arr()[0].id);
+}
@@ -1,4 +1,4 @@
-%global rn 1
+%global rn 4

 Name:           unity-greeter
 Version:        23.10.1
@@ -1,9 +1,9 @@
-%define _ubuntu_rel 1ubuntu1
+%define _ubuntu_rel 1ubuntu4

 Name:    unity-session
 Summary: Lightdm profile for Unity 7
-Version: 45.0
-Release: 1%{?dist}
+Version: 46.0
+Release: 1%?dist

 License:   GPL-2.0
 URL:       https://packages.ubuntu.com/jammy/unity-session
@@ -1,4 +1,4 @@
-%define archive unity_7.7.0+23.04.20230222.2-0ubuntu2.tar.xz
+%define archive unity_7.7.0+23.04.20230222.2-0ubuntu7.tar.xz

 Name:		unity-shell
 Version:	7.7.0
@@ -1,6 +1,6 @@
 Name:       ayatana-indicator-datetime
 Summary:    A GTK implementation of the StatusNotifierItem Specification
-Version:    23.10.0
+Version:    24.2.0
 Release:    1%{?dist}
 License:    GPL-3.0
 URL:        https://github.com/AyatanaIndicators/ayatana-indicator-datetime
@@ -38,7 +38,7 @@ Unity7 desktop and Lomiri desktop.

 %build
 %cmake -DENABLE_LOMIRI_FEATURES=ON \
-       -DENABLE_TESTS=ON \
+       -DENABLE_TESTS=OFF\
       -DENABLE_COVERAGE=OFF \
 %cmake_build

--- a/Show More
+++ b/Show More