add: terra-sddm (#1204 )

* add: sddm * fix: terra-sddm instead of just sddm (cherry picked from commit 61ee2b6de9)
cros-keyboard-map (#1199 ) (#1201 )
2026-06-14 07:30:38 +00:00 · 2024-05-05 10:41:53 +00:00 · 2024-05-05 14:35:46 +08:00 · 2024-05-05 09:31:23 +08:00 · 2024-05-04 14:28:55 -05:00 · 2024-05-04 15:25:43 +00:00
146 changed files with 2544 additions and 1434 deletions
@@ -6,13 +6,13 @@ on:
    paths:
      - anda/**
    branches:
-      - f40
+      - f39
  pull_request:
    branches:
-      - f40
+      - f39
  merge_group:
    branches:
-      - f40
+      - f39
  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:f39
      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: ["39"]
      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: ["39"]
        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: ["39"]
        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: ["39"]
      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
+      - f39
  pull_request:
    branches:
-      - f40
+      - f39
  merge_group:
    branches:
-      - f40
+      - f39
 jobs:
  lint:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:f40
+      image: ghcr.io/terrapkg/builder:f39
    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)
@@ -16,7 +16,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0
          ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
@@ -3,7 +3,6 @@ name: Push comps updates
 on:
  push:
    branches:
-      - f40
      - f39
      - f38
      - f37
@@ -15,9 +14,9 @@ jobs:
  update-comps:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:f40
+      image: ghcr.io/terrapkg/builder:f39
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
      - name: Push to subatomic
        run: |
          branch=${{ github.ref_name }}
@@ -8,11 +8,11 @@ jobs:
  autoupdate:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:f40
+      image: ghcr.io/terrapkg/builder:f39
      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 }}
@@ -46,8 +46,8 @@ jobs:
              git add *
              git commit -S -a -m "$msg"
            }
-            copy_over f37 || true
            copy_over f38 || true
+            copy_over f40 || true
            copy_over frawhide || true
            git push -u origin --all
          fi
@@ -8,11 +8,11 @@ jobs:
  autoupdate:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:f40
+      image: ghcr.io/terrapkg/builder:f39
      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 }}
@@ -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 f40 || true
            copy_over frawhide || true
            git push -u origin --all
          fi
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-canary-openasar
-Version:        0.0.346
+Version:        0.0.381
 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.346
+Version:        0.0.381
 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.49
+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.79
+Version:        0.0.84
 Release:        1%?dist
 Summary:        A snappier Discord rewrite with features like further customization and theming
 License:        MIT AND https://discord.com/terms
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-ptb
-Version:        0.0.79
+Version:        0.0.84
 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.49
+Version:		0.0.52
 Release:		1%?dist
 Summary:		Free Voice and Text Chat for Gamers
 URL:			https://discord.com
@@ -1,7 +1,7 @@
-%global commit a46ce9e28cd97f7280c085649a79f85aa1d0fe70
+%global commit 943a50b300a081bb223325295040846fe435a861
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240325
-%global ver v0.37.0
+%global commit_date 20240504
+%global ver v0.38.0

 Name:           mpv-nightly
 Version:        %ver^%commit_date.%shortcommit
@@ -13,8 +13,8 @@
 %global crate sccache

 Name:           rust-sccache
-Version:        0.7.7
-Release:        1%{?dist}
+Version:        0.8.0
+Release:        1%?dist
 Summary:        Ccache-like tool

 License:        Apache-2.0
@@ -6,7 +6,7 @@

 Name:		vencord-desktop
 Provides:   VencordDesktop = %{version}-%{release}
-Version:	1.5.1
+Version:	1.5.2
 Release:	1%?dist
 License:	GPL-3.0
 Summary:	Vesktop is a cross platform desktop app aiming to give you a snappier Discord experience with Vencord pre-installed
@@ -1,6 +1,6 @@
-%global nodev 18.13.0
-%global npmv 8.19.3
-%global ver 0.18.1
+%global nodev 20.12.2
+%global npmv 10.5.0
+%global ver 0.19.1
 %define debug_package %nil
 %global _build_id_links none

@@ -3,8 +3,9 @@
 Name:           gala
 Summary:        Gala window manager
 Version:        7.1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPL-3.0-or-later
+Epoch:          1

 URL:            https://github.com/elementary/gala
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
@@ -35,7 +36,7 @@ BuildRequires:  pkgconfig(mutter-clutter-13)
 BuildRequires:  pkgconfig(mutter-cogl-13)
 BuildRequires:  pkgconfig(mutter-cogl-pango-13)

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

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

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

 %description    devel
 Gala is Pantheon's Window Manager, part of the elementary project.
@@ -9,6 +9,7 @@ Summary:        Stylish top panel
 Version:        3.0.5
 Release:        1%{?dist}
 License:        GPL-2.0-or-later
+Epoch:          1

 URL:            https://github.com/elementary/wingpanel
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
@@ -32,7 +33,7 @@ BuildRequires:  pkgconfig(mutter-clutter-13)
 BuildRequires:  pkgconfig(mutter-cogl-13)
 BuildRequires:  pkgconfig(mutter-cogl-pango-13)

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

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

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

 %description    libs %{common_description}

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

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

 %description    devel %{common_description}

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

 Name:           gnome-shell-extension-%{extension}
 Version:        2
-Release:        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,13 +1,13 @@
 # from Fedora upstream
 %global extension   pop-shell
 %global uuid        %{extension}@system76.com
-%global commit      9a30c5bd49c373896410852d6477596ac4c43bd3
+%global commit      9418d0a9af7c9b30b61ac3eeb5ca432a3ad3e651
 %global shortcommit %{lua:print(macros.commit:sub(1,7))}
-%global commit_date 240218
+%global commit_date 20240401
 %global ver         1.2.0

 Name:           terra-gnome-shell-extension-%{extension}
-Version:        %{ver}^%{shortcommit}
+Version:        %{ver}^%commit_date.%{shortcommit}
 Release:        1%?dist
 Summary:        GNOME Shell extension for advanced tiling window management
 License:        GPL-3.0-only
@@ -1,6 +1,6 @@
 %global forgeurl https://github.com/KDE/latte-dock/

-%global commit 8328f9a6863b4bae48adfdbc29b32b4c571c6530
+%global commit b4b16f61f1d69c994701f149e54335c40b9b201d
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global commit_date %(date '+%Y%m%d')
 %global snapshot_info %{commit_date}.%{shortcommit}
@@ -1,5 +1,5 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-app-launch
-%global commit 11bddd982b3643aacdf052cf339ae1ca1873fbb2
+%global commit 99fa99c6e8af868f64dbfdb973eebeb2ca3ad14a
 %forgemeta

 Name:           lomiri-app-launch
@@ -1,10 +1,10 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings
-%global commit 30d9df926b6837b139990a622d39171ea42c9017
+%global commit aacd2e4704112468b44332e8c8b1f7445651b8da
 %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
@@ -1,4 +1,4 @@
-%define _ubuntu_rel 1ubuntu3
+%define _ubuntu_rel 1ubuntu4

 Name:    unity-session
 Summary: Lightdm profile for Unity 7
@@ -0,0 +1,142 @@
+From 4d44531c8f624f5b479c3ff23e8fecc67eb848ab Mon Sep 17 00:00:00 2001
+From: Jeremy Linton <jeremy.linton@arm.com>
+Date: Fri, 22 Oct 2021 14:51:54 -0500
+Subject: [PATCH] Delay for logind, and fallback to seat0
+
+There is systemd/logind race with when restarting
+sddm that causes logind1 not to be available. Previously
+this meant the seat0 was immediately created regardless
+of the state of CanGraphical.
+
+Fixing this, though we still want seat0 to be started
+if none of the seats appear to be graphical. Presumably
+there are some graphics on the machine, otherwise
+why run sddm? Wait a bit, and create seat0 anyway. If
+this fails the output from Xorg should tell us why. This
+is generally a better strategy than what happens a good
+amount of time now, where sddm is started and silent about
+why the screen is blank.
+
+References:
+* https://bugzilla.redhat.com/2011991
+* https://bugzilla.redhat.com/2016310
+
+Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
+---
+ src/daemon/LogindDBusTypes.cpp | 31 +++++++++++++++++++++----------
+ src/daemon/SeatManager.cpp     | 22 ++++++++++++++++++++++
+ src/daemon/SeatManager.h       |  1 +
+ 3 files changed, 44 insertions(+), 10 deletions(-)
+
+diff --git a/src/daemon/LogindDBusTypes.cpp b/src/daemon/LogindDBusTypes.cpp
+index 011bb7f..6255c69 100644
+--- a/src/daemon/LogindDBusTypes.cpp
+++ b/src/daemon/LogindDBusTypes.cpp
+@@ -8,6 +8,8 @@
+ 
+ #include <QDebug>
+ 
+#include <unistd.h>
+
+ class LogindPathInternal {
+ public:
+     LogindPathInternal();
+@@ -46,17 +48,26 @@ LogindPathInternal::LogindPathInternal()
+     qRegisterMetaType<UserInfoList>("UserInfoList");
+     qDBusRegisterMetaType<UserInfoList>();
+ 
+-    if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.login1"))) {
+-        qDebug() << "Logind interface found";
+-        available = true;
+-        serviceName = QStringLiteral("org.freedesktop.login1");
+-        managerPath = QStringLiteral("/org/freedesktop/login1");
+-        managerIfaceName = QStringLiteral("org.freedesktop.login1.Manager");
+-        seatIfaceName = QStringLiteral("org.freedesktop.login1.Seat");
+-        sessionIfaceName = QStringLiteral("org.freedesktop.login1.Session");
+-        userIfaceName = QStringLiteral("org.freedesktop.login1.User");
+-        return;
+#ifdef HAVE_SYSTEMD
+    // systemd-logind should be running, although because it takes a few moments to restart after
+    // systemctl isolate calls, it may not yet be running. Wait a few seconds for it, while blocking everything else.
+    int logind_wait_seconds = 50;
+    while (logind_wait_seconds--) {
+        if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.login1"))) {
+            qDebug() << "Logind interface found";
+            available = true;
+            serviceName = QStringLiteral("org.freedesktop.login1");
+            managerPath = QStringLiteral("/org/freedesktop/login1");
+            managerIfaceName = QStringLiteral("org.freedesktop.login1.Manager");
+            seatIfaceName = QStringLiteral("org.freedesktop.login1.Seat");
+            sessionIfaceName = QStringLiteral("org.freedesktop.login1.Session");
+            userIfaceName = QStringLiteral("org.freedesktop.login1.User");
+            return;
+        }
+	qDebug() << "Sleeping for systemd-logind";
+	usleep(100000);
+     }
+#endif
+ 
+     if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.ConsoleKit"))) {
+         qDebug() << "Console kit interface found";
+diff --git a/src/daemon/SeatManager.cpp b/src/daemon/SeatManager.cpp
+index bd207e6..39d8b85 100644
+--- a/src/daemon/SeatManager.cpp
+++ b/src/daemon/SeatManager.cpp
+@@ -26,6 +26,9 @@
+ #include <QDBusMessage>
+ #include <QDBusPendingReply>
+ #include <QDBusContext>
+#include <QDebug>
+#include <QFileInfo>
+#include <QTimer>
+ 
+ #include "LogindDBusTypes.h"
+ 
+@@ -115,6 +118,8 @@ namespace SDDM {
+ 
+         QDBusConnection::systemBus().connect(Logind::serviceName(), Logind::managerPath(), Logind::managerIfaceName(), QStringLiteral("SeatNew"), this, SLOT(logindSeatAdded(QString,QDBusObjectPath)));
+         QDBusConnection::systemBus().connect(Logind::serviceName(), Logind::managerPath(), Logind::managerIfaceName(), QStringLiteral("SeatRemoved"), this, SLOT(logindSeatRemoved(QString,QDBusObjectPath)));
+
+	QTimer::singleShot(5000, this, &SeatManager::checkSeat);
+     }
+ 
+     void SeatManager::createSeat(const QString &name) {
+@@ -152,6 +157,23 @@ namespace SDDM {
+         m_seats.value(name)->createDisplay(Display::defaultDisplayServerType());
+     }
+ 
+    // this is a bit hacky, but linux DRM drivers
+    // won't initially be available so there is a race
+    // between determing if a efifb/etc graphical object
+    // is the only graphics on the machine, or a DRM driver
+    // will take over the display. So we will hang out for a few
+    // seconds and if none of the seats are declared cangraphical
+    // its possible the only graphics on the machine don't have
+    // a drm driver.
+    void SeatManager::checkSeat(void) {
+        if (m_seats.isEmpty()) {
+	     //if (QFileInfo::exists(QStringLiteral("/dev/fb0"))) {
+                 qWarning() << "No graphical seats found, attempt to start one on the main console anyway...";
+                 createSeat(QStringLiteral("seat0"));
+	     //}
+        }
+    }
+
+     void SDDM::SeatManager::logindSeatAdded(const QString& name, const QDBusObjectPath& objectPath)
+     {
+         auto logindSeat = new LogindSeat(name, objectPath);
+diff --git a/src/daemon/SeatManager.h b/src/daemon/SeatManager.h
+index b2f9796..aa43047 100644
+--- a/src/daemon/SeatManager.h
+++ b/src/daemon/SeatManager.h
+@@ -49,6 +49,7 @@ namespace SDDM {
+     private:
+         QHash<QString, Seat *> m_seats; //these will exist only for graphical seats
+         QHash<QString, LogindSeat*> m_systemSeats; //these will exist for all seats
+        void checkSeat(void);
+     };
+ }
+ 
+-- 
+2.39.2
+
@@ -0,0 +1,2 @@
+This scripts dir contains only samples, but are generally not used directly.
+In practice, sddm runtime uses items under /etc/sddm by default
@@ -0,0 +1,5 @@
+project pkg {
+  rpm {
+    spec = "terra-sddm.spec"
+  }
+}
@@ -0,0 +1,11 @@
+diff -up sddm-0.18.0/services/sddm.service.in.env sddm-0.18.0/services/sddm.service.in
+--- sddm-0.18.0/services/sddm.service.in.env	2018-07-18 05:31:40.000000000 -0500
+++ sddm-0.18.0/services/sddm.service.in	2019-03-14 08:23:22.095498405 -0500
+@@ -7,6 +7,7 @@ After=systemd-user-sessions.service gett
+ [Service]
+ ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/sddm
+ Restart=always
+EnvironmentFile=-/etc/sysconfig/sddm
+ 
+ [Install]
+ Alias=display-manager.service
@@ -0,0 +1,53 @@
+diff --git a/src/common/Configuration.h b/src/common/Configuration.h
+index 54bcace..9b8fa22 100644
+--- a/src/common/Configuration.h
+++ b/src/common/Configuration.h
+@@ -37,9 +37,8 @@ namespace SDDM {
+         enum NumState { NUM_NONE, NUM_SET_ON, NUM_SET_OFF };
+ 
+         //  Name                   Type         Default value                                   Description
+-        // TODO: Change default to x11-user in a future release
+-        Entry(DisplayServer,       QString,     _S("x11"),                                      _S("Which display server should be used.\n"
+-                                                                                                   "Valid values are: x11, x11-user, wayland. Wayland support is experimental"));
+        Entry(DisplayServer,       QString,     _S("wayland"),                                  _S("Which display server should be used.\n"
+                                                                                                   "Valid values are: x11, x11-user, wayland."));
+         Entry(HaltCommand,         QString,     _S(HALT_COMMAND),                               _S("Halt command"));
+         Entry(RebootCommand,       QString,     _S(REBOOT_COMMAND),                             _S("Reboot command"));
+         Entry(Numlock,             NumState,    NUM_NONE,                                       _S("Initial NumLock state. Can be on, off or none.\n"
+@@ -51,7 +50,7 @@ namespace SDDM {
+         //  Name   Entries (but it's a regular class again)
+         Section(Theme,
+             Entry(ThemeDir,            QString,     _S(DATA_INSTALL_DIR "/themes"),             _S("Theme directory path"));
+-            Entry(Current,             QString,     _S(""),                                     _S("Current theme name"));
+            Entry(Current,             QString,     _S("01-breeze-fedora"),                     _S("Current theme name"));
+             Entry(FacesDir,            QString,     _S(DATA_INSTALL_DIR "/faces"),              _S("Global directory for user avatars\n"
+                                                                                                    "The files should be named <username>.face.icon"));
+             Entry(CursorTheme,         QString,     QString(),                                  _S("Cursor theme used in the greeter"));
+@@ -71,9 +70,9 @@ namespace SDDM {
+             Entry(SessionDir,          QStringList, {_S("/usr/local/share/xsessions"),
+                                                      _S("/usr/share/xsessions")},               _S("Comma-separated list of directories containing available X sessions"));
+             Entry(SessionCommand,      QString,     _S(SESSION_COMMAND),                        _S("Path to a script to execute when starting the desktop session"));
+-            Entry(SessionLogFile,      QString,     _S(".local/share/sddm/xorg-session.log"),   _S("Path to the user session log file"));
+-            Entry(DisplayCommand,      QString,     _S(DATA_INSTALL_DIR "/scripts/Xsetup"),     _S("Path to a script to execute when starting the display server"));
+-            Entry(DisplayStopCommand,  QString,     _S(DATA_INSTALL_DIR "/scripts/Xstop"),      _S("Path to a script to execute when stopping the display server"));
+            Entry(SessionLogFile,      QString,     _S(".cache/xsession-errors"),               _S("Path to the user session log file"));
+            Entry(DisplayCommand,      QString,     _S(SYS_CONFIG_DIR "/sddm/Xsetup"),          _S("Path to a script to execute when starting the display server"));
+            Entry(DisplayStopCommand,  QString,     _S(SYS_CONFIG_DIR "/sddm/Xstop"),           _S("Path to a script to execute when stopping the display server"));
+             Entry(EnableHiDPI,         bool,        true,                                      _S("Enable Qt's automatic high-DPI scaling"));
+         );
+ 
+@@ -82,12 +81,12 @@ namespace SDDM {
+             Entry(SessionDir,          QStringList, {_S("/usr/local/share/wayland-sessions"),
+                                                      _S("/usr/share/wayland-sessions")},        _S("Comma-separated list of directories containing available Wayland sessions"));
+             Entry(SessionCommand,      QString,     _S(WAYLAND_SESSION_COMMAND),                _S("Path to a script to execute when starting the desktop session"));
+-            Entry(SessionLogFile,      QString,     _S(".local/share/sddm/wayland-session.log"),_S("Path to the user session log file"));
+            Entry(SessionLogFile,      QString,     _S(".cache/wayland-errors"),                _S("Path to the user session log file"));
+             Entry(EnableHiDPI,         bool,        true,                                       _S("Enable Qt's automatic high-DPI scaling"));
+         );
+ 
+         Section(Users,
+-            Entry(DefaultPath,         QString,     _S("/usr/local/bin:/usr/bin:/bin"),         _S("Default $PATH for logged in users"));
+            Entry(DefaultPath,         QString,     _S("/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin"), _S("Default $PATH for logged in users"));
+             Entry(MinimumUid,          int,         UID_MIN,                                    _S("Minimum user id for displayed users"));
+             Entry(MaximumUid,          int,         UID_MAX,                                    _S("Maximum user id for displayed users"));
+             Entry(HideUsers,           QStringList, QStringList(),                              _S("Comma-separated list of users that should not be listed"));
@@ -0,0 +1,67 @@
+From 52175648f4e1b415f93b24a3ef970983024659f2 Mon Sep 17 00:00:00 2001
+From: Neal Gompa <neal@gompa.dev>
+Date: Wed, 28 Feb 2024 16:47:16 -0500
+Subject: [PATCH] Default to Qt6 and always use versioned greeters
+
+Distributors can handle creating an unversioned name if necessary.
+---
+ src/common/ThemeMetadata.cpp | 4 ++--
+ src/daemon/Greeter.cpp       | 3 +--
+ src/greeter/CMakeLists.txt   | 9 +--------
+ 3 files changed, 4 insertions(+), 12 deletions(-)
+
+diff --git a/src/common/ThemeMetadata.cpp b/src/common/ThemeMetadata.cpp
+index 2cb3762..003056a 100644
+--- a/src/common/ThemeMetadata.cpp
+++ b/src/common/ThemeMetadata.cpp
+@@ -28,7 +28,7 @@ namespace SDDM {
+         QString mainScript { QStringLiteral("Main.qml") };
+         QString configFile;
+         QString translationsDirectory { QStringLiteral(".") };
+-        int qtVersion = 5;
+        int qtVersion = 6;
+     };
+ 
+     ThemeMetadata::ThemeMetadata(const QString &path, QObject *parent) : QObject(parent), d(new ThemeMetadataPrivate()) {
+@@ -61,6 +61,6 @@ namespace SDDM {
+         d->mainScript = settings.value(QStringLiteral("SddmGreeterTheme/MainScript"), QStringLiteral("Main.qml")).toString();
+         d->configFile = settings.value(QStringLiteral("SddmGreeterTheme/ConfigFile"), QStringLiteral("theme.conf")).toString();
+         d->translationsDirectory = settings.value(QStringLiteral("SddmGreeterTheme/TranslationsDirectory"), QStringLiteral(".")).toString();
+-        d->qtVersion = settings.value(QStringLiteral("SddmGreeterTheme/QtVersion"), 5).toInt();
+        d->qtVersion = settings.value(QStringLiteral("SddmGreeterTheme/QtVersion"), 6).toInt();
+     }
+ }
+diff --git a/src/daemon/Greeter.cpp b/src/daemon/Greeter.cpp
+index 07fccde..5a956b6 100644
+--- a/src/daemon/Greeter.cpp
+++ b/src/daemon/Greeter.cpp
+@@ -82,8 +82,7 @@ namespace SDDM {
+ 
+     QString Greeter::greeterPathForQt(int qtVersion)
+     {
+-        const QString suffix = qtVersion == 5 ? QString() : QStringLiteral("-qt%1").arg(qtVersion);
+-        return QStringLiteral(BIN_INSTALL_DIR "/sddm-greeter%1").arg(suffix);
+        return QStringLiteral(BIN_INSTALL_DIR "/sddm-greeter-qt%1").arg(qtVersion);
+     }
+ 
+     bool Greeter::start() {
+diff --git a/src/greeter/CMakeLists.txt b/src/greeter/CMakeLists.txt
+index 72769e4..524368d 100644
+--- a/src/greeter/CMakeLists.txt
+++ b/src/greeter/CMakeLists.txt
+@@ -1,11 +1,4 @@
+-if(QT_MAJOR_VERSION EQUAL "5")
+-    # Keep the unversioned name for Qt5. When upgrading SDDM, the old daemon
+-    # might still be running and only know about "sddm-greeter". Keeping the
+-    # previous name around also helps users calling it directly.
+-    set(GREETER_TARGET sddm-greeter)
+-else()
+-    set(GREETER_TARGET sddm-greeter-qt${QT_MAJOR_VERSION})
+-endif()
+set(GREETER_TARGET sddm-greeter-qt${QT_MAJOR_VERSION})
+ 
+ message(STATUS "Building greeter for Qt ${QT_MAJOR_VERSION} as ${GREETER_TARGET}")
+ 
+-- 
+2.43.0
+
@@ -0,0 +1,20 @@
+ #%PAM-1.0
+auth       required    pam_env.so
+auth       required    pam_permit.so
+auth       include     postlogin
+
+account    required    pam_nologin.so
+account    include     system-auth
+
+password   include     system-auth
+
+session    required    pam_selinux.so close
+session    required    pam_loginuid.so
+session    required    pam_selinux.so open
+session    optional    pam_keyinit.so force revoke
+session    required    pam_namespace.so
+session    include     system-auth
+-session    optional    pam_gnome_keyring.so auto_start
+-session    optional    pam_kwallet5.so auto_start
+-session    optional    pam_kwallet.so auto_start
+session    include     postlogin
@@ -0,0 +1,17 @@
+#%PAM-1.0
+
+# Load environment from /etc/environment and ~/.pam_environment
+auth		required pam_env.so
+
+# Always let the greeter start without authentication
+auth		required pam_permit.so
+
+# No action required for account management
+account		required pam_permit.so
+
+# Can't change password
+password	required pam_deny.so
+
+# Setup session
+session		required pam_unix.so
+session		optional pam_systemd.so
@@ -0,0 +1,12 @@
+diff --git a/services/sddm-tmpfiles.conf.in b/services/sddm-tmpfiles.conf.in
+index fb45553..6acfb6c 100644
+--- a/services/sddm-tmpfiles.conf.in
+++ b/services/sddm-tmpfiles.conf.in
+@@ -1,5 +1,7 @@
+ # Home dir of the sddm user, also contains state.conf
+ d	${STATE_DIR}	0750	sddm	sddm
+# Workaround for https://pagure.io/fedora-kde/SIG/issue/87
+Z	${STATE_DIR}	-	sddm	sddm
+ # This contains X11 auth files passed to Xorg and the greeter
+ d	${RUNTIME_DIR}	0711	root	root
+ # Sockets for IPC
@@ -0,0 +1,2 @@
+#Type Name ID GECOS                  Home directory Shell
+u     sddm -  "SDDM Greeter Account" /var/lib/sddm   -
@@ -0,0 +1,2 @@
+[General]
+DisplayServer=x11
@@ -0,0 +1,122 @@
+[Autologin]
+# Whether sddm should automatically log back into sessions when they exit
+#Relogin=false
+
+# Name of session file for autologin session
+#Session=
+
+# Username for autologin session
+#User=
+
+
+[General]
+# Enable Qt's automatic high-DPI scaling
+#EnableHiDPI=false
+
+# Halt command
+#HaltCommand=/usr/bin/systemctl poweroff
+
+# Initial NumLock state. Can be on, off or none.
+# If property is set to none, numlock won't be changed
+# NOTE: Currently ignored if autologin is enabled.
+#Numlock=none
+
+# Reboot command
+#RebootCommand=/usr/bin/systemctl reboot
+
+# Control x11/wayland startup
+# DisplayServer=wayland
+
+[Theme]
+# Current theme name
+#Current=01-breeze-fedora
+
+# Cursor theme used in the greeter
+#CursorTheme=
+
+# Number of users to use as threshold
+# above which avatars are disabled
+# unless explicitly enabled with EnableAvatars
+#DisableAvatarsThreshold=7
+
+# Enable display of custom user avatars
+#EnableAvatars=true
+
+# Global directory for user avatars
+# The files should be named <username>.face.icon
+#FacesDir=/usr/share/sddm/faces
+
+# Theme directory path
+#ThemeDir=/usr/share/sddm/themes
+
+
+[Users]
+# Default $PATH for logged in users
+#DefaultPath=/usr/local/bin:/usr/bin:/bin
+
+# Comma-separated list of shells.
+# Users with these shells as their default won't be listed
+#HideShells=
+
+# Comma-separated list of users that should not be listed
+#HideUsers=
+
+# Maximum user id for displayed users
+#MaximumUid=60000
+
+# Minimum user id for displayed users
+#MinimumUid=1000
+
+# Remember the session of the last successfully logged in user
+#RememberLastSession=true
+
+# Remember the last successfully logged in user
+#RememberLastUser=true
+
+
+[Wayland]
+# Path to a script to execute when starting the desktop session
+#SessionCommand=/etc/sddm/wayland-session
+
+# Directory containing available Wayland sessions
+#SessionDir=/usr/share/wayland-sessions
+
+# Path to the user session log file
+#SessionLogFile=.cache/wayland-errors
+
+
+[X11]
+# Path to a script to execute when starting the display server
+#DisplayCommand=/etc/sddm/Xsetup
+
+# Path to a script to execute when stopping the display server
+#DisplayStopCommand=/etc/sddm/Xstop
+
+# The lowest virtual terminal number that will be used.
+#MinimumVT=1
+
+# Arguments passed to the X server invocation
+#ServerArguments=-nolisten tcp
+
+# Path to X server binary
+#ServerPath=/usr/bin/X
+
+# Path to a script to execute when starting the desktop session
+#SessionCommand=/etc/X11/xinit/Xsession
+
+# Directory containing available X sessions
+#SessionDir=/usr/share/xsessions
+
+# Path to the user session log file
+#SessionLogFile=.cache/xsession-errors
+
+# Path to the Xauthority file
+#UserAuthFile=.Xauthority
+
+# Path to xauth binary
+#XauthPath=/usr/bin/xauth
+
+# Path to Xephyr binary
+#XephyrPath=/usr/bin/Xephyr
+
+
@@ -0,0 +1,23 @@
+auth     [success=done ignore=ignore default=bad] pam_selinux_permit.so
+auth        substack      password-auth
+-auth        optional      pam_gnome_keyring.so
+-auth        optional      pam_kwallet5.so
+-auth        optional      pam_kwallet.so
+auth        include       postlogin
+
+account     required      pam_nologin.so
+account     include       password-auth
+
+password    include       password-auth
+
+session     required      pam_selinux.so close
+session     required      pam_loginuid.so
+-session    optional    pam_ck_connector.so
+session     required      pam_selinux.so open
+session     optional      pam_keyinit.so force revoke
+session     required      pam_namespace.so
+session     include       password-auth
+-session     optional      pam_gnome_keyring.so auto_start
+-session     optional      pam_kwallet5.so auto_start
+-session     optional      pam_kwallet.so auto_start
+session     include       postlogin
@@ -0,0 +1,5 @@
+# workaround https://bugzilla.redhat.com/1686675
+# see also https://bugreports.qt.io/browse/QTBUG-58508
+QML_DISABLE_DISK_CACHE=1
+# enable qDebug messages for debug build
+# QT_LOGGING_RULES="*.debug=true"
@@ -0,0 +1,293 @@
+# Disable X11 for RHEL 10+
+%bcond x11 %[%{undefined rhel} || 0%{?rhel} < 10]
+
+Name:           terra-sddm
+Version:        0.21.0
+Release:        5%{?dist}
+License:        GPL-2.0-or-later
+Summary:        QML based desktop and login manager
+Provides:       sddm = %version-%release
+
+URL:            https://github.com/sddm/sddm
+Source0:        %{url}/archive/v%{version}/sddm-%{version}.tar.gz
+
+## upstream patches
+# Port all themes to Qt 6
+# Submitted: https://github.com/sddm/sddm/pull/1876
+Patch1:         sddm-PR1876.patch
+
+## upstreamable patches
+# Fix race with logind restart, and start seat0 if !CanGraphical on timer
+# https://bugzilla.redhat.com/show_bug.cgi?id=2011991
+# https://bugzilla.redhat.com/show_bug.cgi?id=2016310
+# Submmited: https://github.com/sddm/sddm/pull/1494
+Patch11:        0001-Delay-for-logind-and-fallback-to-seat0.patch
+
+## downstream patches
+Patch101:       sddm-0.20.0-fedora_config.patch
+
+# sddm.service: +EnvironmentFile=-/etc/sysconfig/sddm
+Patch103:       sddm-0.18.0-environment_file.patch
+
+# Workaround for https://pagure.io/fedora-kde/SIG/issue/87
+Patch104:       sddm-rpmostree-tmpfiles-hack.patch
+
+# Workaround lack of Qt 5 greeter build
+Patch105:       sddm-0.21.0-qt6greeter.patch
+
+# https://github.com/sddm/sddm/pull/1779
+Patch106:       https://github.com/sddm/sddm/pull/1779.patch
+
+# Shamelessly stolen from gdm
+Source10:       sddm.pam
+# Shamelessly stolen from gdm
+Source11:       sddm-autologin.pam
+# Previously included in sddm sources
+Source12:       sddm-greeter.pam
+# sample sddm.conf generated with sddm --example-config, and entries commented-out
+Source13:       sddm.conf
+# README.scripts
+Source14:       README.scripts
+# sysconfig snippet
+Source15:       sddm.sysconfig
+# sddm x11 override config
+Source16:       sddm-x11.conf
+# sysusers config file. note these are shipped in the upstream tarball
+# but we cannot use the files from the tarball for %pre scriptlet
+# generation, so we duplicate them as source files for that purpose;
+# this is an ugly hack that should be removed if it becomes possible.
+# see https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/TFDMAU7KLMSQTKPJELHSM6PFVXIZ56GK/
+Source17:       sddm-systemd-sysusers.conf
+
+
+Provides: service(graphical-login) = sddm
+
+BuildRequires:  cmake >= 2.8.8
+BuildRequires:  extra-cmake-modules
+BuildRequires:  pam-devel
+BuildRequires:  pkgconfig(libsystemd)
+BuildRequires:  pkgconfig(systemd)
+BuildRequires:  pkgconfig(xcb)
+BuildRequires:  pkgconfig(xcb-xkb)
+# sometimes python-docutils, sometimes python2-docutils, sometimes python3-docutils.
+# use path then for sanity
+BuildRequires:  /usr/bin/rst2man
+BuildRequires:  cmake(Qt6Core)
+BuildRequires:  cmake(Qt6DBus)
+BuildRequires:  cmake(Qt6Gui)
+BuildRequires:  cmake(Qt6Qml)
+BuildRequires:  cmake(Qt6Quick)
+BuildRequires:  cmake(Qt6LinguistTools)
+BuildRequires:  cmake(Qt6Test)
+BuildRequires:  cmake(Qt6QuickTest)
+# verify presence to pull defaults from /etc/login.defs
+BuildRequires:  shadow-utils
+BuildRequires:  systemd
+BuildRequires:  systemd-rpm-macros
+
+Obsoletes: kde-settings-sddm < 20-5
+
+%if 0%{?fedora}
+# for /usr/share/backgrounds/default.png
+BuildRequires: desktop-backgrounds-compat
+BuildRequires: GraphicsMagick
+Requires: desktop-backgrounds-compat
+# for /usr/share/pixmaps/system-logo-white.png
+Requires: system-logos
+%endif
+Requires: systemd
+%if %{with x11}
+Requires: xorg-x11-xinit
+%endif
+%{?systemd_requires}
+
+Requires(pre): shadow-utils
+
+# Virtual dependency for sddm greeter setup
+Requires: sddm-greeter-displayserver
+Suggests: sddm-wayland-generic
+
+%description
+SDDM is a modern graphical display manager aiming to be fast, simple and
+beautiful. It uses modern technologies like QtQuick, which in turn gives the
+designer the ability to create smooth, animated user interfaces.
+
+%package wayland-generic
+Summary: Generic Wayland SDDM greeter configuration
+Provides: sddm-greeter-displayserver
+Conflicts: sddm-greeter-displayserver
+Requires: weston
+Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
+
+%description wayland-generic
+This package contains configuration and dependencies for SDDM
+to use Weston for the greeter display server.
+
+This is the generic default Wayland configuration provided
+by SDDM.
+
+%if %{with x11}
+%package x11
+Summary: X11 SDDM greeter configuration
+Provides: sddm-greeter-displayserver
+Conflicts: sddm-greeter-displayserver
+# This will eventually go away...
+Provides: deprecated()
+Requires: xorg-x11-server-Xorg
+Requires: %{name} = %{version}-%{release}
+Recommends: qt6-qtvirtualkeyboard
+BuildArch: noarch
+
+%description x11
+This package contains configuration and dependencies for SDDM
+to use X11 for the greeter display server.
+%endif
+
+%package themes
+Summary: SDDM Themes
+# for upgrade path
+Obsoletes: sddm < 0.2.0-0.12
+Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
+%description themes
+A collection of sddm themes, including: elarun, maldives, maya
+
+
+%prep
+%autosetup -p1 %{?commitdate:-n sddm-%{commit}} -n sddm-%version
+
+%if 0%{?fedora}
+#FIXME/TODO: use version on filesystem instead of using a bundled copy
+cp -v /usr/share/backgrounds/default.png  \
+      src/greeter/theme/background.png
+ls -sh src/greeter/theme/background.png
+gm mogrify -resize 1920x1200 src/greeter/theme/background.png
+ls -sh src/greeter/theme/background.png
+%endif
+
+
+%build
+%cmake \
+  -DBUILD_WITH_QT6:BOOL=ON \
+  -DBUILD_MAN_PAGES:BOOL=ON \
+  -DCMAKE_BUILD_TYPE:STRING="Release" \
+  -DENABLE_JOURNALD:BOOL=ON \
+  -DSESSION_COMMAND:PATH=/etc/X11/xinit/Xsession \
+  -DWAYLAND_SESSION_COMMAND:PATH=/etc/sddm/wayland-session
+
+%cmake_build
+
+
+%install
+%cmake_install
+
+mkdir -p %{buildroot}%{_sysconfdir}/sddm.conf.d
+mkdir -p %{buildroot}%{_prefix}/lib/sddm/sddm.conf.d
+install -Dpm 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/sddm
+install -Dpm 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/pam.d/sddm-autologin
+install -Dpm 644 %{SOURCE12} %{buildroot}%{_sysconfdir}/pam.d/sddm-greeter
+install -Dpm 644 %{SOURCE13} %{buildroot}%{_sysconfdir}/sddm.conf
+install -Dpm 644 %{SOURCE14} %{buildroot}%{_datadir}/sddm/scripts/README.scripts
+install -Dpm 644 %{SOURCE15} %{buildroot}%{_sysconfdir}/sysconfig/sddm
+%if %{with x11}
+install -Dpm 644 %{SOURCE16} %{buildroot}%{_prefix}/lib/sddm/sddm.conf.d/x11.conf
+%endif
+mkdir -p %{buildroot}/run/sddm
+mkdir -p %{buildroot}%{_localstatedir}/lib/sddm
+mkdir -p %{buildroot}%{_sysconfdir}/sddm/
+cp -a %{buildroot}%{_datadir}/sddm/scripts/* \
+      %{buildroot}%{_sysconfdir}/sddm/
+# we're using /etc/X11/xinit/Xsession (by default) instead
+rm -fv %{buildroot}%{_sysconfdir}/sddm/Xsession
+
+# De-conflict the dbus file
+mv %{buildroot}%{_datadir}/dbus-1/system.d/org.freedesktop.DisplayManager.conf \
+   %{buildroot}%{_datadir}/dbus-1/system.d/org.freedesktop.DisplayManager-sddm.conf
+
+%if 0%{?fedora} && 0%{?fedora} < 43
+# Provide unversioned greeter until F40 is EOL
+ln -sr %{buildroot}%{_bindir}/sddm-greeter-qt6 %{buildroot}%{_bindir}/sddm-greeter
+%endif
+
+
+%pre
+%sysusers_create_compat %{SOURCE17}
+
+%post
+%systemd_post sddm.service
+# handle incompatible configuration changes
+(grep \
+   -e '^Current=fedora$' \
+   -e '^\[XDisplay\]$' \
+   -e '^\[WaylandDisplay\]$' \
+   %{_sysconfdir}/sddm.conf > /dev/null && \
+ sed -i.rpmsave \
+   -e 's|^Current=fedora$|#Current=01-breeze-fedora|' \
+   -e 's|^\[XDisplay\]$|\[X11\]|' \
+   -e 's|^\[WaylandDisplay\]$|\[Wayland\]|' \
+   %{_sysconfdir}/sddm.conf
+) ||:
+
+
+%preun
+%systemd_preun sddm.service
+
+
+%postun
+%systemd_postun sddm.service
+
+
+%files
+%license LICENSE
+%doc README.md CONTRIBUTORS
+%dir %{_sysconfdir}/sddm/
+%dir %{_sysconfdir}/sddm.conf.d
+%dir %{_prefix}/lib/sddm/sddm.conf.d
+%config(noreplace)   %{_sysconfdir}/sddm/*
+%config(noreplace)   %{_sysconfdir}/sddm.conf
+%config(noreplace) %{_sysconfdir}/sysconfig/sddm
+%config(noreplace) %{_sysconfdir}/pam.d/sddm*
+%{_datadir}/dbus-1/system.d/org.freedesktop.DisplayManager-sddm.conf
+%{_bindir}/sddm
+%{_bindir}/sddm-greeter*
+%{_libexecdir}/sddm-helper
+%{_libexecdir}/sddm-helper-start-wayland
+%{_libexecdir}/sddm-helper-start-x11user
+%{_tmpfilesdir}/sddm.conf
+%{_sysusersdir}/sddm.conf
+%attr(0711, root, sddm) %dir /run/sddm
+%attr(1770, sddm, sddm) %dir %{_localstatedir}/lib/sddm
+%{_unitdir}/sddm.service
+%{_qt6_archdatadir}/qml/SddmComponents/
+%dir %{_datadir}/sddm
+%{_datadir}/sddm/faces/
+%{_datadir}/sddm/flags/
+%{_datadir}/sddm/scripts/
+%dir %{_datadir}/sddm/themes/
+# %%lang'ify? they're small, probably not worth it -- rex
+%{_datadir}/sddm/translations*/
+%{_mandir}/man1/sddm.1*
+%{_mandir}/man1/sddm-greeter.1*
+%{_mandir}/man5/sddm.conf.5*
+%{_mandir}/man5/sddm-state.conf.5*
+
+
+%files wayland-generic
+# No files since default configuration
+
+
+%if %{with x11}
+%files x11
+%{_prefix}/lib/sddm/sddm.conf.d/x11.conf
+%endif
+
+
+%files themes
+%{_datadir}/sddm/themes/elarun/
+%{_datadir}/sddm/themes/maldives/
+%{_datadir}/sddm/themes/maya/
+
+
+%changelog
+%autochangelog
@@ -0,0 +1 @@
+rpm.version(gh("sddm/sddm"));
@@ -1,5 +1,5 @@
 Name:			flutter
-Version:		3.19.5
+Version:		3.19.6
 Release:		1%?dist
 Summary:		SDK for crafting beautiful, fast user experiences from a single codebase
 License:		BSD-3-Clause
@@ -7,7 +7,7 @@

 # https://github.com/containerd/containerd
 %global goipath         github.com/containerd/containerd
-Version:                1.7.15
+Version:                1.7.16

 %gometa

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

 Name:           moby-buildx
-Version:        0.13.1
+Version:        0.14.0
 Release:        1%?dist
 Summary:        Docker CLI plugin for extended build capabilities with BuildKit

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

 Name:           moby-compose
-Version:        2.26.1
+Version:        2.27.0
 Release:        1%?dist
 Summary:        Define and run multi-container applications with Docker

@@ -1,5 +1,5 @@
 Name:		sarasa-gothic-fonts
-Version:	1.0.10
+Version:	1.0.11
 Release:	1%?dist
 URL:		https://github.com/be5invis/Sarasa-Gothic
 Source0:	%url/releases/download/v%version/Sarasa-TTC-%version.7z
@@ -1,11 +1,10 @@
 Name:			seto-fonts
 Version:		6.20
-Release:		2%?dist
+Release:		3%?dist
 URL:			https://setofont.osdn.jp/
-Source0:		https://osdn.net/frs/redir.php?m=nchc&f=setofont%2F61995%2Fsetofont_v_6_20.zip
+Source0:		https://github.com/terrapkg/pkg-seto-fonts/archive/refs/tags/%version.tar.gz
 License:		OFL-1.1
 Summary:		A handwritten font that contains kanji up to JIS 4th level and difficult kanji
-BuildRequires:	unzip
 BuildArch:		noarch


@@ -14,7 +13,7 @@ BuildArch:		noarch


 %prep
-%setup -q -n setofont
+%setup -q -n pkg-seto-fonts-%version

 %build

@@ -25,11 +24,8 @@ install -Dm644 *.ttf %buildroot/%_datadir/fonts/%name/

 %files
 %doc readme.txt
+%license LICENSE.md
 %_datadir/fonts/%name/

 %changelog
-* Sun Jun 18 2023 windowsboy111 <windowsboy111@fyralabs.com> - 6.20-2
- Fix install dir.
-
-* Tue Nov 22 2022 windowsboy111 <windowsboy111@fyralabs.com> - 6.20-1
- Initial package
+%autochangelog
@@ -1,13 +1,13 @@
 %global real_name prismlauncher
 %global nice_name PrismLauncher

-%global commit df0280f52b68f4352d8da711136609c16ce4db7b
+%global commit bfac12604e9cd0884987ca89f34a455cf16c543c
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f
 %global quazip_commit 6117161af08e366c37499895b00ef62f93adc345
 %global tomlplusplus_commit 7eb2ffcc09f8e9890dc0b77ff8ab00fc53b1f2b8

-%global commit_date 20240325
+%global commit_date 20240501
 %global snapshot_info %{commit_date}.%{shortcommit}

 %bcond_without qt6
@@ -1,13 +1,13 @@
 %global real_name prismlauncher
 %global nice_name PrismLauncher

-%global commit df0280f52b68f4352d8da711136609c16ce4db7b
+%global commit a2d28f6872841d047ce3854365c595ebf941b848
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f
 %global quazip_commit 6117161af08e366c37499895b00ef62f93adc345
 %global tomlplusplus_commit 7eb2ffcc09f8e9890dc0b77ff8ab00fc53b1f2b8

-%global commit_date 20240325
+%global commit_date 20240401
 %global snapshot_info %{commit_date}.%{shortcommit}

 %bcond_with qt6
@@ -22,8 +22,8 @@ Name:             prismlauncher
 %else
 Name:             prismlauncher-qt5
 %endif
-Version:          8.2
-Release:          2%?dist
+Version:          8.3
+Release:          1%?dist
 Summary:          Minecraft launcher with ability to manage multiple instances
 # see COPYING.md for more information
 # each file in the source also contains a SPDX-License-Identifier header that declares its license
@@ -1,8 +1,8 @@
 %define debug_package %nil

 Name:			crystal
-Version:		1.11.2
-Release:		1%{?dist}
+Version:		1.12.1
+Release:		1%?dist
 Summary:		The Crystal Programming Language
 License:		Apache-2.0
 URL:			https://crystal-lang.org/
@@ -1,2 +1,2 @@
 let html = get("https://crystal-lang.org/");
-rpm.version(find("Latest release <.+>(.+)</a>", html, 1))
+rpm.version(find("Latest release: <strong>(.+?)</strong>", html, 1))
@@ -1,7 +1,7 @@
 %define debug_package %{nil}

 Name: dart
-Version: 3.3.3
+Version: 3.3.4
 Release: 1%?dist
 Summary: The Dart Language
 License: BSD-3-Clause
@@ -1,11 +1,11 @@
 %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10
-%global commit 33902d9dbb65fbfdfbd6e3b2a34c6e19eccb762f
+%global commit d09c3c0f58eb9f1f4cf07fa98a9686aa19778f16
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global ver 2.1.1
-%global commit_date 20240322
+%global commit_date 20240430
 %global debug_package %nil

-Name:			nim-nighlty
+Name:			nim-nightly
 Version:		%ver^%commit_date.%shortcommit
 Release:		1%?dist
 Summary:		Imperative, multi-paradigm, compiled programming language
@@ -19,6 +19,9 @@ Source4:		nimsuggest.1
 BuildRequires:	gcc mold git gcc-c++ nodejs openssl-devel pkgconfig(bash-completion) gc-devel pcre pcre-devel
 Requires:		redhat-rpm-config gcc
 Conflicts:		choosenim
+# somehow wrong name and never noticed
+Provides:		nim-nightly = %version-%release
+Obsoletes:		nim-nighlty < 2.1.1^20240404.9e1b170-2


 %description
@@ -29,6 +32,9 @@ order of priority).

 %package tools
 Summary:	Tools for Nim programming language
+Provides:	nim-nightly-tools = %version-%release
+Obsoletes:	nim-nighlty-tools < 2.1.1^20240404.9e1b170-2
+
 %description tools
 Nim is a compiled, garbage-collected systems programming language with a
 design that focuses on efficiency, expressiveness, and elegance (in that
@@ -41,6 +47,8 @@ This package provides various tools, which help Nim programmers.
 %package doc
 Summary:	Documentation for Nim programming language
 BuildArch:	noarch
+Provides:	nim-nightly-doc = %version-%release
+Obsoletes:	nim-nighlty-doc < 2.1.1^20240404.9e1b170-2
 %description doc
 Nim is a compiled, garbage-collected systems programming language with a
 design that focuses on efficiency, expressiveness, and elegance (in that
@@ -2,8 +2,8 @@
 %global debug_package %{nil}

 Name:			nim
-Version:		2.0.2
-Release:		3%{?dist}
+Version:		2.0.4
+Release:		1%?dist
 Summary:		Imperative, multi-paradigm, compiled programming language
 License:		MIT and BSD
 URL:			https://nim-lang.org
@@ -1,8 +1,8 @@
 %define debug_package %nil

 Name:			python3-mpv
-Version:		1.0.5
-Release:		1%{?dist}
+Version:		1.0.6
+Release:		1%?dist
 Summary:		Python interface to the awesome mpv media player
 License:		GPL-2.0+ OR LGPL-2.1+
 URL:			https://github.com/jaseg/python-mpv
@@ -0,0 +1,6 @@
+project pkg {
+  arches = ["x86_64"]
+  rpm {
+	spec = "python-pip-system-certs.spec"
+  }
+}
@@ -0,0 +1,56 @@
+# Created by pyp2rpm-3.3.10
+%global pypi_name pip-system-certs
+%global pypi_version 4.0
+
+Name:           python-%{pypi_name}
+Version:        %{pypi_version}
+Release:        1%{?dist}
+Summary:        Live patches pip to use system certs by default
+
+License:        BSD-2-Clause
+URL:            https://gitlab.com/alelec/pip-system-certs
+Source0:        https://files.pythonhosted.org/packages/source/p/%{pypi_name}/pip_system_certs-%{pypi_version}.tar.gz
+BuildArch:      noarch
+
+BuildRequires:  python3-devel python3-pip python3dist(setuptools) python3dist(wheel) git
+
+
+%description
+This package patches pip and requests at runtime to use
+certificates from the default system store (rather than the bundled certs
+ca). This will allow pip to verify tls/ssl connections to servers who's cert is
+trusted by your system install.
+
+%package -n     python3-%{pypi_name}
+Summary:        %{summary}
+%{?python_provide:%python_provide python3-%{pypi_name}}
+
+Requires:       python3dist(wrapt) >= 1.10.4
+%description -n python3-%{pypi_name}
+This package patches pip and requests at runtime to use
+certificates from the default system store (rather than the bundled certs
+ca). This will allow pip to verify tls/ssl connections to servers who's cert is
+trusted by your system install.
+
+%prep
+%autosetup -n pip_system_certs-%{pypi_version}
+# Remove bundled egg-info
+rm -rf %{pypi_name}.egg-info
+
+%build
+pip install git-versioner
+%pyproject_wheel
+
+%install
+%pyproject_install
+
+%pyproject_save_files pip_system_certs
+
+%files -n python3-%{pypi_name} -f %pyproject_files
+%license LICENSE
+%doc README.rst
+%python3_sitelib/pip_system_certs.pth
+
+%changelog
+* Thu Apr 04 2024 madomado <madonuko@outlook.com> - 4.0-1
+- Initial package.
@@ -0,0 +1 @@
+rpm.global("pypi_version", pypi("pip-system-certs"));
@@ -1,7 +1,7 @@
 %define debug_package %{nil}

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

 Name:           rust-terra-maturin
 Version:        1.5.1
-Release:        1%?dist
+Release:        %autorelease
 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,6 +296,18 @@ 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
@@ -320,18 +332,6 @@ 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_no_tilde} -p1
+%autosetup -n %{crate}-%{version} -p1
 %cargo_prep_online

 %build
@@ -1,5 +1,5 @@
 Name:			nushell
-Version:		0.92.2
+Version:		0.93.0
 Release:		1%?dist
 Summary:		A new type of shell
 License:		MIT
@@ -19,7 +19,8 @@ Requires:		glibc openssl zlib
 %{cargo_build -f extra,dataframe} --workspace

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

 %post
@@ -4,8 +4,8 @@
 %global crate oxipng

 Name:           rust-oxipng
-Version:        9.0.0
-Release:        %autorelease
+Version:        9.1.1
+Release:        1%?dist
 Summary:        Lossless PNG compression optimizer

 License:        MIT
@@ -0,0 +1,25 @@
+From b62e3879abe83e0b879421a023d8e944e31f00cb Mon Sep 17 00:00:00 2001
+From: madomado <madonuko@outlook.com>
+Date: Mon, 25 Mar 2024 18:33:25 +0800
+Subject: [PATCH] gix 0.61.1 -> 0.61.0
+
+---
+ Cargo.toml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index d98ba90..c3059c9 100644
+--- a/Cargo.toml
+++ b/Cargo.toml
+@@ -82,7 +82,7 @@ version = "1.0.4"
+ version = "0.4.3"
+ 
+ [dependencies.gix]
+-version = "0.61.1"
+version = "0.61.0"
+ features = [
+     "max-performance-safe",
+     "revision",
+-- 
+2.44.0
+
@@ -1,21 +1,20 @@
-%global debug_package %{nil}
-# Generated by rust2rpm 24
-%bcond_without check
+# Generated by rust2rpm 26
+#bcond_without check

 %global crate starship

 Name:           rust-starship
-Version:        1.18.1
-Release:        1%?dist
+Version:        1.18.2
+Release:        2%?dist
 Summary:        Minimal, blazing-fast, and infinitely customizable prompt for any shell! ☄🌌️

 License:        ISC
 URL:            https://crates.io/crates/starship
 Source:         %{crates_source}
-# Automatically generated patch to strip foreign dependencies
-Patch:          starship-fix-metadata-auto.diff
+# Automatically generated patch to strip dependencies and normalize metadata
+Patch0:         starship-fix-metadata-auto.diff

-BuildRequires:  rust-packaging >= 21
+BuildRequires:  cargo-rpm-macros >= 24
 BuildRequires:  anda-srpm-macros
 BuildRequires:  cmake
 BuildRequires:  pkgconfig
@@ -29,11 +28,13 @@ shell! ☄🌌️.}

 %package     -n %{crate}
 Summary:        %{summary}
+License:        ISC

 %description -n %{crate} %{_description}

 %files       -n %{crate}
 %license LICENSE
+#license LICENSE.dependencies
 %doc README.md
 %{_bindir}/starship

@@ -170,14 +171,14 @@ use the "starship-battery" feature of the "%{crate}" crate.
 %ghost %{crate_instdir}/Cargo.toml

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

 %build
-%cargo_build
+%{cargo_build}

 %install
-%cargo_install
+%{cargo_install}

 %if %{with check}
 %check
@@ -1,6 +1,6 @@
--- starship-1.14.2/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ starship-1.14.2/Cargo.toml	2023-04-25T12:48:23.509565+00:00
-@@ -254,18 +254,3 @@
+--- starship-1.18.1/Cargo.toml	1970-01-01T00:00:01+00:00
+++ starship-1.18.1/Cargo.toml	2024-03-24T13:14:24.022475+00:00
+@@ -263,18 +263,3 @@
 ]
 default-features = false
 
@@ -8,7 +8,7 @@
 -version = "0.2.0"
 -
 -[target."cfg(windows)".dependencies.windows]
-version = "0.48.0"
+-version = "0.54.0"
 -features = [
 -    "Win32_Foundation",
 -    "Win32_UI_Shell",
@@ -5,8 +5,8 @@
 %global crate zellij

 Name:           rust-zellij
-Version:        0.39.2
-Release:        1%{?dist}
+Version:        0.40.1
+Release:        1%?dist
 Summary:        Terminal workspace with batteries included

 License:        MIT
@@ -1,9 +1,9 @@
 %global real_name vala-language-server

-%global commit 0b020298aa3dafacd2f6633533ca91fba5698340
+%global commit a49292758922160244d1842cdcba0a5154d1cb27
 %global shortcommit %(c=%{commit}; echo ${c:0:7})

-%global commit_date 20240323
+%global commit_date 20240330
 %global snapshot_info %{commit_date}.%{shortcommit}
 %global verrel 0.48.7

@@ -3,11 +3,11 @@
 %global priority 90

 %global real_name vala
-%global commit 933eb2d0e41bb7fdc4fe5fc01a03254965990f3e
+%global commit fa704b2c2385f35d12568ee31de33568d6d67749
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global repo https://gitlab.gnome.org/GNOME/%{real_name}.git

-%global commit_date 20240218
+%global commit_date 20240426
 %global snapshot_info %{commit_date}.%{shortcommit}

 Name:           vala-nightly
@@ -1,5 +1,5 @@
 %global forgeurl https://gitlab.com/vala-panel-project/vala-panel-appmenu
-%global commit 2112c4e36243f2f625d7adb24ba1dfc029285c3f
+%global commit fdf282159d3a344c8c5f0956062f2a7d12d55b75
 %forgemeta

 Name:    vala-panel-appmenu
@@ -0,0 +1 @@
+rpm.version(gitlab("6865057"));
@@ -1,10 +1,9 @@
+Name:    vala-panel
+Version: 24.03
 %global forgeurl https://gitlab.com/vala-panel-project/vala-panel
-%global commit ead4e7a36b0e4b0a2ac43c5d9ca17eb753461afe
 %forgemeta

-Name:    vala-panel
-Version: 0.5.0
-Release: 2%?dist
+Release: 1%?dist
 License: LGPL-3.0-or-later
 Summary: This package provides Application Menu plugin for vala-panel
 Group:   System/GUI/Other
@@ -38,7 +37,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 %forgeautosetup

 %build
-%meson -Dwnck=enabled -Dplatforms='layer-shell,x11'
+%meson -Dwnck=enabled -Dplatforms='wayland,x11'
 %meson_build

 %install
@@ -73,6 +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-%version.typelib

 %files devel
 %doc README.md
@@ -82,6 +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-%version.gir

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

 Name:           apparmor
 Version:        4.0.0~alpha3
-Release:        1%{?dist}
+Release:        2%{?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}/%(echo %version | sed 's/~/-/')/+download/%{name}-%{version}.tar.gz
+Source0:        %{url}/%{baseversion}/%normver/+download/%{name}-%{version}.tar.gz
 Source1:        apparmor.preset
 Patch01:        0001-fix-avahi-daemon-authselect-denial-in-fedora.patch

@@ -138,6 +139,8 @@ 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}
@@ -149,7 +152,7 @@ pushd libraries/libapparmor
 %configure \
    --with-python \

-%make_build
+%make_build VERSION=%normver
 popd

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


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

 License:        MIT
@@ -1,5 +0,0 @@
-project pkg {
-  rpm {
-	spec = "openh264.spec"
-  }
-}
@@ -1,201 +0,0 @@
-#!/bin/sh
-
-# Process a gst-plugins-bad tarball to remove
-# unwanted GStreamer plugins.
-#
-# This script here is taken from Fedora gstreamer1-plugins-bad-free repo, with
-# only change being openh264 addition.
-#
-# See https://bugzilla.redhat.com/show_bug.cgi?id=532470
-# for details
-#
-# Bastien Nocera <bnocera@redhat.com> - 2010
-#
-
-SOURCE="$1"
-NEW_SOURCE=`echo $SOURCE | sed 's/bad-/bad-openh264-/'`
-DIRECTORY=`echo $SOURCE | sed 's/\.tar\.xz//'`
-
-ALLOWED="
-aacparse
-accurip
-adpcmdec
-adpcmenc
-aiff
-aiffparse
-amrparse
-asfmux
-audiobuffersplit
-audiofxbad
-audiolatency
-audiomixer
-audiomixmatrix
-audioparsers
-audiovisualizers
-autoconvert
-bayer
-camerabin
-camerabin2
-cdxaparse
-codecalpha
-codectimestamper
-coloreffects
-colorspace
-compositor
-dataurisrc
-dccp
-debugutils
-dtmf
-dvbsubenc
-faceoverlay
-festival
-fieldanalysis
-freeverb
-freeze
-frei0r
-gaudieffects
-gdp
-geometrictransform
-h264parse
-hdvparse
-hls
-id3tag
-inter
-interlace
-invtelecine
-ivfparse
-ivtc
-jpegformat
-jp2kdecimator
-legacyresample
-librfb
-liveadder
-midi
-mve
-mpegdemux
-mpeg4videoparse
-mpegpsmux
-mpegtsdemux
-mpegtsmux
-mpegvideoparse
-mxf
-netsim
-nsf
-nuvdemux
-onvif
-openh264
-patchdetect
-pcapparse
-pnm
-proxy
-qtmux
-rawparse
-removesilence
-rist
-rtmp2
-rtp
-rtpmux
-rtpvp8
-scaletempo
-sdi
-sdp
-segmentclip
-selector
-smooth
-speed
-stereo
-subenc
-switchbin
-timecode
-transcode
-tta
-valve
-videofilters
-videoframe_audiolevel
-videomaxrate
-videomeasure
-videoparsers
-videosignal
-vmnc
-yadif
-y4m
-"
-
-NOT_ALLOWED="
-dvbsuboverlay
-dvdspu
-real
-siren
-"
-
-error()
-{
-	MESSAGE=$1
-	echo $MESSAGE
-	exit 1
-}
-
-check_allowed()
-{
-	MODULE=$1
-	for i in $ALLOWED ; do
-		if test x$MODULE = x$i ; then
-			return 0;
-		fi
-	done
-	# Ignore errors coming from ext/ directory
-	# they require external libraries so are ineffective anyway
-	return 1;
-}
-
-check_not_allowed()
-{
-	MODULE=$1
-	for i in $NOT_ALLOWED ; do
-		if test x$MODULE = x$i ; then
-			return 0;
-		fi
-	done
-	return 1;
-}
-
-rm -rf $DIRECTORY
-tar xJf $SOURCE || error "Cannot unpack $SOURCE"
-pushd $DIRECTORY > /dev/null || error "Cannot open directory \"$DIRECTORY\""
-
-unknown=""
-for subdir in gst ext sys; do
-	for dir in $subdir/* ; do
-		# Don't touch non-directories
-		if ! [ -d $dir ] ; then
-			continue;
-		fi
-		MODULE=`basename $dir`
-		if ( check_not_allowed $MODULE ) ; then
-			echo "**** Removing $MODULE ****"
-			echo "Removing directory $dir"
-			rm -r $dir || error "Cannot remove $dir"
-			echo
-		elif test $subdir = ext  || test $subdir = sys; then
-			# Ignore library or system non-blacklisted plugins
-			continue;
-		elif ! ( check_allowed $MODULE ) ; then
-			echo "Unknown module in $dir"
-			unknown="$unknown $dir"
-		fi
-	done
-done
-
-echo
-
-if test "x$unknown" != "x"; then
-  echo -n "Aborting due to unkown modules: "
-  echo "$unknown" | sed "s/ /\n  /g"
-  exit 1
-fi
-
-popd > /dev/null
-
-tar cJf $NEW_SOURCE $DIRECTORY
-echo "$NEW_SOURCE is ready to use"
-
@@ -1,14 +0,0 @@
-diff -up gst-plugins-bad-1.18.2/ext/openh264/meson.build.orig gst-plugins-bad-1.18.2/ext/openh264/meson.build
--- gst-plugins-bad-1.18.2/ext/openh264/meson.build.orig	2020-12-06 14:24:13.000000000 +0100
-+++ gst-plugins-bad-1.18.2/ext/openh264/meson.build	2021-02-11 11:48:58.660450319 +0100
-@@ -4,9 +4,7 @@ openh264_sources = [
-   'gstopenh264plugin.c',
- ]
- 
-openh264_dep = dependency('openh264', version : '>= 1.3.0',
-                          required : get_option('openh264'),
-                          fallback: ['openh264', 'openh264_dep'])
-+openh264_dep = cc.find_library('openh264')
- 
- if openh264_dep.found()
-   gstopenh264 = library('gstopenh264',
@@ -1,213 +0,0 @@
-# ref: https://src.fedoraproject.org/rpms/openh264
-%global commit1 e7d30b921df736a1121a0c8e0cf3ab1ce5b8a4b7
-%global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
-
-%global openh264_version 2.4.0
-%global gst_version 1.23.2
-
-Name:           openh264
-Version:        %{openh264_version}
-# Also bump the Release tag for gstreamer1-plugin-openh264 down below
-Release:        1%{?dist}
-Summary:        H.264 codec library
-
-License:        BSD
-URL:            https://www.openh264.org/
-Source0:        https://github.com/cisco/openh264/archive/v%{openh264_version}/openh264-%{openh264_version}.tar.gz
-Source1:        https://github.com/mozilla/gmp-api/archive/%{commit1}/gmp-api-%{shortcommit1}.tar.gz
-# The source is:
-# http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-%%{gst_version}.tar.xz
-# modified with gst-p-bad-cleanup.sh from SOURCE3
-Source2:        gst-plugins-bad-openh264-%{gst_version}.tar.xz
-Source3:        gst-p-bad-cleanup.sh
-
-# Don't use pkg-config for finding openh264 as we are building against an in-tree copy
-Patch2:         hardcode-openh264-dep.patch
-
-BuildRequires:  gcc-c++
-BuildRequires:  gstreamer1-devel >= %{gst_version}
-BuildRequires:  gstreamer1-plugins-base-devel >= %{gst_version}
-BuildRequires:  make
-BuildRequires:  meson
-BuildRequires:  nasm
-
-%description
-OpenH264 is a codec library which supports H.264 encoding and decoding. It is
-suitable for use in real time applications such as WebRTC.
-
-
-%package        devel
-Summary:        Development files for %{name}
-Requires:       %{name}%{?_isa} = %{openh264_version}-%{release}
-
-%description    devel
-The %{name}-devel package contains libraries and header files for
-developing applications that use %{name}.
-
-
-%package     -n mozilla-openh264
-Summary:        H.264 codec support for Mozilla browsers
-Requires:       %{name}%{?_isa} = %{openh264_version}-%{release}
-Requires:       mozilla-filesystem%{?_isa}
-
-%description -n mozilla-openh264
-The mozilla-openh264 package contains a H.264 codec plugin for Mozilla
-browsers.
-
-
-%package     -n gstreamer1-plugin-openh264
-Version:        %{gst_version}
-Release:        2%{?dist}
-Summary:        GStreamer H.264 plugin
-
-%description -n gstreamer1-plugin-openh264
-GStreamer is a streaming media framework, based on graphs of elements which
-operate on media data.
-
-This package contains the H.264 plugin.
-
-
-%prep
-%setup -q
-
-# Extract gmp-api archive
-tar -xf %{S:1}
-mv gmp-api-%{commit1} gmp-api
-
-# Extract gst-plugins-bad-free archive
-tar -xf %{S:2}
-pushd gst-plugins-bad-%{gst_version}
-%patch2 -p1
-popd
-
-
-%build
-# Update the makefile with our build options
-# Must be done in %%build in order to pick up correct LDFLAGS.
-sed -i -e 's|^CFLAGS_OPT=.*$|CFLAGS_OPT=%{optflags}|' Makefile
-sed -i -e 's|^PREFIX=.*$|PREFIX=%{_prefix}|' Makefile
-sed -i -e 's|^LIBDIR_NAME=.*$|LIBDIR_NAME=%{_lib}|' Makefile
-sed -i -e 's|^SHAREDLIB_DIR=.*$|SHAREDLIB_DIR=%{_libdir}|' Makefile
-sed -i -e '/^CFLAGS_OPT=/i LDFLAGS=%{__global_ldflags}' Makefile
-
-# First build the openh264 libraries
-make %{?_smp_mflags}
-
-# ... then build the mozilla plugin
-make plugin %{?_smp_mflags}
-
-# ... and finally build the gstreamer plugin against the previously built
-# openh264 libraries
-pushd gst-plugins-bad-%{gst_version}
-CFLAGS="%{build_cflags} -I`pwd`/../codec/api" \
-CXXFLAGS="%{build_cflags} -I`pwd`/../codec/api" \
-LDFLAGS="%{build_ldflags} -L`pwd`/.." \
-%meson \
-    --auto-features=disabled \
-    -D package-name="Fedora gstreamer1-plugin-openh264 package" \
-    -D package-origin="http://www.openh264.org/" \
-    -D openh264=enabled
-%meson_build
-popd
-
-
-%install
-%make_install
-
-# Install mozilla plugin
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/gmp-gmpopenh264/system-installed
-cp -a libgmpopenh264.so* gmpopenh264.info $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/gmp-gmpopenh264/system-installed/
-
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/firefox/defaults/pref
-cat > $RPM_BUILD_ROOT%{_libdir}/firefox/defaults/pref/gmpopenh264.js << EOF
-pref("media.gmp-gmpopenh264.autoupdate", false);
-pref("media.gmp-gmpopenh264.version", "system-installed");
-EOF
-
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
-cat > $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/gmpopenh264.sh << EOF
-MOZ_GMP_PATH="${MOZ_GMP_PATH}${MOZ_GMP_PATH:+:}%{_libdir}/mozilla/plugins/gmp-gmpopenh264/system-installed"
-export MOZ_GMP_PATH
-EOF
-
-# Remove static libraries
-rm $RPM_BUILD_ROOT%{_libdir}/*.a
-
-# Install the gstreamer plugin
-pushd gst-plugins-bad-%{gst_version}
-%meson_install
-
-# Register as an AppStream component to be visible in the software center
-#
-# NOTE: It would be *awesome* if this file was maintained by the upstream
-# project, translated and installed into the right place during `make install`.
-#
-# See http://www.freedesktop.org/software/appstream/docs/ for more details.
-#
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
-cat > $RPM_BUILD_ROOT%{_datadir}/appdata/gstreamer-openh264.appdata.xml <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2015 Kalev Lember <klember@redhat.com> -->
-<component type="codec">
-  <id>gstreamer-openh264</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <name>GStreamer Multimedia Codecs - H.264</name>
-  <summary>Multimedia playback for H.264</summary>
-  <description>
-    <p>
-      This addon includes a codec for H.264 playback and encoding.
-    </p>
-    <p>
-      These codecs can be used to encode and decode media files where the
-      format is not patent encumbered.
-    </p>
-    <p>
-      A codec decodes audio and video for playback or editing and is also
-      used for transmission or storage.
-      Different codecs are used in video-conferencing, streaming media and
-      video editing applications.
-    </p>
-  </description>
-  <url type="homepage">http://gstreamer.freedesktop.org/</url>
-  <url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer</url>
-  <url type="help">http://gstreamer.freedesktop.org/documentation/</url>
-  <url type="donation">http://www.gnome.org/friends/</url>
-  <update_contact><!-- upstream-contact_at_email.com --></update_contact>
-</component>
-EOF
-
-# Remove unwanted gst-plugins-bad files
-rm -rf $RPM_BUILD_ROOT%{_bindir}/gst-transcoder-1.0
-rm -rf $RPM_BUILD_ROOT%{_includedir}/gstreamer-1.0/
-rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gstreamer-*.pc
-rm -rf $RPM_BUILD_ROOT%{_libdir}/libgst*.so*
-rm -rf $RPM_BUILD_ROOT%{_datadir}/gstreamer-1.0/
-popd
-
-
-%files
-%license LICENSE
-%doc README.md
-%{_libdir}/libopenh264.so.7
-%{_libdir}/libopenh264.so.%{openh264_version}
-
-%files devel
-%{_includedir}/wels/
-%{_libdir}/libopenh264.so
-%{_libdir}/pkgconfig/openh264.pc
-
-%files -n mozilla-openh264
-%{_sysconfdir}/profile.d/gmpopenh264.sh
-%dir %{_libdir}/firefox
-%dir %{_libdir}/firefox/defaults
-%dir %{_libdir}/firefox/defaults/pref
-%{_libdir}/firefox/defaults/pref/gmpopenh264.js
-%{_libdir}/mozilla/plugins/gmp-gmpopenh264/
-
-%files -n gstreamer1-plugin-openh264
-%{_datadir}/appdata/*.appdata.xml
-%{_libdir}/gstreamer-1.0/libgstopenh264.so
-
-
-%changelog
-%autochangelog
@@ -1,14 +0,0 @@
-let cwd = "anda/lib/openh264";
-let spec = open_file("anda/lib/openh264/openh264.spec").read_string();
-let gst = find("%global gst_version ([\\d.]+)", spec, 1);
-print(`:: found gst version ${gst}`);
-let out = sh(`wget https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${gst}.tar.xz`, cwd);
-//print(":: wget stdout below");
-//print(out.sh_stdout());
-//print(":: wget stderr below");
-//print(out.sh_stderr());
-out = sh(`sh gst-p-bad-cleanup.sh gst-plugins-bad-${gst}.tar.xz`, cwd);
-//print(":: script stdout below");
-//print(out.sh_stdout());
-//print(":: script stderr below");
-//print(out.sh_stderr());
@@ -1,6 +0,0 @@
-rpm.global("commit1", gh_commit("mozilla/gmp-api"));
-let h264 = gh("cisco/openh264");
-h264.crop(1);
-rpm.global("openh264_version", h264);
-let html = get("https://gstreamer.freedesktop.org/src/gst-plugins-bad/?C=N;O=D");
-rpm.global("gst_version", find("gst-plugins-bad-([\\d.]+).tar.xz", html, 1));
@@ -1,5 +1,5 @@
-%global commit 586bc784138042d2710168cd0b29f5dd6d415f45
-%global ver 1.8.26
+%global commit 77b34797d89d23ccfab3f3e1eab532f0bc73ab38
+%global ver 1.8.28
 %global commit_date 20240219
 %global shortcommit %(c=%{commit}; echo ${c:0:7})

@@ -0,0 +1,31 @@
+From db29e1ce9f1a2b6b2ac3ef9df8b8b8524ab895f9 Mon Sep 17 00:00:00 2001
+From: madomado <madonuko@outlook.com>
+Date: Mon, 29 Apr 2024 21:29:01 +0800
+Subject: [PATCH] fix: support esbuild
+
+---
+ src/process/index.js | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/src/process/index.js b/src/process/index.js
+index 97ea651..f5486ca 100644
+--- a/src/process/index.js
+++ b/src/process/index.js
+@@ -1,13 +1,7 @@
+ const rgb = (r, g, b, msg) => `\x1b[38;2;${r};${g};${b}m${msg}\x1b[0m`;
+ const log = (...args) => console.log(`[${rgb(88, 101, 242, 'arRPC')} > ${rgb(237, 66, 69, 'process')}]`, ...args);
+ 
+-import fs from 'node:fs';
+-import { dirname, join } from 'path';
+-import { fileURLToPath } from 'url';
+-
+-const __dirname = dirname(fileURLToPath(import.meta.url));
+-const DetectableDB = JSON.parse(fs.readFileSync(join(__dirname, 'detectable.json'), 'utf8'));
+-
+import DetectableDB from './detectable.json' with { type: "json" };
+ import * as Natives from './native/index.js';
+ const Native = Natives[process.platform];
+ 
+-- 
+2.44.0
+
@@ -1,14 +1,16 @@
 %define debug_package %nil
-%global commit c6e23e7eb733ad396d3eebc328404cc656fed581
+%define __strip /bin/true
+%global commit cca93db585dedf8acc1423f5e2db215de95c4c3b

 Name:			arrpc
-Version:		3.3.1
-Release:		1%?dist
+Version:		3.4.0
+Release:		2%?dist
 Summary:		Open Discord RPC server for atypical setups
 License:		MIT
 URL:			https://arrpc.openasar.dev
 Source0:		https://github.com/OpenAsar/arrpc/archive/%commit.tar.gz
 Source1:		arrpc.service
+Patch0:			0001-fix-support-esbuild.patch
 Requires:		glibc
 BuildRequires:	nodejs-npm systemd-rpm-macros

@@ -20,15 +22,15 @@ server which messages the JSON of exactly what to dispatch with in the client wi
 allowing small and simple mods or plugins. arRPC is experimental and a work in progress, so expect bugs, etc.

 %prep
-%autosetup -n arrpc-%commit
+%autosetup -n arrpc-%commit -p1
 # patch for using esbuild
 sed -i -E 's@const server[^\n]+;@async function main() {\0@' src/index.js
 sed -i -E 's@server\.on[^\n]+;@\0}\nmain();@' src/index.js

 %build
-npm i esbuild pkg
-npx esbuild --bundle --platform=node --target=node18 --outdir=dist ./src/index.js
-npx pkg -t node18-linux-x64 -o arrpc  ./dist/index.js
+npm i esbuild @yao-pkg/pkg
+npx esbuild --bundle --platform=node --target=node20 --outdir=dist ./src/index.js
+npx pkg -t node20-linux-x64 -o arrpc ./dist/index.js

 %install
 install -D -m755 arrpc %buildroot%_bindir/arrpc
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "katsu-systemd-sysusers-presets.spec"
+	}
+}
@@ -0,0 +1,72 @@
+%define debug_package %nil
+
+Name:			katsu-systemd-sysusers-presets
+Version:		1.0
+Release:		%autorelease
+Summary:		A set of systemd system user presets to supplement Fedora's defaults, used by Katsu
+License:		GPLv3+
+Source0:		polkit.conf
+Source1:		rpcbind.conf
+BuildRequires:  systemd-rpm-macros
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd 
+
+
+%description
+A set of systemd system user presets to supplement Fedora's defaults,
+Since for some packages, the system users are created using the package's
+post-install script, this package is a no-op on its own. It is intended to be
+used as a dependency for other packages that need to create system users.
+For example, Polkit needs to create the polkitd system user, so this package
+generates the polkitd system user for Polkit to use properly.
+
+Katsu uses this package to fix Fedora's default system user presets, which
+fails to add the system users for Polkit and rpcbind.
+
+%package polkit
+Summary:		Polkit system user
+Requires:       rpcbind
+
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd 
+
+Supplements:    polkit
+
+%description polkit
+Polkit system user preset
+
+%package rpcbind
+Summary:		RPC bind system user
+Requires:       rpcbind
+
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
+
+Supplements:    rpcbind
+
+%description rpcbind
+RPC bind system user preset
+
+%prep
+
+%install
+install -D %{SOURCE0} %{buildroot}%{_sysusersdir}/katsu-polkit.conf
+install -D %{SOURCE1} %{buildroot}%{_sysusersdir}/katsu-rpcbind.conf
+
+%post polkit
+systemd-sysusers %{_sysusersdir}/katsu-polkit.conf
+
+%post rpcbind
+systemd-sysusers %{_sysusersdir}/katsu-rpcbind.conf
+
+
+%files polkit
+%{_sysusersdir}/katsu-polkit.conf
+%files rpcbind
+%{_sysusersdir}/katsu-rpcbind.conf
+
+%changelog
+%autochangelog
@@ -0,0 +1,2 @@
+g      polkitd 114  
+u      polkitd 114:114 "User for polkitd" - -
@@ -0,0 +1,2 @@
+g      rpc     32
+u      rpc     32:32  "Rpcbind Daemon" - -
@@ -3,18 +3,18 @@
 Name:       kwin-system76-scheduler-integration

 %global forgeurl https://github.com/maxiberta/%{name}
-%global commit 093a269670275feaa240d02c712f1ec8b812fd80
-%global date 20240320
+%global commit e00f1b74998d6513552633c791ea23ffa3fe78a0
+%global date 20240425
 %forgemeta

 Version:    0.1
-Release:    5%?dist
+Release:    1%?dist
 Summary:    Notify the System76 Scheduler which app has focus so it can be prioritized
 License:    MIT
 URL:        %forgeurl
 Source0:    %forgesource
 Source1:    com.system76.Scheduler.dbusproxy.service
-Requires:   bash dbus-tools system76-scheduler kde-cli-tools systemd kf6-kconfig-core
+Requires:   bash dbus-tools system76-scheduler kde-cli-tools systemd kf6-kconfig
 BuildRequires: systemd-rpm-macros

 %description
@@ -0,0 +1,14 @@
+#!/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,4 +1,4 @@
-rpm.global("commit", gh("maxiberta/kwin-system76-scheduler-integration"));
+rpm.global("commit", gh_commit("maxiberta/kwin-system76-scheduler-integration"));
 if rpm.changed() {
  rpm.global("date", date()); // remove if we don't need the `date` macro
  rpm.release();
@@ -4,7 +4,7 @@
 %define _build_id_links none

 Name: sass
-Version: 1.75.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 = "sunshine.spec"
-	}
-}
@@ -1,78 +0,0 @@
-
-%global forgeurl https://github.com/LizardByte/Sunshine
-Name:           sunshine
-Version:        0.23.0
-Release:        1%{?dist}
-Summary:        Self-hosted game stream host for Moonlight. 
-
-License:        GPL-3.0-or-later
-URL:            http://app.lizardbyte.dev/Sunshine
-Source0:        %{forgeurl}/archive/refs/tags/v%{version}.tar.gz
-
-BuildRequires:  pkgconfig
-BuildRequires:  boost-devel
-BuildRequires:  cmake
-BuildRequires:  gcc
-BuildRequires:  gcc-c++
-BuildRequires:  make
-%ifarch x86_64
-BuildRequires:  intel-mediasdk-devel
-%endif
-BuildRequires:  libcap-devel
-BuildRequires:  libcurl-devel
-BuildRequires:  libdrm-devel
-BuildRequires:  libevdev-devel
-BuildRequires:  libnotify-devel
-BuildRequires:  libva-devel
-BuildRequires:  libvdpau-devel
-BuildRequires:  libX11-devel
-BuildRequires:  libxcb-devel
-BuildRequires:  libXcursor-devel
-BuildRequires:  libXfixes-devel
-BuildRequires:  libXi-devel
-BuildRequires:  libXinerama-devel
-BuildRequires:  libXrandr-devel
-BuildRequires:  libXtst-devel
-BuildRequires:  mesa-libGL-devel
-BuildRequires:  miniupnpc-devel
-BuildRequires:  npm
-BuildRequires:  numactl-devel
-BuildRequires:  openssl-devel
-BuildRequires:  opus-devel
-BuildRequires:  pulseaudio-libs-devel
-BuildRequires:  wayland-devel
-
-# TODO: Add CUDA support before merging PR
-# blocker: nvidia-driver
-
-%description
-Sunshine is a self-hosted game stream host for Moonlight.
-Offering low latency, cloud gaming server capabilities with support for AMD, Intel, and Nvidia GPUs for hardware encoding.
-Software encoding is also available.
-You can connect to Sunshine from any Moonlight client on a variety of devices.
-A web UI is provided to allow configuration, and client pairing, from your favorite web browser.
-Pair from the local server or any mobile device.
-
-%prep
-%autosetup -n Sunshine-%{version}
-
-
-%build
-%cmake .
-
-%cmake_build
-
-
-%install
-%cmake_install
-
-
-%files
-%license add-license-file-here
-%doc add-docs-here
-
-
-
-%changelog
-* Mon Apr 15 2024 Cappy Ishihara <cappy@cappuchino.xyz>
- Initial re-packaging for Terra
@@ -1 +0,0 @@
-rpm.version(gh("LizardByte/Sunshine"));
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "systemd-sysusers-presets.spec"
+	}
+}
@@ -0,0 +1,2 @@
+g      polkitd 114  
+u      polkitd 114:114 "User for polkitd" - -
@@ -0,0 +1,2 @@
+g      rpc     32
+u      rpc     32:32  "Rpcbind Daemon" - -
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`rpm.global("pypi_version", pypi("pip-system-certs"));`