Add Modrinth desktop app

Signed-off-by: madomado <madonuko@outlook.com>

.backportrc.json

@@ -2,7 +2,7 @@
   "repoOwner": "terrapkg",
   "repoName": "packages",
   "resetAuthor": true,
-  "targetBranchChoices": ["f38", "f39", "f40", "frawhide"],
+  "targetBranchChoices": ["f39", "f40", "frawhide"],
   "branchLabelMapping": {
     "^sync-(.+)$": "$1"
   }

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-ARG VARIANT="38"
+ARG VARIANT="rawhide"
 FROM fedora:${VARIANT}
 
 RUN useradd -m vscode

.devcontainer/devcontainer.json

@@ -2,7 +2,7 @@
   "name": "Fedora",
   "build": {
     "dockerfile": "Dockerfile",
-    "args": { "VARIANT": "38" }
+    "args": { "VARIANT": "rawhide" }
   },
   "remoteUser": "vscode",
   "runArgs": [

.github/workflows/autobuild.yml

@@ -6,13 +6,13 @@ on:
     paths:
       - anda/**
     branches:
-      - f39
+      - frawhide
   pull_request:
     branches:
-      - f39
+      - frawhide
   merge_group:
     branches:
-      - f39
+      - frawhide
   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:frawhide
       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: ["rawhide"]
       fail-fast: false
     runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || matrix.pkg.labels['large'] && 'x86-64-lg' || 'ubuntu-latest' }}
     container:

.github/workflows/bootstrap.yml

@@ -7,7 +7,7 @@ jobs:
   bootstrap:
     strategy:
       matrix:
-        version: ["39"]
+        version: ["rawhide"]
         arch: ["x86_64", "aarch64"]
       fail-fast: true
     runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}

.github/workflows/build.yml

@@ -44,7 +44,7 @@ jobs:
     strategy:
       matrix:
         pkg: ${{ fromJson(needs.parse.outputs.pkgs) }}
-        version: ["39"]
+        version: ["rawhide"]
         arch: ${{ fromJson(needs.parse.outputs.arch) }}
       fail-fast: false
     runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || needs.parse.outputs.builder && needs.parse.outputs.builder || 'ubuntu-latest' }}

.github/workflows/json-build.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         pkg: ${{ fromJson(inputs.packages) }}
-        version: ["39"]
+        version: ["rawhide"]
       fail-fast: false
     runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
     container:

.github/workflows/lint.yml

@@ -3,18 +3,18 @@ name: Lint
 on:
   push:
     branches:
-      - f39
+      - frawhide
   pull_request:
     branches:
-      - f39
+      - frawhide
   merge_group:
     branches:
-      - f39
+      - frawhide
 jobs:
   lint:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/terrapkg/builder:f39
+      image: ghcr.io/terrapkg/builder:frawhide
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4

.github/workflows/sync.yml.bak

@@ -1,38 +0,0 @@
-name: Sync PR to other branches
-on:
-  pull_request:
-    types:
-      - closed
-    branches:
-      - f38
-
-jobs:
-  sync:
-    strategy:
-      matrix:
-        branch: ["f37"]
-      fail-fast: false
-    if: github.event.pull_request.merged == true && !contains(github.event.pull_request.labels.*.name, 'nosync')
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
-          ref: ${{ matrix.branch }}
-      - name: Install SSH key and Setup Git
-        run: |
-          mkdir -p ${{ runner.temp }}
-          echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key
-          chmod 0700 ${{ runner.temp }}/signing_key
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"
-          git config user.name "Raboneko"
-          git config user.email "raboneko@fyralabs.com"
-          git config gpg.format "ssh"
-          git config user.signingkey "${{ runner.temp }}/signing_key"
-      - name: Apply patches and Push
-        run: |
-          curl https://github.com/terrapkg/packages/pull/${{ github.event.pull_request.number }}.patch > pr.patch
-          git am -S --keep-cr --signoff < pr.patch
-          git push -u origin --all

.github/workflows/update-branch.yml

@@ -0,0 +1,52 @@
+name: Update per branch
+on:
+  schedule:
+    - cron: "*/30 * * * *"
+  workflow_dispatch:
+
+jobs:
+  autoupdate:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        branch:
+          - frawhide
+          - f39
+          - f40
+          - f41
+          - el9
+    container:
+      image: ghcr.io/terrapkg/builder:frawhide
+      options: --cap-add=SYS_ADMIN --privileged
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ matrix.branch }}
+          fetch-depth: 0
+          ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
+
+      - name: Install SSH signing key & Set up git repository
+        run: |
+          mkdir -p ${{ runner.temp }}
+          echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key
+          chmod 0700 ${{ runner.temp }}/signing_key
+          git config --global --add safe.directory "$GITHUB_WORKSPACE"
+
+      - name: Run Update
+        run: anda update -vv --filters updbranch=1 --labels branch=${{ matrix.branch }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          RUST_BACKTRACE: full
+
+      - name: Save
+        run: |
+          if [[ `git status --porcelain` ]]; then
+            git config user.name "Raboneko"
+            git config user.email "raboneko@fyralabs.com"
+            git config gpg.format "ssh"
+            git config user.signingkey "${{ runner.temp }}/signing_key"
+            msg="bump(branch): $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')"
+            git commit -S -a -m "$msg"
+            git push -u origin --all
+          fi

.github/workflows/update-comps.yml

@@ -3,9 +3,9 @@ name: Push comps updates
 on:
   push:
     branches:
+      - frawhide
+      - f40
       - f39
-      - f38
-      - f37
     paths:
       - comps.xml
   workflow_dispatch:
@@ -14,7 +14,7 @@ jobs:
   update-comps:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/terrapkg/builder:f39
+      image: ghcr.io/terrapkg/builder:frawhide
     steps:
       - uses: actions/checkout@v4
       - name: Push to subatomic

.github/workflows/update-nightly.yml

@@ -8,7 +8,7 @@ jobs:
   autoupdate:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/terrapkg/builder:f39
+      image: ghcr.io/terrapkg/builder:frawhide
       options: --cap-add=SYS_ADMIN --privileged
     steps:
       - name: Checkout
@@ -17,11 +17,12 @@ jobs:
           fetch-depth: 0
           ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
 
-      - name: Install SSH signing key
+      - name: Install SSH signing key & Set up git repository
         run: |
           mkdir -p ${{ runner.temp }}
           echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key
           chmod 0700 ${{ runner.temp }}/signing_key
+          git config --global --add safe.directory "$GITHUB_WORKSPACE"
 
       - name: Run Nightly Update
         run: anda update -vv --filters nightly=1
@@ -30,7 +31,6 @@ jobs:
 
       - name: Save
         run: |
-          git config --global --add safe.directory "*"
           if [[ `git status --porcelain` ]]; then
             git config user.name "Raboneko"
             git config user.email "raboneko@fyralabs.com"
@@ -46,8 +46,8 @@ jobs:
               git add *
               git commit -S -a -m "$msg"
             }
-            copy_over f38 || true
+            copy_over f39 || true
             copy_over f40 || true
-            copy_over frawhide || true
+            copy_over f41 || true
             git push -u origin --all
           fi

.github/workflows/update.yml

@@ -8,7 +8,7 @@ jobs:
   autoupdate:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/terrapkg/builder:f39
+      image: ghcr.io/terrapkg/builder:frawhide
       options: --cap-add=SYS_ADMIN --privileged
     steps:
       - name: Checkout
@@ -17,21 +17,21 @@ jobs:
           fetch-depth: 0
           ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
 
-      - name: Install SSH signing key
+      - name: Install SSH signing key & Set up git repository
         run: |
           mkdir -p ${{ runner.temp }}
           echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key
           chmod 0700 ${{ runner.temp }}/signing_key
+          git config --global --add safe.directory "$GITHUB_WORKSPACE"
 
       - name: Run Update
-        run: anda update -vv
+        run: anda update -vv --excludes nightly=1 --excludes updbranch=1
         env:
           GITHUB_TOKEN: ${{ secrets.AUTOUPDATE_GH_TOKEN }}
           RUST_BACKTRACE: full
 
       - name: Save
         run: |
-          git config --global --add safe.directory "*"
           if [[ `git status --porcelain` ]]; then
             git config user.name "Raboneko"
             git config user.email "raboneko@fyralabs.com"
@@ -47,8 +47,8 @@ jobs:
               git add *
               git commit -S -a -m "$msg"
             }
-            copy_over f38 || true
+            copy_over f39 || true
             copy_over f40 || true
-            copy_over frawhide || true
+            copy_over f41 || true
             git push -u origin --all
           fi

CONTRIBUTING.md

@@ -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 [join our chats](https://wiki.ultramarine-linux.org/en/community/community/).
 
-* [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://developer.fyralabs.com/terra/contributing)
+- [FAQ](https://developer.fyralabs.com/terra/faq)
+- [Policy](https://developer.fyralabs.com/terra/policy)

README.md

@@ -1,6 +1,5 @@
 # Terra Sources
 
-[![Repository status](https://repology.org/badge/repository-big/terra_38.svg?header=Terra+38)](https://repology.org/repository/terra_38)
 [![Repository status](https://repology.org/badge/repository-big/terra_39.svg?header=Terra+39)](https://repology.org/repository/terra_39)
 [![Repository status](https://repology.org/badge/repository-big/terra_40.svg?header=Terra+40)](https://repology.org/repository/terra_40)
 [![Repository status](https://repology.org/badge/repository-big/terra_rawhide.svg?header=Terra+Rawhide)](https://repology.org/repository/terra_rawhide)
@@ -8,16 +7,31 @@
 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.
 
+See the introduction at [our website](https://terra.fyralabs.com).
+
 This monorepo contains the package manifests for all packages in Terra.
 
 ## Installation
+
 ```bash
-sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra.repo
+sudo dnf install --repofrompath 'terra,https://repos.fyralabs.com/terra$releasever' --setopt='terra.gpgkey=https://repos.fyralabs.com/terra$releasever/key.asc' terra-release
+```
+
+If you are using immutable/atomic editions of Fedora, run the following commands instead:
+
+```bash
+curl -fsSL https://github.com/terrapkg/subatomic-repos/raw/main/terra.repo | pkexec tee /etc/yum.repos.d/terra.repo
+sudo rpm-ostree install terra-release
 ```
-You should also install the `terra-release` package so that when our infrastructure has any migrations, you can be assured that your Terra installation will still work as-is.
 
 ## Documentation
-Our documentation can be found on our [Devdocs](https://developer.fyralabs.com/terra/). Alternatively, the GitHub Wiki contains older versions of the documentations.
+
+Our documentation can be found on our [Devdocs](https://developer.fyralabs.com/terra/).
 
 ## Questions?
-Feel free to reach out on [Discord](https://discord.gg/5fdPuxTg5Q). We're always happy to help!
+
+Feel free to reach out by [joining our community](https://wiki.ultramarine-linux.org/en/community/community/). We're always happy to help!
+
+- [Contribution Guide](https://developer.fyralabs.com/terra/contributing)
+- [FAQ](https://developer.fyralabs.com/terra/faq)
+- [Policy](https://developer.fyralabs.com/terra/policy)

anda/apps/armcord-bin/armcord-bin.spec

@@ -2,11 +2,11 @@
 %global _build_id_links none
 
 %ifarch x86_64
-%global src ArmCord-%version
+%global src ArmCord-%version-linux-x64
 %elifarch aarch64
-%global src ArmCord-%version-arm64
+%global src ArmCord-%version-linux-arm64
 %elifarch armv7l
-%global src ArmCord-%version-armv7l
+%global src ArmCord-%version-linux-armv7l
 %endif
 
 # Exclude private libraries

anda/apps/armcord/armcord.spec

@@ -10,7 +10,7 @@ Group:		Applications/Internet
 Source1:	launch.sh
 Packager:	madonuko <mado@fyralabs.com>
 Requires:	electron xdg-utils
-BuildRequires:	git-core pnpm
+BuildRequires:	git-core add-determinism pnpm
 Conflicts:	armcord-bin
 BuildArch:	noarch
 

anda/apps/discord-canary-openasar/discord-canary-openasar.spec

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

anda/apps/discord-canary/discord-canary.spec

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

anda/apps/discord-openasar/discord-openasar.spec

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

anda/apps/discord/discord.spec

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

anda/apps/envision/envision.spec

@@ -1,5 +1,5 @@
-%global commit 6ff4bc2cd57628c95aacd2f5a07305fd83e197e4
-%global commit_date 20240820
+%global commit 943fc151f7c1927cb450456de9bb838311d9cc24
+%global commit_date 20240831
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:           envision
@@ -16,7 +16,7 @@ BuildRequires:  pkgconfig(gtk4) >= 4.10.0
 BuildRequires:  pkgconfig(vte-2.91-gtk4) >= 0.72.0
 BuildRequires:  pkgconfig(libadwaita-1)
 BuildRequires:  pkgconfig(libusb-1.0)
-BuildRequires:  openssl-devel
+BuildRequires:  openssl-devel-engine
 BuildRequires:  openxr-devel
 BuildRequires:  libappstream-glib
 BuildRequires:  desktop-file-utils

anda/apps/komikku/komikku.spec

@@ -5,7 +5,7 @@
 %global pure_protobuf_version 2.0.0
 
 Name:           komikku
-Version:        1.55.0
+Version:        1.56.0
 %forgemeta
 Release:        1%?dist
 Summary:        A manga reader for GNOME

anda/apps/mpv/mpv-nightly.spec

@@ -1,6 +1,6 @@
-%global commit f44c29b223d7f0187ccf938eb1651671c8e92cf3
+%global commit 7c672e33a5eab0564383127c8837b1034a84357b
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240821
+%global commit_date 20240831
 %global ver 0.38.0
 
 Name:           mpv-nightly

anda/apps/ruffle/ruffle-nightly.spec

@@ -1,4 +1,4 @@
-%global ver 2024-08-26
+%global ver 2024-08-31
 %global goodver %(echo %ver | sed 's/-//g')
 %global __brp_mangle_shebangs %{nil}
 %bcond_without mold

anda/desktops/elementary/appcenter/elementary-appcenter.spec

@@ -2,8 +2,8 @@
 
 Name:           elementary-appcenter
 Summary:        Software Center from elementary
-Version:        7.4.0
-Release:        1%{?dist}
+Version:        8.0.0
+Release:        1%?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

anda/desktops/elementary/appcenter/pr2099.patch

@@ -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',

anda/desktops/elementary/elementary-camera/elementary-camera.spec

@@ -3,8 +3,8 @@
 
 Name:           elementary-camera
 Summary:        Camera app designed for elementary
-Version:        6.2.2
-Release:        2%{?dist}
+Version:        8.0.0
+Release:        1%?dist
 License:        GPL-3.0
 
 URL:            https://github.com/elementary/camera
@@ -20,7 +20,7 @@ BuildRequires:  fdupes
 BuildRequires:  pkgconfig(gee-0.8)
 BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(granite) >= 6.0.0
+BuildRequires:  pkgconfig(granite-7)
 BuildRequires:  pkgconfig(gstreamer-1.0)
 BuildRequires:  pkgconfig(gstreamer-pbutils-1.0)
 BuildRequires:  pkgconfig(gtk+-3.0)

anda/desktops/elementary/elementary-greeter/elementary-greeter.spec

@@ -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}

anda/desktops/elementary/elementary-settings-daemon/elementary-settings-daemon.spec

@@ -3,7 +3,7 @@
 %global iface   io.elementary.SettingsDaemon.AccountsService
 
 Name:           elementary-settings-daemon
-Version:        8.0.0
+Version:        8.1.0
 Release:        1%?dist
 Summary:        Settings Daemon and Portal for Pantheon
 License:        GPL-3.0-or-later

anda/desktops/elementary/elementary-shortcut-overlay/elementary-shortcut-overlay.spec

@@ -3,7 +3,7 @@
 
 Name:           elementary-shortcut-overlay
 Summary:        Native, OS-wide shortcut overlay
-Version:        8.0.0
+Version:        8.0.1
 Release:        1%?dist
 License:        GPL-3.0
 

anda/desktops/elementary/elementary-theme/elementary-theme.spec

@@ -3,7 +3,7 @@
 
 Name:           elementary-theme
 Summary:        Elementary GTK+ Stylesheet
-Version:        8.0.0
+Version:        8.1.0
 Release:        1%?dist
 License:        GPL-3.0
 

anda/desktops/elementary/gala/gala.spec

@@ -12,6 +12,7 @@ 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
@@ -32,9 +33,11 @@ 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} = %{epoch}:%{version}-%{release}
 
@@ -86,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
@@ -99,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

anda/desktops/elementary/switchboard-plug-keyboard/switchboard-plug-keyboard.spec

@@ -8,7 +8,7 @@
 
 Name:           switchboard-plug-keyboard
 Summary:        Switchboard Keyboard plug
-Version:        8.0.0
+Version:        8.0.1
 Release:        1%?dist
 License:        GPL-3.0-or-later
 

anda/desktops/elementary/switchboard-plug-mouse-touchpad/switchboard-plug-mouse-touchpad.spec

@@ -8,7 +8,7 @@
 
 Name:           switchboard-plug-mouse-touchpad
 Summary:        Switchboard Mouse and Touchpad plug
-Version:        8.0.0
+Version:        8.0.1
 Release:        1%?dist
 License:        GPL-3.0-or-later
 

anda/desktops/elementary/switchboard-plug-pantheon-shell/switchboard-plug-pantheon-shell.spec

@@ -8,8 +8,8 @@
 
 Name:           switchboard-plug-pantheon-shell
 Summary:        Switchboard Pantheon Shell plug
-Version:        6.5.0
-Release:        1%{?dist}
+Version:        8.0.1
+Release:        1%?dist
 License:        GPL-3.0
 
 URL:            https://github.com/elementary/switchboard-plug-pantheon-shell

anda/desktops/elementary/wingpanel/wingpanel.spec

@@ -13,7 +13,7 @@ Epoch:          1
 
 URL:            https://github.com/elementary/wingpanel
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
-Patch0:         https://github.com/elementary/wingpanel/commit/d6009d9f0d5c7479172093447ccceccba86ff1f3.patch
+Patch0:         https://github.com/elementary/wingpanel/compare/23a3eb7c2448b4f35398116df7d01b075361ef1f..5d22d436b45decfb2a50d9a7c27f2c961f1dd39f.patch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -29,9 +29,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-14)
+BuildRequires:  pkgconfig(mutter-cogl-14)
+BuildRequires:  pkgconfig(mutter-cogl-pango-14)
 
 Requires:       %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
 

anda/desktops/gnome/gnome-shell-extension-appmenu-is-back/gnome-shell-extension-appmenu-is-back.spec

@@ -11,15 +11,16 @@ 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/compare/v2..703a31acf900eb7bcab3462baeefa815ec7f13ab.patch
 
-Requires:       (gnome-shell >= 45~ with gnome-shell < 46~)
+Requires:       (gnome-shell >= 46~ with gnome-shell < 48~)
 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}
+%autosetup -n appmenu-is-back-%{version} -p1
 
 %install
 install -Dm644 metadata.json %{buildroot}%{_datadir}/gnome-shell/extensions/%{uuid}/metadata.json

anda/desktops/gnome/gnome-shell-extension-pop-shell/terra-gnome-shell-extension-pop-shell.spec

@@ -1,9 +1,9 @@
 # from Fedora upstream
 %global extension   pop-shell
 %global uuid        %{extension}@system76.com
-%global commit      9418d0a9af7c9b30b61ac3eeb5ca432a3ad3e651
+%global commit      cfa0c55e84b7ce339e5ce83832f76fee17e99d51
 %global shortcommit %{lua:print(macros.commit:sub(1,7))}
-%global commit_date 20240401
+%global commit_date 20240404
 %global ver         1.2.0
 
 Name:           terra-gnome-shell-extension-%{extension}

anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec

@@ -1,6 +1,6 @@
 %global forgeurl https://github.com/KDE/latte-dock/
 
-%global commit b4b16f61f1d69c994701f149e54335c40b9b201d
+%global commit 3f43a2ec5e6ef3d1c28636b420f49fd96f5d83a0
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global commit_date %(date '+%Y%m%d')
 %global snapshot_info %{commit_date}.%{shortcommit}

anda/desktops/lomiri-unity/lomiri-download-manager/lomiri-download-manager.spec

@@ -4,7 +4,7 @@
 
 Name:       lomiri-download-manager
 Version:    0.1.3
-Release:    1%{?dist}
+Release:    1%?dist
 Summary:    Upload Download Manager for Lomiri
 License:    LGPLv3
 URL:        https://gitlab.com/ubports/development/core/lomiri-download-manager

anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec

@@ -10,6 +10,7 @@ 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++

anda/desktops/lomiri-unity/lomiri-ui-toolkit/lomiri-ui-toolkit.spec

@@ -1,5 +1,5 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-ui-toolkit
-%global commit a72422f66dc1e40afcb9feefbc672c00c6f70671
+%global commit 8f490672f9853278b0aec6435a68d56b9eaf8207
 %forgemeta
 
 Name:           lomiri-ui-toolkit

anda/desktops/lomiri-unity/lomiri-url-dispatcher/lomiri-url-dispatcher.spec

@@ -4,7 +4,7 @@
 
 Name:           lomiri-url-dispatcher
 Version:        0.1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A small library for handling URLs over dbus
 
 License:        LGPL-3.0

anda/desktops/sddm/0001-Delay-for-logind-and-fallback-to-seat0.patch

@@ -0,0 +1,142 @@
+From 4d44531c8f624f5b479c3ff23e8fecc67eb848ab Mon Sep 17 00:00:00 2001
+From: Jeremy Linton <jeremy.linton@arm.com>
+Date: Fri, 22 Oct 2021 14:51:54 -0500
+Subject: [PATCH] Delay for logind, and fallback to seat0
+
+There is systemd/logind race with when restarting
+sddm that causes logind1 not to be available. Previously
+this meant the seat0 was immediately created regardless
+of the state of CanGraphical.
+
+Fixing this, though we still want seat0 to be started
+if none of the seats appear to be graphical. Presumably
+there are some graphics on the machine, otherwise
+why run sddm? Wait a bit, and create seat0 anyway. If
+this fails the output from Xorg should tell us why. This
+is generally a better strategy than what happens a good
+amount of time now, where sddm is started and silent about
+why the screen is blank.
+
+References:
+* https://bugzilla.redhat.com/2011991
+* https://bugzilla.redhat.com/2016310
+
+Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
+---
+ src/daemon/LogindDBusTypes.cpp | 31 +++++++++++++++++++++----------
+ src/daemon/SeatManager.cpp     | 22 ++++++++++++++++++++++
+ src/daemon/SeatManager.h       |  1 +
+ 3 files changed, 44 insertions(+), 10 deletions(-)
+
+diff --git a/src/daemon/LogindDBusTypes.cpp b/src/daemon/LogindDBusTypes.cpp
+index 011bb7f..6255c69 100644
+--- a/src/daemon/LogindDBusTypes.cpp
++++ b/src/daemon/LogindDBusTypes.cpp
+@@ -8,6 +8,8 @@
+ 
+ #include <QDebug>
+ 
++#include <unistd.h>
++
+ class LogindPathInternal {
+ public:
+     LogindPathInternal();
+@@ -46,17 +48,26 @@ LogindPathInternal::LogindPathInternal()
+     qRegisterMetaType<UserInfoList>("UserInfoList");
+     qDBusRegisterMetaType<UserInfoList>();
+ 
+-    if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.login1"))) {
+-        qDebug() << "Logind interface found";
+-        available = true;
+-        serviceName = QStringLiteral("org.freedesktop.login1");
+-        managerPath = QStringLiteral("/org/freedesktop/login1");
+-        managerIfaceName = QStringLiteral("org.freedesktop.login1.Manager");
+-        seatIfaceName = QStringLiteral("org.freedesktop.login1.Seat");
+-        sessionIfaceName = QStringLiteral("org.freedesktop.login1.Session");
+-        userIfaceName = QStringLiteral("org.freedesktop.login1.User");
+-        return;
++#ifdef HAVE_SYSTEMD
++    // systemd-logind should be running, although because it takes a few moments to restart after
++    // systemctl isolate calls, it may not yet be running. Wait a few seconds for it, while blocking everything else.
++    int logind_wait_seconds = 50;
++    while (logind_wait_seconds--) {
++        if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.login1"))) {
++            qDebug() << "Logind interface found";
++            available = true;
++            serviceName = QStringLiteral("org.freedesktop.login1");
++            managerPath = QStringLiteral("/org/freedesktop/login1");
++            managerIfaceName = QStringLiteral("org.freedesktop.login1.Manager");
++            seatIfaceName = QStringLiteral("org.freedesktop.login1.Seat");
++            sessionIfaceName = QStringLiteral("org.freedesktop.login1.Session");
++            userIfaceName = QStringLiteral("org.freedesktop.login1.User");
++            return;
++        }
++	qDebug() << "Sleeping for systemd-logind";
++	usleep(100000);
+     }
++#endif
+ 
+     if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.ConsoleKit"))) {
+         qDebug() << "Console kit interface found";
+diff --git a/src/daemon/SeatManager.cpp b/src/daemon/SeatManager.cpp
+index bd207e6..39d8b85 100644
+--- a/src/daemon/SeatManager.cpp
++++ b/src/daemon/SeatManager.cpp
+@@ -26,6 +26,9 @@
+ #include <QDBusMessage>
+ #include <QDBusPendingReply>
+ #include <QDBusContext>
++#include <QDebug>
++#include <QFileInfo>
++#include <QTimer>
+ 
+ #include "LogindDBusTypes.h"
+ 
+@@ -115,6 +118,8 @@ namespace SDDM {
+ 
+         QDBusConnection::systemBus().connect(Logind::serviceName(), Logind::managerPath(), Logind::managerIfaceName(), QStringLiteral("SeatNew"), this, SLOT(logindSeatAdded(QString,QDBusObjectPath)));
+         QDBusConnection::systemBus().connect(Logind::serviceName(), Logind::managerPath(), Logind::managerIfaceName(), QStringLiteral("SeatRemoved"), this, SLOT(logindSeatRemoved(QString,QDBusObjectPath)));
++
++	QTimer::singleShot(5000, this, &SeatManager::checkSeat);
+     }
+ 
+     void SeatManager::createSeat(const QString &name) {
+@@ -152,6 +157,23 @@ namespace SDDM {
+         m_seats.value(name)->createDisplay(Display::defaultDisplayServerType());
+     }
+ 
++    // this is a bit hacky, but linux DRM drivers
++    // won't initially be available so there is a race
++    // between determing if a efifb/etc graphical object
++    // is the only graphics on the machine, or a DRM driver
++    // will take over the display. So we will hang out for a few
++    // seconds and if none of the seats are declared cangraphical
++    // its possible the only graphics on the machine don't have
++    // a drm driver.
++    void SeatManager::checkSeat(void) {
++        if (m_seats.isEmpty()) {
++	     //if (QFileInfo::exists(QStringLiteral("/dev/fb0"))) {
++                 qWarning() << "No graphical seats found, attempt to start one on the main console anyway...";
++                 createSeat(QStringLiteral("seat0"));
++	     //}
++        }
++    }
++
+     void SDDM::SeatManager::logindSeatAdded(const QString& name, const QDBusObjectPath& objectPath)
+     {
+         auto logindSeat = new LogindSeat(name, objectPath);
+diff --git a/src/daemon/SeatManager.h b/src/daemon/SeatManager.h
+index b2f9796..aa43047 100644
+--- a/src/daemon/SeatManager.h
++++ b/src/daemon/SeatManager.h
+@@ -49,6 +49,7 @@ namespace SDDM {
+     private:
+         QHash<QString, Seat *> m_seats; //these will exist only for graphical seats
+         QHash<QString, LogindSeat*> m_systemSeats; //these will exist for all seats
++        void checkSeat(void);
+     };
+ }
+ 
+-- 
+2.39.2
+

anda/desktops/sddm/README.scripts

@@ -0,0 +1,2 @@
+This scripts dir contains only samples, but are generally not used directly.
+In practice, sddm runtime uses items under /etc/sddm by default

anda/desktops/sddm/anda.hcl

@@ -0,0 +1,5 @@
+project pkg {
+  rpm {
+    spec = "terra-sddm.spec"
+  }
+}

anda/desktops/sddm/sddm-0.18.0-environment_file.patch

@@ -0,0 +1,11 @@
+diff -up sddm-0.18.0/services/sddm.service.in.env sddm-0.18.0/services/sddm.service.in
+--- sddm-0.18.0/services/sddm.service.in.env	2018-07-18 05:31:40.000000000 -0500
++++ sddm-0.18.0/services/sddm.service.in	2019-03-14 08:23:22.095498405 -0500
+@@ -7,6 +7,7 @@ After=systemd-user-sessions.service gett
+ [Service]
+ ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/sddm
+ Restart=always
++EnvironmentFile=-/etc/sysconfig/sddm
+ 
+ [Install]
+ Alias=display-manager.service

anda/desktops/sddm/sddm-0.20.0-fedora_config.patch

@@ -0,0 +1,53 @@
+diff --git a/src/common/Configuration.h b/src/common/Configuration.h
+index 54bcace..9b8fa22 100644
+--- a/src/common/Configuration.h
++++ b/src/common/Configuration.h
+@@ -37,9 +37,8 @@ namespace SDDM {
+         enum NumState { NUM_NONE, NUM_SET_ON, NUM_SET_OFF };
+ 
+         //  Name                   Type         Default value                                   Description
+-        // TODO: Change default to x11-user in a future release
+-        Entry(DisplayServer,       QString,     _S("x11"),                                      _S("Which display server should be used.\n"
+-                                                                                                   "Valid values are: x11, x11-user, wayland. Wayland support is experimental"));
++        Entry(DisplayServer,       QString,     _S("wayland"),                                  _S("Which display server should be used.\n"
++                                                                                                   "Valid values are: x11, x11-user, wayland."));
+         Entry(HaltCommand,         QString,     _S(HALT_COMMAND),                               _S("Halt command"));
+         Entry(RebootCommand,       QString,     _S(REBOOT_COMMAND),                             _S("Reboot command"));
+         Entry(Numlock,             NumState,    NUM_NONE,                                       _S("Initial NumLock state. Can be on, off or none.\n"
+@@ -51,7 +50,7 @@ namespace SDDM {
+         //  Name   Entries (but it's a regular class again)
+         Section(Theme,
+             Entry(ThemeDir,            QString,     _S(DATA_INSTALL_DIR "/themes"),             _S("Theme directory path"));
+-            Entry(Current,             QString,     _S(""),                                     _S("Current theme name"));
++            Entry(Current,             QString,     _S("01-breeze-fedora"),                     _S("Current theme name"));
+             Entry(FacesDir,            QString,     _S(DATA_INSTALL_DIR "/faces"),              _S("Global directory for user avatars\n"
+                                                                                                    "The files should be named <username>.face.icon"));
+             Entry(CursorTheme,         QString,     QString(),                                  _S("Cursor theme used in the greeter"));
+@@ -71,9 +70,9 @@ namespace SDDM {
+             Entry(SessionDir,          QStringList, {_S("/usr/local/share/xsessions"),
+                                                      _S("/usr/share/xsessions")},               _S("Comma-separated list of directories containing available X sessions"));
+             Entry(SessionCommand,      QString,     _S(SESSION_COMMAND),                        _S("Path to a script to execute when starting the desktop session"));
+-            Entry(SessionLogFile,      QString,     _S(".local/share/sddm/xorg-session.log"),   _S("Path to the user session log file"));
+-            Entry(DisplayCommand,      QString,     _S(DATA_INSTALL_DIR "/scripts/Xsetup"),     _S("Path to a script to execute when starting the display server"));
+-            Entry(DisplayStopCommand,  QString,     _S(DATA_INSTALL_DIR "/scripts/Xstop"),      _S("Path to a script to execute when stopping the display server"));
++            Entry(SessionLogFile,      QString,     _S(".cache/xsession-errors"),               _S("Path to the user session log file"));
++            Entry(DisplayCommand,      QString,     _S(SYS_CONFIG_DIR "/sddm/Xsetup"),          _S("Path to a script to execute when starting the display server"));
++            Entry(DisplayStopCommand,  QString,     _S(SYS_CONFIG_DIR "/sddm/Xstop"),           _S("Path to a script to execute when stopping the display server"));
+             Entry(EnableHiDPI,         bool,        true,                                      _S("Enable Qt's automatic high-DPI scaling"));
+         );
+ 
+@@ -82,12 +81,12 @@ namespace SDDM {
+             Entry(SessionDir,          QStringList, {_S("/usr/local/share/wayland-sessions"),
+                                                      _S("/usr/share/wayland-sessions")},        _S("Comma-separated list of directories containing available Wayland sessions"));
+             Entry(SessionCommand,      QString,     _S(WAYLAND_SESSION_COMMAND),                _S("Path to a script to execute when starting the desktop session"));
+-            Entry(SessionLogFile,      QString,     _S(".local/share/sddm/wayland-session.log"),_S("Path to the user session log file"));
++            Entry(SessionLogFile,      QString,     _S(".cache/wayland-errors"),                _S("Path to the user session log file"));
+             Entry(EnableHiDPI,         bool,        true,                                       _S("Enable Qt's automatic high-DPI scaling"));
+         );
+ 
+         Section(Users,
+-            Entry(DefaultPath,         QString,     _S("/usr/local/bin:/usr/bin:/bin"),         _S("Default $PATH for logged in users"));
++            Entry(DefaultPath,         QString,     _S("/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin"), _S("Default $PATH for logged in users"));
+             Entry(MinimumUid,          int,         UID_MIN,                                    _S("Minimum user id for displayed users"));
+             Entry(MaximumUid,          int,         UID_MAX,                                    _S("Maximum user id for displayed users"));
+             Entry(HideUsers,           QStringList, QStringList(),                              _S("Comma-separated list of users that should not be listed"));

anda/desktops/sddm/sddm-0.21.0-qt6greeter.patch

@@ -0,0 +1,67 @@
+From 52175648f4e1b415f93b24a3ef970983024659f2 Mon Sep 17 00:00:00 2001
+From: Neal Gompa <neal@gompa.dev>
+Date: Wed, 28 Feb 2024 16:47:16 -0500
+Subject: [PATCH] Default to Qt6 and always use versioned greeters
+
+Distributors can handle creating an unversioned name if necessary.
+---
+ src/common/ThemeMetadata.cpp | 4 ++--
+ src/daemon/Greeter.cpp       | 3 +--
+ src/greeter/CMakeLists.txt   | 9 +--------
+ 3 files changed, 4 insertions(+), 12 deletions(-)
+
+diff --git a/src/common/ThemeMetadata.cpp b/src/common/ThemeMetadata.cpp
+index 2cb3762..003056a 100644
+--- a/src/common/ThemeMetadata.cpp
++++ b/src/common/ThemeMetadata.cpp
+@@ -28,7 +28,7 @@ namespace SDDM {
+         QString mainScript { QStringLiteral("Main.qml") };
+         QString configFile;
+         QString translationsDirectory { QStringLiteral(".") };
+-        int qtVersion = 5;
++        int qtVersion = 6;
+     };
+ 
+     ThemeMetadata::ThemeMetadata(const QString &path, QObject *parent) : QObject(parent), d(new ThemeMetadataPrivate()) {
+@@ -61,6 +61,6 @@ namespace SDDM {
+         d->mainScript = settings.value(QStringLiteral("SddmGreeterTheme/MainScript"), QStringLiteral("Main.qml")).toString();
+         d->configFile = settings.value(QStringLiteral("SddmGreeterTheme/ConfigFile"), QStringLiteral("theme.conf")).toString();
+         d->translationsDirectory = settings.value(QStringLiteral("SddmGreeterTheme/TranslationsDirectory"), QStringLiteral(".")).toString();
+-        d->qtVersion = settings.value(QStringLiteral("SddmGreeterTheme/QtVersion"), 5).toInt();
++        d->qtVersion = settings.value(QStringLiteral("SddmGreeterTheme/QtVersion"), 6).toInt();
+     }
+ }
+diff --git a/src/daemon/Greeter.cpp b/src/daemon/Greeter.cpp
+index 07fccde..5a956b6 100644
+--- a/src/daemon/Greeter.cpp
++++ b/src/daemon/Greeter.cpp
+@@ -82,8 +82,7 @@ namespace SDDM {
+ 
+     QString Greeter::greeterPathForQt(int qtVersion)
+     {
+-        const QString suffix = qtVersion == 5 ? QString() : QStringLiteral("-qt%1").arg(qtVersion);
+-        return QStringLiteral(BIN_INSTALL_DIR "/sddm-greeter%1").arg(suffix);
++        return QStringLiteral(BIN_INSTALL_DIR "/sddm-greeter-qt%1").arg(qtVersion);
+     }
+ 
+     bool Greeter::start() {
+diff --git a/src/greeter/CMakeLists.txt b/src/greeter/CMakeLists.txt
+index 72769e4..524368d 100644
+--- a/src/greeter/CMakeLists.txt
++++ b/src/greeter/CMakeLists.txt
+@@ -1,11 +1,4 @@
+-if(QT_MAJOR_VERSION EQUAL "5")
+-    # Keep the unversioned name for Qt5. When upgrading SDDM, the old daemon
+-    # might still be running and only know about "sddm-greeter". Keeping the
+-    # previous name around also helps users calling it directly.
+-    set(GREETER_TARGET sddm-greeter)
+-else()
+-    set(GREETER_TARGET sddm-greeter-qt${QT_MAJOR_VERSION})
+-endif()
++set(GREETER_TARGET sddm-greeter-qt${QT_MAJOR_VERSION})
+ 
+ message(STATUS "Building greeter for Qt ${QT_MAJOR_VERSION} as ${GREETER_TARGET}")
+ 
+-- 
+2.43.0
+

anda/desktops/sddm/sddm-autologin.pam

@@ -0,0 +1,20 @@
+ #%PAM-1.0
+auth       required    pam_env.so
+auth       required    pam_permit.so
+auth       include     postlogin
+
+account    required    pam_nologin.so
+account    include     system-auth
+
+password   include     system-auth
+
+session    required    pam_selinux.so close
+session    required    pam_loginuid.so
+session    required    pam_selinux.so open
+session    optional    pam_keyinit.so force revoke
+session    required    pam_namespace.so
+session    include     system-auth
+-session    optional    pam_gnome_keyring.so auto_start
+-session    optional    pam_kwallet5.so auto_start
+-session    optional    pam_kwallet.so auto_start
+session    include     postlogin

anda/desktops/sddm/sddm-greeter.pam

@@ -0,0 +1,17 @@
+#%PAM-1.0
+
+# Load environment from /etc/environment and ~/.pam_environment
+auth		required pam_env.so
+
+# Always let the greeter start without authentication
+auth		required pam_permit.so
+
+# No action required for account management
+account		required pam_permit.so
+
+# Can't change password
+password	required pam_deny.so
+
+# Setup session
+session		required pam_unix.so
+session		optional pam_systemd.so

anda/desktops/sddm/sddm-rpmostree-tmpfiles-hack.patch

@@ -0,0 +1,12 @@
+diff --git a/services/sddm-tmpfiles.conf.in b/services/sddm-tmpfiles.conf.in
+index fb45553..6acfb6c 100644
+--- a/services/sddm-tmpfiles.conf.in
++++ b/services/sddm-tmpfiles.conf.in
+@@ -1,5 +1,7 @@
+ # Home dir of the sddm user, also contains state.conf
+ d	${STATE_DIR}	0750	sddm	sddm
++# Workaround for https://pagure.io/fedora-kde/SIG/issue/87
++Z	${STATE_DIR}	-	sddm	sddm
+ # This contains X11 auth files passed to Xorg and the greeter
+ d	${RUNTIME_DIR}	0711	root	root
+ # Sockets for IPC

anda/desktops/sddm/sddm-systemd-sysusers.conf

@@ -0,0 +1,2 @@
+#Type Name ID GECOS                  Home directory Shell
+u     sddm -  "SDDM Greeter Account" /var/lib/sddm   -

anda/desktops/sddm/sddm-x11.conf

@@ -0,0 +1,2 @@
+[General]
+DisplayServer=x11

anda/desktops/sddm/sddm.conf

@@ -0,0 +1,122 @@
+[Autologin]
+# Whether sddm should automatically log back into sessions when they exit
+#Relogin=false
+
+# Name of session file for autologin session
+#Session=
+
+# Username for autologin session
+#User=
+
+
+[General]
+# Enable Qt's automatic high-DPI scaling
+#EnableHiDPI=false
+
+# Halt command
+#HaltCommand=/usr/bin/systemctl poweroff
+
+# Initial NumLock state. Can be on, off or none.
+# If property is set to none, numlock won't be changed
+# NOTE: Currently ignored if autologin is enabled.
+#Numlock=none
+
+# Reboot command
+#RebootCommand=/usr/bin/systemctl reboot
+
+# Control x11/wayland startup
+# DisplayServer=wayland
+
+[Theme]
+# Current theme name
+#Current=01-breeze-fedora
+
+# Cursor theme used in the greeter
+#CursorTheme=
+
+# Number of users to use as threshold
+# above which avatars are disabled
+# unless explicitly enabled with EnableAvatars
+#DisableAvatarsThreshold=7
+
+# Enable display of custom user avatars
+#EnableAvatars=true
+
+# Global directory for user avatars
+# The files should be named <username>.face.icon
+#FacesDir=/usr/share/sddm/faces
+
+# Theme directory path
+#ThemeDir=/usr/share/sddm/themes
+
+
+[Users]
+# Default $PATH for logged in users
+#DefaultPath=/usr/local/bin:/usr/bin:/bin
+
+# Comma-separated list of shells.
+# Users with these shells as their default won't be listed
+#HideShells=
+
+# Comma-separated list of users that should not be listed
+#HideUsers=
+
+# Maximum user id for displayed users
+#MaximumUid=60000
+
+# Minimum user id for displayed users
+#MinimumUid=1000
+
+# Remember the session of the last successfully logged in user
+#RememberLastSession=true
+
+# Remember the last successfully logged in user
+#RememberLastUser=true
+
+
+[Wayland]
+# Path to a script to execute when starting the desktop session
+#SessionCommand=/etc/sddm/wayland-session
+
+# Directory containing available Wayland sessions
+#SessionDir=/usr/share/wayland-sessions
+
+# Path to the user session log file
+#SessionLogFile=.cache/wayland-errors
+
+
+[X11]
+# Path to a script to execute when starting the display server
+#DisplayCommand=/etc/sddm/Xsetup
+
+# Path to a script to execute when stopping the display server
+#DisplayStopCommand=/etc/sddm/Xstop
+
+# The lowest virtual terminal number that will be used.
+#MinimumVT=1
+
+# Arguments passed to the X server invocation
+#ServerArguments=-nolisten tcp
+
+# Path to X server binary
+#ServerPath=/usr/bin/X
+
+# Path to a script to execute when starting the desktop session
+#SessionCommand=/etc/X11/xinit/Xsession
+
+# Directory containing available X sessions
+#SessionDir=/usr/share/xsessions
+
+# Path to the user session log file
+#SessionLogFile=.cache/xsession-errors
+
+# Path to the Xauthority file
+#UserAuthFile=.Xauthority
+
+# Path to xauth binary
+#XauthPath=/usr/bin/xauth
+
+# Path to Xephyr binary
+#XephyrPath=/usr/bin/Xephyr
+
+

anda/desktops/sddm/sddm.pam

@@ -0,0 +1,23 @@
+auth     [success=done ignore=ignore default=bad] pam_selinux_permit.so
+auth        substack      password-auth
+-auth        optional      pam_gnome_keyring.so
+-auth        optional      pam_kwallet5.so
+-auth        optional      pam_kwallet.so
+auth        include       postlogin
+
+account     required      pam_nologin.so
+account     include       password-auth
+
+password    include       password-auth
+
+session     required      pam_selinux.so close
+session     required      pam_loginuid.so
+-session    optional    pam_ck_connector.so
+session     required      pam_selinux.so open
+session     optional      pam_keyinit.so force revoke
+session     required      pam_namespace.so
+session     include       password-auth
+-session     optional      pam_gnome_keyring.so auto_start
+-session     optional      pam_kwallet5.so auto_start
+-session     optional      pam_kwallet.so auto_start
+session     include       postlogin

anda/desktops/sddm/sddm.sysconfig

@@ -0,0 +1,5 @@
+# workaround https://bugzilla.redhat.com/1686675
+# see also https://bugreports.qt.io/browse/QTBUG-58508
+QML_DISABLE_DISK_CACHE=1
+# enable qDebug messages for debug build
+# QT_LOGGING_RULES="*.debug=true"

anda/desktops/sddm/terra-sddm.spec

@@ -0,0 +1,293 @@
+# Disable X11 for RHEL 10+
+%bcond x11 %[%{undefined rhel} || 0%{?rhel} < 10]
+
+Name:           terra-sddm
+Version:        0.21.0
+Release:        5%{?dist}
+License:        GPL-2.0-or-later
+Summary:        QML based desktop and login manager
+Provides:       sddm = %version-%release
+
+URL:            https://github.com/sddm/sddm
+Source0:        %{url}/archive/v%{version}/sddm-%{version}.tar.gz
+
+## upstream patches
+# Port all themes to Qt 6
+# Submitted: https://github.com/sddm/sddm/pull/1876
+Patch1:         sddm-PR1876.patch
+
+## upstreamable patches
+# Fix race with logind restart, and start seat0 if !CanGraphical on timer
+# https://bugzilla.redhat.com/show_bug.cgi?id=2011991
+# https://bugzilla.redhat.com/show_bug.cgi?id=2016310
+# Submmited: https://github.com/sddm/sddm/pull/1494
+Patch11:        0001-Delay-for-logind-and-fallback-to-seat0.patch
+
+## downstream patches
+Patch101:       sddm-0.20.0-fedora_config.patch
+
+# sddm.service: +EnvironmentFile=-/etc/sysconfig/sddm
+Patch103:       sddm-0.18.0-environment_file.patch
+
+# Workaround for https://pagure.io/fedora-kde/SIG/issue/87
+Patch104:       sddm-rpmostree-tmpfiles-hack.patch
+
+# Workaround lack of Qt 5 greeter build
+Patch105:       sddm-0.21.0-qt6greeter.patch
+
+# https://github.com/sddm/sddm/pull/1779
+Patch106:       https://github.com/sddm/sddm/pull/1779.patch
+
+# Shamelessly stolen from gdm
+Source10:       sddm.pam
+# Shamelessly stolen from gdm
+Source11:       sddm-autologin.pam
+# Previously included in sddm sources
+Source12:       sddm-greeter.pam
+# sample sddm.conf generated with sddm --example-config, and entries commented-out
+Source13:       sddm.conf
+# README.scripts
+Source14:       README.scripts
+# sysconfig snippet
+Source15:       sddm.sysconfig
+# sddm x11 override config
+Source16:       sddm-x11.conf
+# sysusers config file. note these are shipped in the upstream tarball
+# but we cannot use the files from the tarball for %pre scriptlet
+# generation, so we duplicate them as source files for that purpose;
+# this is an ugly hack that should be removed if it becomes possible.
+# see https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/TFDMAU7KLMSQTKPJELHSM6PFVXIZ56GK/
+Source17:       sddm-systemd-sysusers.conf
+
+
+Provides: service(graphical-login) = sddm
+
+BuildRequires:  cmake >= 2.8.8
+BuildRequires:  extra-cmake-modules
+BuildRequires:  pam-devel
+BuildRequires:  pkgconfig(libsystemd)
+BuildRequires:  pkgconfig(systemd)
+BuildRequires:  pkgconfig(xcb)
+BuildRequires:  pkgconfig(xcb-xkb)
+# sometimes python-docutils, sometimes python2-docutils, sometimes python3-docutils.
+# use path then for sanity
+BuildRequires:  /usr/bin/rst2man
+BuildRequires:  cmake(Qt6Core)
+BuildRequires:  cmake(Qt6DBus)
+BuildRequires:  cmake(Qt6Gui)
+BuildRequires:  cmake(Qt6Qml)
+BuildRequires:  cmake(Qt6Quick)
+BuildRequires:  cmake(Qt6LinguistTools)
+BuildRequires:  cmake(Qt6Test)
+BuildRequires:  cmake(Qt6QuickTest)
+# verify presence to pull defaults from /etc/login.defs
+BuildRequires:  shadow-utils
+BuildRequires:  systemd
+BuildRequires:  systemd-rpm-macros
+
+Obsoletes: kde-settings-sddm < 20-5
+
+%if 0%{?fedora}
+# for /usr/share/backgrounds/default.png
+BuildRequires: desktop-backgrounds-compat
+BuildRequires: GraphicsMagick
+Requires: desktop-backgrounds-compat
+# for /usr/share/pixmaps/system-logo-white.png
+Requires: system-logos
+%endif
+Requires: systemd
+%if %{with x11}
+Requires: xorg-x11-xinit
+%endif
+%{?systemd_requires}
+
+Requires(pre): shadow-utils
+
+# Virtual dependency for sddm greeter setup
+Requires: sddm-greeter-displayserver
+Suggests: sddm-wayland-generic
+
+%description
+SDDM is a modern graphical display manager aiming to be fast, simple and
+beautiful. It uses modern technologies like QtQuick, which in turn gives the
+designer the ability to create smooth, animated user interfaces.
+
+%package wayland-generic
+Summary: Generic Wayland SDDM greeter configuration
+Provides: sddm-greeter-displayserver
+Conflicts: sddm-greeter-displayserver
+Requires: weston
+Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
+
+%description wayland-generic
+This package contains configuration and dependencies for SDDM
+to use Weston for the greeter display server.
+
+This is the generic default Wayland configuration provided
+by SDDM.
+
+%if %{with x11}
+%package x11
+Summary: X11 SDDM greeter configuration
+Provides: sddm-greeter-displayserver
+Conflicts: sddm-greeter-displayserver
+# This will eventually go away...
+Provides: deprecated()
+Requires: xorg-x11-server-Xorg
+Requires: %{name} = %{version}-%{release}
+Recommends: qt6-qtvirtualkeyboard
+BuildArch: noarch
+
+%description x11
+This package contains configuration and dependencies for SDDM
+to use X11 for the greeter display server.
+%endif
+
+%package themes
+Summary: SDDM Themes
+# for upgrade path
+Obsoletes: sddm < 0.2.0-0.12
+Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
+%description themes
+A collection of sddm themes, including: elarun, maldives, maya
+
+
+%prep
+%autosetup -p1 %{?commitdate:-n sddm-%{commit}} -n sddm-%version
+
+%if 0%{?fedora}
+#FIXME/TODO: use version on filesystem instead of using a bundled copy
+cp -v /usr/share/backgrounds/default.png  \
+      src/greeter/theme/background.png
+ls -sh src/greeter/theme/background.png
+gm mogrify -resize 1920x1200 src/greeter/theme/background.png
+ls -sh src/greeter/theme/background.png
+%endif
+
+
+%build
+%cmake \
+  -DBUILD_WITH_QT6:BOOL=ON \
+  -DBUILD_MAN_PAGES:BOOL=ON \
+  -DCMAKE_BUILD_TYPE:STRING="Release" \
+  -DENABLE_JOURNALD:BOOL=ON \
+  -DSESSION_COMMAND:PATH=/etc/X11/xinit/Xsession \
+  -DWAYLAND_SESSION_COMMAND:PATH=/etc/sddm/wayland-session
+
+%cmake_build
+
+
+%install
+%cmake_install
+
+mkdir -p %{buildroot}%{_sysconfdir}/sddm.conf.d
+mkdir -p %{buildroot}%{_prefix}/lib/sddm/sddm.conf.d
+install -Dpm 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/sddm
+install -Dpm 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/pam.d/sddm-autologin
+install -Dpm 644 %{SOURCE12} %{buildroot}%{_sysconfdir}/pam.d/sddm-greeter
+install -Dpm 644 %{SOURCE13} %{buildroot}%{_sysconfdir}/sddm.conf
+install -Dpm 644 %{SOURCE14} %{buildroot}%{_datadir}/sddm/scripts/README.scripts
+install -Dpm 644 %{SOURCE15} %{buildroot}%{_sysconfdir}/sysconfig/sddm
+%if %{with x11}
+install -Dpm 644 %{SOURCE16} %{buildroot}%{_prefix}/lib/sddm/sddm.conf.d/x11.conf
+%endif
+mkdir -p %{buildroot}/run/sddm
+mkdir -p %{buildroot}%{_localstatedir}/lib/sddm
+mkdir -p %{buildroot}%{_sysconfdir}/sddm/
+cp -a %{buildroot}%{_datadir}/sddm/scripts/* \
+      %{buildroot}%{_sysconfdir}/sddm/
+# we're using /etc/X11/xinit/Xsession (by default) instead
+rm -fv %{buildroot}%{_sysconfdir}/sddm/Xsession
+
+# De-conflict the dbus file
+mv %{buildroot}%{_datadir}/dbus-1/system.d/org.freedesktop.DisplayManager.conf \
+   %{buildroot}%{_datadir}/dbus-1/system.d/org.freedesktop.DisplayManager-sddm.conf
+
+%if 0%{?fedora} && 0%{?fedora} < 43
+# Provide unversioned greeter until F40 is EOL
+ln -sr %{buildroot}%{_bindir}/sddm-greeter-qt6 %{buildroot}%{_bindir}/sddm-greeter
+%endif
+
+
+%pre
+%sysusers_create_compat %{SOURCE17}
+
+%post
+%systemd_post sddm.service
+# handle incompatible configuration changes
+(grep \
+   -e '^Current=fedora$' \
+   -e '^\[XDisplay\]$' \
+   -e '^\[WaylandDisplay\]$' \
+   %{_sysconfdir}/sddm.conf > /dev/null && \
+ sed -i.rpmsave \
+   -e 's|^Current=fedora$|#Current=01-breeze-fedora|' \
+   -e 's|^\[XDisplay\]$|\[X11\]|' \
+   -e 's|^\[WaylandDisplay\]$|\[Wayland\]|' \
+   %{_sysconfdir}/sddm.conf
+) ||:
+
+
+%preun
+%systemd_preun sddm.service
+
+
+%postun
+%systemd_postun sddm.service
+
+
+%files
+%license LICENSE
+%doc README.md CONTRIBUTORS
+%dir %{_sysconfdir}/sddm/
+%dir %{_sysconfdir}/sddm.conf.d
+%dir %{_prefix}/lib/sddm/sddm.conf.d
+%config(noreplace)   %{_sysconfdir}/sddm/*
+%config(noreplace)   %{_sysconfdir}/sddm.conf
+%config(noreplace) %{_sysconfdir}/sysconfig/sddm
+%config(noreplace) %{_sysconfdir}/pam.d/sddm*
+%{_datadir}/dbus-1/system.d/org.freedesktop.DisplayManager-sddm.conf
+%{_bindir}/sddm
+%{_bindir}/sddm-greeter*
+%{_libexecdir}/sddm-helper
+%{_libexecdir}/sddm-helper-start-wayland
+%{_libexecdir}/sddm-helper-start-x11user
+%{_tmpfilesdir}/sddm.conf
+%{_sysusersdir}/sddm.conf
+%attr(0711, root, sddm) %dir /run/sddm
+%attr(1770, sddm, sddm) %dir %{_localstatedir}/lib/sddm
+%{_unitdir}/sddm.service
+%{_qt6_archdatadir}/qml/SddmComponents/
+%dir %{_datadir}/sddm
+%{_datadir}/sddm/faces/
+%{_datadir}/sddm/flags/
+%{_datadir}/sddm/scripts/
+%dir %{_datadir}/sddm/themes/
+# %%lang'ify? they're small, probably not worth it -- rex
+%{_datadir}/sddm/translations*/
+%{_mandir}/man1/sddm.1*
+%{_mandir}/man1/sddm-greeter.1*
+%{_mandir}/man5/sddm.conf.5*
+%{_mandir}/man5/sddm-state.conf.5*
+
+
+%files wayland-generic
+# No files since default configuration
+
+
+%if %{with x11}
+%files x11
+%{_prefix}/lib/sddm/sddm.conf.d/x11.conf
+%endif
+
+
+%files themes
+%{_datadir}/sddm/themes/elarun/
+%{_datadir}/sddm/themes/maldives/
+%{_datadir}/sddm/themes/maya/
+
+
+%changelog
+%autochangelog

anda/desktops/sddm/update.rhai

@@ -0,0 +1 @@
+rpm.version(gh("sddm/sddm"));

anda/devs/flow/flow-control-nightly.spec

@@ -1,6 +1,6 @@
-%global commit b831d99d1cb7c32489255be3872dce3503f1831c
+%global commit 267ccdd069df388d0cfd80146c03fe13e1491c5d
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240821
+%global commit_date 20240831
 
 Name:           flow-control-nightly
 Version:        %commit_date.%shortcommit

anda/devs/tracy/tracy.spec

@@ -27,7 +27,7 @@ This package contains the development files for the tracy package.
 %meson
 %meson_build
 
-for project in capture csvexport import-chrome import-fuchsia update profiler
+for project in capture csvexport import update profiler
 do
     pushd $project
     %cmake -DDOWNLOAD_CAPSTONE=0
@@ -41,8 +41,8 @@ done
 # NOTE: the subprojects don't have install targets so we do it manually
 install -Dm755 capture/%__cmake_builddir/tracy-capture %buildroot%_bindir/tracy-capture
 install -Dm755 csvexport/%__cmake_builddir/tracy-csvexport %buildroot%_bindir/tracy-csvexport
-install -Dm755 import-chrome/%__cmake_builddir/tracy-import-chrome %buildroot%_bindir/tracy-import-chrome
-install -Dm755 import-fuchsia/%__cmake_builddir/tracy-import-fuchsia %buildroot%_bindir/tracy-import-fuchsia
+install -Dm755 import/%__cmake_builddir/tracy-import-chrome %buildroot%_bindir/tracy-import-chrome
+install -Dm755 import/%__cmake_builddir/tracy-import-fuchsia %buildroot%_bindir/tracy-import-fuchsia
 install -Dm755 update/%__cmake_builddir/tracy-update %buildroot%_bindir/tracy-update
 install -Dm755 profiler/%__cmake_builddir/tracy-profiler %buildroot%_bindir/tracy
 

anda/devs/zed/nightly/zed-nightly.spec

@@ -1,7 +1,7 @@
-%global commit a82cc80d1dcc3f1d155e3e4350beacd253a721c4
+%global commit a850731b0ed61b0ef2a0173843b6daedf45327e8
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240821
-%global ver 0.151.0
+%global commit_date 20240831
+%global ver 0.152.0
 
 %bcond_with check
 
@@ -35,7 +35,7 @@ BuildRequires:  alsa-lib-devel
 BuildRequires:  fontconfig-devel
 BuildRequires:  wayland-devel
 BuildRequires:  libxkbcommon-x11-devel
-BuildRequires:  openssl-devel
+BuildRequires:  openssl-devel-engine
 BuildRequires:  libzstd-devel
 BuildRequires:  perl-FindBin
 BuildRequires:  perl-IPC-Cmd

anda/devs/zed/preview/zed-preview.spec

@@ -1,6 +1,6 @@
 %bcond_with check
 
-%global ver 0.149.1-pre
+%global ver 0.151.1-pre
 # Exclude input files from mangling
 %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$
 # Use Mold as the linker
@@ -31,7 +31,7 @@ BuildRequires:  alsa-lib-devel
 BuildRequires:  fontconfig-devel
 BuildRequires:  wayland-devel
 BuildRequires:  libxkbcommon-x11-devel
-BuildRequires:  openssl-devel
+BuildRequires:  openssl-devel-engine
 BuildRequires:  libzstd-devel
 BuildRequires:  perl-FindBin
 BuildRequires:  perl-IPC-Cmd

anda/devs/zed/stable/zed.spec

@@ -9,7 +9,7 @@
 %global app_id dev.zed.Zed
 
 Name:           zed
-Version:        0.148.1
+Version:        0.150.4
 Release:        1%?dist
 Summary:        Zed is a high-performance, multiplayer code editor
 
@@ -30,7 +30,7 @@ BuildRequires:  alsa-lib-devel
 BuildRequires:  fontconfig-devel
 BuildRequires:  wayland-devel
 BuildRequires:  libxkbcommon-x11-devel
-BuildRequires:  openssl-devel
+BuildRequires:  openssl-devel-engine
 BuildRequires:  libzstd-devel
 BuildRequires:  perl-FindBin
 BuildRequires:  perl-IPC-Cmd

anda/docker/containerd/containerd.spec

@@ -7,7 +7,7 @@
 
 # https://github.com/containerd/containerd
 %global goipath         github.com/containerd/containerd
-Version:                1.7.20
+Version:                1.7.21
 
 %gometa
 

anda/fonts/iosevka-fusion/anda.hcl

@@ -1,6 +0,0 @@
-project pkg {
-	arches = ["x86_64"]
-	rpm {
-		spec = "iosevka-fusion-fonts.spec"
-	}
-}

anda/fonts/iosevka-fusion/iosevka-fusion-fonts.spec

@@ -1,142 +0,0 @@
-%global         source_name Iosevka
-%global         debug_package %{nil}
-
-Name:           iosevka-fusion-fonts
-Version:        31.0.0
-Release:        1%?dist
-Summary:        A custom font based on iosevka
-
-License:        OFL-1.1
-URL:            https://github.com/be5invis/Iosevka
-Source0:        %{url}/archive/v%{version}.tar.gz
-Source1:        iosevka-fusion.toml
-
-BuildArch:      noarch
-
-BuildRequires:  clang
-BuildRequires:  nodejs-npm
-BuildRequires:  ttfautohint
-
-%description
-Based on Iosevka font, https://github.com/be5invis/Iosevka,
-this font mixes elements from various fonts tailored to my personal taste.
-
-%prep
-%autosetup -n %{source_name}-%{version}
-%__cp %SOURCE1 %{_builddir}/%{source_name}-%{version}/private-build-plans.toml
-
-%build
-npm install
-npm run build -- ttf::iosevka-fusion
-
-%install
-%__mkdir -p %{buildroot}%{_datadir}/fonts/%{name}
-
-%__install -m 0644                                                     \
-           dist/iosevka-fusion/ttf/iosevka-fusion-bold.ttf             \
-           -T                                                          \
-           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-Bold.ttf
-
-%__install -m 0644                                                     \
-           dist/iosevka-fusion/ttf/iosevka-fusion-bolditalic.ttf       \
-           -T                                                          \
-           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-BoldItalic.ttf
-
-%__install -m 0644                                                     \
-           dist/iosevka-fusion/ttf/iosevka-fusion-book.ttf             \
-           -T                                                          \
-           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-Book.ttf
-
-%__install -m 0644                                                     \
-           dist/iosevka-fusion/ttf/iosevka-fusion-bookitalic.ttf       \
-           -T                                                          \
-           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-BookItalic.ttf
-
-%__install -m 0644                                                     \
-           dist/iosevka-fusion/ttf/iosevka-fusion-extrabold.ttf        \
-           -T                                                          \
-           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-ExtraBold.ttf
-
-%__install -m 0644                                                     \
-           dist/iosevka-fusion/ttf/iosevka-fusion-extrabolditalic.ttf  \
-           -T                                                          \
-           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-ExtraBoldItalic.ttf
-
-%__install -m 0644                                                     \
-           dist/iosevka-fusion/ttf/iosevka-fusion-extralight.ttf       \
-           -T                                                          \
-           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-ExtraLight.ttf
-
-%__install -m 0644                                                     \
-           dist/iosevka-fusion/ttf/iosevka-fusion-extralightitalic.ttf \
-           -T                                                          \
-           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-ExtraLightItalic.ttf
-
-%__install -m 0644                                                     \
-           dist/iosevka-fusion/ttf/iosevka-fusion-heavy.ttf            \
-           -T                                                          \
-           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-Heavy.ttf
-
-%__install -m 0644                                                     \
-           dist/iosevka-fusion/ttf/iosevka-fusion-heavyitalic.ttf      \
-           -T                                                          \
-           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-HeavyItalic.ttf
-
-%__install -m 0644                                                     \
-           dist/iosevka-fusion/ttf/iosevka-fusion-italic.ttf           \
-           -T                                                          \
-           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-Italic.ttf
-
-%__install -m 0644                                                     \
-           dist/iosevka-fusion/ttf/iosevka-fusion-light.ttf            \
-           -T                                                          \
-           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-Light.ttf
-
-%__install -m 0644                                                     \
-           dist/iosevka-fusion/ttf/iosevka-fusion-lightitalic.ttf      \
-           -T                                                          \
-           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-LightItalic.ttf
-
-%__install -m 0644                                                     \
-           dist/iosevka-fusion/ttf/iosevka-fusion-medium.ttf           \
-           -T                                                          \
-           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-Medium.ttf
-
-%__install -m 0644                                                     \
-           dist/iosevka-fusion/ttf/iosevka-fusion-mediumitalic.ttf     \
-           -T                                                          \
-           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-MediumItalic.ttf
-
-%__install -m 0644                                                     \
-           dist/iosevka-fusion/ttf/iosevka-fusion-regular.ttf          \
-           -T                                                          \
-           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-Regular.ttf
-
-%__install -m 0644                                                     \
-           dist/iosevka-fusion/ttf/iosevka-fusion-semibold.ttf         \
-           -T                                                          \
-           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-SemiBold.ttf
-
-%__install -m 0644                                                     \
-           dist/iosevka-fusion/ttf/iosevka-fusion-semibolditalic.ttf   \
-           -T                                                          \
-           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-SemiBoldItalic.ttf
-
-%__install -m 0644                                                     \
-           dist/iosevka-fusion/ttf/iosevka-fusion-thin.ttf             \
-           -T                                                          \
-           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-Thin.ttf
-
-%__install -m 0644                                                     \
-           dist/iosevka-fusion/ttf/iosevka-fusion-thinitalic.ttf       \
-           -T                                                          \
-           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-ThinItalic.ttf
-
-%files
-%license LICENSE.md
-%doc README.md
-%{_datadir}/fonts/*
-
-%changelog
-* Wed Dec 28 2022 windowsboy111 <windowsboy111@fyralabs.com> - 16.8.4
-- Initial package

anda/fonts/iosevka-fusion/iosevka-fusion.toml

@@ -1,190 +0,0 @@
-[buildPlans.iosevka-fusion]
-family      = "Iosevka Fusion"
-spacing     = "fixed"
-serifs      = "sans"
-
-[buildPlans.iosevka-fusion.variants.design]
-cv01 = 1    # A cap straight
-cv02 = 1    # B cap straight
-cv03 = 1    # C cap serifless
-cv04 = 1    # D cap serifless
-cv05 = 1    # E cap serifless
-cv06 = 1    # F cap serifless
-cv07 = 6    # G cap toothless rounded serifless hooked
-cv08 = 1    # H cap serifless
-cv09 = 1    # I cap long serifs
-cv10 = 2    # J cap serified
-cv11 = 2    # K cap curly
-cv12 = 1    # L cap serifless
-cv13 = 1    # M cap short middle leg
-cv14 = 1    # N cap symmetric
-cv15 = 1    # P cap straight
-cv16 = 4    # Q cap crossing tail
-cv17 = 1    # R cap straight
-cv18 = 1    # S cap serifless
-cv19 = 1    # T cap serifless
-cv20 = 3    # U cap serifless
-cv21 = 1    # V cap straight
-cv22 = 1    # W straight
-cv23 = 1    # X cap straight
-cv24 = 1    # Y cap straight
-cv25 = 1    # Z cap straight
-cv28 = 1    # c serifless
-cv33 = 1    # h straight
-cv34 = 10   # i serified flat tailed
-cv35 = 6    # j flat hook serified
-cv37 = 10   # l serified flat tailed
-cv42 = 9    # r compact
-cv43 = 1    # s serifless
-cv44 = 2    # t flat hook
-cv49 = 6    # y cursive flat terminal hook
-cv53 = 1    # Λ, Δ lambda and delta cap straight
-cv54 = 2    # α alpha straight tailed
-cv55 = 1    # δ delta rounded top
-cv56 = 1    # Γ gamma cap straight
-cv57 = 6    # ι iota serified flat tailed
-cv58 = 2    # λ lambda top tailed
-cv59 = 1    # μ me tailless
-cv60 = 2    # ξ xe flat top
-cv77 = 13   # 0 oval dashed forward slash
-cv80 = 2    # 3 arched
-cv82 = 2    # 5 open contour
-cv84 = 1    # 7 straight
-cv85 = 3    # 8 two asymmetric circles
-cv89 = 2    # ~ tilde low
-cv90 = 3    # * asterisk five-pointed low
-cv91 = 1    # _ underscore right below baseline
-cv92 = 1    # ^ uptick high
-cv93 = 1    # ( parentheses normal slope
-cv94 = 2    # { braces curly
-cv95 = 1    # # column straight
-cv97 = 4    # @ three-fold, tall height
-cv98 = 2    # $ dollar strike through
-VXSF = 2    # ¢ cent strike through
-cv99 = 1    # % percent dots
-VXSA = 1    # | bar natural slope
-VXSB = 1    # ' single quote straight
-VXSC = 1    # ` grave/backtick straight
-VXSD = 1    # ? smooth
-cv88 = 2    # .:; square punctuation marks
-cv87 = 2    # ijäöü square diacretics
-
-[buildPlans.iosevka-fusion.variants.upright]
-cv26 = 3    # a double storey rounded
-cv27 = 2    # b rounded
-cv29 = 2    # d rounded
-cv30 = 1    # e straight
-cv31 = 16   # f serifless bottom flat top crossbar at x height
-cv32 = 9    # g single storey flat hook earless cornered top
-cv36 = 1    # k straight
-cv38 = 5    # m earless normal middle leg
-cv39 = 3    # n earless straight
-cv40 = 2    # p earless
-cv41 = 2    # q earless
-cv45 = 2    # u rounded
-cv46 = 1    # v straight
-cv47 = 1    # w straight
-cv48 = 1    # x straight
-cv50 = 1    # z straight
-cv78 = 3    # 1 serified with base
-cv79 = 1    # 2 straight
-cv81 = 3    # 4 semi-open contour
-cv83 = 3    # 6 straight
-cv86 = 3    # 9 straight
-cv96 = 2    # & et open top (ampersand)
-
-[buildPlans.iosevka-fusion.variants.italic]
-cv26 = 1    # a double storey straight
-cv27 = 1    # b straight
-cv29 = 1    # d straight
-cv30 = 2    # e curly
-cv31 = 18   # f flat hook tailed crossbar at x height
-cv32 = 7    # g single storey flat hook
-cv36 = 2    # k curly
-cv38 = 1    # m straight normal middle leg
-cv39 = 1    # n straight
-cv40 = 1    # p straight
-cv41 = 1    # q straight
-cv45 = 1    # u straight
-cv46 = 2    # v curly
-cv47 = 2    # w curly short middle top
-cv48 = 2    # x curly
-cv50 = 4    # z curly
-cv78 = 2    # 1 serified no base
-cv79 = 2    # 2 curly
-cv81 = 1    # 4 closed contour crossing
-cv83 = 1    # 6 closed contour
-cv86 = 1    # 9 closed contour
-cv96 = 4    # & et open top toothed (ampersand)
-
-[buildPlans.iosevka-fusion.weights.thin]
-shape = 100
-menu  = 100
-css   = 100
-
-[buildPlans.iosevka-fusion.weights.extralight]
-shape = 200
-menu  = 200
-css   = 200
-
-[buildPlans.iosevka-fusion.weights.light]
-shape = 300
-menu  = 300
-css   = 300
-
-[buildPlans.iosevka-fusion.weights.regular]
-shape = 400
-menu  = 400
-css   = 400
-
-[buildPlans.iosevka-fusion.weights.book]
-shape = 450
-menu  = 450
-css   = 450
-
-[buildPlans.iosevka-fusion.weights.medium]
-shape = 500
-menu  = 500
-css   = 500
-
-[buildPlans.iosevka-fusion.weights.semibold]
-shape = 600
-menu  = 600
-css   = 600
-
-[buildPlans.iosevka-fusion.weights.bold]
-shape = 700
-menu  = 700
-css   = 700
-
-[buildPlans.iosevka-fusion.weights.extrabold]
-shape = 800
-menu  = 800
-css   = 800
-
-[buildPlans.iosevka-fusion.weights.heavy]
-shape = 900
-menu  = 900
-css   = 900
-
-[buildPlans.iosevka-fusion.slopes.upright]
-angle = 0
-shape = "upright"
-menu  = "upright"
-css   = "normal"
-
-[buildPlans.iosevka-fusion.slopes.italic]
-angle = 9.4
-shape = "italic"
-menu  = "italic"
-css   = "italic"
-
-[buildPlans.iosevka-fusion.widths.normal]
-shape = 600
-menu  = 5
-css   = "normal"
-
-[buildPlans.iosevka-fusion.metric-override]
-leading = 1350
-sb = 60
-xHeight = 530

anda/fonts/iosevka-fusion/update.rhai

@@ -1 +0,0 @@
-rpm.version(gh("be5invis/Iosevka"));

anda/games/gamescope/0001-cstdint.patch

@@ -0,0 +1,36 @@
+From 5529e8ac8f3232ec6233e33286834548e1d8018d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= <fzatlouk@redhat.com>
+Date: Sun, 8 Oct 2023 22:10:33 +0200
+Subject: [PATCH] <cstdint>
+
+---
+ src/reshade/source/effect_parser_stmt.cpp | 1 +
+ src/reshade/source/effect_token.hpp       | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/reshade/source/effect_parser_stmt.cpp b/src/reshade/source/effect_parser_stmt.cpp
+index 7829729..f126be2 100644
+--- a/src/reshade/source/effect_parser_stmt.cpp
++++ b/src/reshade/source/effect_parser_stmt.cpp
+@@ -9,6 +9,7 @@
+ #include <cctype> // std::toupper
+ #include <cassert>
+ #include <functional>
++#include <limits>
+ #include <string_view>
+ 
+ struct on_scope_exit
+diff --git a/src/reshade/source/effect_token.hpp b/src/reshade/source/effect_token.hpp
+index 072d439..e4bb633 100644
+--- a/src/reshade/source/effect_token.hpp
++++ b/src/reshade/source/effect_token.hpp
+@@ -5,6 +5,7 @@
+ 
+ #pragma once
+ 
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
+-- 
+2.41.0

anda/games/gamescope/0001-limits.patch

@@ -0,0 +1,21 @@
+From 88ce1e5de62886aa14c74421cde6130e16e70d7d Mon Sep 17 00:00:00 2001
+From: psykose <alice@ayaya.dev>
+Date: Sat, 6 Jul 2024 20:52:50 +0200
+Subject: [PATCH] utils: include limits.h for PATH_MAX
+
+---
+ src/Utils/Process.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/Utils/Process.cpp b/src/Utils/Process.cpp
+index e71786f75..3e748e0d3 100644
+--- a/src/Utils/Process.cpp
++++ b/src/Utils/Process.cpp
+@@ -21,6 +21,7 @@
+ #include <pthread.h>
+ #include <stdlib.h>
+ #include <dirent.h>
++#include <limits.h>
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <signal.h>

anda/games/gamescope/1231.patch

@@ -1,239 +0,0 @@
-From ab115896be1a448bde0eb7673c26300ea4ca5040 Mon Sep 17 00:00:00 2001
-From: sharkautarch <128002472+sharkautarch@users.noreply.github.com>
-Date: Sun, 19 May 2024 20:15:36 -0400
-Subject: [PATCH 1/2] QueuePresent: canBypassXWayland(): fetch multiple xcb
- cookies initially before waiting on any of them
-
----
- layer/VkLayer_FROG_gamescope_wsi.cpp |   1 +
- layer/xcb_helpers.hpp                | 105 +++++++++++++++++++++++----
- 2 files changed, 93 insertions(+), 13 deletions(-)
-
-diff --git a/layer/VkLayer_FROG_gamescope_wsi.cpp b/layer/VkLayer_FROG_gamescope_wsi.cpp
-index 5844c2a63..ca44849f2 100644
---- a/layer/VkLayer_FROG_gamescope_wsi.cpp
-+++ b/layer/VkLayer_FROG_gamescope_wsi.cpp
-@@ -975,6 +975,7 @@ namespace GamescopeWSILayer {
-             continue;
-           }
- 
-+          xcb::Prefetcher prefetcher(gamescopeSurface->connection, gamescopeSurface->window);
-           const bool canBypass = gamescopeSurface->canBypassXWayland();
-           if (canBypass != gamescopeSwapchain->isBypassingXWayland)
-             UpdateSwapchainResult(canBypass ? VK_SUBOPTIMAL_KHR : VK_ERROR_OUT_OF_DATE_KHR);
-diff --git a/layer/xcb_helpers.hpp b/layer/xcb_helpers.hpp
-index 8fac5635b..72d0ec092 100644
---- a/layer/xcb_helpers.hpp
-+++ b/layer/xcb_helpers.hpp
-@@ -4,22 +4,106 @@
- #include <xcb/composite.h>
- #include <cstdio>
- #include <optional>
-+#include <pthread.h>
- 
- namespace xcb {
-+  inline static constinit pthread_t g_cache_tid; //incase g_cache could otherwise be accessed by one thread, while it is being deleted by another thread
-+  inline static constinit struct cookie_cache_t {
-+    xcb_window_t window;
-+    std::tuple<xcb_get_geometry_cookie_t, xcb_query_tree_cookie_t> cached_cookies;
-+    std::tuple<xcb_get_geometry_reply_t*, xcb_query_tree_reply_t*> cached_replies;
-+  } g_cache = {};
-+  
-+  //Note: this class is currently only meant to be used within GamescopeWSILayer::VkDeviceOverrides::QueuePresentKHR:
-+  struct Prefetcher {
-+    explicit Prefetcher(xcb_connection_t* connection, const xcb_window_t window) {
-+        g_cache = {
-+            .window = window,
-+            .cached_cookies = {
-+                xcb_get_geometry(connection, window),
-+                xcb_query_tree(connection, window)
-+            }
-+        };
-+        g_cache_tid = pthread_self();
-+    }
- 
-+    ~Prefetcher() {
-+        g_cache_tid = {};
-+        free(std::get<0>(g_cache.cached_replies));
-+        free(std::get<1>(g_cache.cached_replies));
-+        g_cache.cached_replies = {nullptr,nullptr};
-+    }
-+  };
-+  
-   struct ReplyDeleter {
-+    const bool m_bOwning = true;
-+    consteval ReplyDeleter(bool bOwning = true) : m_bOwning{bOwning} {}
-     template <typename T>
-     void operator()(T* ptr) const {
--      free(const_cast<std::remove_const_t<T>*>(ptr));
-+      if (m_bOwning)
-+        free(const_cast<std::remove_const_t<T>*>(ptr));
-     }
-   };
- 
-   template <typename T>
-   using Reply = std::unique_ptr<T, ReplyDeleter>;
-+  
-+  template <typename Cookie_RetType, typename Reply_RetType, typename XcbConn=xcb_connection_t*, typename... Args>
-+  class XcbFetch {
-+    using cookie_f_ptr_t = Cookie_RetType (*)(XcbConn, Args...);
-+    using reply_f_ptr_t = Reply_RetType* (*)(XcbConn, Cookie_RetType, xcb_generic_error_t**);
-+    
-+    const cookie_f_ptr_t m_cookieFunc;
-+    const reply_f_ptr_t m_replyFunc;
-+    
-+    public:
-+        consteval XcbFetch(cookie_f_ptr_t cookieFunc, reply_f_ptr_t replyFunc) : m_cookieFunc{cookieFunc}, m_replyFunc{replyFunc} {}
-+        
-+        inline Reply<Reply_RetType> operator()(XcbConn conn, auto... args) { //have to use auto for argsTwo, since otherwise there'd be a type deduction conflict
-+            return Reply<Reply_RetType> { m_replyFunc(conn, m_cookieFunc(conn, args...), nullptr) };
-+        }
-+  };
-+  
-+  template <typename CookieType>
-+  concept CacheableCookie = std::is_same<CookieType, xcb_get_geometry_cookie_t>::value 
-+                            || std::is_same<CookieType, xcb_query_tree_cookie_t>::value;
-+  
-+  template <CacheableCookie Cookie_RetType, typename Reply_RetType>
-+  class XcbFetch<Cookie_RetType, Reply_RetType, xcb_connection_t*, xcb_window_t> {
-+    using cookie_f_ptr_t = Cookie_RetType (*)(xcb_connection_t*, xcb_window_t);
-+    using reply_f_ptr_t = Reply_RetType* (*)(xcb_connection_t*, Cookie_RetType, xcb_generic_error_t**);
-+    
-+    const cookie_f_ptr_t m_cookieFunc;
-+    const reply_f_ptr_t m_replyFunc;
-+    
-+    inline Reply<Reply_RetType> getCachedReply(xcb_connection_t* connection) {
-+        if (std::get<Reply_RetType*>(g_cache.cached_replies) == nullptr) {
-+            std::get<Reply_RetType*>(g_cache.cached_replies) = m_replyFunc(connection, std::get<Cookie_RetType>(g_cache.cached_cookies), nullptr);
-+        }
- 
-+        return Reply<Reply_RetType>{std::get<Reply_RetType*>(g_cache.cached_replies), ReplyDeleter{false}}; // return 'non-owning' unique_ptr
-+    }
-+    
-+    public:
-+        consteval XcbFetch(cookie_f_ptr_t cookieFunc, reply_f_ptr_t replyFunc) : m_cookieFunc{cookieFunc}, m_replyFunc{replyFunc} {}
-+        
-+        inline Reply<Reply_RetType> operator()(xcb_connection_t* conn, xcb_window_t window) {
-+            const bool tryCached = pthread_equal(g_cache_tid, pthread_self())
-+                                   && g_cache.window == window;
-+            if (!tryCached) [[unlikely]]
-+                return Reply<Reply_RetType> { m_replyFunc(conn, m_cookieFunc(conn, window), nullptr) };
-+            
-+            auto ret = getCachedReply(conn);
-+            #if !defined(NDEBUG) || NDEBUG == 0
-+            if (!ret)
-+                fprintf(stderr, "[Gamescope WSI] getCachedReply() failed.\n");
-+            #endif
-+            return ret;
-+        }
-+  };
-+ 
-   static std::optional<xcb_atom_t> getAtom(xcb_connection_t* connection, std::string_view name) {
--    xcb_intern_atom_cookie_t cookie = xcb_intern_atom(connection, false, name.length(), name.data());
--    auto reply = Reply<xcb_intern_atom_reply_t>{ xcb_intern_atom_reply(connection, cookie, nullptr) };
-+    auto reply = XcbFetch{xcb_intern_atom, xcb_intern_atom_reply}(connection, false, name.length(), name.data());
-     if (!reply) {
-       fprintf(stderr, "[Gamescope WSI] Failed to get xcb atom.\n");
-       return std::nullopt;
-@@ -34,8 +118,7 @@ namespace xcb {
- 
-     xcb_screen_t* screen = xcb_setup_roots_iterator(xcb_get_setup(connection)).data;
- 
--    xcb_get_property_cookie_t cookie = xcb_get_property(connection, false, screen->root, atom, XCB_ATOM_CARDINAL, 0, sizeof(T) / sizeof(uint32_t));
--    auto reply = Reply<xcb_get_property_reply_t>{ xcb_get_property_reply(connection, cookie, nullptr) };
-+    auto reply = XcbFetch{xcb_get_property, xcb_get_property_reply}(connection, false, screen->root, atom, XCB_ATOM_CARDINAL, 0, sizeof(T) / sizeof(uint32_t));
-     if (!reply) {
-       fprintf(stderr, "[Gamescope WSI] Failed to read T root window property.\n");
-       return std::nullopt;
-@@ -61,8 +144,7 @@ namespace xcb {
- 
-   static std::optional<xcb_window_t> getToplevelWindow(xcb_connection_t* connection, xcb_window_t window) {
-     for (;;) {
--      xcb_query_tree_cookie_t cookie = xcb_query_tree(connection, window);
--      auto reply = Reply<xcb_query_tree_reply_t>{ xcb_query_tree_reply(connection, cookie, nullptr) };
-+      auto reply = XcbFetch{xcb_query_tree, xcb_query_tree_reply}(connection, window);
- 
-       if (!reply) {
-         fprintf(stderr, "[Gamescope WSI] getToplevelWindow: xcb_query_tree failed for window 0x%x.\n", window);
-@@ -77,8 +159,7 @@ namespace xcb {
-   }
- 
-   static std::optional<VkRect2D> getWindowRect(xcb_connection_t* connection, xcb_window_t window) {
--    xcb_get_geometry_cookie_t cookie = xcb_get_geometry(connection, window);
--    auto reply = Reply<xcb_get_geometry_reply_t>{ xcb_get_geometry_reply(connection, cookie, nullptr) };
-+    auto reply = XcbFetch{xcb_get_geometry, xcb_get_geometry_reply}(connection, window);
-     if (!reply) {
-       fprintf(stderr, "[Gamescope WSI] getWindowRect: xcb_get_geometry failed for window 0x%x.\n", window);
-       return std::nullopt;
-@@ -112,8 +193,7 @@ namespace xcb {
-   static std::optional<VkExtent2D> getLargestObscuringChildWindowSize(xcb_connection_t* connection, xcb_window_t window) {
-     VkExtent2D largestExtent = {};
- 
--    xcb_query_tree_cookie_t cookie = xcb_query_tree(connection, window);
--    auto reply = Reply<xcb_query_tree_reply_t>{ xcb_query_tree_reply(connection, cookie, nullptr) };
-+    auto reply = XcbFetch{xcb_query_tree, xcb_query_tree_reply}(connection, window);
- 
-     if (!reply) {
-       fprintf(stderr, "[Gamescope WSI] getLargestObscuringWindowSize: xcb_query_tree failed for window 0x%x.\n", window);
-@@ -130,8 +210,7 @@ namespace xcb {
-     for (uint32_t i = 0; i < reply->children_len; i++) {
-       xcb_window_t child = children[i];
- 
--      xcb_get_window_attributes_cookie_t attributeCookie = xcb_get_window_attributes(connection, child);
--      auto attributeReply = Reply<xcb_get_window_attributes_reply_t>{ xcb_get_window_attributes_reply(connection, attributeCookie, nullptr) };
-+      auto attributeReply = XcbFetch{xcb_get_window_attributes, xcb_get_window_attributes_reply}(connection, child);
- 
-       const bool obscuring =
-         attributeReply &&
-
-From 1b59621f4de5c05096d1f279cba2e04264124154 Mon Sep 17 00:00:00 2001
-From: sharkautarch <128002472+sharkautarch@users.noreply.github.com>
-Date: Tue, 18 Jun 2024 22:21:23 -0400
-Subject: [PATCH 2/2] WSI: prefetcher: fix issue w/ attempting to prefetch xcb
- stuff for pure wayland surfaces
-
----
- layer/VkLayer_FROG_gamescope_wsi.cpp | 2 +-
- layer/xcb_helpers.hpp                | 9 ++++++++-
- 2 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/layer/VkLayer_FROG_gamescope_wsi.cpp b/layer/VkLayer_FROG_gamescope_wsi.cpp
-index f26819a60..ce011dcd7 100644
---- a/layer/VkLayer_FROG_gamescope_wsi.cpp
-+++ b/layer/VkLayer_FROG_gamescope_wsi.cpp
-@@ -1234,7 +1234,7 @@ namespace GamescopeWSILayer {
-             continue;
-           }
- 
--          xcb::Prefetcher prefetcher(gamescopeSurface->connection, gamescopeSurface->window);
-+          auto prefetcher = xcb::Prefetcher::GetPrefetcherIf(!gamescopeSurface->isWayland(), gamescopeSurface->connection, gamescopeSurface->window);
-           const bool canBypass = gamescopeSurface->canBypassXWayland();
-           if (canBypass != gamescopeSwapchain->isBypassingXWayland)
-             UpdateSwapchainResult(canBypass ? VK_SUBOPTIMAL_KHR : VK_ERROR_OUT_OF_DATE_KHR);
-diff --git a/layer/xcb_helpers.hpp b/layer/xcb_helpers.hpp
-index 72d0ec092..f26aef38b 100644
---- a/layer/xcb_helpers.hpp
-+++ b/layer/xcb_helpers.hpp
-@@ -16,6 +16,13 @@ namespace xcb {
-   
-   //Note: this class is currently only meant to be used within GamescopeWSILayer::VkDeviceOverrides::QueuePresentKHR:
-   struct Prefetcher {
-+    static std::optional<Prefetcher> GetPrefetcherIf(bool bCond, xcb_connection_t* connection, const xcb_window_t window) {
-+       if (bCond)
-+         return std::optional<Prefetcher>(std::in_place_t{}, connection, window);
-+       
-+       return std::nullopt;
-+    }
-+    
-     explicit Prefetcher(xcb_connection_t* connection, const xcb_window_t window) {
-         g_cache = {
-             .window = window,
-@@ -90,7 +97,7 @@ namespace xcb {
-         inline Reply<Reply_RetType> operator()(xcb_connection_t* conn, xcb_window_t window) {
-             const bool tryCached = pthread_equal(g_cache_tid, pthread_self())
-                                    && g_cache.window == window;
--            if (!tryCached) [[unlikely]]
-+            if (!tryCached)
-                 return Reply<Reply_RetType> { m_replyFunc(conn, m_cookieFunc(conn, window), nullptr) };
-             
-             auto ret = getCachedReply(conn);

anda/games/gamescope/1483.patch

@@ -0,0 +1,34 @@
+From ca58cb2453e6d9ef44d799e394ee9950b7a35b30 Mon Sep 17 00:00:00 2001
+From: Cappy Ishihara <cappy@cappuchino.xyz>
+Date: Wed, 21 Aug 2024 03:56:53 +0700
+Subject: [PATCH] Check if current GPU supports Vulkan DRM modifiers when
+ `--backend=auto` is used.
+
+This works around #1218 by making use of the new backend option added in #1321,
+but adds a check to automatically fall back to the SDL backend if the current
+GPU does not support Vulkan DRM modifiers.
+---
+ src/main.cpp | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/src/main.cpp b/src/main.cpp
+index ca4001249..bc6b16904 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -817,9 +817,13 @@ int main(int argc, char **argv)
+ 	if ( eCurrentBackend == gamescope::GamescopeBackend::Auto )
+ 	{
+ 		if ( g_pOriginalWaylandDisplay != NULL )
+-			eCurrentBackend = gamescope::GamescopeBackend::Wayland;
+-		else if ( g_pOriginalDisplay != NULL )
+-			eCurrentBackend = gamescope::GamescopeBackend::SDL;
++			// Additional check if the current GPU supports Vulkan DRM modifiers
++			// Fallback to SDL if not supported (e.g Older AMD GPUs like Polaris 10/20)
++			if ( vulkan_supports_modifiers() ) 
++				eCurrentBackend = gamescope::GamescopeBackend::Wayland;
++			else
++				eCurrentBackend = gamescope::GamescopeBackend::SDL;
++
+ 		else
+ 			eCurrentBackend = gamescope::GamescopeBackend::DRM;
+ 	}

anda/games/gamescope/deckhd.patch

@@ -1,136 +0,0 @@
-diff --git a/src/Backends/DRMBackend.cpp b/src/Backends/DRMBackend.cpp
-index 85e5126..be418b4 100644
---- a/src/Backends/DRMBackend.cpp
-+++ b/src/Backends/DRMBackend.cpp
-@@ -2149,6 +2149,7 @@ namespace gamescope
- 			( m_Mutable.szMakePNP == "WLC"sv && m_Mutable.szModel == "ANX7530 U"sv ) ||
- 			( m_Mutable.szMakePNP == "ANX"sv && m_Mutable.szModel == "ANX7530 U"sv ) ||
- 			( m_Mutable.szMakePNP == "VLV"sv && m_Mutable.szModel == "ANX7530 U"sv ) ||
-+			( m_Mutable.szMakePNP == "DHD"sv && m_Mutable.szModel == "DeckHD-1200p"sv ) ||
- 			( m_Mutable.szMakePNP == "VLV"sv && m_Mutable.szModel == "Jupiter"sv ) ||
- 			( m_Mutable.szMakePNP == "VLV"sv && m_Mutable.szModel == "Galileo"sv );
- 
-@@ -2160,6 +2161,7 @@ namespace gamescope
- 		{
- 			static constexpr uint32_t kPIDGalileoSDC = 0x3003;
- 			static constexpr uint32_t kPIDGalileoBOE = 0x3004;
-+			static constexpr uint32_t kPIDJupiterDHD = 0x4001;
- 
- 			if ( pProduct->product == kPIDGalileoSDC )
- 			{
-@@ -2171,6 +2173,10 @@ namespace gamescope
- 				m_Mutable.eKnownDisplay = GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_OLED_BOE;
- 				m_Mutable.ValidDynamicRefreshRates = std::span( s_kSteamDeckOLEDRates );
- 			}
-+			else if (pProduct-> product == kPIDJupiterDHD ) {
-+				m_Mutable.eKnownDisplay = GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_LCD_DHD;
-+				m_Mutable.ValidDynamicRefreshRates = std::span( s_kSteamDeckLCDRates );
-+			}
- 			else
- 			{
- 				m_Mutable.eKnownDisplay = GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_LCD;
-@@ -2200,7 +2206,8 @@ namespace gamescope
- 			drm_log.infof( "[colorimetry]: Steam Deck LCD detected. Using known colorimetry" );
- 			m_Mutable.DisplayColorimetry = displaycolorimetry_steamdeck_measured;
- 		}
--		else
-+		else if (m_Mutable.eKnownDisplay == GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_OLED_BOE ||
-+				 m_Mutable.eKnownDisplay == GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_OLED_SDC )
- 		{
- 			// Steam Deck OLED has calibrated chromaticity coordinates in the EDID
- 			// for each unit.
-@@ -2330,7 +2337,7 @@ namespace gamescope
- 				.uMinContentLightLevel = nits_to_u16_dark( 0 ),
- 			};
- 		}
--		else if ( eKnownDisplay == GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_LCD )
-+		else if ( eKnownDisplay == GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_LCD || eKnownDisplay == GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_LCD_DHD )
- 		{
- 			// Set up some HDR fallbacks for undocking
- 			return BackendConnectorHDRInfo
-diff --git a/src/gamescope_shared.h b/src/gamescope_shared.h
-index ed30d8c..3b60774 100644
---- a/src/gamescope_shared.h
-+++ b/src/gamescope_shared.h
-@@ -8,6 +8,7 @@ namespace gamescope
- 	{
- 		GAMESCOPE_KNOWN_DISPLAY_UNKNOWN,
- 		GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_LCD,      // Jupiter
-+		GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_LCD_DHD,  // Jupiter Deck HD
- 		GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_OLED_SDC, // Galileo SDC
- 		GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_OLED_BOE, // Galileo BOE
- 	};
-diff --git a/src/modegen.cpp b/src/modegen.cpp
-index d174c2d..5dd1136 100644
---- a/src/modegen.cpp
-+++ b/src/modegen.cpp
-@@ -293,13 +293,32 @@ unsigned int galileo_boe_vfp[] =
- 	172,152,136,120,100,84,68,52,36,20,8
- };
- 
--#define GALILEO_MIN_REFRESH 45
-+//SD LCD Stock Timings
-+#define JUPITER_BOE_PID     0x3001
-+#define JUPITER_B_PID       0x3002
-+#define JUPITER_HFP         40
-+#define JUPITER_HSYNC       4
-+#define JUPITER_HBP         40
-+#define JUPITER_VFP         30
-+#define JUPITER_VSYNC       4
-+#define JUPITER_VBP         8
-+//SD LCD DeckHD Timings
-+#define JUPITER_DHD_PID     0x4001
-+#define JUPITER_DHD_HFP     40
-+#define JUPITER_DHD_HSYNC   20
-+#define JUPITER_DHD_HBP     40
-+#define JUPITER_DHD_VFP     18
-+#define JUPITER_DHD_VSYNC   2
-+#define JUPITER_DHD_VBP     20
-+//SD OLED SDC Timings
- #define GALILEO_SDC_PID     0x3003
- #define GALILEO_SDC_VSYNC   1
- #define GALILEO_SDC_VBP     22
-+//SD OLED BOE Timings
- #define GALILEO_BOE_PID     0x3004
- #define GALILEO_BOE_VSYNC   2
- #define GALILEO_BOE_VBP     30
-+#define GALILEO_MIN_REFRESH 45
- #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
- 
- unsigned int get_galileo_vfp( int vrefresh, unsigned int * vfp_array, unsigned int num_rates )
-@@ -344,17 +363,28 @@ void generate_fixed_mode(drmModeModeInfo *mode, const drmModeModeInfo *base, int
- 		mode->vsync_end = mode->vsync_start + vsync;
- 		mode->vtotal = mode->vsync_end + vbp;
- 	} else {
--		if ( eKnownDisplay == gamescope::GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_LCD )
-+		if ( eKnownDisplay == gamescope::GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_LCD_DHD ) {
-+			mode->hdisplay = 1200;
-+			mode->hsync_start = mode->hdisplay + JUPITER_DHD_HFP;
-+			mode->hsync_end = mode->hsync_start + JUPITER_DHD_HSYNC;
-+			mode->htotal = mode->hsync_end + JUPITER_DHD_HBP;
-+
-+			mode->vdisplay = 1920;
-+			mode->vsync_start = mode->vdisplay + JUPITER_DHD_VFP;
-+			mode->vsync_end = mode->vsync_start + JUPITER_DHD_VSYNC;
-+			mode->vtotal = mode->vsync_end + JUPITER_DHD_VBP;
-+		}
-+		else if ( eKnownDisplay == gamescope::GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_LCD )
- 		{
- 			mode->hdisplay = 800;
--			mode->hsync_start = 840;
--			mode->hsync_end = 844;
--			mode->htotal = 884;
-+			mode->hsync_start = mode->hdisplay + JUPITER_HFP;
-+			mode->hsync_end = mode->hsync_start + JUPITER_HSYNC;
-+			mode->htotal = mode->hsync_end + JUPITER_HBP;
- 
- 			mode->vdisplay = 1280;
--			mode->vsync_start = 1310;
--			mode->vsync_end = 1314;
--			mode->vtotal = 1322;
-+			mode->vsync_start = mode->vdisplay + JUPITER_VFP;
-+			mode->vsync_end = mode->vsync_start + JUPITER_VSYNC;
-+			mode->vtotal = mode->vsync_end + JUPITER_VBP;
- 		}
- 
- 		mode->clock = ( ( mode->htotal * mode->vtotal * vrefresh ) + 999 ) / 1000;

anda/games/gamescope/disable-steam-touch-click-atom.patch

@@ -48,4 +48,4 @@ index 92bf617..d7498e5 100644
 +					cv_disable_touch_click = true;
  				}
  				break;
- 			case '?':
+ 			case '?':

anda/games/gamescope/drm-Separate-BOE-and-SDC-OLED-Deck-panel-rates.patch

@@ -1,63 +0,0 @@
-From 2e4d7ad1bf2cb98eb67ff8f9385cf6657cf2e912 Mon Sep 17 00:00:00 2001
-From: Matthew Schwartz <njtransit215@gmail.com>
-Date: Wed, 3 Jul 2024 15:20:08 -0700
-Subject: [PATCH] drm: Separate BOE and SDC OLED Deck panel valid refresh rates
-
-OLED Decks with BOE panels seem to struggle with a few different
-specific modesets (51hz/55hz/65hz) that SDC panels have no issues with.
-To work around this, let's make use of Gamescope recognizing each
-display manufacturer to correct the bad modesets while leaving
-SDC panel units alone. This can be reverted if an underlying cause can
-be found in the kernel in the future.
----
- src/Backends/DRMBackend.cpp | 16 +++++++++++++---
- 1 file changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/src/Backends/DRMBackend.cpp b/src/Backends/DRMBackend.cpp
-index 97ef446..9f93c7f 100644
---- a/src/Backends/DRMBackend.cpp
-+++ b/src/Backends/DRMBackend.cpp
-@@ -554,7 +554,7 @@ static constexpr uint32_t s_kSteamDeckLCDRates[] =
- 	60,
- };
- 
--static constexpr uint32_t s_kSteamDeckOLEDRates[] =
-+static constexpr uint32_t s_kSteamDeckOLEDSDCRates[] =
- {
- 	45, 47, 48, 49, 
- 	50, 51, 53, 55, 56, 59, 
-@@ -564,6 +564,16 @@ static constexpr uint32_t s_kSteamDeckOLEDRates[] =
- 	90, 
- };
- 
-+static constexpr uint32_t s_kSteamDeckOLEDBOERates[] =
-+{
-+	45, 47, 48, 49, 
-+	50, 53, 56, 59, 
-+	60, 62, 64, 66, 68, 
-+	72, 73, 76, 77, 78, 
-+	80, 81, 82, 84, 85, 86, 87, 88, 
-+	90, 
-+};
-+
- static void update_connector_display_info_wl(struct drm_t *drm)
- {
- 	wlserver_lock();
-@@ -2128,12 +2138,12 @@ namespace gamescope
- 			if ( pProduct->product == kPIDGalileoSDC )
- 			{
- 				m_Mutable.eKnownDisplay = GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_OLED_SDC;
--				m_Mutable.ValidDynamicRefreshRates = std::span( s_kSteamDeckOLEDRates );
-+				m_Mutable.ValidDynamicRefreshRates = std::span( s_kSteamDeckOLEDSDCRates );
- 			}
- 			else if ( pProduct->product == kPIDGalileoBOE )
- 			{
- 				m_Mutable.eKnownDisplay = GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_OLED_BOE;
--				m_Mutable.ValidDynamicRefreshRates = std::span( s_kSteamDeckOLEDRates );
-+				m_Mutable.ValidDynamicRefreshRates = std::span( s_kSteamDeckOLEDBOERates );
- 			}
- 			else
- 			{
--- 
-2.45.2
-

anda/games/gamescope/gamescope-legacy.sh

@@ -0,0 +1,29 @@
+#!/bin/sh
+
+# Wrapper script to run Gamescope with legacy options for older GPUs
+
+gamescope_path="/usr/bin/gamescope"
+
+
+# check if $BACKEND is already defined
+# todo: Probably want to patch gamescope-session-plus for this instead meow
+
+# For compatibility, let's add the argument for nested backends too
+
+LEGACY_BACKEND_ARGS=""
+NESTED_BACKEND_ARGS=""
+if [ -z "$BACKEND" ]; then
+    LEGACY_BACKEND_ARGS="--backend=sdl"
+    NESTED_BACKEND_ARGS="--backend=sdl"
+else
+    # Only added for nested sessions, as $BACKEND should be defined only for legacy
+    NESTED_BACKEND_ARGS="--backend=$BACKEND"
+fi
+
+
+if [ -z "$DISPLAY" ]; then
+    $gamescope_path $LEGACY_BACKEND_ARGS $@
+else
+    $gamescope_path $NESTED_BACKEND_ARGS $@
+fi
+

anda/games/gamescope/stb.pc

@@ -4,4 +4,4 @@ includedir=${prefix}/include/stb
 Name: stb
 Description: Single-file public domain libraries for C/C++
 Version: 0.1.0
-Cflags: -I${includedir}
+Cflags: -I${includedir}

anda/games/gamescope/terra-gamescope.spec

@@ -1,37 +1,43 @@
+%if 0%{?fedora} >= 41
+%global libliftoff_minver 0.5.0
+%else
 %global libliftoff_minver 0.4.1
+%endif
 
+%global toolchain clang
 %global _default_patch_fuzz 2
-%global gamescope_tag 3.15.1
+%global gamescope_tag 3.15.4-beta-for-steamos-main
 
 Name:           terra-gamescope
 Version:        100.%{gamescope_tag}
 Release:        1%?dist
-Summary:        Micro-compositor for video games on Wayland
+Summary:        Micro-compositor for video games on Wayland - Terra patch, please read the full description
 
 License:        BSD
 URL:            https://github.com/ValveSoftware/gamescope
 
 # Create stb.pc to satisfy dependency('stb')
 Source0:        stb.pc
+Source1:        gamescope-legacy.sh
+
+Patch0:         0001-cstdint.patch
 
 # https://github.com/ChimeraOS/gamescope
-#Patch0:         chimeraos.patch
+Patch1:         chimeraos.patch
 # https://hhd.dev/
-#Patch1:         disable-steam-touch-click-atom.patch
-# https://github.com/ValveSoftware/gamescope/pull/1281
-# Patch2:         deckhd.patch
-# https://github.com/ValveSoftware/gamescope/issues/1398
-Patch3:         drm-Separate-BOE-and-SDC-OLED-Deck-panel-rates.patch
-# https://github.com/ValveSoftware/gamescope/issues/1369
-Patch4:         revert-299bc34.patch
-# https://github.com/ValveSoftware/gamescope/pull/1231
-Patch5:         1231.patch
+Patch2:         disable-steam-touch-click-atom.patch
+Patch3:         v2-0001-always-send-ctrl-1-2-to-steam-s-wayland-session.patch
+
+# Set default backend to SDL instead of Wayland, to avoid issues with GPUs that do not support
+# Vulkan DRM modifiers.
+# See also: gamescope-legacy package
+# https://github.com/ValveSoftware/gamescope/issues/1218#issuecomment-2123801764
+Patch6:         1483.patch
 
 BuildRequires:  meson >= 0.54.0
 BuildRequires:  ninja-build
 BuildRequires:  cmake
-BuildRequires:  gcc
-BuildRequires:  gcc-c++
+BuildRequires:  clang
 BuildRequires:  glm-devel
 BuildRequires:  google-benchmark-devel
 BuildRequires:  libXmu-devel
@@ -52,22 +58,16 @@ BuildRequires:  pkgconfig(xres)
 BuildRequires:  pkgconfig(libdrm)
 BuildRequires:  pkgconfig(vulkan)
 BuildRequires:  pkgconfig(wayland-scanner)
-BuildRequires:  pkgconfig(wayland-server)
+BuildRequires:  pkgconfig(wayland-server) >= 1.23.0
 BuildRequires:  pkgconfig(wayland-protocols) >= 1.17
 BuildRequires:  pkgconfig(xkbcommon)
 BuildRequires:  pkgconfig(sdl2)
 BuildRequires:  pkgconfig(libpipewire-0.3)
 BuildRequires:  pkgconfig(libavif)
-#BuildRequires:  (pkgconfig(wlroots) >= 0.18.0 with pkgconfig(wlroots) < 0.19.0)
-#BuildRequires:  (pkgconfig(libliftoff) >= 0.4.1 with pkgconfig(libliftoff) < 0.5)
-BuildRequires:  pkgconfig(libliftoff)
+BuildRequires:  pkgconfig(wlroots)
+BuildRequires:  pkgconfig(libliftoff) >= 0.4.1
 BuildRequires:  pkgconfig(libcap)
 BuildRequires:  pkgconfig(hwdata)
-BuildRequires:  pkgconfig(libudev)
-BuildRequires:  pkgconfig(libseat)
-BuildRequires:  pkgconfig(libinput)
-BuildRequires:  xcb-util-wm-devel
-BuildRequires:  pkgconfig(xcb-errors)
 BuildRequires:  pkgconfig(lcms2)
 BuildRequires:  spirv-headers-devel
 # Enforce the the minimum EVR to contain fixes for all of:
@@ -90,16 +90,21 @@ BuildRequires:  git
 # libliftoff hasn't bumped soname, but API/ABI has changed for 0.2.0 release
 Requires:       libliftoff%{?_isa} >= %{libliftoff_minver}
 Requires:       xorg-x11-server-Xwayland
-Requires:       %{name}-libs = %{version}-%{release}
-%ifarch %{ix86}
-Requires:       %{name}-libs(x86-32) = %{version}-%{release}
-%endif
+Requires:       terra-gamescope-libs = %{version}-%{release}
+Requires:       terra-gamescope-libs(x86-32) = %{version}-%{release}
 Recommends:     mesa-dri-drivers
 Recommends:     mesa-vulkan-drivers
 
+Provides:       gamescope-legacy
+Obsoletes:      gamescope-legacy < 3.14.2
+
 %description
 Gamescope is the micro-compositor optimized for running video games on Wayland.
 
+This specific build of Gamescope is patched to use SDL as the default backend instead of Wayland, and
+includes a legacy wrapper script for older GPUs and extra configuration options. Please see
+https://developer.fyralabs.com/terra/gamescope for more information.
+
 %package libs
 Summary:	libs for Gamescope
 %description libs
@@ -120,21 +125,35 @@ sed -i 's^../thirdparty/SPIRV-Headers/include/spirv/^/usr/include/spirv/^' src/m
 %build
 cd gamescope
 export PKG_CONFIG_PATH=pkgconfig
-%meson -Dpipewire=enabled -Dinput_emulation=enabled -Ddrm_backend=enabled -Drt_cap=enabled -Davif_screenshots=enabled -Dsdl2_backend=enabled
+%if %{__isa_bits} == 64
+%meson --auto-features=enabled -Dforce_fallback_for=vkroots,wlroots,libliftoff
+%else
+%meson -Denable_gamescope=false -Denable_gamescope_wsi_layer=true
+%endif
 %meson_build
 
 %install
 cd gamescope
 %meson_install --skip-subprojects
 
+%if %{__isa_bits} == 64
+install -Dm755 %{SOURCE1} %{buildroot}%{_bindir}/gamescope-legacy
+%endif
+
 %files
 %license gamescope/LICENSE
 %doc gamescope/README.md
+%if %{__isa_bits} == 64
 %caps(cap_sys_nice=eip) %{_bindir}/gamescope
 %{_bindir}/gamescopectl
 %{_bindir}/gamescopestream
 %{_bindir}/gamescopereaper
+%{_bindir}/gamescope-legacy
+%endif
 
 %files libs
 %{_libdir}/libVkLayer_FROG_gamescope_wsi_*.so
 %{_datadir}/vulkan/implicit_layer.d/VkLayer_FROG_gamescope_wsi.*.json
+
+%changelog
+%autochangelog

anda/games/gamescope/update-patch.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+curl -o ./1483.patch https://patch-diff.githubusercontent.com/raw/ValveSoftware/gamescope/pull/1483.patch

anda/games/gamescope/v2-0001-always-send-ctrl-1-2-to-steam-s-wayland-session.patch

@@ -0,0 +1,39 @@
+From 35e001dc59a44227d670c667a85a6ef5472eee58 Mon Sep 17 00:00:00 2001
+From: antheas <git@antheas.dev>
+Date: Sat, 20 Jul 2024 01:23:19 +0300
+Subject: [PATCH v2] always send ctrl+1/2 to steam's wayland session
+
+---
+ src/wlserver.cpp | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/src/wlserver.cpp b/src/wlserver.cpp
+index 1852be9..7de737d 100644
+--- a/src/wlserver.cpp
++++ b/src/wlserver.cpp
+@@ -369,7 +369,12 @@ static void wlserver_handle_key(struct wl_listener *listener, void *data)
+ 		keysym == XKB_KEY_XF86AudioLowerVolume ||
+ 		keysym == XKB_KEY_XF86AudioRaiseVolume ||
+ 		keysym == XKB_KEY_XF86PowerOff;
+-	if ( ( event->state == WL_KEYBOARD_KEY_STATE_PRESSED || event->state == WL_KEYBOARD_KEY_STATE_RELEASED ) && forbidden_key )
++
++	// Check for steam keys (ctrl + 1/2)
++	bool is_steamshortcut = (keyboard->wlr->modifiers.depressed & WLR_MODIFIER_CTRL) && (keysym == XKB_KEY_1 ||
++																						 keysym == XKB_KEY_2);
++
++	if ( ( event->state == WL_KEYBOARD_KEY_STATE_PRESSED || event->state == WL_KEYBOARD_KEY_STATE_RELEASED ) && (forbidden_key || is_steamshortcut) )
+ 	{
+ 		// Always send volume+/- to root server only, to avoid it reaching the game.
+ 		struct wlr_surface *old_kb_surf = wlserver.kb_focus_surface;
+@@ -378,6 +383,9 @@ static void wlserver_handle_key(struct wl_listener *listener, void *data)
+ 		{
+ 			wlserver_keyboardfocus( new_kb_surf, false );
+ 			wlr_seat_set_keyboard( wlserver.wlr.seat, keyboard->wlr );
++			// Send modifiers to steam for it to work
++			if (is_steamshortcut)
++				wlr_seat_keyboard_notify_modifiers(wlserver.wlr.seat, &keyboard->wlr->modifiers);
+ 			wlr_seat_keyboard_notify_key( wlserver.wlr.seat, event->time_msec, event->keycode, event->state );
+ 			wlserver_keyboardfocus( old_kb_surf, false );
+ 			return;
+-- 
+2.45.2

anda/games/modrinth/anda.hcl

@@ -0,0 +1,5 @@
+project pkg {
+    rpm {
+        spec = "modrinth.spec"
+    }
+}

anda/games/modrinth/modrinth.spec

@@ -0,0 +1,37 @@
+Name:           modrinth
+Version:        1.2.3
+Release:        1%?dist
+Summary:        Desktop app for managing mods and modpacks from Modrinth
+URL:            https://github.com/modrinth/code
+License:        GPL-3.0-or-later
+BuildRequires:  git-core rust tauri
+Packager:       Willow Reed <willow@willowidk.dev>
+ 
+%description
+Desktop app for managing mods and modpacks from Modrinth
+ 
+%prep
+rm -rf ./*
+git clone --recursive %{url} .
+git checkout v%{version}
+ 
+%build
+# Vendor PNPM directly instead of installing from packages, because we need to somehow force PNPM to use Node.js 20
+# We are not using Fedora's PNPM because we need to use `pnpm env`, which PNPM does not support when not vendored directly from upstream
+curl -fsSL https://get.pnpm.io/install.sh | sh -
+source /builddir/.bashrc
+pnpm env use --global 20
+pnpm install
+pnpm build
+pnpm electron-builder --linux --dir
+ 
+%install
+echo "this will also run when building pkg but for installing it into %{buildroot} so that anda (mock) can package it"
+ 
+%files
+/usr/bin/pkgname-binary
+/path/to/more/files/*/package
+ 
+%changelog
+* Wed Jan 11 2006 your-username-here <your_email@idk.xyz>
+- Description on what you've done

anda/games/modrinth/update.rhai

@@ -0,0 +1 @@
+rpm.version(find(`https://launcher-files.modrinth.com/versions/([/d/.]+)/linux/Modrinth%20App_.+?_amd64.AppImage`, get("https://modrinth.com/app"), 1));

anda/games/prismlauncher-nightly/prismlauncher-nightly.spec

@@ -1,11 +1,11 @@
 %global real_name prismlauncher
 %global nice_name PrismLauncher
 
-%global commit 7f594a342e056ad2f9b0f0e4dff26e8cfcf324dd
+%global commit 828acef7e938800a693343a0bb51e5fcd7349680
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f
 
-%global commit_date 20240821
+%global commit_date 20240830
 %global snapshot_info %{commit_date}.%{shortcommit}
 
 %bcond_without qt6

anda/games/prismlauncher-qt5-nightly/0001-find-cmark-with-pkgconfig.patch

@@ -1,79 +0,0 @@
-From 5a38fc2c9a329e88c8337af541dfeccaeff1fefb Mon Sep 17 00:00:00 2001
-From: seth <getchoo@tuta.io>
-Date: Sun, 15 Jan 2023 14:47:49 -0500
-Subject: [PATCH] find cmark with pkgconfig
-
-Signed-off-by: seth <getchoo@tuta.io>
----
- cmake/Findcmark.cmake | 59 +++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 59 insertions(+)
- create mode 100755 cmake/Findcmark.cmake
-
-diff --git a/cmake/Findcmark.cmake b/cmake/Findcmark.cmake
-new file mode 100755
-index 00000000..9858e5df
---- /dev/null
-+++ b/cmake/Findcmark.cmake
-@@ -0,0 +1,59 @@
-+# SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
-+# SPDX-License-Identifier: GPL-3.0-only
-+
-+#
-+# CMake module to search for the cmark library
-+#
-+
-+# first try to find cmark-config.cmake
-+# path to a file not in the search path can be set with 'cmake -Dcmark_DIR=some/path/'
-+find_package(cmark CONFIG QUIET)
-+if(cmark_FOUND AND TARGET cmark::cmark)
-+  # found it!
-+  return()
-+endif()
-+
-+find_package(PkgConfig QUIET)
-+if(PKG_CONFIG_FOUND)
-+  pkg_check_modules(PC_CMARK QUIET cmark)
-+endif()
-+
-+if(NOT CMARK_INCLUDE_DIR)
-+  find_path(CMARK_INCLUDE_DIR
-+            NAMES cmark.h
-+            PATHS
-+            ${PC_CMARK_INCLUDEDIR}
-+            ${PC_CMARK_INCLUDE_DIRS}
-+            /usr/include
-+            /usr/local/include)
-+endif()
-+
-+if(NOT CMARK_LIBRARY)
-+  find_library(CMARK_LIBRARY
-+               NAMES cmark
-+               HINTS
-+               ${PC_CMARK_LIBDIR}
-+               ${PC_CMARK_LIBRARY_DIRS}
-+               /usr/lib
-+               /usr/local/lib)
-+endif()
-+
-+if(NOT TARGET cmark::cmark)
-+  add_library(cmark::cmark UNKNOWN IMPORTED)
-+  set_target_properties(cmark::cmark
-+                        PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
-+                                   ${CMARK_INCLUDE_DIR})
-+  set_property(TARGET cmark::cmark APPEND
-+               PROPERTY IMPORTED_LOCATION ${CMARK_LIBRARY})
-+endif()
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(cmark
-+                                  DEFAULT_MSG
-+                                  CMARK_INCLUDE_DIR
-+                                  CMARK_LIBRARY)
-+
-+mark_as_advanced(CMARK_LIBRARY CMARK_INCLUDE_DIR)
-+
-+set(CMARK_LIBRARIES ${CMARK_LIBRARY})
-+set(CMARK_INCLUDE_DIRS ${CMARK_INCLUDE_DIR})
--- 
-2.39.0
-

anda/games/prismlauncher-qt5-nightly/anda.hcl

@@ -1,8 +0,0 @@
-project pkg {
-	rpm {
-		spec = "prismlauncher-qt5-nightly.spec"
-	}
-	labels {
-		nightly = "1"
-	}
-}

anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec

@@ -1,198 +0,0 @@
-%global real_name prismlauncher
-%global nice_name PrismLauncher
-
-%global commit a2d28f6872841d047ce3854365c595ebf941b848
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f
-%global quazip_commit 6117161af08e366c37499895b00ef62f93adc345
-%global tomlplusplus_commit 7eb2ffcc09f8e9890dc0b77ff8ab00fc53b1f2b8
-
-%global commit_date 20240401
-%global snapshot_info %{commit_date}.%{shortcommit}
-
-%bcond_with qt6
-
-# Change this variables if you want to use custom keys
-# Leave blank if you want to build Prism Launcher without MSA id or curseforge api key
-%define msa_id default
-%define curseforge_key default
-
-%if %{with qt6}
-%global qt_version 6
-%global min_qt_version 6
-%else
-%global qt_version 5
-%global min_qt_version 5.12
-%endif
-
-%global build_platform terra
-
-%if %{with qt6}
-Name:             prismlauncher-nightly
-%else
-Name:             prismlauncher-qt5-nightly
-%endif
-Version:          9.0^%{snapshot_info}
-Release:          1%?dist
-Summary:          Minecraft launcher with ability to manage multiple instances
-License:          GPL-3.0-only AND Apache-2.0 AND LGPL-3.0-only AND GPL-3.0-or-later AND GPL-2.0-or-later AND ISC AND OFL-1.1 AND LGPL-2.1-only AND MIT AND BSD-2-Clause-FreeBSD AND BSD-3-Clause AND LGPL-3.0-or-later
-Group:            Amusements/Games
-URL:              https://prismlauncher.org/
-Source0:          https://github.com/PrismLauncher/PrismLauncher/archive/%{commit}/%{real_name}-%{shortcommit}.tar.gz
-Source1:          https://github.com/PrismLauncher/libnbtplusplus/archive/%{libnbtplusplus_commit}/libnbtplusplus-%{libnbtplusplus_commit}.tar.gz
-Source2:          https://github.com/stachenov/quazip/archive/%{quazip_commit}/quazip-%{quazip_commit}.tar.gz
-Source3:          https://github.com/marzer/tomlplusplus/archive/%{tomlplusplus_commit}/tomlplusplus-%{tomlplusplus_commit}.tar.gz
-Patch0:           0001-find-cmark-with-pkgconfig.patch
-
-BuildRequires:    cmake >= 3.15
-BuildRequires:    extra-cmake-modules
-BuildRequires:    gcc-c++
-BuildRequires:    java-17-openjdk-devel
-BuildRequires:    desktop-file-utils
-BuildRequires:    libappstream-glib
-BuildRequires:    cmake(ghc_filesystem)
-BuildRequires:    cmake(Qt%{qt_version}Concurrent) >= %{min_qt_version}
-BuildRequires:    cmake(Qt%{qt_version}Core) >= %{min_qt_version}
-BuildRequires:    cmake(Qt%{qt_version}Gui) >= %{min_qt_version}
-BuildRequires:    cmake(Qt%{qt_version}Network) >= %{min_qt_version}
-BuildRequires:    cmake(Qt%{qt_version}Test) >= %{min_qt_version}
-BuildRequires:    cmake(Qt%{qt_version}Widgets) >= %{min_qt_version}
-BuildRequires:    cmake(Qt%{qt_version}Xml) >= %{min_qt_version}
-
-%if %{with qt6}
-BuildRequires:    cmake(Qt6Core5Compat)
-%endif
-
-BuildRequires:    pkgconfig(libcmark)
-%if 0%{fedora} < 38
-BuildRequires:    cmark
-%endif
-BuildRequires:    pkgconfig(scdoc)
-BuildRequires:    pkgconfig(zlib)
-
-Requires(post):   desktop-file-utils
-Requires(postun): desktop-file-utils
-
-Requires:         qt%{qt_version}-qtimageformats
-Requires:         qt%{qt_version}-qtsvg
-Requires:         javapackages-filesystem
-Recommends:       java-21-openjdk
-Recommends:       java-17-openjdk
-Suggests:         java-1.8.0-openjdk
-
-# xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
-Recommends:       xrandr
-# libflite needed for using narrator in minecraft
-Recommends:       flite
-# Prism supports enabling gamemode
-Suggests:         gamemode
-
-Conflicts:        %{real_name}
-Conflicts:        %{real_name}-qt5
-%if %{without qt6}
-Conflicts:        %{real_name}-nightly
-%endif
-
-
-%description
-A custom launcher for Minecraft that allows you to easily manage
-multiple installations of Minecraft at once (Fork of MultiMC)
-
-
-%prep
-%autosetup -p1 -n PrismLauncher-%{commit}
-
-tar -xzf %{SOURCE1} -C libraries
-tar -xvf %{SOURCE2} -C libraries
-tar -xvf %{SOURCE3} -C libraries
-
-rmdir libraries/{extra-cmake-modules,filesystem,libnbtplusplus,quazip,tomlplusplus,zlib}/
-mv -f libraries/libnbtplusplus-%{libnbtplusplus_commit} libraries/libnbtplusplus
-mv -f libraries/quazip-%{quazip_commit} libraries/quazip
-mv -f libraries/tomlplusplus-%{tomlplusplus_commit} libraries/tomlplusplus
-
-# Do not set RPATH
-sed -i "s|\$ORIGIN/||" CMakeLists.txt
-
-
-%build
-%cmake \
-  -DLauncher_QT_VERSION_MAJOR="%{qt_version}" \
-  -DLauncher_BUILD_PLATFORM="%{build_platform}" \
-  %if "%{msa_id}" != "default"
-  -DLauncher_MSA_CLIENT_ID="%{msa_id}" \
-  %endif
-  %if "%{curseforge_key}" != "default"
-  -DLauncher_CURSEFORGE_API_KEY="%{curseforge_key}" \
-  %endif
-  -DBUILD_TESTING=OFF
-
-%cmake_build
-
-
-%install
-%cmake_install
-
-
-%check
-%ctest
-
-
-%files
-%doc README.md
-%license LICENSE COPYING.md
-%dir %{_datadir}/%{nice_name}
-%{_bindir}/%{real_name}
-%{_datadir}/%{nice_name}/NewLaunch.jar
-%{_datadir}/%{nice_name}/JavaCheck.jar
-%{_datadir}/%{nice_name}/qtlogging.ini
-%{_datadir}/%{nice_name}/NewLaunchLegacy.jar
-%{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop
-%{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml
-%{_datadir}/icons/hicolor/scalable/apps/org.prismlauncher.PrismLauncher.svg
-%{_datadir}/mime/packages/modrinth-mrpack-mime.xml
-%{_datadir}/qlogging-categories%{qt_version}/prismlauncher.categories
-%{_mandir}/man?/prismlauncher.*
-
-
-%changelog
-* Wed Jul 26 2023 seth <getchoo at tuta dot io> - 8.0^20230726.4f00012-1
-- remove terra-fractureiser-detector from recommends, use proper build platform,
-  and add patches for epel/older fedora versions
-
-* Sun Jul 23 2023 seth <getchoo at tuta dot io> - 8.0^20230722.273d75f-1
-- update submodules, version, & use autorelease
-
-* Wed Jun 07 2023 seth <getchoo at tuta dot io> - 7.0^20230603.954d4d7-1
-- specify jdk 17 + cleanup outdated patches/scriptlets
-
-* Sun May 14 2023 seth <getchoo at tuta dot io> - 7.0^20230513.c5aff7c-1
-- add qtlogging.ini to files list
-
-* Mon Mar 20 2023 seth <getchoo at tuta dot io> - 7.0^20230319.6dcf34a-1
-- recommend flite to support narrator in minecraft
-
-* Fri Feb 03 2023 seth <getchoo at tuta dot io> - 7.0^20230203.58d9ced-1
-- disable tests and explicitly require cmark
-
-* Sun Jan 15 2023 seth <getchoo at tuta dot io> - 7.0^20230115.f1247d2-1
-- add 0001-find-cmark-with-pkgconfig.patch
-
-* Fri Jan 13 2023 seth <getchoo at tuta dot io> - 7.0^20230113.3de681d-1
-- add cmark as a build dep
-
-* Tue Jan 03 2023 seth <getchoo at tuta dot io> - 7.0^20230102.4b12c85-1
-- add qlogging categories
-
-* Mon Dec 05 2022 seth <getchoo at tuta dot io> - 6.0^20221204.79d5bef-1
-- revise file to better follow fedora packaging guidelines and add java 8 as a
-  dependency
-
-* Thu Nov 10 2022 seth <getchoo at tuta dot io> - 5.1-0.1.20221110.e6d057f
-- add package to Amusements/Games
-
-* Sun Nov 06 2022 seth <getchoo at tuta dot io> - 5.0-0.1.20221105.9fb80a2
-- update installed files
-
-* Thu Oct 27 2022 seth <getchoo at tuta dot io> - 5.0-0.1.20221027.610b971
-- initial commit

anda/games/prismlauncher-qt5-nightly/update.rhai

@@ -1,11 +0,0 @@
-if filters.contains("nightly") {
-	rpm.global("commit", gh_commit("PrismLauncher/PrismLauncher"));
-	if rpm.changed() {
-		rpm.release();
-		let cmake = get("https://raw.githubusercontent.com/PrismLauncher/PrismLauncher/develop/CMakeLists.txt");
-		let maj = find("set\\(Launcher_VERSION_MAJOR\\s+(\\d+)\\)", cmake, 1);
-		let min = find("set\\(Launcher_VERSION_MINOR\\s+(\\d+)\\)", cmake, 1);
-		rpm.global("commit_date", date());
-		rpm.version(`${maj}.${min}^%{snapshot_info}`);
-	}
-}

anda/games/prismlauncher-qt5/anda.hcl

@@ -1,5 +0,0 @@
-project pkg {
-	rpm {
-		spec = "prismlauncher-qt5.spec"
-	}
-}

anda/games/prismlauncher-qt5/prismlauncher-qt5.spec

@@ -1,188 +0,0 @@
-%global real_name prismlauncher
-%global nice_name PrismLauncher
-%bcond_with qt6
-
-# Change this variables if you want to use custom keys
-# Leave blank if you want to build Prism Launcher without MSA id or curseforge api key
-%define msa_id default
-%define curseforge_key default
-
-%if %{with qt6}
-%global qt_version 6
-%global min_qt_version 6
-%else
-%global qt_version 5
-%global min_qt_version 5.12
-%endif
-
-%global build_platform terra
-
-%if %{with qt6}
-Name:             prismlauncher
-%else
-Name:             prismlauncher-qt5
-%endif
-Version:          8.4
-Release:          1%?dist
-Summary:          Minecraft launcher with ability to manage multiple instances
-# see COPYING.md for more information
-# each file in the source also contains a SPDX-License-Identifier header that declares its license
-License:          GPL-3.0-only AND Apache-2.0 AND LGPL-3.0-only AND GPL-3.0-or-later AND GPL-2.0-or-later AND ISC AND OFL-1.1 AND LGPL-2.1-only AND MIT AND BSD-2-Clause-FreeBSD AND BSD-3-Clause AND LGPL-3.0-or-later
-Group:            Amusements/Games
-URL:              https://prismlauncher.org/
-Source0:          https://github.com/PrismLauncher/PrismLauncher/releases/download/%{version}/%{real_name}-%{version}.tar.gz
-
-BuildRequires:    cmake >= 3.15
-BuildRequires:    extra-cmake-modules
-BuildRequires:    gcc-c++
-BuildRequires:    java-17-openjdk-devel
-BuildRequires:    desktop-file-utils
-BuildRequires:    libappstream-glib
-BuildRequires:    cmake(ghc_filesystem)
-BuildRequires:    cmake(Qt%{qt_version}Concurrent) >= %{min_qt_version}
-BuildRequires:    cmake(Qt%{qt_version}Core) >= %{min_qt_version}
-BuildRequires:    cmake(Qt%{qt_version}Gui) >= %{min_qt_version}
-BuildRequires:    cmake(Qt%{qt_version}Network) >= %{min_qt_version}
-BuildRequires:    cmake(Qt%{qt_version}Test) >= %{min_qt_version}
-BuildRequires:    cmake(Qt%{qt_version}Widgets) >= %{min_qt_version}
-BuildRequires:    cmake(Qt%{qt_version}Xml) >= %{min_qt_version}
-
-%if %{with qt6}
-BuildRequires:    cmake(Qt6Core5Compat)
-%endif
-
-BuildRequires:    pkgconfig(libcmark)
-BuildRequires:    pkgconfig(scdoc)
-BuildRequires:    pkgconfig(zlib)
-
-Requires(post):   desktop-file-utils
-Requires(postun): desktop-file-utils
-
-Requires:         qt%{qt_version}-qtimageformats
-Requires:         qt%{qt_version}-qtsvg
-Requires:         javapackages-filesystem
-Recommends:       java-21-openjdk
-Recommends:       java-17-openjdk
-Suggests:         java-1.8.0-openjdk
-
-# xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
-Recommends:       xrandr
-# libflite needed for using narrator in minecraft
-Recommends:       flite
-
-# Prism supports enabling gamemode
-Suggests:         gamemode
-
-%if %{without qt6}
-Conflicts:        %{real_name}
-%endif
-
-%description
-A custom launcher for Minecraft that allows you to easily manage
-multiple installations of Minecraft at once (Fork of MultiMC)
-
-
-%prep
-%autosetup -n PrismLauncher-%{version}
-
-rm -rf libraries/{extra-cmake-modules,filesystem,zlib}
-
-# Do not set RPATH
-sed -i "s|\$ORIGIN/||" CMakeLists.txt
-
-
-%build
-%cmake \
-  -DLauncher_QT_VERSION_MAJOR="%{qt_version}" \
-  -DLauncher_BUILD_PLATFORM="%{build_platform}" \
-  %if "%{msa_id}" != "default"
-  -DLauncher_MSA_CLIENT_ID="%{msa_id}" \
-  %endif
-  %if "%{curseforge_key}" != "default"
-  -DLauncher_CURSEFORGE_API_KEY="%{curseforge_key}" \
-  %endif
-  -DBUILD_TESTING=OFF
-
-%cmake_build
-
-
-%install
-%cmake_install
-
-
-%check
-%ctest
-
-
-%files
-%doc README.md
-%license LICENSE COPYING.md
-%dir %{_datadir}/%{nice_name}
-%{_bindir}/prismlauncher
-%{_datadir}/%{nice_name}/NewLaunch.jar
-%{_datadir}/%{nice_name}/JavaCheck.jar
-%{_datadir}/%{nice_name}/qtlogging.ini
-%{_datadir}/%{nice_name}/NewLaunchLegacy.jar
-%{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop
-%{_datadir}/icons/hicolor/scalable/apps/org.prismlauncher.PrismLauncher.svg
-%{_datadir}/mime/packages/modrinth-mrpack-mime.xml
-%{_datadir}/qlogging-categories%{qt_version}/prismlauncher.categories
-%{_mandir}/man?/prismlauncher.*
-%{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml
-
-
-%changelog
-* Wed Apr 03 2024 seth <getchoo at tuta dot io> - 8.2-2
-- move JREs to weak deps, add java 21 for snapshots
-
-* Wed Jul 26 2023 seth <getchoo at tuta dot io> - 7.2-2
-- remove terra-fractureiser-detector from recommends, use proper build platform
-
-* Thu Jun 08 2023 seth <getchoo@tuta.io> - 6.3-3
-- specify jdk 17 + cleanup outdated patches/scriptlets
-
-* Mon Mar 20 2023 seth <getchoo at tuta dot io> - 6.3-2
-- recommend flite to support narrator in minecraft
-
-* Sat Feb 04 2023 seth <getchoo at tuta dot io> - 6.3-1
-- update to 6.3
-
-* Mon Dec 19 2022 seth <getchoo at tuta dot io> - 6.1-2
-- start using non-headless java deps
-
-* Mon Dec 12 2022 seth <getchoo at tuta dot io> - 6.0-1
-- update to 6.0
-
-* Mon Dec 05 2022 seth <getchoo at tuta dot io> - 5.2-3
-- revise file to better follow fedora packaging guidelines and add java 8 as a
-  dependency
-
-* Tue Nov 15 2022 seth <getchoo at tuta dot io> - 5.2-2
-- use newer version of toml++ to fix issues on aarch64
-
-* Tue Nov 15 2022 seth <getchoo at tuta dot io> - 5.2-1
-- update to 5.2
-
-* Thu Nov 10 2022 seth <getchoo at tuta dot io> - 5.1-2
-- add package to Amusements/Games
-
-* Tue Nov 01 2022 seth <getchoo at tuta dot io> - 5.1-1
-- update to 5.1
-
-* Wed Oct 19 2022 seth <getchoo at tuta dot io> - 5.0-3
-- add missing deps and build with qt6 by default
-
-* Wed Oct 19 2022 seth <getchoo at tuta dot io> - 5.0-2
-- add change-jars-path.patch to allow for package-specific jar path
-
-* Wed Oct 19 2022 seth <getchoo at tuta dot io> - 5.0-1
-- update to version 5.0
-
-* Tue Oct 18 2022 Cappy Ishihara <cappy@cappuchino.xyz> - 1.4.2.git981e9cf-0.2.20221018.981e9cf
-- Update provides and obsoletes
-
-* Tue Oct 18 2022 seth <getchoo at tuta dot io> - 1.4.2.git981e9cf-0.1.20221018.981e9cf
-- start using qt6
-
-* Tue Oct 18 2022 Cappy Ishihara <cappy@cappuchino.xyz> - 1.4.2-1
-- Repackaged as Prism Launcher

anda/games/prismlauncher-qt5/update.rhai

@@ -1 +0,0 @@
-rpm.version(gh("PrismLauncher/PrismLauncher"));

anda/langs/dart/dart.spec

@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 
 Name: dart
-Version: 3.5.1
+Version: 3.5.2
 Release: 1%?dist
 Summary: The Dart Language
 License: BSD-3-Clause

anda/langs/nim/nim-nightly/nim-nightly.spec

@@ -1,8 +1,8 @@
 %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10
-%global commit e38cbd3c846a8e95bed0d709e4d61cc1ad5279b2
+%global commit fc853cb7268b74d87932fb08553dfbd5864d8f81
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global ver 2.1.9
-%global commit_date 20240821
+%global ver 2.1.99
+%global commit_date 20240831
 %global debug_package %nil
 
 Name:			nim-nightly

anda/langs/nim/nph/anda.hcl

@@ -0,0 +1,5 @@
+project pkg {
+    rpm {
+        spec = "nph.spec"
+    }
+}

anda/langs/nim/nph/nph.spec

@@ -0,0 +1,31 @@
+%define debug_package %nil
+
+Name:           nph
+Version:        0.6.0
+Release:        1%?dist
+Summary:        An opinionated code formatter for Nim
+License:        MIT
+URL:            https://github.com/arnetheduck/nph
+Source0:        %url/archive/refs/tags/v%version.tar.gz
+SourceLicense:  MIT
+Packager:       madonuko <mado@fyralabs.com>
+BuildRequires:  anda-srpm-macros
+BuildRequires:  nim
+
+%description
+nph is an opinionated source code formatter for the Nim language, aiming to take the drudgery of manual formatting out of your coding day.
+
+%prep
+%autosetup
+%nim_prep -t:"%nim_tflags" -l:"%nim_lflags"
+
+%build
+nimble c -d:release -t:"%nim_tflags" -l:"%nim_lflags" src/nph
+
+%install
+install -Dpm755 src/nph %buildroot%_bindir/nph
+
+%files
+%_bindir/nph
+%license copying.txt
+%doc README.md

anda/langs/nim/nph/update.rhai

@@ -0,0 +1 @@
+rpm.version(gh("arnetheduck/nph"));