fix restore keys

bump(nightly): prismlauncher-nightly prismlauncher-qt5-nightly tdlib nim-nightly
bump: osu-lazer
2026-05-31 09:01:55 +00:00 · 2023-10-14 19:38:40 +07:00 · 2023-10-14 01:05:59 +00:00 · 2023-10-13 17:35:23 +00:00 · 2023-10-13 12:56:35 +00:00 · 2023-10-13 06:33:29 +00:00
539 changed files with 831 additions and 6784 deletions
@@ -6,13 +6,13 @@ on:
    paths:
      - anda/**
    branches:
-      - f39
+      - f38
  pull_request:
    branches:
-      - f39
+      - f38
  merge_group:
    branches:
-      - f39
+      - f38
  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:f38
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Set workspace as safe
@@ -40,11 +40,11 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }}
-        version: ["39"]
+        version: ["38"]
      fail-fast: false
    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
    container:
-      image: ghcr.io/terrapkg/builder:f${{ matrix.version}}
+      image: ghcr.io/terrapkg/builder:f38
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
@@ -59,14 +59,19 @@ jobs:
        uses: actions/cache@v3
        with:
          path: /var/cache
-          key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}
+          key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}-${{ matrix.pkg.pkg }}
+          restore-keys: |
+            ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}-${{ matrix.pkg.pkg }}
+            ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}
+            ${{ runner.os }}-br-${{ matrix.version }}
+            ${{ runner.os }}-br

      - name: Include custom build template instead of package default
        run: |
-          cp -v anda/terra/mock-configs/terra.tpl /etc/mock/templates/terra.tpl
+          cp -v anda/mock-configs/terra.tpl /etc/mock/templates/terra.tpl

      - name: Build with Andaman
-        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c anda/terra/mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg
+        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c anda/mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg

      - name: Generating artifact name
        id: art
@@ -78,9 +83,7 @@ jobs:
      - uses: actions/upload-artifact@v3
        with:
          name: ${{ steps.art.outputs.name }}
-          path: |
-            anda-build/rpm/rpms/*
-            anda-build/rpm/srpm/*
+          path: anda-build/rpm/rpms/*

      - name: Upload packages to subatomic
        if: github.event_name == 'push'
@@ -90,14 +93,6 @@ jobs:
            --token ${{ secrets.SUBATOMIC_TOKEN }} \
            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 \
-            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }}-source anda-build/rpm/srpm/*
-
      - name: Notify Madoguchi (Success)
        if: success() && github.event_name == 'push'
        run: ./.github/workflows/mg.sh true ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
@@ -7,55 +7,71 @@ jobs:
  bootstrap:
    strategy:
      matrix:
-        version: ["39"]
+        version: ["38"]
        arch: ["x86_64", "aarch64"]
      fail-fast: true
    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
    container:
-      image: registry.fedoraproject.org/fedora-minimal:${{ matrix.version }}
+      image: fedora:38
      options: --cap-add=SYS_ADMIN --privileged
    steps:
-      - name: Install repositories
-        run: dnf5 install -y --setopt=install_weak_deps=False mock curl wget git-core openssl-devel cargo podman fuse-overlayfs
+      - uses: actions/setup-go@v3
+        with:
+          go-version: "^1.19"

+      - name: Install repositories
+        run: |
+          sudo dnf install -y dnf-plugins-core
+          sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra${{ matrix.version }}.repo
+          sudo dnf install -y mock createrepo_c rpm-build gcc curl wget git-core openssl-devel
+
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
      - name: Install Anda
-        run: cargo install anda
+        uses: actions-rs/cargo@v1
+        with:
+          command: install
+          args: anda
+

      - uses: actions/checkout@v3
        with:
-          ref: f${{ matrix.version }}
+          ref: f${{ matrix.version} }}
          fetch-depth: 1
      - name: Build terra-mock-configs
        run: |
-          echo "PATH=$PATH:/github/home/.cargo/bin" >> $GITHUB_ENV
-          export PATH=$PATH:/github/home/.cargo/bin
          git config --global --add safe.directory "$GITHUB_WORKSPACE"
-          anda build -c fedora-${{ matrix.version }}-${{ matrix.arch }} anda/terra/mock-configs/pkg -p rpm
+          anda build -c fedora-${{ matrix.version }}-${{ matrix.arch }} anda/mock-configs/pkg -p rpm
      - name: Install terra-mock-configs
-        run: dnf5 install -y anda-build/rpm/rpms/terra-mock-configs*.rpm
-
-      - name: Build anda-srpm-macros
-        run: anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} anda/terra/srpm-macros/pkg
+        run: sudo dnf install -y anda-build/rpm/rpms/terra-mock-configs*.rpm

+      - uses: actions/checkout@v3
+        with:
+          repository: FyraLabs/subatomic
+          set-safe-directory: true
+          fetch-depth: 1
+      
      - name: Build Subatomic
-        run: anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} anda/tools/buildsys/subatomic/pkg
+        run: |
+          git config --global --add safe.directory "$GITHUB_WORKSPACE"
+          anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} subatomic -p rpm -D "autogitcommit $(git log -1 --format='%H')"
      - name: Install Subatomic
-        run: dnf5 install -y ./anda-build/rpm/rpms/subatomic-*.rpm
+        run: sudo dnf install -y ./anda-build/rpm/rpms/subatomic-*.rpm
+
+
+      - uses: actions/checkout@v3
+        with:
+          repository: FyraLabs/anda
+          fetch-depth: 1

      - name: Build Andaman
-        run: anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} anda/tools/buildsys/anda/pkg
+        run: anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} anda -p rpm

-      - name: Upload packages to subatomic
+
+      - name: Upload to Subatomic
        run: |
          subatomic-cli upload --prune \
            --server https://subatomic.fyralabs.com \
            --token ${{ secrets.SUBATOMIC_TOKEN }} \
            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 \
-            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }}-source anda-build/rpm/srpm/*
@@ -21,12 +21,12 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(needs.parse.outputs.pkgs) }}
-        version: ["39"]
+        version: ["38"]
        arch: ["x86_64", "aarch64"]
      fail-fast: false
    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
    container:
-      image: ghcr.io/terrapkg/builder:f${{ matrix.version }}
+      image: ghcr.io/terrapkg/builder:f38
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
@@ -44,7 +44,7 @@ jobs:
          key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.arch }}-${{ matrix.pkg }}

      - name: Build with Andaman
-        run: anda build anda/${{ matrix.pkg }}pkg --package rpm -c anda/terra/mock-configs/terra-${{ matrix.version }}-${{ matrix.arch }}.cfg
+        run: anda build anda/${{ matrix.pkg }}pkg --package rpm -c anda/mock-configs/terra-${{ matrix.version }}-${{ matrix.arch }}.cfg

      - name: Generating artifact name
        id: art
@@ -56,9 +56,7 @@ jobs:
      - uses: actions/upload-artifact@v3
        with:
          name: ${{ steps.art.outputs.name }}
-          path: |
-            anda-build/rpm/rpms/*
-            anda-build/rpm/srpm/*
+          path: anda-build/rpm/rpms/*

      - name: Upload packages to subatomic
        run: |
@@ -67,17 +65,9 @@ jobs:
            --token ${{ secrets.SUBATOMIC_TOKEN }} \
            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 \
-            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }}-source anda-build/rpm/srpm/*
-
      - name: Notify Madoguchi (Success)
-        if: success()
+        if: success() && github.event_name == 'push'
        run: ./.github/workflows/mg.sh true ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
      - name: Notify Madoguchi (Failure)
-        if: cancelled() || failure()
+        if: ( cancelled() || failure() ) && github.event_name == 'push'
        run: ./.github/workflows/mg.sh false ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
@@ -11,11 +11,11 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(inputs.packages) }}
-        version: ["39"]
+        version: ["38"]
      fail-fast: false
    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
    container:
-      image: ghcr.io/terrapkg/builder:f${{ matrix.version }}
+      image: ghcr.io/terrapkg/builder:f38
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
@@ -33,7 +33,7 @@ jobs:
          key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}-${{ matrix.pkg.pkg }}

      - name: Build with Andaman
-        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c anda/terra/mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg
+        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c anda/mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg

      - name: Generating artifact name
        id: art
@@ -45,9 +45,7 @@ jobs:
      - uses: actions/upload-artifact@v3
        with:
          name: ${{ steps.art.outputs.name }}
-          path: |
-            anda-build/rpm/rpms/*
-            anda-build/rpm/srpm/*
+          path: anda-build/rpm/rpms/*

      - name: Upload packages to subatomic
        run: |
@@ -56,17 +54,9 @@ jobs:
            --token ${{ secrets.SUBATOMIC_TOKEN }} \
            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 \
-            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }}-source anda-build/rpm/srpm/*
-
      - name: Notify Madoguchi (Success)
-        if: success()
+        if: success() && github.event_name == 'push'
        run: ./.github/workflows/mg.sh true ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
      - name: Notify Madoguchi (Failure)
-        if: cancelled() || failure()
+        if: ( cancelled() || failure() ) && github.event_name == 'push'
        run: ./.github/workflows/mg.sh false ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
@@ -3,18 +3,18 @@ name: Lint
 on:
  push:
    branches:
-      - f39
+      - f38
  pull_request:
    branches:
-      - f39
+      - f38
  merge_group:
    branches:
-      - f39
+      - f38
 jobs:
  lint:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:f39
+      image: ghcr.io/terrapkg/builder:f38
    steps:
      - name: Checkout repository
        uses: actions/checkout@v3
@@ -3,7 +3,6 @@ name: Push comps updates
 on:
  push:
    branches:
-      - f39
      - f38
      - f37
    paths:
@@ -14,7 +13,7 @@ jobs:
  update-comps:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:f39
+      image: ghcr.io/terrapkg/builder:f38
    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:f39
+      image: ghcr.io/terrapkg/builder:f38
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
@@ -47,7 +47,6 @@ jobs:
              git commit -S -a -m "$msg"
            }
            copy_over f37 || true
-            copy_over f38 || true
-            copy_over frawhide || true
+            copy_over f39 || 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:f38
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
@@ -48,18 +48,6 @@ jobs:
              git commit -S -a -m "$msg"
            }
            copy_over f37 || true
-            copy_over f38 || true
-            copy_over frawhide || true
-            git remote add raboneko git@github.com:raboneko/packages.git
+            copy_over f39 || true
            git push -u origin --all
-
-            gh pr create --title "$msg" --body "Automatic update from Raboneko!" --label "auto-update" --base "f37" --head "raboneko:f37"
-            gh pr create --title "$msg" --body "Automatic update from Raboneko!" --label "auto-update" --base "f38" --head "raboneko:f38"
-            gh pr create --title "$msg" --body "Automatic update from Raboneko!" --label "auto-update" --base "frawhide" --head "raboneko:frawhide"
-            gh pr create --title "$msg" --body "Automatic update from Raboneko!" --label "auto-update" --base "f39" --head "raboneko:f39"
-
-            gh pr merge --auto --squash raboneko:f37
-            gh pr merge --auto --squash raboneko:f38
-            gh pr merge --auto --squash raboneko:frawhide
-            gh pr merge --auto --squash raboneko:f39
          fi
@@ -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 [documentation](https://developer.fyralabs.com/terra), 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 [documention](https://github.com/terrapkg/packages/wiki), our guidelines may be found there. See the links below:

-* [Contribution Guide](https://developer.fyralabs.com/terra/contributing)
-* [FAQ](https://developer.fyralabs.com/terra/faq)
-* [Policy](https://developer.fyralabs.com/terra/policy)
+* [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)
@@ -1,7 +1,7 @@
 # Terra Sources

+[![Repository status](https://repology.org/badge/repository-big/terra_37.svg?header=Terra+37)](https://repology.org/repository/terra_37)
 [![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)

 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.
@@ -12,7 +12,6 @@ This monorepo contains the package manifests for all packages in Terra.
 ```bash
 sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra.repo
 ```
-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.

 ## Documentation
 Our documentation can be found on our [Devdocs](https://developer.fyralabs.com/terra/). Alternatively, the GitHub Wiki contains older versions of the documentations.
@@ -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://developer.fyralabs.com/terra/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://github.com/terrapkg/packages/wiki/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), [Fedi](https://fedi.fyralabs.com/@hq), and [Discord](https://discord.gg/5fdPuxTg5Q).
+We will publish these updates on our [Twitter](https://twitter.com/TeamFyraLabs) and [Discord](https://discord.gg/5fdPuxTg5Q).

 ## Reporting a Vulnerability

@@ -1,14 +1,13 @@
 Name:			anki-bin
-Version:		23.12.1
-Release:		1%{?dist}
+Version:		2.1.66
+Release:		2%{?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-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
-Requires:       libxcrypt-compat hicolor-icon-theme sox mpv 
+BuildRequires:	python3-installer python3.11 rpm_macro(fdupes)
+Requires:		hicolor-icon-theme python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-send2trash
+Requires:		python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema sox libxcrypt-compat
+Requires:		python3-flask-cors python3-protobuf python3-requests python3-waitress python3-pyqt6-webengine
 ExclusiveArch:	x86_64
 Conflicts:		anki
 Source0:		https://files.pythonhosted.org/packages/cp39/a/anki/anki-%{version}-cp39-abi3-manylinux_2_28_%{_arch}.whl
@@ -29,37 +28,29 @@ Anki is based on a theory called spaced repetition.
 %build

 %install
-pip3 install --root=%{buildroot} %SOURCE0 %SOURCE1
+python3.11 -m installer --destdir="%{buildroot}" %{SOURCE0}
+python3.11 -m installer --destdir="%{buildroot}" %{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"

-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/
+%fdupes %_libdir/python*/site-packages/_aqt/data/


 %files
 %license LICENSE
 %doc README.md
-%_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
+/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

 %changelog
-* Fri Nov 10 2023 hazel-bunny <dabiswas112@gmail.com> - 23.10-2
- Add python3-orjson and mpv as dependencies
-
 * Wed Jan 11 2023 windowsboy111 <windowsboy111@fyralabs.com> - 2.1.60
 - Initial package
@@ -1,20 +1,20 @@
--- a/qt/aqt/qt/__init__.py
-+++ b/qt/aqt/qt/__init__.py
-@@ -9,16 +9,7 @@ import sys
+diff -uNr anki-2.1.55.old/qt/aqt/qt/__init__.py anki-2.1.55/qt/aqt/qt/__init__.py
+--- anki-2.1.55.old/qt/aqt/qt/__init__.py	2023-01-02 18:34:13.716216913 +0800
+++ anki-2.1.55/qt/aqt/qt/__init__.py	2023-01-02 18:34:00.410033708 +0800
+@@ -9,16 +9,7 @@
 import traceback
 from typing import Callable, TypeVar, Union
-
+ 
 -try:
 -    import PyQt6
 -except:
 -    from .qt5 import *  # type: ignore
 -else:
-    if os.getenv("ENABLE_QT5_COMPAT"):
+-    if not os.getenv("DISABLE_QT5_COMPAT"):
 -        print("Running with temporary Qt5 compatibility shims.")
+-        print("Run with DISABLE_QT5_COMPAT=1 to confirm compatibility with Qt6.")
 -        from . import qt5_compat  # needs to be imported first
 -    from .qt6 import *
-
 +from .qt5 import *  # type: ignore
+ 
 from anki.utils import is_mac, is_win
-
- # fix buggy ubuntu12.04 display of language selector
@@ -1,13 +1,17 @@
-diff --git a/qt/aqt/update.py b/qt/aqt/update.py
-index 212ddf93d..6f716cc04 100644
--- a/qt/aqt/update.py
-+++ b/qt/aqt/update.py
-@@ -11,6 +11,8 @@ from aqt.utils import openLink, show_warning, showText, tr
+diff -uNr anki-2.1.55.old/qt/aqt/profiles.py anki-2.1.55/qt/aqt/profiles.py
+--- anki-2.1.55.old/qt/aqt/profiles.py	2023-01-02 18:35:44.574467892 +0800
+++ anki-2.1.55/qt/aqt/profiles.py	2023-01-02 18:34:00.412033736 +0800
+@@ -77,11 +77,11 @@
 
- 
- def check_for_update() -> None:
-+    return
-+
-     from aqt import mw
- 
-     def do_check(_col: Collection) -> CheckForUpdateResponse:
+ metaConf = dict(
+     ver=0,
+-    updates=True,
+    updates=False,
+     created=int_time(),
+     id=random.randrange(0, 2**63),
+     lastMsg=-1,
+-    suppressUpdate=False,
+    suppressUpdate=True,
+     firstRun=True,
+     defaultLang=None,
+ )
@@ -1,13 +1,13 @@
 Name:           anki-qt5
-Version:        23.12.1
-Release:        1%{?dist}
+Version:        2.1.66
+Release:        2%{?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/
 BuildRequires:  python3-devel python3-setuptools python3-waitress python3-protobuf python3-pysocks rpm_macro(fdupes)
 BuildRequires:  python3-distro python3-flask-cors python3-jsonschema python3-send2trash python3-certifi python3-simplejson python3-pyqt5-sip
 BuildRequires:  python3-installer make mold cargo git rsync ninja-build libxcrypt-compat nodejs python3.9 python-unversioned-command gcc
-Requires:       hicolor-icon-theme python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-send2trash python3-orjson mpv python3-qt5-webengine
+Requires:       hicolor-icon-theme python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-send2trash
 Requires:       python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema sox libxcrypt-compat python3-pyqt5-sip
 ExclusiveArch:  x86_64
 Conflicts:      anki
@@ -22,6 +22,7 @@ Anki is based on a theory called spaced repetition.
 %prep
 git clone https://github.com/ankitects/anki .
 git checkout %version
+%patch0 -p1
 %patch1 -p1

 # See https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=anki-qt5
@@ -1,13 +1,17 @@
-diff --git a/qt/aqt/update.py b/qt/aqt/update.py
-index 212ddf93d..6f716cc04 100644
--- a/qt/aqt/update.py
-+++ b/qt/aqt/update.py
-@@ -11,6 +11,8 @@ from aqt.utils import openLink, show_warning, showText, tr
+diff -uNr anki-2.1.55.old/qt/aqt/profiles.py anki-2.1.55/qt/aqt/profiles.py
+--- anki-2.1.55.old/qt/aqt/profiles.py	2023-01-02 18:35:44.574467892 +0800
+++ anki-2.1.55/qt/aqt/profiles.py	2023-01-02 18:34:00.412033736 +0800
+@@ -77,11 +77,11 @@
 
- 
- def check_for_update() -> None:
-+    return
-+
-     from aqt import mw
- 
-     def do_check(_col: Collection) -> CheckForUpdateResponse:
+ metaConf = dict(
+     ver=0,
+-    updates=True,
+    updates=False,
+     created=int_time(),
+     id=random.randrange(0, 2**63),
+     lastMsg=-1,
+-    suppressUpdate=False,
+    suppressUpdate=True,
+     firstRun=True,
+     defaultLang=None,
+ )
@@ -1,6 +1,6 @@
 Name:           anki
-Version:        23.12.1
-Release:        1%{?dist}
+Version:        2.1.66
+Release:        2%{?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/
@@ -22,6 +22,7 @@ Anki is based on a theory called spaced repetition.
 %prep
 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

@@ -14,7 +14,7 @@
 %global __provides_exclude_from %{_datadir}/armcord/.*\\.so

 Name:			armcord-bin
-Version:		3.2.6
+Version:		3.2.4.libwebp
 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.6
+Version:	3.2.4.libwebp
 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.4.1
 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_21.snap
 Requires: gtk3
 Requires: nss
 BuildRequires: squashfs-tools desktop-file-utils
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

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

 Name:           discord-canary
-Version:        0.0.267
+Version:        0.0.171
 Release:        1%{?dist}
 Summary:        Free Voice and Text Chat for Gamers
 URL:            discord.com
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

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

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

 Name:           discord-ptb
-Version:        0.0.66
+Version:        0.0.50
 Release:        1%{?dist}
 Summary:        Free Voice and Text Chat for Gamers.
 URL:            https://discord.com
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:			discord
-Version:		0.0.42
+Version:		0.0.31
 Release:		1%{?dist}
 Summary:		Free Voice and Text Chat for Gamers
 URL:			https://discord.com
@@ -1,10 +1,10 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings
-%global commit ad39d8a88e71320c2d6f1a39a96bfe421f644519
+%global commit 8b9442ced668b24565206830cf47c928b3b6af82
 %forgemeta

 Name:       lomiri-system-settings
-Version:    1.0.2
-Release:    1%{?dist}
+Version:    1.0.1
+Release:    %autorelease
 Summary:    The system settings application for Lomiri
 License:    GPLv3
 URL:        https://gitlab.com/ubports/development/core/lomiri-system-settings
@@ -1,5 +0,0 @@
-project pkg {
-	rpm {
-		spec = "rust-sccache.spec"
-	}
-}
@@ -1,599 +0,0 @@
-# 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.7.6
-Release:        %autorelease
-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
@@ -1,14 +0,0 @@
--- 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",
-]
@@ -1 +0,0 @@
-rpm.version(crates("sccache"));
@@ -1,5 +1,5 @@
 %global forgeurl https://gitlab.com/vala-panel-project/vala-panel-appmenu
-%global commit 7abc96e774fb7bc00318d834ad988dd229655c34
+%global commit 76442be6195385193cb5931d0004122310d40c95
 %forgemeta

 Name:    vala-panel-appmenu
@@ -7,7 +7,6 @@ Version: 0.7.6
 Release: 2%?dist
 License: LGPL-3.0-or-later
 Summary: Application Menu plugin for vala-panel
-Group:   System/GUI/Other
 URL:     %{forgeurl}
 Source:  %{forgesource}

@@ -1,5 +1,6 @@
 %global forgeurl https://gitlab.com/vala-panel-project/vala-panel
 %global commit ead4e7a36b0e4b0a2ac43c5d9ca17eb753461afe
+
 %forgemeta

 Name:    vala-panel
@@ -7,7 +8,6 @@ Version: 0.5.0
 Release: 2%?dist
 License: LGPL-3.0-or-later
 Summary: This package provides Application Menu plugin for vala-panel
-Group:   System/GUI/Other
 URL:     %{forgeurl}
 Source:  %{forgesource}

@@ -1 +0,0 @@
-*.tar.gz
@@ -1,5 +0,0 @@
-project "pkg" {
-    rpm {
-        spec = "vencord-desktop.spec"
-    }
-}
@@ -1 +0,0 @@
-rpm.version(gh_tag("Vencord/Vesktop"));
@@ -1,74 +0,0 @@
-%define debug_package %nil
-
-# Exclude private libraries
-%global __requires_exclude libffmpeg.so
-%global __provides_exclude_from %{_datadir}/vesktop/.*\\.so
-
-Name:		vencord-desktop
-Provides:   VencordDesktop = %{version}-%{release}
-Version:	1.5.0
-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
-Group:		Applications/Internet
-#Source1:	launch.sh
-Source0:    https://github.com/Vencord/Vesktop/archive/refs/tags/v%{version}.tar.gz
-Requires:   xdg-utils
-BuildRequires:	nodejs-npm git
-# Conflicts:	vesktop-bin
-
-%description
-vesktop is a custom client designed to enhance your Discord experience
-while keeping everything lightweight.
-
-%prep
-git init
-git remote add origin %url || :
-git reset --hard
-git fetch
-git checkout v%version
-
-cat <<EOF > vesktop.desktop
-[Desktop Entry]
-Name=Vesktop
-Comment=%summary
-GenericName=Internet Messenger
-Type=Application
-Exec=/usr/bin/vencorddesktop
-Icon=vesktop
-Categories=Network;InstantMessaging;
-StartupWMClass=VencordDesktop
-
-Keywords=discord;vesktop;vencord;shelter;armcord;electron;
-EOF
-
-
-%build
-npx pnpm@8 install --no-frozen-lockfile
-npx pnpm@8 package:dir
-
-
-%install
-
-mkdir -p %buildroot/usr/share/vesktop
-cp -r dist/*-unpacked/. %buildroot/usr/share/vesktop/.
-
-install -Dm755 dist/*-unpacked/vencorddesktop %buildroot/usr/bin/vencorddesktop
-ln -sf /usr/share/vesktop/vencorddesktop %buildroot/usr/bin/vencorddesktop
-install -Dm644 vesktop.desktop %buildroot/usr/share/applications/vesktop.desktop
-install -Dm644 build/icon.png %buildroot/usr/share/pixmaps/vesktop.png
-
-%files
-%doc README.md
-%license LICENSE
-/usr/bin/vencorddesktop
-/usr/share/applications/vesktop.desktop
-/usr/share/pixmaps/vesktop.png
-/usr/share/vesktop/*
-
-%changelog
-* Tue Nov 07 2023 Cappy Ishihara <cappy@cappuchino.xyz> - 0.4.3-1
- Initial package
-
-
@@ -1,6 +1,6 @@
-%global nodev 18.13.0
-%global npmv 8.19.3
-%global ver 0.15.2
+%global nodev 16.17.0
+%global npmv 8.11.0
+%global ver 0.14.8
 %define debug_package %nil
 %global _build_id_links none

@@ -1,7 +1,7 @@
 %define debug_package %nil

 Name:			blahaj
-Version:		2.2.0
+Version:		2.1.0
 Release:		1%{?dist}
 Summary:		Gay sharks at your local terminal - lolcat-like CLI tool
 License:		BSD-2-Clause
@@ -1,7 +1,7 @@
 %define debug_package %nil

 Name:			crystal
-Version:		1.11.2
+Version:		1.10.1
 Release:		1%{?dist}
 Summary:		The Crystal Programming Language
 License:		Apache-2.0
@@ -1,7 +1,7 @@
 %define debug_package %{nil}

 Name: dart
-Version: 3.2.6
+Version: 3.1.3
 Release: 1%{?dist}
 Summary: The Dart Language
 License: BSD-3-Clause
@@ -1,5 +1,5 @@
 Name:		budgie-extras
-Version:	1.7.1
+Version:	1.7.0
 Release:	1%{?dist}

 License:	GPL-3.0
@@ -51,6 +51,7 @@ Requires:	budgie-applet-recentlyused
 Requires:	budgie-applet-rotation-lock
 Requires:	budgie-applet-showtime
 Requires:	budgie-applet-takeabreak
+Requires:	budgie-applet-trash
 Requires:	budgie-applet-visualspace
 Requires:	budgie-applet-wallstreet
 Requires:	budgie-applet-window-shuffler
@@ -207,6 +208,14 @@ upside down, dim the screen, lock screen or show a countdown message on break
 time. The applet can be accessed quickly from the panel to temporarily switch
 it off.

+%package -n	budgie-applet-trash
+Requires:	budgie-extras-common
+Summary:	Applet allows access to trash capabilities for the Budgie Desktop
+%description -n	budgie-applet-trash
+The trash applet allows the user access the desktop trash capabilities
+from the panel including the ability to delete and restore files stored
+in the trash folder.
+
 %package -n	budgie-applet-visualspace
 Requires:	budgie-extras-common
 Summary:	Shows the current workspace(s), as bullet(s)
@@ -384,6 +393,9 @@ rm -f %{buildroot}%{_bindir}/quickchar
 %{_datadir}/glib-2.0/schemas/org.ubuntubudgie.plugins.takeabreak.gschema.xml
 %{_datadir}/pixmaps/takeabreak*.svg

+%files -n budgie-applet-trash
+%{_libdir}/budgie-desktop/plugins/budgie-trash
+
 %files -n budgie-applet-visualspace
 %config %{_sysconfdir}/xdg/autostart/visualspace-autostart.desktop
 %{_libdir}/budgie-desktop/plugins/budgie-visualspace
@@ -1,4 +1,4 @@
-%define _ubuntu_rel 22.10.20220822-0ubuntu6
+%define _ubuntu_rel 22.10.20220822-0ubuntu4
 %global _hardened_build 0

 Name:           compiz9
@@ -1,6 +1,6 @@
 Name:           contractor
 Version:        0.3.5
-Release:        1%{?dist}
+Release:        %autorelease
 Summary:        Desktop-wide extension service

 License:        GPL-3.0-or-later
@@ -3,8 +3,8 @@

 Name:           elementary-calculator
 Summary:        Calculator app designed for elementary
-Version:        2.0.3
-Release:        1%{?dist}
+Version:        2.0.2
+Release:        2%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/%{srcname}
@@ -5,7 +5,7 @@

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

@@ -5,7 +5,7 @@

 Name:           elementary-files
 Summary:        File manager from elementary
-Version:        6.5.3
+Version:        6.5.2
 Release:        1%{?dist}
 License:        GPL-3.0

@@ -11,8 +11,6 @@ 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
-
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
@@ -36,9 +34,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-12)
+BuildRequires:  pkgconfig(mutter-cogl-12)
+BuildRequires:  pkgconfig(mutter-cogl-pango-12)
 BuildRequires:  pkgconfig(x11)

 Provides:       pantheon-greeter = %{version}-%{release}
@@ -70,7 +68,7 @@ The elementary Greeter is a styled Login Screen for LightDM.


 %prep
-%autosetup -p1 -n %{srcname}-%{version}
+%autosetup -n %{srcname}-%{version}


 %build
@@ -4,7 +4,7 @@
 Name:           elementary-icon-theme
 Summary:        Icons from the Elementary Project
 Version:        7.3.1
-Release:        2%{?dist}
+Release:        1%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/icons
@@ -89,7 +89,9 @@ gtk-update-icon-cache --force %{_datadir}/icons/elementary &>/dev/null || :
 %dir %{_datadir}/icons/elementary
 %ghost %{_datadir}/icons/elementary/icon-theme.cache

-%{_datadir}/icons/elementary/*
+%{_datadir}/icons/elementary/*/
+%{_datadir}/icons/elementary/*@2x
+%{_datadir}/icons/elementary/*@3x

 %{_datadir}/icons/elementary/cursor.theme
 %{_datadir}/icons/elementary/index.theme
@@ -4,7 +4,7 @@
 Name:           elementary-onboarding
 Summary:        Onboarding app for new users
 Version:        7.2.0
-Release:        2%{?dist}
+Release:        1%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/onboarding
@@ -12,19 +12,15 @@ 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
 BuildRequires:  meson >= 0.46.0
 BuildRequires:  vala
 BuildRequires:  fdupes
-BuildRequires:  git-core

 BuildRequires:  pkgconfig(gee-0.8) >= 0.8.5
-BuildRequires:  pkgconfig(geocode-glib-2.0)
+BuildRequires:  pkgconfig(geocode-glib-1.0)
 BuildRequires:  pkgconfig(gexiv2) >= 0.4.90
 BuildRequires:  pkgconfig(gio-2.0) >= 2.20
 BuildRequires:  pkgconfig(gio-unix-2.0) >= 2.20
@@ -37,12 +33,17 @@ BuildRequires:  pkgconfig(gstreamer-plugins-base-1.0) >= 1.0.0
 BuildRequires:  pkgconfig(gstreamer-pbutils-1.0) >= 1.0.0
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.6.0
 BuildRequires:  pkgconfig(gudev-1.0) >= 145
+BuildRequires:  pkgconfig(json-glib-1.0)
 BuildRequires:  pkgconfig(libexif) >= 0.6.16
 BuildRequires:  pkgconfig(libgphoto2) >= 2.4.2
 BuildRequires:  pkgconfig(libhandy-1)
 BuildRequires:  pkgconfig(libraw) >= 0.13.2
+BuildRequires:  pkgconfig(libsoup-2.4) >= 2.26.0
 BuildRequires:  pkgconfig(libwebp) >= 0.4.4
+BuildRequires:  pkgconfig(libxml-2.0) >= 2.6.32
+BuildRequires:  pkgconfig(rest-0.7) >= 0.7
 BuildRequires:  pkgconfig(sqlite3) >= 3.5.9
+BuildRequires:  pkgconfig(webkit2gtk-4.0) >= 2.0.0

 Requires:       hicolor-icon-theme

@@ -52,8 +53,7 @@ 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
+%autosetup -n %{srcname}-%{version} -p1


 %build
@@ -94,6 +94,7 @@ appstream-util validate-relax --nonet \
 %{_datadir}/applications/%{appname}.desktop
 %{_datadir}/applications/%{appname}-viewer.desktop
 %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
+%{_datadir}/glib-2.0/schemas/%{appname}-extras.gschema.xml
 %{_datadir}/icons/hicolor/*/apps/%{appname}.svg
 %{_datadir}/icons/hicolor/*/apps/%{appname}-viewer.svg
 %{_datadir}/metainfo/%{appname}.appdata.xml
@@ -3,8 +3,8 @@

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

 URL:            https://github.com/elementary/stylesheet
@@ -2,7 +2,7 @@

 Name:           gala
 Summary:        Gala window manager
-Version:        7.1.3
+Version:        7.1.2
 Release:        1%{?dist}
 License:        GPL-3.0-or-later

@@ -31,9 +31,9 @@ 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(mutter-clutter-12)
+BuildRequires:  pkgconfig(mutter-cogl-12)
+BuildRequires:  pkgconfig(mutter-cogl-pango-12)

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

@@ -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.3.0
+Release:        2%{?dist}
 License:        LGPL-3.0-or-later

 URL:            https://github.com/elementary/granite
@@ -13,11 +13,10 @@ BuildArch:      noarch

 Requires:       elementary-settings-daemon
 Requires:       gala
-# Gala has a hard runtime dependency on... GNOME Disks' DBus service!?!
 Requires:       gnome-disk-utility
 Requires:       gnome-keyring
 Requires:       gnome-session
-#Requires:       gnome-session-xsession  # this pulls in gnome-shell
+Requires:       gnome-session-xsession
 Requires:       gnome-settings-daemon
 Requires:       orca
 Requires:       pantheon-agent-geoclue2
@@ -42,8 +41,6 @@ Requires:       elementary-sound-theme
 Requires:       elementary-theme
 Requires:       open-sans-fonts

-Source1:        https://github.com/elementary/default-settings/raw/master/xdg-desktop-portal/pantheon-portals.conf
-
 %description
 Configuration files and settings overrides for the Pantheon desktop session.

@@ -87,9 +84,6 @@ mkdir -p %{buildroot}/%{_datadir}/accountsservice/interfaces
 ln -s ../../dbus-1/interfaces/io.elementary.pantheon.AccountsService.xml \
    %{buildroot}/%{_datadir}/accountsservice/interfaces/io.elementary.pantheon.AccountsService.xml

-mkdir -p %{buildroot}/%{_datadir}/xdg-desktop-portal
-install -m 644 %{SOURCE1} %{buildroot}/%{_datadir}/xdg-desktop-portal/
-

 # these scriptlets are apparently still necessary, because
 # .override files don't seem to trigger schema recompilation
@@ -115,7 +109,6 @@ fi
 %{_datadir}/gnome-session/sessions/pantheon.session
 %{_datadir}/polkit-1/actions/io.elementary.pantheon.AccountsService.policy
 %{_datadir}/xsessions/pantheon.desktop
-%{_datadir}/xdg-desktop-portal/pantheon-portals.conf


 %changelog
@@ -1,5 +1,5 @@
 Name:			pantheon-tweaks
-Version:		1.1.2
+Version:		1.1.0
 Release:		1%{?dist}
 Summary:		A system settings panel for the Pantheon desktop environment
 License:		GPL-3.0
@@ -8,8 +8,8 @@

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

 URL:            https://github.com/elementary/switchboard-plug-network
@@ -1,23 +0,0 @@
-From a3be778d1c4137d30af6ed9a08d0b54ee828687f Mon Sep 17 00:00:00 2001
-From: madomado <madonuko@outlook.com>
-Date: Tue, 21 Nov 2023 19:45:14 +0800
-Subject: [PATCH] fix(wallpaper): change wallpaper for dark theme settings
-
-Previously before the fix, the wallpaper cannot be changed via settings because it only sets the wallpaper for the light theme, not the dark theme.
-This fixes the issue.
---
- src/Views/Wallpaper.vala | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/Views/Wallpaper.vala b/src/Views/Wallpaper.vala
-index 07251444..7141cad8 100644
--- a/src/Views/Wallpaper.vala
-+++ b/src/Views/Wallpaper.vala
-@@ -206,6 +206,7 @@ public class PantheonShell.Wallpaper : Gtk.Box {
-         }
- 
-         gnome_background_settings.set_string ("picture-uri", uri);
-+        gnome_background_settings.set_string ("picture-uri-dark", uri);
-     }
- 
-     private void update_checked_wallpaper (Gtk.FlowBox box, Gtk.FlowBoxChild child) {
@@ -14,7 +14,6 @@ License:        GPL-3.0

 URL:            https://github.com/elementary/switchboard-plug-pantheon-shell
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
-Patch0:         dark-theme-wallpaper.patch

 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
@@ -5,7 +5,7 @@

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

@@ -4,7 +4,7 @@
 Name:           switchboard
 Summary:        Modular Desktop Settings Hub
 Version:        6.0.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        LGPL-2.0-or-later

 URL:            https://github.com/elementary/%{name}
@@ -5,7 +5,7 @@

 Name:           wingpanel-indicator-network
 Summary:        Network Indicator for wingpanel
-Version:        7.1.0
+Version:        7.0.2
 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:        1%{?dist}
+Release:        2%{?dist}
 License:        GPL-2.0-or-later

 URL:            https://github.com/elementary/wingpanel-indicator-session
@@ -12,7 +12,6 @@ License:        GPL-2.0-or-later

 URL:            https://github.com/elementary/wingpanel
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
-Patch0:         https://github.com/elementary/wingpanel/commit/d6009d9f0d5c7479172093447ccceccba86ff1f3.patch

 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -28,9 +27,9 @@ 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-12)
+BuildRequires:  pkgconfig(mutter-cogl-12)
+BuildRequires:  pkgconfig(mutter-cogl-pango-12)

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

@@ -43,8 +42,6 @@ Obsoletes:      wingpanel-indicator-ayatana < 2.0.3-11

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

 %description    libs %{common_description}

@@ -1,5 +0,0 @@
-project pkg {
-    rpm {
-        spec = "gnome-shell-extension-appmenu-is-back.spec"
-    }
-}
@@ -1,34 +0,0 @@
-%global extension   appmenu-is-back
-%global uuid        %{extension}@fthx
-
-Name:           gnome-shell-extension-%{extension}
-Version:        2
-Release:        1%{?dist}
-Summary:        GNOME Shell extension to bring back the app menu
-License:        GPL-3.0-only
-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
-
-Requires:       (gnome-shell >= 45~ with gnome-shell < 46~)
-Recommends:     gnome-extensions-app
-
-%description
-This extension brings back the app menu in the top panel, for GNOME 45 and later.
-
-%prep
-%autosetup -n appmenu-is-back-%{version}
-
-%install
-install -Dm644 metadata.json %{buildroot}%{_datadir}/gnome-shell/extensions/%{uuid}/metadata.json
-install -Dm644 extension.js %{buildroot}%{_datadir}/gnome-shell/extensions/%{uuid}/extension.js
-
-%files
-%license LICENSE
-%{_datadir}/gnome-shell/extensions/%{uuid}
-
-%changelog
-* Thu Nov 16 2023 Lleyton Gray <lleyton@fyralabs.com> - 2-1
- Initial Release
@@ -1,2 +0,0 @@
-let version = find("v(.+)", gh("fthx/appmenu-is-back"), 1);
-rpm.version(version);
@@ -1,34 +0,0 @@
-From 3f8b19139bf3f13b4285fd9d949cb5460a0909df Mon Sep 17 00:00:00 2001
-From: Carl George <carl@george.computer>
-Date: Fri, 25 Jun 2021 22:26:50 -0500
-Subject: [PATCH] Remove schema handling from transpile.sh
-
---
- scripts/transpile.sh | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/scripts/transpile.sh b/scripts/transpile.sh
-index e619a8c..8977c29 100755
--- a/scripts/transpile.sh
-+++ b/scripts/transpile.sh
-@@ -15,8 +15,6 @@ transpile() {
- 
- rm -rf _build
- 
-glib-compile-schemas schemas &
-
- # Transpile to JavaScript
- 
- for proj in ${PROJECTS}; do
-@@ -30,7 +28,7 @@ wait
- 
- # Convert JS to GJS-compatible scripts
- 
-cp -r metadata.json icons schemas *.css _build &
-+cp -r metadata.json icons *.css _build &
- 
- for src in $(find target -name '*.js'); do
-     dest=$(echo "$src" | sed s#target#_build#g)
-- 
-2.31.1
-
@@ -1,18 +0,0 @@
-[org.gnome.desktop.wm.keybindings]
-close = ['<Alt>F4', '<Super>q']
-maximize = []
-minimize = []
-move-to-monitor-down = []
-move-to-monitor-left = []
-move-to-monitor-right = []
-move-to-monitor-up = []
-move-to-workspace-down = []
-move-to-workspace-left = []
-move-to-workspace-right = []
-move-to-workspace-up = []
-switch-to-workspace-down = ['<Primary><Super>Down', '<Primary><Super>KP_Down', '<Primary><Super>j']
-switch-to-workspace-left = []
-switch-to-workspace-right = []
-switch-to-workspace-up = ['<Primary><Super>Up', '<Primary><Super>KP_Up', '<Primary><Super>k']
-toggle-maximized = ['<Super>m']
-unmaximize = []
@@ -1,7 +0,0 @@
-[org.gnome.mutter:GNOME]
-attach-modal-dialogs = false
-workspaces-only-on-primary = false
-
-[org.gnome.mutter.keybindings]
-toggle-tiled-left = ['<Primary><Super>Left', '<Primary><Super>KP_Left', '<Primary><Super>h']
-toggle-tiled-right = ['<Primary><Super>Right', '<Primary><Super>KP_Right', '<Primary><Super>l']
@@ -1,2 +0,0 @@
-[org.gnome.mutter.wayland.keybindings]
-restore-shortcuts = []
@@ -1,6 +0,0 @@
-[org.gnome.settings-daemon.plugins.media-keys]
-email = ['<Super>e']
-home = ['<Super>f']
-screensaver = ['<Super>Escape']
-www = ['<Super>b']
-rotate-video-lock-static = ['XF86RotationLockToggle']
@@ -1,18 +0,0 @@
-[org.gnome.shell.keybindings]
-open-application-menu = []
-shift-overview-down = []
-shift-overview-up = []
-switch-to-application-1 = []
-switch-to-application-2 = []
-switch-to-application-3 = []
-switch-to-application-4 = []
-switch-to-application-5 = []
-switch-to-application-6 = []
-switch-to-application-7 = []
-switch-to-application-8 = []
-switch-to-application-9 = []
-toggle-message-tray = ['<Super>v']
-
-[org.gnome.shell.overrides]
-attach-modal-dialogs = false
-workspaces-only-on-primary = false
@@ -1,8 +0,0 @@
-project pkg {
-    rpm {
-        spec = "terra-gnome-shell-extension-pop-shell.spec"
-    }
-    labels {
-        nightly = "1"
-    }
-}
@@ -1,89 +0,0 @@
-# from Fedora upstream
-%global extension   pop-shell
-%global uuid        %{extension}@system76.com
-%global commit      cf3c932b55d5c247906efe9d81f988ee092d9f51
-%global shortcommit %{lua:print(macros.commit:sub(1,7))}
-%global ver         1.2.0
-
-Name:           terra-gnome-shell-extension-%{extension}
-Version:        %{ver}^%{shortcommit}
-Release:        1%?dist
-Summary:        GNOME Shell extension for advanced tiling window management
-License:        GPL-3.0-only
-URL:            https://github.com/pop-os/shell
-BuildArch:      noarch
-
-Source0:        %{url}/archive/%{commit}/%{extension}-%{shortcommit}.tar.gz
-Source1:        50_org.gnome.desktop.wm.keybindings.%{extension}.gschema.override
-Source2:        50_org.gnome.mutter.%{extension}.gschema.override
-Source3:        50_org.gnome.mutter.wayland.%{extension}.gschema.override
-Source4:        50_org.gnome.settings-daemon.plugins.media-keys.%{extension}.gschema.override
-Source5:        50_org.gnome.shell.%{extension}.gschema.override
-# downstream-only
-Patch0:         0001-Remove-schema-handling-from-transpile.sh.patch
-
-BuildRequires:  typescript >= 3.8
-BuildRequires:  make
-
-Requires:       (gnome-shell >= 45~ with gnome-shell < 46~)
-Recommends:     gnome-extensions-app
-Recommends:     %{name}-shortcut-overrides = %{version}-%{release}
-Provides:       %{extension} = %{version}-%{release}
-
-
-%description
-Pop Shell is a keyboard-driven layer for GNOME Shell which allows for quick and
-sensible navigation and management of windows.  The core feature of Pop Shell
-is the addition of advanced tiling window management - a feature that has been
-highly sought within our community.  For many - ourselves included - i3wm has
-become the leading competitor to the GNOME desktop.
-
-
-%package shortcut-overrides
-Summary:        Shortcut overrides for %{name}
-
-
-%description shortcut-overrides
-Shortcut overrides for %{name}.
-
-
-%prep
-%autosetup -p 1 -n shell-%{commit}
-
-
-%build
-%make_build compile
-
-
-%install
-# install main extension files
-%make_install
-
-# install the schema file
-install -D -p -m 0644 \
-    schemas/org.gnome.shell.extensions.%{extension}.gschema.xml \
-    %{buildroot}%{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.%{extension}.gschema.xml
-
-# install the gnome-control-center keybindings
-install -d -m 0755 %{buildroot}%{_datadir}/gnome-control-center/keybindings
-install -p -m 0644 keybindings/*.xml %{buildroot}%{_datadir}/gnome-control-center/keybindings/
-
-# install the schema override files
-install -d -m 0755 %{buildroot}%{_datadir}/glib-2.0/schemas
-install -p -m 0644 %{S:1} %{S:2} %{S:3} %{S:4} %{S:5} %{buildroot}%{_datadir}/glib-2.0/schemas/
-
-
-%files
-%license LICENSE
-%doc README.md
-%{_datadir}/gnome-shell/extensions/%{uuid}
-%{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.%{extension}.gschema.xml
-%{_datadir}/gnome-control-center/keybindings/*.xml
-
-
-%files shortcut-overrides
-%{_datadir}/glib-2.0/schemas/*.%{extension}.gschema.override
-
-
-%changelog
-%autochangelog
@@ -1,4 +0,0 @@
-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"));
-}
@@ -1,6 +1,6 @@
 %global forgeurl https://github.com/KDE/latte-dock/

-%global commit 131ee4d39ce8913b2de8f9a673903225345c7a38
+%global commit bf320e2d15282a466f32396486c42dbb577d3905
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global commit_date %(date '+%Y%m%d')
 %global snapshot_info %{commit_date}.%{shortcommit}
@@ -1,7 +0,0 @@
-let o = get("https://gitlab.com/api/v4/projects/31038307/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,7 +0,0 @@
-let o = get("https://gitlab.com/api/v4/projects/25770169/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,9 +1,9 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri
-%global commit a083a14fe65105fc1996ceb1b92165ca3b0cb94e
+%global commit ed5564cbba53d1c4a3acfb53024db3a912083f59
 %forgemeta

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

@@ -1 +0,0 @@
-rpm.version(gh_tag("AyatanaIndicators/ayatana-indicator-messages"));
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`rpm.version(gh_tag("AyatanaIndicators/ayatana-indicator-messages"));`