chore(rebuild): unity-settings-daemon

Signed-off-by: madomado <madonuko@outlook.com>
bump: zellij
2026-05-31 09:01:55 +00:00 · 2024-05-02 19:56:57 +08:00 · 2024-05-02 07:46:05 +00:00 · 2024-05-02 06:18:54 +00:00 · 2024-05-02 12:45:22 +08:00 · 2024-05-02 12:14:23 +08:00
95 changed files with 132 additions and 3164 deletions
@@ -6,13 +6,13 @@ on:
    paths:
      - anda/**
    branches:
-      - f40
+      - frawhide
  pull_request:
    branches:
-      - f40
+      - frawhide
  merge_group:
    branches:
-      - f40
+      - frawhide
  workflow_dispatch:
  workflow_call:

@@ -23,13 +23,13 @@ jobs:
    outputs:
      build_matrix: ${{ steps.generate_build_matrix.outputs.build_matrix }}
    container:
-      image: ghcr.io/terrapkg/builder:f40
+      image: ghcr.io/terrapkg/builder:frawhide
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Set workspace as safe
        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0
      - name: Generate build matrix
@@ -40,7 +40,7 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }}
-        version: ["40"]
+        version: ["rawhide"]
      fail-fast: false
    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
    container:
@@ -48,7 +48,7 @@ jobs:
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0
      - name: Set up git repository
@@ -68,9 +68,10 @@ jobs:
          x=${NAME//\//@}
          echo "name=$x" >> $GITHUB_OUTPUT

-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
        with:
          name: ${{ steps.art.outputs.name }}
+          compression-level: 0 # The RPMs are already compressed :p
          path: |
            anda-build/rpm/rpms/*
            anda-build/rpm/srpm/*
@@ -7,7 +7,7 @@ jobs:
  bootstrap:
    strategy:
      matrix:
-        version: ["40"]
+        version: ["rawhide"]
        arch: ["x86_64", "aarch64"]
      fail-fast: true
    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
@@ -21,7 +21,7 @@ jobs:
      - name: Install Anda
        run: cargo install anda

-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
        with:
          ref: f${{ matrix.version }}
          fetch-depth: 1
@@ -21,7 +21,7 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(needs.parse.outputs.pkgs) }}
-        version: ["40"]
+        version: ["rawhide"]
        arch: ["x86_64", "aarch64"]
      fail-fast: false
    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
@@ -30,7 +30,7 @@ jobs:
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0
      - name: Set up git repository
@@ -38,7 +38,7 @@ jobs:

      - name: Cache buildroot
        id: br-cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
        with:
          path: /var/cache
          key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.arch }}-${{ matrix.pkg }}
@@ -53,9 +53,10 @@ jobs:
          x=${NAME//\//@}
          echo "name=$x" >> $GITHUB_OUTPUT

-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
        with:
          name: ${{ steps.art.outputs.name }}
+          compression-level: 0 # The RPMs are already compressed :p
          path: |
            anda-build/rpm/rpms/*
            anda-build/rpm/srpm/*
@@ -11,7 +11,7 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(inputs.packages) }}
-        version: ["40"]
+        version: ["rawhide"]
      fail-fast: false
    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
    container:
@@ -19,7 +19,7 @@ jobs:
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0
      - name: Set up git repository
@@ -27,7 +27,7 @@ jobs:

      - name: Cache buildroot
        id: br-cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
        with:
          path: /var/cache
          key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}-${{ matrix.pkg.pkg }}
@@ -42,9 +42,10 @@ jobs:
          x=${NAME//\//@}
          echo "name=$x" >> $GITHUB_OUTPUT

-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
        with:
          name: ${{ steps.art.outputs.name }}
+          compression-level: 0 # The RPMs are already compressed :p
          path: |
            anda-build/rpm/rpms/*
            anda-build/rpm/srpm/*
@@ -3,20 +3,20 @@ name: Lint
 on:
  push:
    branches:
-      - f40
+      - frawhide
  pull_request:
    branches:
-      - f40
+      - frawhide
  merge_group:
    branches:
-      - f40
+      - frawhide
 jobs:
  lint:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:f40
+      image: ghcr.io/terrapkg/builder:frawhide
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
      - name: Lint spec files
        run: rpmlint $(find anda -type f -name "*.spec" -type f)
@@ -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@v3
-        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
@@ -3,7 +3,7 @@ name: Push comps updates
 on:
  push:
    branches:
-      - f40
+      - frawhide
      - f39
      - f38
      - f37
@@ -15,9 +15,9 @@ jobs:
  update-comps:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:f40
+      image: ghcr.io/terrapkg/builder:frawhide
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
      - name: Push to subatomic
        run: |
          branch=${{ github.ref_name }}
@@ -8,20 +8,21 @@ jobs:
  autoupdate:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:f40
+      image: ghcr.io/terrapkg/builder:frawhide
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          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 f37 || true
            copy_over f38 || true
-            copy_over frawhide || true
+            copy_over f39 || true
+            copy_over f40 || true
            git push -u origin --all
          fi
@@ -8,20 +8,21 @@ jobs:
  autoupdate:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:f40
+      image: ghcr.io/terrapkg/builder:frawhide
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          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
@@ -31,7 +32,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"
@@ -47,9 +47,8 @@ jobs:
              git add *
              git commit -S -a -m "$msg"
            }
-            copy_over f39 || true
-            copy_over f37 || true
            copy_over f38 || true
-            copy_over frawhide || true
+            copy_over f39 || true
+            copy_over f40 || true
            git push -u origin --all
          fi
@@ -1,7 +1,9 @@
 # Contributing

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

 * [Contribution Guide](https://developer.fyralabs.com/terra/contributing)
 * [FAQ](https://developer.fyralabs.com/terra/faq)
-* [Policy](https://developer.fyralabs.com/terra/policy)
+* [Policy](https://developer.fyralabs.com/terra/policy)
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

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

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

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

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

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

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

 Name:			feishin
-Version:		0.7.0
+Version:		0.6.1
 Release:		1%?dist
 Summary:		A modern self-hosted music player
 License:		GPL-3.0
@@ -1,6 +1,6 @@
-%global commit 943a50b300a081bb223325295040846fe435a861
+%global commit ec447fd4a266e8158519f5e89589c368211bfa14
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240504
+%global commit_date 20240502
 %global ver v0.38.0

 Name:           mpv-nightly
@@ -3,8 +3,8 @@

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

 URL:            https://github.com/elementary/stylesheet
@@ -5,8 +5,8 @@ apps built for elementary.}

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

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

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


 %files devel
@@ -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/compare/3.0.5..5d22d436b45decfb2a50d9a7c27f2c961f1dd39f.patch
+Patch0:         https://github.com/elementary/wingpanel/compare/23a3eb7c2448b4f35398116df7d01b075361ef1f..5d22d436b45decfb2a50d9a7c27f2c961f1dd39f.patch

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

 BuildRequires:  mesa-libEGL-devel

-BuildRequires:  pkgconfig(gala) >= 7.1.3-2
+BuildRequires:  pkgconfig(gala)
 BuildRequires:  pkgconfig(gdk-x11-3.0)
 BuildRequires:  pkgconfig(gee-0.8)
 BuildRequires:  pkgconfig(glib-2.0) >= 2.32
@@ -3,7 +3,7 @@

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

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

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

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

 %changelog
-* Mon Apr 1 2024 Lleyton Gray <lleyton@fyralabs.com> - 2-2
- Patch for GNOME 46 compatibility
-
 * Thu Nov 16 2023 Lleyton Gray <lleyton@fyralabs.com> - 2-1
 - Initial Release
@@ -1,6 +1,6 @@
 %global forgeurl https://github.com/KDE/latte-dock/

-%global commit 8328f9a6863b4bae48adfdbc29b32b4c571c6530
+%global commit 23b9e9ea3694235e19868846bab5292b2518fd34
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global commit_date %(date '+%Y%m%d')
 %global snapshot_info %{commit_date}.%{shortcommit}
@@ -1,10 +1,10 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-download-manager
-%global commit 682c4928a91da598767e0be2496d9c35af7db035
+%global commit 6e4342ae0ef3710343e2dbf0b8da586853625e2e
 %forgemeta

 Name:       lomiri-download-manager
-Version:    0.1.3
-Release:    1%{?dist}
+Version:    0.5.2
+Release:    1%?dist
 Summary:    Upload Download Manager for Lomiri
 License:    LGPLv3
 URL:        https://gitlab.com/ubports/development/core/lomiri-download-manager
@@ -1,4 +1,4 @@
-let o = get("https://gitlab.com/api/v4/projects/17088252/repository/tags").json_arr()[0];
+let o = get("https://gitlab.com/api/v4/projects/25034025/repository/tags").json_arr()[0];
 let f = rpm.f;
 rpm.version(o.name);
 // check if changed
@@ -1,15 +1,16 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings
-%global commit 30d9df926b6837b139990a622d39171ea42c9017
+%global commit 10d7151a3e4ea08b92e85be7e6e631c48219feaf
 %forgemeta

 Name:       lomiri-system-settings
-Version:    1.0.2
-Release:    1%{?dist}
+Version:    1.1.0
+Release:    1%?dist
 Summary:    The system settings application for Lomiri
 License:    GPLv3
 URL:        https://gitlab.com/ubports/development/core/lomiri-system-settings
 Source0:    %{url}/-/archive/%commit/lomiri-system-settings-%commit.tar.gz
 Patch0:     https://sources.debian.org/data/main/l/lomiri-system-settings/1.0.1-2/debian/patches/1001_use-maliit-keyboard-for-language-plugin.patch
+Patch1:     https://sources.debian.org/data/main/l/lomiri-system-settings/1.0.1-2/debian/patches/2001_disable-current-language-switching.patch

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

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

 Name:          lomiri
@@ -1,6 +1,6 @@
 Name:           unity-settings-daemon
 Version:        15.04.1+21.10.20220802
-Release:        %autorelease
+Release:        2%?dist
 Summary:        Daemon handling for Unity session settings

 License:        GPL-2.0 AND LGPL-2.0-or-later
@@ -1,142 +0,0 @@
-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
-
@@ -1,2 +0,0 @@
-This scripts dir contains only samples, but are generally not used directly.
-In practice, sddm runtime uses items under /etc/sddm by default
@@ -1,5 +0,0 @@
-project pkg {
-  rpm {
-    spec = "terra-sddm.spec"
-  }
-}
@@ -1,11 +0,0 @@
-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
@@ -1,53 +0,0 @@
-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"));
@@ -1,67 +0,0 @@
-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
-
@@ -1,20 +0,0 @@
- #%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
@@ -1,17 +0,0 @@
-#%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
@@ -1,12 +0,0 @@
-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
@@ -1,2 +0,0 @@
-#Type Name ID GECOS                  Home directory Shell
-u     sddm -  "SDDM Greeter Account" /var/lib/sddm   -
@@ -1,2 +0,0 @@
-[General]
-DisplayServer=x11
@@ -1,122 +0,0 @@
-[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
-
-
@@ -1,23 +0,0 @@
-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
@@ -1,5 +0,0 @@
-# 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"
@@ -1,293 +0,0 @@
-# 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
@@ -1 +0,0 @@
-rpm.version(gh("sddm/sddm"));
@@ -12,7 +12,7 @@
 %endif

 Name:			codium
-Version:		1.89.0.24127
+Version:		1.88.1.24104
 Release:		1%?dist
 Summary:		Code editing. Redefined.
 License:		MIT
@@ -1,6 +0,0 @@
-project pkg {
-	arches = ["x86_64"]
-	rpm {
-		spec = "iosevka-fusion-fonts.spec"
-	}
-}
@@ -1,142 +0,0 @@
-%global         source_name Iosevka
-%global         debug_package %{nil}
-
-Name:           iosevka-fusion-fonts
-Version:        29.2.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
@@ -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
@@ -1 +0,0 @@
-rpm.version(gh("be5invis/Iosevka"));
@@ -1,5 +1,5 @@
 Name:		sarasa-gothic-fonts
-Version:	1.0.11
+Version:	1.0.10
 Release:	1%?dist
 URL:		https://github.com/be5invis/Sarasa-Gothic
 Source0:	%url/releases/download/v%version/Sarasa-TTC-%version.7z
@@ -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
-
@@ -1,8 +0,0 @@
-project pkg {
-	rpm {
-		spec = "prismlauncher-qt5-nightly.spec"
-	}
-	labels {
-		nightly = "1"
-	}
-}
@@ -1,198 +0,0 @@
-%global real_name prismlauncher
-%global nice_name PrismLauncher
-
-%global commit 2012b2c243dcfad8860847c0d85f184b6dd24504
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f
-%global quazip_commit 6117161af08e366c37499895b00ef62f93adc345
-%global tomlplusplus_commit 7eb2ffcc09f8e9890dc0b77ff8ab00fc53b1f2b8
-
-%global commit_date 20240329
-%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
@@ -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}`);
-	}
-}
@@ -1,5 +0,0 @@
-project pkg {
-	rpm {
-		spec = "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.2
-Release:          2%?dist
-Summary:          Minecraft launcher with ability to manage multiple instances
-# see COPYING.md for more information
-# each file in the source also contains a SPDX-License-Identifier header that declares its license
-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
@@ -1 +0,0 @@
-rpm.version(gh("PrismLauncher/PrismLauncher"));
@@ -7,7 +7,7 @@

 Name:			nim-nightly
 Version:		%ver^%commit_date.%shortcommit
-Release:		2%?dist
+Release:		1%?dist
 Summary:		Imperative, multi-paradigm, compiled programming language
 License:		MIT and BSD
 URL:			https://nim-lang.org
@@ -1,7 +1,7 @@
 %define debug_package %{nil}

 Name:			python3-ruff
-Version:		0.4.3
+Version:		0.4.2
 Release:		1%?dist
 Summary:		An extremely fast Python linter, written in Rust
 License:		MIT
@@ -1,9 +1,9 @@
-# Generated by rust2rpm 26
+# Generated by rust2rpm 24
 %global crate maturin

 Name:           rust-terra-maturin
 Version:        1.5.1
-Release:        %autorelease
+Release:        1%?dist
 Summary:        Build and publish crates with pyo3, rust-cpython and cffi bindings as well as rust binaries as python packages

 License:        MIT OR Apache-2.0
@@ -296,18 +296,6 @@ use the "tracing-subscriber" feature of the "%{crate}" crate.
 %files       -n %{name}+tracing-subscriber-devel
 %ghost %{crate_instdir}/Cargo.toml

-%package     -n %{name}+unicode-xid-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+unicode-xid-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "unicode-xid" feature of the "%{crate}" crate.
-
-%files       -n %{name}+unicode-xid-devel
-%ghost %{crate_instdir}/Cargo.toml
-
 %package     -n %{name}+upload-devel
 Summary:        %{summary}
 BuildArch:      noarch
@@ -332,6 +320,18 @@ use the "ureq" feature of the "%{crate}" crate.
 %files       -n %{name}+ureq-devel
 %ghost %{crate_instdir}/Cargo.toml

+%package     -n %{name}+url-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+url-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "url" feature of the "%{crate}" crate.
+
+%files       -n %{name}+url-devel
+%ghost %{crate_instdir}/Cargo.toml
+
 %package     -n %{name}+wild-devel
 Summary:        %{summary}
 BuildArch:      noarch
@@ -369,7 +369,7 @@ use the "zig" feature of the "%{crate}" crate.
 %ghost %{crate_instdir}/Cargo.toml

 %prep
-%autosetup -n %{crate}-%{version} -p1
+%autosetup -n %{crate}-%{version_no_tilde} -p1
 %cargo_prep_online

 %build
@@ -19,8 +19,7 @@ Requires:		glibc openssl zlib
 %{cargo_build -f extra,dataframe} --workspace

 %install
-mkdir -p %buildroot%_bindir
-cp target/rpm/nu* %buildroot%_bindir/
+%cargo_install -f extra,dataframe
 rm -rf .cargo

 %post
@@ -1,5 +1,5 @@
 %global forgeurl https://gitlab.com/vala-panel-project/vala-panel-appmenu
-%global commit bada552e3eb595d7205d3ec69ea2e0162b9cca12
+%global commit a819ab7b36a449c2d5d0104b896c04115f875d05
 %forgemeta

 Name:    vala-panel-appmenu
@@ -72,7 +72,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.valapanel.applica
 %{_datadir}/vala-panel/applets/*.plugin
 %dir %{_datadir}/vala-panel/images
 %{_datadir}/vala-panel/images/background.png
-%{_libdir}/girepository-1.0/ValaPanel-*.typelib
+%{_libdir}/girepository-1.0/ValaPanel-%version.typelib

 %files devel
 %doc README.md
@@ -82,7 +82,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.valapanel.applica
 %{_libdir}/libvalapanel.so
 %{_libdir}/pkgconfig/vala-panel.pc
 %{_datadir}/vala/vapi/vala-panel.*
-%{_datadir}/gir-1.0/ValaPanel-*.gir
+%{_datadir}/gir-1.0/ValaPanel-%version.gir

 %changelog
 %autochangelog
@@ -4,15 +4,14 @@

 Name:           apparmor
 Version:        4.0.0~alpha3
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        AppArmor userspace components

 %define baseversion %(echo %{version} | cut -d. -f-2)
-%global normver %(echo %version | sed 's/~/-/')

 License:        GPL-2.0
 URL:            https://launchpad.net/apparmor
-Source0:        %{url}/%{baseversion}/%normver/+download/%{name}-%{version}.tar.gz
+Source0:        %{url}/%{baseversion}/%(echo %version | sed 's/~/-/')/+download/%{name}-%{version}.tar.gz
 Source1:        apparmor.preset
 Patch01:        0001-fix-avahi-daemon-authselect-denial-in-fedora.patch

@@ -139,8 +138,6 @@ changehat abilities exposed through libapparmor.

 %prep
 %autosetup -p1 -n %{name}-%{version}
-sed -i 's/@VERSION@/%normver/g' libraries/libapparmor/swig/python/setup.py.in
-sed -i 's/${VERSION}/%normver/g' utils/Makefile

 %build
 export PYTHON=%{__python3}
@@ -152,7 +149,7 @@ pushd libraries/libapparmor
 %configure \
    --with-python \

-%make_build VERSION=%normver
+%make_build
 popd

 %make_build -C binutils
@@ -7,7 +7,7 @@ Name:           libappimage


 Version:        %{libver_format}
-Release:        3%{?dist}
+Release:        2%{?dist}
 Summary:        Implements functionality for dealing with AppImage files

 License:        MIT
@@ -10,7 +10,7 @@
 Name:           libappimageupdate

 Version:        %{libver_format}
-Release:        3%{?dist}
+Release:        2%{?dist}
 Summary:        AppImageUpdate lets you update AppImages in a decentral way using information embedded in the AppImage itself.

 License:        MIT
@@ -2,8 +2,8 @@
 %global commit1 e7d30b921df736a1121a0c8e0cf3ab1ce5b8a4b7
 %global shortcommit1 %(c=%{commit1}; echo ${c:0:7})

-%global openh264_version 2.4.0
-%global gst_version 1.23.2
+%global openh264_version 2.4.1
+%global gst_version 1.24.3

 Name:           openh264
 Version:        %{openh264_version}
@@ -1,4 +0,0 @@
-rpm.global("ver", gh("AppImageCommunity/zsync2"));
-if rpm.changed() {
-  rpm.global("git_commit", gh_commit("AppImageCommunity/zsync2"));
-}
@@ -1,9 +1,8 @@
-%global git_commit 87fb5a0f3c14d3cf35aa6547cc60d099c89ca532
+%global git_commit 1608115705047d6826bcd7b35a6988deaf3dbfec

 %global commit_short %(c=%{git_commit}; echo ${c:0:7})

-%global ver     2.0.0-alpha-1-20230304
-%global libver  %ver.git%{commit_short}
+%global libver  2.0.0-alpha-1-20220304.git%{commit_short}

 # replace - with ~
 %global libver_format %(v=%{libver}; sed 's/-/~/g' <<< $v)
@@ -18,6 +17,7 @@ License:        Artistic-2.0
 URL:            https://github.com/AppImageCommunity/zsync2
 #Source0:        %%{url}/archive/refs/%%{libver}.tar.gz
 Source0:        %{url}/archive/%{git_commit}.tar.gz
+Patch0:         https://github.com/AppImageCommunity/zsync2/commit/e57e1fce68194fa920542fd334488de5123e4832.patch

 BuildRequires:  make
 BuildRequires:  cmake3
@@ -47,7 +47,6 @@ developing applications that use %{name}.
 %autosetup -n zsync2-%{git_commit} -p1

 %build
-export CFLAGS="$CFLAGS -Wno-incompatible-pointer-types"
 %cmake -DCPR_FORCE_USE_SYSTEM_CURL=ON \
    -DUSE_SYSTEM_CURL=ON \
    -DUSE_SYSTEM_CPR=ON
@@ -11,6 +11,7 @@ URL:            https://gitlab.com/ubports/development/core/click
 Source0:        %{url}/-/archive/%commit/click-%commit.tar.gz

 BuildRequires: automake libtool
+BuildRequires: pkgconfig
 BuildRequires: make
 BuildRequires: g++
 BuildRequires: gcc
@@ -62,7 +63,6 @@ Provides HTML and Manpage (documentation) for Click.
 NOCONFIGURE=1 \
 ./autogen.sh

-export CFLAGS="$CFLAGS -Wno-implicit-function-declaration"
 %configure
 %make_build

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-
-DBUS_SERVICE="com.system76.Scheduler"
-DBUS_PATH="/com/system76/Scheduler"
-DBUS_INTERFACE="com.system76.Scheduler"
-DBUS_METHOD="SetForegroundProcess"
-
-while true; do 
-  read method call time sender _ dest serial path interface member
-  read type pid
-  [ "$member" = "member=$DBUS_METHOD" ] && qdbus --system $DBUS_SERVICE $DBUS_PATH $DBUS_INTERFACE.$DBUS_METHOD $pid
-done < <(dbus-monitor "destination=$DBUS_SERVICE,path=$DBUS_PATH,interface=$DBUS_INTERFACE,member=$DBUS_METHOD")
@@ -1,6 +0,0 @@
-project pkg {
-  rpm {
-    spec = "openbangla-keyboard-nightly.spec"
-  }
-  labels { nightly = "1" }
-}
@@ -1,84 +0,0 @@
-%global ver 2.0.0
-%global commit c7aeeda40f528d647af0a019984897543ebb6d5e
-%global commit_date 20240505
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-
-Name:           openbangla-keyboard-nightly
-Version:        %ver^%commit_date.%shortcommit
-Release:        1%?dist
-Summary:        An OpenSource, Unicode compliant Bengali Input Method 
-License:        GPL-3.0-or-later
-URL:            https://openbangla.github.io/
-Source0:        https://github.com/OpenBangla/OpenBangla-Keyboard/archive/%commit.tar.gz
-Source1:        https://github.com/OpenBangla/riti/archive/master.tar.gz
-BuildRequires:  cmake anda-srpm-macros rust-packaging git-core gcc-c++
-BuildRequires:  qt5-qtbase-devel pkgconfig(ibus-1.0) fcitx5-devel pkgconfig(libzstd)
-Requires:       qt5-qtbase hicolor-icon-theme zstd
-Requires:       openbangla-im = %version-%release
-Provides:       openbangla-keyboard = %version-%release
-Conflicts:      openbangla-keyboard
-
-%description
-OpenBangla Keyboard is an open source, Unicode compliant, Bangla input method for GNU/Linux systems.
-It’s a full-fledged Bangla input method with typing automation tools, includes many famous typing
-methods such as Avro Phonetic, Probhat, Munir Optima, National (Jatiya) etc.
-
-
-%package -n ibus-openbangla
-Summary:    OpenBangla Keyboard for IBus
-Requires:   ibus
-Requires:   openbangla-keyboard = %version-%release
-Provides:   openbangla-im = %version-%release
-Conflicts:  openbangla-im
-
-%description -n ibus-openbangla
-OpenBangla Keyboard for IBus.
-
-
-%package -n fcitx5-openbangla
-Summary:    OpenBangla Keyboard for Fcitx5
-Requires:   fcitx5
-Requires:   openbangla-keyboard = %version-%release
-Provides:   openbangla-im = %version-%release
-Conflicts:  openbangla-im
-
-%description -n fcitx5-openbangla
-OpenBangla Keyboard for Fcitx5.
-
-
-%prep
-%autosetup -n OpenBangla-Keyboard-%commit
-rmdir src/engine/riti
-tar xf %SOURCE1 -C src/engine/
-mv src/engine/riti-master src/engine/riti
-
-%build
-if [[ -d build ]]; then rm -rf build; fi
-%cmake -DENABLE_FCITX=YES -DENABLE_IBUS=YES
-%cmake_build
-
-%install
-%cmake_install
-
-%files
-%doc README.adoc
-%license LICENSE
-%_bindir/openbangla-gui
-%_datadir/applications/openbangla-keyboard.desktop
-%_datadir/icons/hicolor/*/apps/openbangla-keyboard.png
-%_datadir/metainfo/io.github.openbangla.keyboard.metainfo.xml
-%_datadir/openbangla-keyboard/
-%_datadir/pixmaps/openbangla-keyboard.png
-
-%files -n ibus-openbangla
-%_libexecdir/ibus-engine-openbangla
-%_datadir/ibus/component/openbangla.xml
-
-%files -n fcitx5-openbangla
-%_libdir/fcitx5/openbangla.so
-%_datadir/fcitx5/addon/openbangla.conf
-%_datadir/fcitx5/inputmethod/openbangla.conf
-
-
-%changelog
-%autochangelog
@@ -1,8 +0,0 @@
-if filters.contains("nightly") {
-	rpm.global("commit", get("https://api.github.com/repos/OpenBangla/OpenBangla-Keyboard/commits/develop").json().sha);
-	if rpm.changed() {
-		rpm.global("ver", gh("OpenBangla/OpenBangla-Keyboard"));
-		rpm.global("commit_date", date());
-		rpm.release();
-	}
-}
@@ -4,7 +4,7 @@
 %define _build_id_links none

 Name: sass
-Version: 1.77.0
+Version: 1.76.0
 Release: 1%?dist
 Summary: The reference implementation of Sass, written in Dart
 License: MIT
@@ -1,5 +0,0 @@
-project pkg {
-	rpm {
-		spec = "chromebook-wireplumber-config.spec"
-	}
-}
@@ -1,36 +0,0 @@
-%global commit 4f5a96a359e0917ace6ae3778618a46d5e88c45a
-%global commit_date 20240322
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global debug_package %{nil}
-%define __os_install_post %{nil}
-
-Name:           chromebook-wireplumber-config
-Version:        %commit_date.%shortcommit
-Release:        1%?dist
-
-License:        Apache-2.0
-Summary:        Chromebook wireplumber configs
-URL:            https://github.com/WeirdTreeThing/chromebook-linux-audio
-Source0:        https://github.com/WeirdTreeThing/chromebook-linux-audio/archive/%commit/chromebook-linux-audio-%commit.tar.gz
-
-Requires:       wireplumber
-
-%description
-WeirdTreeThing's wireplumber configs for chromebooks.
-
-%prep
-%autosetup -n chromebook-linux-audio-%commit
-
-%install
-mkdir -p %buildroot/etc/wireplumber/main.lua.d
-cp conf/avs/51-avs-dmic.lua %buildroot/etc/wireplumber/main.lua.d/
-cp conf/common/51-increase-headroom.lua %buildroot/etc/wireplumber/main.lua.d/
-
-%files
-%doc README.md
-%license LICENSE
-/etc/wireplumber/main.lua.d/*.lua
-
-%changelog
-* Thu Mar 28 2024 june-fish <terra@june.fish>
- Initial package.
@@ -1,7 +0,0 @@
-if filters.contains("nightly") {
-  rpm.global("commit", gh_commit("WeirdTreeThing/chromebook-linux-audio"));
-  if rpm.changed() {
-    rpm.release();
-    rpm.global("commit_date", date());
-  }
-}
@@ -1,8 +0,0 @@
-project pkg {
-	rpm {
-		spec = "cros-keyboard-map.spec"
-	}
-  labels {
-    nightly = "1"
-  }
-}
@@ -1,89 +0,0 @@
-%global commit 1889baff16c08ddf2382d95ca18caa37001d5971
-%global commit_date 20240418
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global debug_package %{nil}
-%define __os_install_post %{nil}
-
-Name:           cros-keyboard-map
-Version:        %commit_date.%shortcommit
-Release:        1%?dist
-
-License:        BSD-3-Clause
-Summary:        Utility to generate keyd configurations for use on Chromebooks
-URL:            https://github.com/WeirdTreeThing/cros-keyboard-map
-Source0:        https://github.com/WeirdTreeThing/cros-keyboard-map/archive/%commit/cros-keyboard-map-%commit.tar.gz
-
-%{?systemd_requires}
-BuildRequires:  systemd-rpm-macros
-Requires:       keyd python3
-
-%description
-Set of tools designed to help develop and debug software and firmware on Intel platforms with AudioDSP onboard.
-
-Related to alsa-utils which is also set of utilities but targets AdvancedLinuxSoundArchitecture (ALSA) audience in more general fashion.
-
-%prep
-%autosetup -n cros-keyboard-map-%commit
-
-%install
-mkdir -p %buildroot/etc/cros-keyboard-map/configs
-install -Dm755 cros-keyboard-map.py %buildroot/etc/cros-keyboard-map/cros-keyboard-map.py
-cp configs/* %buildroot/etc/cros-keyboard-map/configs
-
-mkdir -p %buildroot/usr/bin
-tee %buildroot/usr/bin/um-generate-cros-keymap <<EOF
-if (grep -E "^(Nocturne|Atlas|Eve)$" /sys/class/dmi/id/product_name &> /dev/null)
-then
-	cp /etc/cros-keyboard-map/configs/cros-pixel.conf /etc/cros-keyboard-map/current.config
-elif (grep -E "^(Sarien|Arcada)$" /sys/class/dmi/id/product_name &> /dev/null)
-then
-	cp /etc/cros-keyboard-map/configs/cros-sarien.conf /etc/cros-keyboard-map/current.config
-else
-	python3 /etc/cros-keyboard-map/cros-keyboard-map.py --file /etc/cros-keyboard-map/current.config
-fi
-
-mkdir -p /etc/keyd
-if [[ -f /etc/keyd/default.conf ]]; then
-	rm /etc/keyd/default.conf
-fi
-ln -s /etc/cros-keyboard-map/current.config /etc/keyd/default.conf
-EOF
-
-mkdir -p %buildroot/etc/systemd/system
-tee %buildroot/etc/systemd/system/cros-keyboard-map.service <<EOF
-[Unit]
-Description=Generate chromebook keyboard layout
-Before=keyd.service
-After=tmp.mount
-
-[Service]
-Type=oneshot
-ExecStart=/bin/bash /usr/bin/um-generate-cros-keymap
-
-[Install]
-WantedBy=sysinit.target
-EOF
-chmod +x %buildroot/usr/bin/um-generate-cros-keymap
-
-%post
-%systemd_post cros-keyboard-map.service
-%systemd_post keyd.service
-
-%preun
-%systemd_preun cros-keyboard-map.service
-%systemd_preun keyd.service
-
-%postun
-%systemd_postun_with_restart cros-keyboard-map.service
-%systemd_postun_with_restart keyd.service
-
-%files
-%doc README.md
-%license LICENSE
-/etc/cros-keyboard-map/*
-/etc/systemd/system/cros-keyboard-map.service
-/usr/bin/um-generate-cros-keymap
-
-%changelog
-* Sat May 4 2024 Owen-sz <owen@fyralabs.com>
- Initial package.
@@ -1,7 +0,0 @@
-if filters.contains("nightly") {
-  rpm.global("commit", gh_commit("WeirdTreeThing/cros-keyboard-map"));
-  if rpm.changed() {
-    rpm.release();
-    rpm.global("commit_date", date());
-  }
-}
@@ -1,5 +1,5 @@
 Name:		limine
-Version:	7.5.0
+Version:	7.4.1
 Release:	1%?dist
 Summary:	Modern, advanced, portable, multiprotocol bootloader
 License:	BSD-2-Clause
@@ -1,5 +0,0 @@
-config_opts['releasever'] = '40'
-config_opts['target_arch'] = 'aarch64'
-config_opts['legal_host_arches'] = ('aarch64',)
-
-include('templates/terra.tpl')
@@ -1,5 +0,0 @@
-config_opts['releasever'] = '40'
-config_opts['target_arch'] = 'x86_64'
-config_opts['legal_host_arches'] = ('x86_64',)
-
-include('templates/terra.tpl')
@@ -1,5 +1,5 @@
 Name:           terra-mock-configs
-Version:        7
+Version:        8
 Release:        1%{?dist}
 Summary:        Mock configs for Terra repos

@@ -10,6 +10,8 @@ Source1:        terra-38-x86_64.cfg
 Source2:        terra-38-aarch64.cfg
 Source3:        terra-39-x86_64.cfg
 Source4:        terra-39-aarch64.cfg
+Source5:        terra-rawhide-x86_64.cfg
+Source6:        terra-rawhide-aarch64.cfg

 BuildRequires:  mock-core-configs
 Requires:       mock-core-configs
@@ -36,6 +38,8 @@ cp -v %{SOURCE1} %{buildroot}%{_sysconfdir}/mock/
 cp -v %{SOURCE2} %{buildroot}%{_sysconfdir}/mock/
 cp -v %{SOURCE3} %{buildroot}%{_sysconfdir}/mock/
 cp -v %{SOURCE4} %{buildroot}%{_sysconfdir}/mock/
+cp -v %{SOURCE5} %{buildroot}%{_sysconfdir}/mock/
+cp -v %{SOURCE6} %{buildroot}%{_sysconfdir}/mock/

 # For legacy compatibility, only while Terra 38 is still alive
 ln -s %{_sysconfdir}/mock/templates/terra.tpl %{buildroot}%{_sysconfdir}/mock/templates/anda.tpl
@@ -44,6 +48,8 @@ ln -s %{_sysconfdir}/mock/terra-38-aarch64.cfg %{buildroot}%{_sysconfdir}/mock/a

 %files
 %config %{_sysconfdir}/mock/templates/terra.tpl
+%config %{_sysconfdir}/mock/terra-rawhide-x86_64.cfg
+%config %{_sysconfdir}/mock/terra-rawhide-aarch64.cfg
 %config %{_sysconfdir}/mock/terra-39-x86_64.cfg
 %config %{_sysconfdir}/mock/terra-39-aarch64.cfg
 %config %{_sysconfdir}/mock/terra-38-x86_64.cfg
@@ -53,6 +59,9 @@ ln -s %{_sysconfdir}/mock/terra-38-aarch64.cfg %{buildroot}%{_sysconfdir}/mock/a
 %config %{_sysconfdir}/mock/anda-38-aarch64.cfg

 %changelog
+* Mon Jan 15 2024 madonuko <mado@fyralabs.com> - 9.1
+- Update for Terra rawhide
+
 * Mon Jan 08 2024 Lleyton Gray <lleyton@fyralabs.com> - 7-1
 - Bump ccache max size to 10G

@@ -4,7 +4,7 @@ Version:    40
 # The dist number is the version here, it is intentionally not repeated in the release
 %global dist %nil

-Release:    2
+Release:    3
 Summary:    A package to obsolete retired packages, based on Fedora's equivalent package

 License:    LicenseRef-Fedora-Public-Domain
@@ -118,8 +118,11 @@ BuildArch:  noarch
 %obsolete katsu-systemd-sysusers-presets-polkit 1.0-2
 %obsolete katsu-systemd-sysusers-presets-rpcbind 1.0-2

-%description
+%obsolete_ticket https://github.com/terrapkg/packages/issues/991
+%obsolete iosevka-fusion-fonts 25.1.1-2

+
+%description
 Currently obsoleted packages:

 %list_obsoletes
@@ -1,12 +1,11 @@
 Name:           terra-release
 Version:        40
-Release:        2
+Release:        1
 Summary:        Release package for Terra

 License:        MIT
 URL:            https://terra.fyralabs.com
 Source0:        terra.repo
-Source1:        terra.urls
 BuildArch:      noarch

 Requires:       system-release(%{version})
@@ -20,15 +19,13 @@ Release package for Terra, containing the Terra repository configuration.

 %install
 install -D -p -m 0644 -t %{buildroot}%{_sysconfdir}/yum.repos.d %{SOURCE0}
-install -D -p -m 0644 -t %{buildroot}%{_sysconfdir}/debuginfod %{SOURCE1}

 %files
 %config(noreplace) %{_sysconfdir}/yum.repos.d/terra.repo
-%config(noreplace) %{_sysconfdir}/debuginfod/terra.urls

 %changelog
-* Mon Feb 26 2024 Lleyton Gray <lleyton@fyralabs.com> - 39-3
- Add debuginfod url
+* Thu Nov 16 2023 Lleyton Gray <lleyton@fyralabs.com> - 40-1
+- Update for Terra 40 (in this case rawhide)

 * Thu Nov 16 2023 Lleyton Gray <lleyton@fyralabs.com> - 39-2
 - Add source repository
@@ -1,6 +1,6 @@
 [terra]
 name=Terra $releasever
-metalink=https://tetsudou.fyralabs.com/metalink?repo=terra$releasever&arch=$basearch
+baseurl=https://repos.fyralabs.com/terra$releasever
 metadata_expire=6h
 type=rpm
 skip_if_unavailable=True
@@ -12,7 +12,7 @@ enabled_metadata=1

 [terra-source]
 name=Terra $releasever - Source
-metalink=https://tetsudou.fyralabs.com/metalink?repo=terra$releasever-source&arch=$basearch
+baseurl=https://repos.fyralabs.com/terra$releasever-source
 metadata_expire=6h
 type=rpm
 skip_if_unavailable=True
@@ -20,4 +20,4 @@ gpgcheck=1
 gpgkey=https://repos.fyralabs.com/terra$releasever-source/key.asc
 repo_gpgcheck=1
 enabled=0
-enabled_metadata=0
+enabled_metadata=0
@@ -1 +0,0 @@
-https://debuginfod.fyralabs.com/
@@ -18,7 +18,7 @@ Source0:        %{forgesource}
 Provides:       %{long_name} = %{version}-%{release}
 Provides:       %{long_name}-core = %{version}-%{release}

-BuildRequires:  dotnet-sdk-8.0
+BuildRequires:  dotnet-sdk-7.0
 # Require DPKG, so that we can use the `dpkg-architecture` command. which makes the build script happy.
 # TODO: Better solution: Patch out the debian-specific packaging code.
 BuildRequires:  dpkg-dev
@@ -1,5 +0,0 @@
-project pkg {
-	rpm {
-		spec = "sbctl.spec"
-	}
-}
@@ -1,89 +0,0 @@
-Name:           sbctl
-Version:        0.13
-Release:        1%{?dist}
-Summary:        Secure Boot key manager
-
-License:        MIT
-URL:            https://github.com/Foxboron/sbctl
-Source0:        https://github.com/Foxboron/sbctl/releases/download/%{version}/sbctl-%{version}.tar.gz
-
-# Fixes https://github.com/Foxboron/sbctl/issues/293, allowing kernel-install to work properly with Fedora
-Patch1:         https://patch-diff.githubusercontent.com/raw/Foxboron/sbctl/pull/294.patch
-
-
-ExclusiveArch:  %{golang_arches}
-
-Requires:       binutils
-Requires:       util-linux
-
-Recommends:     systemd-udev
-
-BuildRequires:  asciidoc
-BuildRequires:  git
-BuildRequires:  go-rpm-macros
-
-%description
-sbctl intends to be a user-friendly secure boot key manager capable of setting
-up secure boot, offer key management capabilities, and keep track of files that
-needs to be signed in the boot chain.
-
-
-%prep
-%autosetup -p1
-
-sed -i '/go build/d' Makefile
-
-
-%build
-export GOPATH=%{_builddir}/go
-%global gomodulesmode GO111MODULE=on
-%gobuild -o sbctl ./cmd/sbctl
-%make_build
-
-
-%install
-%make_install PREFIX=%{_prefix}
-
-
-%transfiletriggerin -P 1 -- /boot /efi /usr/lib /usr/libexec
-if grep -q -m 1 -e '\.efi$' -e '/vmlinuz$'; then
-    exec </dev/null
-    %{_bindir}/sbctl sign-all -g
-fi
-
-
-%files
-%license LICENSE
-%doc README.md
-%{_bindir}/sbctl
-%{_prefix}/lib/kernel/install.d/91-sbctl.install
-%{_mandir}/man8/sbctl.8*
-%{_datadir}/bash-completion/completions/sbctl
-%{_datadir}/fish/vendor_completions.d/sbctl.fish
-%{_datadir}/zsh/site-functions/_sbctl
-
-
-%changelog
-* Sat Mar 30 2024 Cappy Ishihara <cappy@cappuchino.xyz> - 0.13-1
- Push to Terra
-
-* Tue Dec 26 2023 Andrew Gunnerson <accounts+fedora@chiller3.com> - 0.13-1
- Update to version 0.13
-
-* Sun Nov 12 2023 Andrew Gunnerson <accounts+fedora@chiller3.com> - 0.12-2
- Switch to upstream 91-sbctl.install kernel-install script
-
-* Fri Oct 20 2023 Andrew Gunnerson <accounts+fedora@chiller3.com> - 0.12-1
- Update to version 0.12
-
-* Sat Mar 25 2023 Andrew Gunnerson <accounts+fedora@chiller3.com> - 0.11-1
- Update to version 0.11
-
-* Mon Dec 12 2022 Andrew Gunnerson <accounts+fedora@chiller3.com> - 0.10-1
- Update to version 0.10
-
-* Tue May 3 2022 Andrew Gunnerson <chillermillerlong@hotmail.com> - 0.9-1
- Update to version 0.9
-
-* Thu Jan 27 2022 Andrew Gunnerson <chillermillerlong@hotmail.com> - 0.8-1
- Initial release
@@ -1 +0,0 @@
-rpm.version(gh("Foxboron/sbctl"));
				`@@ -1 +0,0 @@`
				`rpm.version(gh("PrismLauncher/PrismLauncher"));`