fix: ayatana-indicator-sound

chore(.backportrc.json): Drop F39 since it's EOL, add EL10 and F42 (#3823 ) (#3838 )m
Signed-off-by: Gilver <rockgrub@disroot.org> (cherry picked from commit 77cef24989) # Conflicts: # .backportrc.json
2026-05-31 09:01:55 +00:00 · 2025-03-20 17:04:36 +08:00 · 2025-03-09 15:32:38 +08:00 · 2025-03-09 07:18:33 +00:00 · 2025-03-09 01:11:24 -06:00 · 2025-03-09 15:09:01 +08:00
855 changed files with 20419 additions and 9018 deletions
@@ -2,7 +2,11 @@
  "repoOwner": "terrapkg",
  "repoName": "packages",
  "resetAuthor": true,
-  "targetBranchChoices": ["f39", "f40", "frawhide"],
+<<<<<<< HEAD
+  "targetBranchChoices": ["f39", "f40", "f41", "f42", "frawhide"],
+=======
+  "targetBranchChoices": ["el10", "f40", "f41", "f42", "frawhide"],
+>>>>>>> 77cef2498 (chore(.backportrc.json): Drop F39 since it's EOL, add EL10 and F42 (#3823))
  "branchLabelMapping": {
    "^sync-(.+)$": "$1"
  }
@@ -1,9 +0,0 @@
-ARG VARIANT="rawhide"
-FROM fedora:${VARIANT}
-
-RUN useradd -m vscode
-RUN groupadd mock
-RUN usermod -aG mock vscode
-RUN echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode
-RUN curl -Lo /etc/yum.repos.d/terra.repo https://raw.githubusercontent.com/terrapkg/subatomic-repos/main/terra.repo
-RUN dnf -y install git mock createrepo_c anda terra-mock-configs
@@ -1,18 +1,15 @@
 {
-  "name": "Fedora",
-  "build": {
-    "dockerfile": "Dockerfile",
-    "args": { "VARIANT": "rawhide" }
+  "name": "Terra Devcontainer",
+  "image": "ghcr.io/terrapkg/builder:f42",
+  "runArgs": ["--privileged"],
+  "features": {
+    "ghcr.io/devcontainers/features/common-utils:2": {}
  },
-  "remoteUser": "vscode",
-  "runArgs": [
-    "--privileged"
-  ],
  "customizations": {
    "vscode": {
-      "extensions": [
-        "rhaiscript.vscode-rhai"
-      ]
+      "extensions": ["rhaiscript.vscode-rhai"]
    }
-  }
+  },
+  "remoteUser": "vscode",
+  "onCreateCommand": "sudo usermod -a -G mock vscode"
 }
@@ -6,24 +6,23 @@ on:
    paths:
      - anda/**
    branches:
-      - frawhide
+      - f42
  pull_request:
    branches:
-      - frawhide
+      - f42
  merge_group:
    branches:
-      - frawhide
+      - f42
  workflow_dispatch:
  workflow_call:

 jobs:
  manifest:
-    runs-on: ubuntu-latest
-
+    runs-on: ubuntu-22.04
    outputs:
      build_matrix: ${{ steps.generate_build_matrix.outputs.build_matrix }}
    container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:f42
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Set workspace as safe
@@ -40,9 +39,9 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }}
-        version: ["rawhide"]
+        version: ["42"]
      fail-fast: false
-    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || matrix.pkg.labels['large'] && 'x86-64-lg' || 'ubuntu-latest' }}
+    runs-on: ${{ (matrix.pkg.arch == 'aarch64' && matrix.pkg.labels['large']) && 'arm64-lg' || matrix.pkg.arch == 'aarch64' && 'ubuntu-22.04-arm' || matrix.pkg.labels['large'] && 'x86-64-lg' || 'ubuntu-22.04' }}
    container:
      image: ghcr.io/terrapkg/builder:f${{ matrix.version }}
      options: --cap-add=SYS_ADMIN --privileged
@@ -90,18 +89,20 @@ jobs:
      - name: Upload packages to subatomic
        if: github.event_name == 'push'
        run: |
+          subrepo="${{ matrix.pkg.labels.subrepo }}"
          subatomic-cli upload --prune \
            --server https://subatomic.fyralabs.com \
            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }}${{ matrix.pkg.labels['extra'] && '-extras' }} anda-build/rpm/rpms/*
+            terra${{ matrix.version }}${{ matrix.pkg.labels['subrepo'] && '-$subrepo' || '' }} anda-build/rpm/rpms/*

      - name: Upload source packages to subatomic
        if: github.event_name == 'push'
        run: |
+          subrepo="${{ matrix.pkg.labels.subrepo }}"
          subatomic-cli upload --prune \
            --server https://subatomic.fyralabs.com \
            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }}${{ matrix.pkg.labels['extra'] && '-extras' }}-source anda-build/rpm/srpm/*
+            terra${{ matrix.version }}${{ matrix.pkg.labels['subrepo'] && '-$subrepo' || '' }}-source anda-build/rpm/srpm/*

      - name: Notify Madoguchi (Success)
        if: success() && github.event_name == 'push'
@@ -7,26 +7,40 @@ jobs:
  bootstrap:
    strategy:
      matrix:
-        version: ["rawhide"]
+        version: ["42"]
        arch: ["x86_64", "aarch64"]
      fail-fast: true
-    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
+    runs-on: ${{ matrix.arch == 'aarch64' && 'ubuntu-22.04-arm' || 'ubuntu-22.04' }}
    container:
      image: registry.fedoraproject.org/fedora-minimal:${{ matrix.version }}
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Install repositories
        run: |
-          dnf5 install -y --setopt=install_weak_deps=False curl wget git-core openssl-devel cargo podman fuse-overlayfs
-          dnf5 builddep -y anda/terra/{mock-configs,srpm-macros}/*.spec anda/tools/buildsys/{anda,subatomic}/*.spec
-
-      - name: Install Anda
-        run: cargo install anda
+          dnf5 swap -y --setopt=install_weak_deps=False systemd-standalone-sysusers systemd
+          dnf5 install -y --setopt=install_weak_deps=False curl wget git-core openssl-devel cargo podman fuse-overlayfs dnf5-plugins rpmbuild script

      - uses: actions/checkout@v4
        with:
          ref: f${{ matrix.version }}
          fetch-depth: 1
+
+      - name: Build anda-srpm-macros
+        run: |
+          mkdir -p anda-build/rpm/rpms
+          rpmbuild -bb anda/terra/srpm-macros/*.spec --undefine=_disable_source_fetch -D "_sourcedir $(pwd)/anda/terra/srpm-macros/" -D "_rpmdir $(pwd)/anda-build/rpm/rpms/"
+          mv ./anda-build/rpm/rpms/*/anda-*.rpm ./anda-build/rpm/rpms/
+          dnf5 install -y ./anda-build/rpm/rpms/anda-*.rpm
+
+      - name: Install build dependencies
+        run: dnf5 builddep -y anda/terra/{mock-configs,srpm-macros}/*.spec anda/tools/buildsys/{anda,subatomic}/*.spec
+
+      - name: Install Anda
+        run: |
+          rpmbuild -bb anda/tools/buildsys/anda/*.spec --undefine=_disable_source_fetch -D "_sourcedir $(pwd)/anda/tools/buildsys/anda/" -D "_rpmdir $(pwd)/anda-build/rpm/rpms/"
+          mv ./anda-build/rpm/rpms/*/anda-*.rpm ./anda-build/rpm/rpms/
+          dnf5 install -y ./anda-build/rpm/rpms/anda-*.rpm
+
      - name: Build terra-mock-configs
        run: |
          echo "PATH=$PATH:/github/home/.cargo/bin" >> $GITHUB_ENV
@@ -36,16 +50,16 @@ jobs:
      - name: Install terra-mock-configs
        run: dnf5 install -y anda-build/rpm/rpms/terra-mock-configs*.rpm

-      - name: Build anda-srpm-macros
-        run: anda build -rrpmbuild anda/terra/srpm-macros/pkg
+      - name: Build trra-release
+        run: anda build -rrpmbuild anda/terra/release/pkg

      - name: Build Subatomic
        run: anda build -rrpmbuild anda/tools/buildsys/subatomic/pkg
      - name: Install Subatomic
        run: dnf5 install -y ./anda-build/rpm/rpms/subatomic-*.rpm

-      - name: Build Andaman
-        run: anda build -rrpmbuild anda/tools/buildsys/anda/pkg
+      - name: Tidy up output directory
+        run: rmdir anda-build/rpm/rpms/{noarch,aarch64,x86_64} | true

      - name: Upload packages to subatomic
        run: |
@@ -21,7 +21,7 @@ jobs:
      pkgs: ${{ steps.parsing.outputs.pkgs }}
      builder: ${{ inputs.custom_builder }}
      arch: ${{ steps.parsing.outputs.arch }}
-    runs-on: "ubuntu-latest"
+    runs-on: ubuntu-22.04
    steps:
      - name: Parse Input
        id: parsing
@@ -44,10 +44,10 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(needs.parse.outputs.pkgs) }}
-        version: ["rawhide"]
+        version: ["42"]
        arch: ${{ fromJson(needs.parse.outputs.arch) }}
      fail-fast: false
-    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || needs.parse.outputs.builder && needs.parse.outputs.builder || 'ubuntu-latest' }}
+    runs-on: ${{ matrix.arch == 'aarch64' && 'ubuntu-22.04-arm' || needs.parse.outputs.builder && needs.parse.outputs.builder || 'ubuntu-22.04' }}
    container:
      image: ghcr.io/terrapkg/builder:f${{ matrix.version }}
      options: --cap-add=SYS_ADMIN --privileged
@@ -60,15 +60,8 @@ jobs:
      - name: Set up git repository
        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"

-      - name: CI Setup Script
-        run: |
-          dir=${{ matrix.pkg }}
-          if [ -f $dir/ci_setup.rhai ]; then
-            anda run $dir/ci_setup.rhai --labels script_path=$dir/ci_setup.rhai
-          fi
-
      - name: Build with Andaman
-        run: anda build -rrpmbuild anda/${{ matrix.pkg }}pkg
+        run: anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} anda/${{ matrix.pkg }}pkg

      - name: Generating artifact name
        id: art
@@ -11,9 +11,9 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(inputs.packages) }}
-        version: ["rawhide"]
+        version: ["42"]
      fail-fast: false
-    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
+    runs-on: ${{ (matrix.pkg.arch == 'aarch64' && matrix.pkg.labels['large']) && 'arm64-lg' || matrix.pkg.arch == 'aarch64' && 'ubuntu-22.04-arm' || matrix.pkg.labels['large'] && 'x86-64-lg' || 'ubuntu-22.04' }}
    container:
      image: ghcr.io/terrapkg/builder:f${{ matrix.version }}
      options: --cap-add=SYS_ADMIN --privileged
@@ -60,17 +60,19 @@ jobs:

      - name: Upload packages to subatomic
        run: |
+          subrepo="${{ matrix.pkg.labels.subrepo }}"
          subatomic-cli upload --prune \
            --server https://subatomic.fyralabs.com \
            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }}${{ matrix.pkg.labels['extra'] && '-extras' }} anda-build/rpm/rpms/*
+            terra${{ matrix.version }}${{ matrix.pkg.labels['subrepo'] && '-$subrepo' || '' }} anda-build/rpm/rpms/*

      - name: Upload source packages to subatomic
        run: |
+          subrepo="${{ matrix.pkg.labels.subrepo }}"
          subatomic-cli upload --prune \
            --server https://subatomic.fyralabs.com \
            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }}${{ matrix.pkg.labels['extra'] && '-extras' }}-source anda-build/rpm/srpm/*
+            terra${{ matrix.version }}${{ matrix.pkg.labels['subrepo'] && '-$subrepo' || '' }}-source anda-build/rpm/srpm/*

      - name: Notify Madoguchi (Success)
        if: success()
@@ -7,7 +7,7 @@ on:
 jobs:
  backport:
    name: Backport/sync PR
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
    if: github.event.pull_request.merged
    steps:
      - name: Install SSH signing key
@@ -6,16 +6,17 @@ on:

 jobs:
  autoupdate:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
    strategy:
      matrix:
        branch:
          - frawhide
          - f40
          - f41
+          - f42
          - el10
    container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:f42
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
@@ -33,10 +34,7 @@ jobs:
          git config --global --add safe.directory "$GITHUB_WORKSPACE"

      - name: Run Update
-        run: |
-          nbranch="${{ matrix.branch }}"
-          [ "$nbranch" = 'frawhide' ] && nbranch='f42'
-          anda update --filters updbranch=1 --labels branch=${{ matrix.branch }},nbranch=$nbranch
+        run: anda update --filters updbranch=1 --labels branch=${{ matrix.branch }}
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          RUST_BACKTRACE: full
@@ -4,6 +4,7 @@ on:
  push:
    branches:
      - frawhide
+      - f42
      - f41
      - f40
      - el10
@@ -13,9 +14,9 @@ on:

 jobs:
  update-comps:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
    container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:f42
    steps:
      - uses: actions/checkout@v4
      - name: Push to subatomic
@@ -6,7 +6,7 @@ on:

 jobs:
  autoupdate:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
    container:
      image: ghcr.io/terrapkg/builder:frawhide
      options: --cap-add=SYS_ADMIN --privileged
@@ -1,12 +1,12 @@
 name: Weekly Update
 on:
  schedule:
-    - cron: "0 0 * * 0"
+    - cron: "0 0 * * *"
  workflow_dispatch:

 jobs:
  autoupdate:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
    container:
      image: ghcr.io/terrapkg/builder:frawhide
      options: --cap-add=SYS_ADMIN --privileged
@@ -25,7 +25,7 @@ jobs:
          git config --global --add safe.directory "$GITHUB_WORKSPACE"

      - name: Run Weekly Update
-        run: anda update --filters weekly=1
+        run: anda update --filters weekly=$(date "+%w")
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          RUST_BACKTRACE: full
@@ -6,7 +6,7 @@ on:

 jobs:
  autoupdate:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
    container:
      image: ghcr.io/terrapkg/builder:frawhide
      options: --cap-add=SYS_ADMIN --privileged
@@ -3,4 +3,7 @@ project pkg {
 	rpm {
 		spec = "anki-bin.spec"
 	}
+        labels {
+        subrepo = "extras"
+       }
 }
@@ -1,29 +1,32 @@
-%global xurl https://files.pythonhosted.org/packages/ef/fa/6c86371d0e3b71129d2a79e63fc3fdc17733c9ebbf77345c62caad8c9fca/anki-24.11-cp39-abi3-manylinux_2_28_x86_64.whl
-%global aurl https://files.pythonhosted.org/packages/58/6e/9f2d4853a83e57cea48ccae3bc2d887bf7c0550042185e156bab23f524bf/anki-24.11-cp39-abi3-manylinux_2_31_aarch64.whl
-%global qurl https://files.pythonhosted.org/packages/40/3c/b70ef91f1dad8248332971c0cbb2922277512789cadc33cb16233e360a56/aqt-24.11-py3-none-any.whl
+%global xurl https://files.pythonhosted.org/packages/68/9c/7685bd012e597332f8ce379a31b0d58dd4eae960da96ff43e9fcd978c93f/anki-25.02-cp39-abi3-manylinux_2_35_x86_64.whl
+%global aurl https://files.pythonhosted.org/packages/da/36/741cef7b7fce943d187784549fd8de8152986067d9226f384959c07770a7/anki-25.02-cp39-abi3-manylinux_2_35_aarch64.whl
+%global qurl https://files.pythonhosted.org/packages/2c/bc/763589b97aa5c91acf3d834beaa473c25ca7f335c7b40954fd0d5fd41ddc/aqt-25.02-py3-none-any.whl

 Name:			anki-bin
-Version:		24.11
+Version:		25.02
 Release:		1%?dist
 Summary:		Flashcard program for using space repetition learning (Installed with wheel)
 License:		AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
 URL:			https://apps.ankiweb.net/
-BuildRequires:	python3-pip rpm_macro(fdupes) cargo
-Requires:		python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-orjson
-Requires:		python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema
-Requires:		python3-flask-cors python3-protobuf python3-requests python3-waitress python3-pyqt6-webengine python3-send2trash
-Requires:       libxcrypt-compat hicolor-icon-theme sox mpv 
-ExclusiveArch:	x86_64
+BuildRequires:          python3-pip rpm_macro(fdupes) cargo
+Requires:               python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-orjson
+Requires:               python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema
+Requires:               python3-flask-cors python3-protobuf python3-requests python3-waitress python3-pyqt6-webengine python3-send2trash
+Requires:               python3-protobuf >= 4.21
+Requires:               libxcrypt-compat hicolor-icon-theme sox
+Requires:               (mpv or mpv-nightly)
+
+ExclusiveArch:	        x86_64
 Conflicts:		anki
 %ifarch x86_64
 Source0:		%xurl
 %elifarch aarch64
-Source0:        %aurl
+Source0:                %aurl
 %endif
 Source1:		%qurl
 Source2:		https://raw.githubusercontent.com/ankitects/anki/%{version}/qt/runanki.py
 Source3:		https://raw.githubusercontent.com/ankitects/anki/%{version}/qt/bundle/lin/anki.desktop
-Source4:		https://raw.githubusercontent.com/ankitects/anki/%{version}/qt/bundle/lin/anki.png
+Source4:                https://raw.githubusercontent.com/ankitects/anki/%{version}/qt/bundle/lin/anki.png
 Source5:		https://raw.githubusercontent.com/ankitects/anki/%{version}/LICENSE
 Source6:		https://raw.githubusercontent.com/ankitects/anki/%{version}/README.md

@@ -57,6 +60,8 @@ rm -rf %buildroot%_bindir/{distro,flask,jsonschema,markdown_py,normalizer,send2t
 %license LICENSE
 %doc README.md
 %_bindir/anki
+%_bindir/pyuic6
+%_bindir/pylupdate6
 /usr/lib/python*/site-packages/_aqt/
 /usr/lib/python*/site-packages/anki-%{version}.dist-info/
 /usr/lib/python*/site-packages/anki/
@@ -1,5 +1,5 @@
 Name:           anki-qt5
-Version:        24.11
+Version:        25.02
 Release:        1%?dist
 Summary:        Flashcard program for using space repetition learning
 License:        AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
@@ -3,4 +3,7 @@ project pkg {
 	rpm {
 		spec = "anki.spec"
 	}
+        labels {
+                subrepo = "extras"
+        }
 }
@@ -1,5 +1,5 @@
 Name:           anki
-Version:        24.11
+Version:        25.02
 Release:        1%?dist
 Summary:        Flashcard program for using space repetition learning
 License:        AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
@@ -9,7 +9,7 @@ BuildRequires:  python3-distro python3-flask-cors python3-jsonschema python3-sen
 BuildRequires:  python3-installer make mold cargo git rsync ninja-build libxcrypt-compat nodejs python3.9 python-unversioned-command gcc python3-pyqt6-webengine
 Requires:       hicolor-icon-theme python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-send2trash
 Requires:       python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema sox libxcrypt-compat python3-pyqt6-webengine
-Recommends:     mpv
+Recommends:     (mpv or mpv-nightly)
 Obsoletes:      anki <= 2.1.15
 Conflicts:      anki-qt5
 Patch0:         0001-No-update.patch
@@ -1,8 +1,11 @@
 %global __requires_exclude ^lib-.*.so            
 %global __provides_exclude ^lib-.*.so

+%global ver Audacity-3.7.1
+%global sanitized_ver %(echo "$( sed 's/Audacity-//' <<< "%{ver}" )")
+
 Name:    audacity-freeworld
-Version: Audacity.3.7.1
+Version: %{sanitized_ver}
 Release: 1%?dist
 Summary: Multitrack audio editor
 License: GPLv2
@@ -1 +1 @@
-rpm.version(gh("audacity/audacity"));
+rpm.global("ver", gh_tag("audacity/audacity"));
@@ -1,54 +0,0 @@
-%define debug_package %nil
-%global _build_id_links none
-
-# Exclude private libraries
-%global __requires_exclude libffmpeg.so
-%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
-
-Name: authy
-Version: 2.5.0
-Release: 1%{?dist}
-Summary: Two factor authentication desktop application
-License: Unlicense
-URL: https://authy.com/
-Source0: https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_23.snap
-Requires: gtk3
-Requires: nss
-BuildRequires: squashfs-tools desktop-file-utils
-
-%description
-%{summary}.
-
-%prep
-unsquashfs -q -f -d snap %{SOURCE0}
-
-%build
-
-%install
-install -d %buildroot%_datadir/authy
-cp -r snap/. %buildroot%_datadir/authy
-
-sed -i 's|${SNAP}/meta/gui/icon.png|authy|g' %buildroot%_datadir/authy/meta/gui/authy.desktop
-install -Dm644 %buildroot%_datadir/authy/meta/gui/authy.desktop -t %buildroot%_datadir/applications
-install -Dm644 %buildroot%_datadir/authy/meta/gui/icon.png %buildroot%_datadir/pixmaps/authy.png
-
-rm -rf %buildroot%_datadir/authy/{data-dir,gnome-platform,lib,meta,scripts,usr,*.sh}
-
-install -d %buildroot%_bindir
-ln -s %_datadir/authy/authy %buildroot%_bindir
-
-%check
-desktop-file-validate %buildroot%_datadir/applications/authy.desktop
-
-%files
-%_datadir/authy/
-%_bindir/authy
-%_datadir/applications/authy.desktop
-%_datadir/pixmaps/authy.png
-
-%changelog
-* Sat Jun 17 2023 windowsboy111 <windowsboy111@fyralabs.com> - 2.3.0-2
- Use /usr/share/ instead of /opt/
-
-* Sat Oct 15 2022 windowsboy111 <windowsboy111@fyralabs.com> - 2.2.1-2
- Initial release
@@ -1,5 +0,0 @@
-let req = new_req("https://api.snapcraft.io/v2/snaps/info/authy");
-req.head("Snap-Device-Series", "16");
-let obj = json(req.get())["channel-map"][0];
-rpm.version(obj.version);
-rpm.source(0, obj.download.url);
@@ -1,5 +0,0 @@
-project pkg {
-	rpm {
-		spec = "blackbox-terminal.spec"
-	}
-}
@@ -1,58 +0,0 @@
-Name:           blackbox-terminal
-Version:        0.14.0
-Release:        1%{?dist}
-Summary:        A beautiful GTK 4 terminal
-License:        GPL-3.0
-URL:            https://gitlab.gnome.org/raggesilver/blackbox
-BuildRequires:  vala meson gettext 
-BuildRequires:  pkgconfig(gtk4) >= 4.6.2
-BuildRequires:  pkgconfig(gio-2.0) >= 2.50
-BuildRequires:  libadwaita-devel >= 1.1
-BuildRequires:  pkgconfig(pqmarble) >= 2
-BuildRequires:  pkgconfig(vte-2.91-gtk4) >= 0.69.0
-BuildRequires:  pkgconfig(json-glib-1.0) >= 1.4.4
-BuildRequires:  pkgconfig(libxml-2.0) >= 2.9.12
-BuildRequires:  pkgconfig(librsvg-2.0) >= 2.54.0
-BuildRequires:  pkgconfig(libpcre2-8)
-BuildRequires:  pkgconfig(graphene-gobject-1.0)
-BuildRequires:  pkgconfig(gee-0.8)
-BuildRequires:  desktop-file-utils libappstream-glib cmake
-Source0:        %url/-/archive/v%version/blackbox-v%version.tar.gz
-
-%description
-%{summary}.
-
-%prep
-%autosetup -p1 -n blackbox-v%version
-
-%build
-%meson
-%meson_build
-
-%install
-%meson_install
-
-%check
-appstream-util validate-relax --nonet %buildroot/%_datadir/metainfo/com.raggesilver.BlackBox.metainfo.xml
-
-%files
-%doc README.md
-%license COPYING
-%_bindir/blackbox
-%_bindir/terminal-toolbox
-%_datadir/applications/com.raggesilver.BlackBox.desktop
-%_datadir/metainfo/com.raggesilver.BlackBox.metainfo.xml
-%_datadir/blackbox/
-%_datadir/glib-2.0/schemas/com.raggesilver.BlackBox.gschema.xml
-%_datadir/icons/hicolor/scalable/actions/com.raggesilver.BlackBox-fullscreen-symbolic.svg
-%_datadir/icons/hicolor/scalable/actions/com.raggesilver.BlackBox-show-headerbar-symbolic.svg
-%_datadir/icons/hicolor/scalable/actions/external-link-symbolic.svg
-%_datadir/icons/hicolor/scalable/actions/settings-symbolic.svg
-%_datadir/icons/hicolor/scalable/apps/com.raggesilver.BlackBox.svg
-%_datadir/locale/*/LC_MESSAGES/blackbox.mo
-
-
-
-%changelog
-* Sun Oct 23 2022 windowsboy111 <windowsboy111@fyralabs.com>
- Initial package
@@ -1,4 +0,0 @@
-let txt = get("https://gitlab.gnome.org/api/v4/projects/20397/releases/");
-let ver = txt.json_arr()[0].tag_name;
-ver.crop(1);
-rpm.version(ver);
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-canary-openasar
-Version:        0.0.555
+Version:        0.0.606
 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.555
+Version:        0.0.606
 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.78
+Version:        0.0.87
 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.124
+Version:        0.0.133
 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.124
+Version:        0.0.133
 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.78
+Version:		0.0.87
 Release:		1%?dist
 Summary:		Free Voice and Text Chat for Gamers
 URL:			https://discord.com
@@ -1,8 +1,8 @@
-%global commit a651b87cc38ab9a208c9272b4f6e5021a1fbfa66
-%global commit_date 20250104
+%global commit e117986715e1e9ef955009ad7f03ec110aa14940
+%global commit_date 20250303
 %global shortcommit %(c=%{commit}; echo ${c:0:7})

-Name:           envision
+Name:           envision-nightly
 Version:        %commit_date.%shortcommit
 Release:        1%?dist
 Summary:        UI for building, configuring and running Monado, the open source OpenXR runtime
@@ -23,6 +23,7 @@ BuildRequires:  desktop-file-utils
 BuildRequires:  glib2-devel
 BuildRequires:  git-core
 Recommends:     android-tools
+Conflicts:      envision

 %description
 %summary.
@@ -6,14 +6,14 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:			feishin
-Version:		0.12.1
+Version:		0.12.2
 Release:		1%?dist
 Summary:		A modern self-hosted music player
 License:		GPL-3.0
 URL:			https://github.com/jeffvli/feishin
 Source0:		%url/archive/refs/tags/v%version.tar.gz
 Requires:		fuse mpv
-BuildRequires:	nodejs-npm jq libxcrypt-compat
+BuildRequires:	nodejs20-npm jq libxcrypt-compat

 %description
 %summary.
@@ -38,9 +38,13 @@ Keywords=Music;Jellyfin;Audio;Stream;Sonixd
 EOF

 %build
-npm install --legacy-peer-deps
-npm run postinstall
-npm run build
+export PATH="$PATH:$(pwd)/bin"
+mkdir bin
+ln -s /usr/bin/node-20 bin/node
+ln -s /usr/bin/npm-20 bin/npm
+npm-20 install --legacy-peer-deps
+npm-20 run postinstall
+npm-20 run build
 %ifarch x86_64

 %define a linux
@@ -48,7 +52,7 @@ npm run build
 %define a arm64
 %endif

-npx electron-builder --linux dir --%a
+npx-20 electron-builder --linux dir --%a

 %install
 mkdir -p %buildroot%_datadir/{pixmaps,applications} %buildroot%_bindir
@@ -1,23 +1,19 @@
-%global commit d530f26d60dc105e44fdc8ac7f30a2f667bc1e4f
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20241224
-
 Name:           fontviewer
-Version:        %{commit_date}.git~%{shortcommit}
+Epoch:          1
+Version:        1.1.0
 Release:        1%?dist
 Summary:        View and install fonts

 License:        GPL-2.0
 URL:            https://github.com/chocolateimage/%{name}
-Source0:        %{url}/archive/%{commit}.tar.gz
+Source0:        %{url}/archive/v%{version}.tar.gz

 BuildRequires:  gcc-c++
 BuildRequires:  meson
-BuildRequires:  pkgconfig(cairomm-1.0)
 BuildRequires:  pkgconfig(fontconfig)
-BuildRequires:  pkgconfig(freetype2)
-BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(gtkmm-3.0)
+BuildRequires:  pkgconfig(libcurl)
+BuildRequires:  json-glib-devel

 Requires:       gtk3 fontconfig

@@ -27,7 +23,7 @@ Packager:       sadlerm <sad_lerm@hotmail.com>
 A platform-agnostic GTK+ 3 alternative to GNOME's Font Viewer

 %prep
-%autosetup -n %{name}-%{commit} -p1
+%autosetup

 %build
 %meson
@@ -41,3 +37,4 @@ A platform-agnostic GTK+ 3 alternative to GNOME's Font Viewer
 %doc README.md
 %{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/hicolor/scalable/actions/%{name}-google-symbolic.svg
@@ -1,5 +1,4 @@
-# rpm.global("commit", gh_commit("chocolateimage/fontviewer"));
-# if rpm.changed() {
-#    rpm.release();
-#    rpm.global("commit_date", date());
-# }
+rpm.version(gh("chocolateimage/fontviewer"));
+if rpm.changed() {
+  rpm.release();
+}
@@ -5,7 +5,7 @@
 %global pure_protobuf_version 2.0.0

 Name:           komikku
-Version:        1.67.0
+Version:        1.72.0
 %forgemeta
 Release:        1%?dist
 Summary:        A manga reader for GNOME
@@ -1,5 +0,0 @@
-project pkg {
-	rpm {
-		spec = "legcord-bin.spec"
-	}
-}
@@ -1,95 +0,0 @@
-%define debug_package %nil
-%global _build_id_links none
-
-%ifarch x86_64
-%global src LegCord-%version-linux-x64
-%elifarch aarch64
-%global src LegCord-%version-linux-arm64
-%elifarch armv7l
-%global src LegCord-%version-linux-armv7l
-%endif
-
-# Exclude private libraries
-%global __requires_exclude libffmpeg.so
-%global __provides_exclude_from %{_datadir}/(armcord|legcord)/.*\\.so
-
-Name:			legcord-bin
-Version:		1.0.6
-Release:		1%?dist
-License:		OSL-3.0
-Summary:		Custom lightweight Discord client designed to enhance your experience
-URL:			https://github.com/LegCord/LegCord
-Group:			Applications/Internet
-Source0:		%url/releases/download/v%version/%src.zip
-Source1:		legcord.png
-Source2:		https://raw.githubusercontent.com/LegCord/LegCord/v%version/README.md
-Requires:		xdg-utils
-BuildRequires:  unzip
-ExclusiveArch:	x86_64 aarch64 armv7l
-Conflicts:		legcord
-BuildRequires:	add-determinism
-Obsoletes:      armcord < 3.3.2-1
-
-%description
-LegCord is a custom client designed to enhance your Discord experience
-while keeping everything lightweight.
-
-%prep
-mkdir legcord
-cd legcord
-unzip %SOURCE0
-
-cat <<EOF > .legcord.desktop
-[Desktop Entry]
-Name=LegCord
-Comment=%summary
-GenericName=Internet Messenger
-Type=Application
-Exec=%_bindir/legcord
-Icon=legcord
-Categories=Network;InstantMessaging;
-StartupWMClass=legcord
-Keywords=discord;armcord;legcord;vencord;shelter;electron;
-EOF
-
-%build
-
-%install
-cd legcord
-mkdir -p %buildroot%_bindir %buildroot%_datadir/applications %buildroot%_datadir/pixmaps %buildroot%_datadir/legcord %buildroot%_docdir/%name
-cp -a * %buildroot%_datadir/legcord/
-ln -s %_datadir/legcord/legcord %buildroot%_bindir/legcord
-ln -s %_datadir/legcord %buildroot%_datadir/armcord
-chmod +x -R %buildroot%_datadir/legcord/*
-chmod 755 %buildroot%_datadir/legcord/legcord
-install -Dm644 .legcord.desktop %buildroot%_datadir/applications/LegCord.desktop
-install -Dm644 %SOURCE1 %buildroot%_datadir/pixmaps/legcord.png
-install -Dm644 %SOURCE2 %buildroot%_docdir/%name/
-
-# HACK: rpm bug for unability to replace existing files on system.
-%pre
-if [ -d %_datadir/armcord ] && [ ! -L %_datadir/armcord ]; then
-  echo "Found old %_datadir/armcord directory, removing…"
-  rm -rf %_datadir/armcord
-fi
-
-%files
-%doc README.md
-%_datadir/legcord
-%_datadir/armcord
-%_bindir/legcord
-%_datadir/applications/LegCord.desktop
-%_datadir/pixmaps/legcord.png
-
-%changelog
-* Mon Oct 21 2024 madonuko <mado@fyralabs.com> - 1.0.2-2
- Rename to LegCord.
-
-* Sat Jun 17 2023 madonuko <mado@fyralabs.com> - 3.2.0-2
- Remove libnotify dependency.
- Fix desktop entry.
- Set as noarch package because there are not binary files.
- Use /usr/share/ instead of /opt/
-
-* Sat May 6 2023 madonuko <mado@fyralabs.com> - 3.1.7-1
- Initial package
@@ -1 +0,0 @@
-rpm.version(gh("LegCord/LegCord"));
@@ -2,47 +2,44 @@
 %global _build_id_links none

 %ifarch x86_64
-%global src LegCord-%version-linux-x64
+%global src Legcord-%version-linux-x64
 %elifarch aarch64
-%global src LegCord-%version-linux-arm64
+%global src Legcord-%version-linux-arm64
 %elifarch armv7l
-%global src LegCord-%version-linux-armv7l
+%global src Legcord-%version-linux-armv7l
 %endif

 # Exclude private libraries
 %global __requires_exclude libffmpeg.so
 %global __provides_exclude_from %{_datadir}/(armcord|legcord)/.*\\.so

-Name:			legcord-bin
-Version:		1.0.6
-Release:		1%?dist
-License:		OSL-3.0
-Summary:		Custom lightweight Discord client designed to enhance your experience
-URL:			https://github.com/LegCord/LegCord
-Group:			Applications/Internet
-Source0:		%url/releases/download/v%version/%src.zip
-Source1:		legcord.png
-Source2:		https://raw.githubusercontent.com/LegCord/LegCord/v%version/README.md
-Requires:		xdg-utils
-BuildRequires:  unzip
-ExclusiveArch:	x86_64 aarch64 armv7l
-Conflicts:		legcord
-Conflicts:		legcord-nightly
-BuildRequires:	add-determinism
+Name:           legcord-bin
+Version:        1.1.0
+Release:        1%?dist
+License:        OSL-3.0
+Summary:        Custom lightweight Discord client designed to enhance your experience
+URL:            https://github.com/Legcord/Legcord
+Group:          Applications/Internet
+Source0:        %url/releases/download/v%version/%src.tar.gz
+Source1:        legcord.png
+Source2:        https://raw.githubusercontent.com/Legcord/Legcord/v%version/README.md
+Requires:       xdg-utils
+ExclusiveArch:  x86_64 aarch64 armv7l
+Conflicts:      legcord
+Conflicts:      legcord-nightly
+BuildRequires:  add-determinism
 Obsoletes:      armcord < 3.3.2-1

 %description
-LegCord is a custom client designed to enhance your Discord experience
+Legcord is a custom client designed to enhance your Discord experience
 while keeping everything lightweight.

 %prep
-mkdir legcord
-cd legcord
-unzip %SOURCE0
+%autosetup -n %src

 cat <<EOF > .legcord.desktop
 [Desktop Entry]
-Name=LegCord
+Name=Legcord
 Comment=%summary
 GenericName=Internet Messenger
 Type=Application
@@ -56,7 +53,6 @@ EOF
 %build

 %install
-cd legcord
 mkdir -p %buildroot%_bindir %buildroot%_datadir/applications %buildroot%_datadir/pixmaps %buildroot%_datadir/legcord %buildroot%_docdir/%name
 cp -a * %buildroot%_datadir/legcord/
 ln -s %_datadir/legcord/legcord %buildroot%_bindir/legcord
@@ -1,28 +1,28 @@
-%global commit e4873a0060127ddaf8f91fb86de219e0d96ea4cf
-%global commit_date 20250104
+%global commit e293f9c7353cfda83d7be65841ade9f8c904b346
+%global commit_date 20250309
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %define debug_package %nil

-Name:		legcord-nightly
-Version:	%commit_date.%shortcommit
-Release:	1%?dist
-License:	OSL-3.0
-Summary:	Custom lightweight Discord client designed to enhance your experience
-URL:		https://github.com/LegCord/LegCord
-Group:		Applications/Internet
-Source0:  %url/archive/%commit/legcord-%commit.tar.gz
-Source1:	launch.sh
-Packager:	Owen <owen@fyralabs.com>
-Requires:	electron xdg-utils
-Provides:   armcord-nightly
-Obsoletes:  armcord < 3.3.2-1
-Conflicts:	legcord-bin
-Conflicts:	legcord
-BuildArch:	noarch
+Name:           legcord-nightly
+Version:        %commit_date.%shortcommit
+Release:        1%?dist
+License:        OSL-3.0
+Summary:        Custom lightweight Discord client designed to enhance your experience
+URL:            https://github.com/Legcord/Legcord
+Group:          Applications/Internet
+Source0:        %url/archive/%commit/Legcord-%commit.tar.gz
+Source1:        launch.sh
+Packager:       Owen <owen@fyralabs.com>
+Requires:       electron xdg-utils
+Provides:       armcord-nightly
+Obsoletes:      armcord < 3.3.2-1
+Conflicts:      legcord-bin
+Conflicts:      legcord
+BuildArch:      noarch
 BuildRequires:  anda-srpm-macros pnpm

 %description
-legcord is a custom client designed to enhance your Discord experience
+Legcord is a custom client designed to enhance your Discord experience
 while keeping everything lightweight.

 %prep
@@ -30,7 +30,7 @@ while keeping everything lightweight.

 cat <<EOF > legcord.desktop
 [Desktop Entry]
-Name=LegCord
+Name=Legcord
 Comment=%summary
 GenericName=Internet Messenger
 Type=Application
@@ -4,25 +4,25 @@
 %global __requires_exclude libffmpeg.so
 %global __provides_exclude_from %{_datadir}/(armcord|legcord)/.*\\.so

-Name:		legcord
-Version:	1.0.6
-Release:	1%?dist
-License:	OSL-3.0
-Summary:	Custom lightweight Discord client designed to enhance your experience
-URL:		https://github.com/LegCord/LegCord
-Group:		Applications/Internet
-Source1:	launch.sh
-Packager:	madonuko <mado@fyralabs.com>
-Requires:	electron xdg-utils
-Provides:   armcord
-Obsoletes:  armcord < 3.3.2-1
-Conflicts:	legcord-bin
-Conflicts:	legcord-nightly
-BuildArch:	noarch
+Name:           legcord
+Version:        1.1.0
+Release:        1%?dist
+License:        OSL-3.0
+Summary:        Custom lightweight Discord client designed to enhance your experience
+URL:            https://github.com/Legcord/Legcord
+Group:          Applications/Internet
+Source1:        launch.sh
+Packager:       madonuko <mado@fyralabs.com>
+Requires:       electron xdg-utils
+Provides:       armcord
+Obsoletes:      armcord < 3.3.2-1
+Conflicts:      legcord-bin
+Conflicts:      legcord-nightly
+BuildArch:      noarch
 BuildRequires:  anda-srpm-macros pnpm

 %description
-legcord is a custom client designed to enhance your Discord experience
+Legcord is a custom client designed to enhance your Discord experience
 while keeping everything lightweight.

 %prep
@@ -1,6 +1,6 @@
-%global commit 257395de995eebf48209e392798b1e6704c20802
+%global commit d9cf7a3d395ca160face9fd0c649c7aab274a93a
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20250104
+%global commit_date 20250309
 %global ver 0.39.0

 Name:           mpv-nightly
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Categories=Utility;
+Comment=A cross-platform system monitor
+Exec=NeoHtop
+Icon=NeoHtop
+Name=NeoHtop
+Terminal=false
+Type=Application
@@ -0,0 +1,5 @@
+project pkg {
+    rpm {
+        spec = "neohtop.spec"
+    }
+}
@@ -0,0 +1,51 @@
+%global __brp_mangle_shebangs %{nil}
+
+Name:           neohtop
+Version:        1.1.2
+Release:        1%?dist
+Summary:        System monitoring on steroids
+License:        MIT
+URL:            https://github.com/Abdenasser/neohtop
+Source0:        %url/archive/refs/tags/v%version.tar.gz
+Source1:        NeoHtop.desktop
+Packager:       Owen Zimmerman <owen@fyralabs.com>
+BuildRequires:  rust
+BuildRequires:  nodejs-npm
+BuildRequires:  webkit2gtk4.1-devel
+BuildRequires:  javascriptcoregtk4.1-devel
+BuildRequires:  libsoup3-devel
+BuildRequires:  gtk3-devel
+BuildRequires:  rust-gdk-pixbuf-sys-devel
+BuildRequires:  glib2-devel
+BuildRequires:  openssl-devel
+
+%description
+%summary.
+
+%prep
+%autosetup -n neohtop-%version
+
+%build
+npm install
+npm run tauri build
+
+%install
+install -Dpm755 src-tauri/target/release/NeoHtop %buildroot%_bindir/NeoHtop
+install -Dpm644 %{SOURCE1} %buildroot%{_datadir}/applications/NeoHtop.desktop
+# don't mind the numbers not matching, this is how the offical rpm installs these files
+install -Dpm644 src-tauri/icons/128x128@2x.png %buildroot%{_iconsdir}/hicolor/256x256@2/apps/NeoHtop.png
+install -Dpm644 src-tauri/icons/32x32.png %buildroot%{_iconsdir}/hicolor/32x32/apps/NeoHtop.png
+install -Dpm644 src-tauri/icons/128x128.png %buildroot%{_iconsdir}/hicolor/128x128/apps/NeoHtop.png
+
+%files
+%doc README.md
+%license LICENSE
+%_bindir/NeoHtop
+%{_datadir}/applications/NeoHtop.desktop
+%{_iconsdir}/hicolor/256x256@2/apps/NeoHtop.png
+%{_iconsdir}/hicolor/32x32/apps/NeoHtop.png
+%{_iconsdir}/hicolor/128x128/apps/NeoHtop.png
+
+%changelog
+* Sat Feb 15 2025 Owen Zimmerman <owen@fyralabs.com>
+- Initial package
@@ -0,0 +1 @@
+rpm.version(gh("Abdenasser/neohtop"));
@@ -1,11 +0,0 @@
--- a/desktop/packages/linux/rs.ruffle.Ruffle.desktop
-+++ b/desktop/packages/linux/rs.ruffle.Ruffle.desktop
-@@ -47,7 +47,7 @@ Comment[zh_CN]=播放 Flash 游戏和动画
- Comment[zh_TW]=播放 Flash 遊戲和動畫
- Comment=Play Flash games & movies
- Icon=rs.ruffle.Ruffle
-Exec=ruffle %u
-+Exec=ruffle_desktop %u
- MimeType=application/x-shockwave-flash;application/vnd.adobe.flash.movie
- Categories=AudioVideo;Player;Graphics;Viewer;VectorGraphics;Game
- Keywords[ar]=الفلاش;swf;مشغل;محاكي;رَسْت
@@ -1,4 +1,4 @@
-%global ver 2025-01-04
+%global ver 2025-03-08
 %global goodver %(echo %ver | sed 's/-//g')
 %global __brp_mangle_shebangs %{nil}
 %bcond_without mold
@@ -14,7 +14,6 @@ Summary:        A Flash Player emulator written in Rust
 License:        Apache-2.0 OR MIT
 URL:            https://ruffle.rs/
 Source0:        https://github.com/ruffle-rs/ruffle/archive/refs/tags/nightly-%ver.tar.gz
-Patch0:         desktop_file_patch.diff
 Provides:       ruffle
 BuildRequires:  cargo-rpm-macros >= 24
 BuildRequires:  anda-srpm-macros mold
@@ -40,6 +39,8 @@ Packager:       madonuko <mado@fyralabs.com>
 %prep
 %autosetup -n ruffle-nightly-%ver -p1
 %cargo_prep_online
+sed -iE 's@^Exec=ruffle %%u$@Exec=ruffle_desktop %%u@' desktop/packages/linux/rs.ruffle.Ruffle.desktop
+cat desktop/packages/linux/rs.ruffle.Ruffle.desktop

 %build
 %{cargo_license_online} > LICENSE.dependencies
@@ -0,0 +1,5 @@
+project pkg {
+  rpm {
+    spec = "sticky.spec"
+  }
+}
@@ -0,0 +1,9 @@
+diff --git a/usr/bin/sticky b/usr/bin/sticky
+index 7425e9c..a00e755 100755
+--- a/usr/bin/sticky
+++ b/usr/bin/sticky
+@@ -1,3 +1,3 @@
+ #!/bin/bash
+ 
+-/usr/lib/sticky/sticky.py $*
+/usr/lib/python3*/site-packages/sticky/sticky.py $*
@@ -0,0 +1,9 @@
+diff --git a/meson.build b/meson.build
+index b25d642..435a6f0 100644
+--- a/meson.build
+++ b/meson.build
+@@ -17,4 +17,3 @@ subdir('po')
+ install_subdir('etc', install_dir: sysconfdir, strip_directory: true)
+ install_subdir('usr', install_dir: prefix, strip_directory: true)
+ 
+-meson.add_install_script('meson/meson-postinstall.sh')
@@ -0,0 +1,62 @@
+%global debug_package %{nil}
+
+Name:           sticky
+Version:        1.24
+Release:        1%{?dist}
+Summary:        A sticky notes app for the Linux desktop
+
+License:        GPL-2.0
+URL:            https://github.com/linuxmint/sticky
+Source0:        %{url}/archive/%{version}.tar.gz
+Patch0:         remove-meson-postinstall-script.patch
+Patch1:         point-executable-to-sitepackages-directory.patch
+
+BuildArch:      noarch
+
+BuildRequires:  python3-devel
+BuildRequires:  meson
+BuildRequires:  gettext-devel
+
+Requires:       python3
+Requires:       glib2
+Requires:       gspell
+Requires:       gtk3
+Requires:       python3-gobject-base
+Requires:       python3-xapp
+Requires:       xapps
+
+Packager:       sadlerm <sad_lerm@hotmail.com>
+
+%description
+Sticky is a note-taking app for the Linux desktop that simulates traditional "sticky note" style stationery on your desktop. Some of its features include basic text formatting (bold, italics, monospaced, etc.), spell-checking, a tray icon for controlling note visibility, color notes, manual and automatic backups, and a manager to organize your notes into groups.
+
+%prep
+%autosetup -p1
+
+%build
+%meson
+%meson_build
+
+%install
+%meson_install
+mkdir -p %{buildroot}%{python3_sitelib}
+mv -v %{buildroot}%{_prefix}/lib/%{name} %{buildroot}%{python3_sitelib}/%{name}
+
+%files
+%license COPYING
+%doc README.md
+%{_bindir}/%{name}
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/glib-2.0/schemas/org.x.%{name}.gschema.xml
+%{_datadir}/icons/hicolor/scalable/apps/%{name}*.svg
+%{_datadir}/icons/hicolor/scalable/status/%{name}*.svg
+%{_datadir}/locale/*/LC_MESSAGES/%{name}.mo
+%{_datadir}/%{name}/*
+%{_sysconfdir}/xdg/autostart/%{name}.desktop
+%{_datadir}/dbus-1/services/org.x.%{name}.service
+%{python3_sitelib}/%{name}/*.py
+%{python3_sitelib}/%{name}/__pycache__/*.pyc
+
+%changelog
+* Thu Jan 16 2025 sadlerm4 <sad_lerm@hotmail.com>
+- Initial package
@@ -3,6 +3,6 @@ project pkg {
 		spec = "switcheroo-control.spec"
 	}
 	labels {
-		extra = 1
+		subrepo = "extras"
 	}
 }
@@ -0,0 +1 @@
+rpm.version(gitlab("gitlab.freedesktop.org", "4339"));
@@ -6,7 +6,7 @@

 Name:		vencord-desktop
 Provides:   VencordDesktop = %{version}-%{release}
-Version:	1.5.4
+Version:	1.5.5
 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
@@ -5,7 +5,7 @@
 %define __strip /bin/true

 # do not perform compression in cpio
-%define _source_payload w0.ufdio
+%define _source_payload w19.zstdio
 %define _binary_payload w19.zstdio

 # Exclude private libraries
@@ -13,8 +13,8 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:			voicevox
-Version:		0.22.3
-Release:		1%?dist
+Version:		0.23.0
+Release:		2%?dist
 Summary:		Free Japanese text-to-speech editor
 License:		LGPL-3.0
 URL:			https://voicevox.hiroshiba.jp
@@ -24,6 +24,7 @@ Source2:        https://github.com/VOICEVOX/voicevox/releases/download/%version/
 Packager:       madonuko <mado@fyralabs.com>
 BuildRequires:  p7zip-plugins
 ExclusiveArch:  x86_64
+AutoReq:        no

 %description
 VOICEVOX is a free Japanese text-to-speech software with medium output quality.
@@ -52,7 +53,7 @@ sed -i "s|Exec=.*|Exec=/usr/share/voicevox/VOICEVOX.AppImage|" squashfs-root/voi
 %install
 install -Dm755 VOICEVOX.AppImage %buildroot%_datadir/voicevox/VOICEVOX.AppImage
 install -Dm755 voicevox.sh %buildroot%_bindir/voicevox
-install -Dm644 squashfs-root%_iconsdir/hicolor/0x0/apps/voicevox.png %buildroot%_iconsdir/hicolor/256x256/apps/voicevox.png
+install -Dm644 squashfs-root%_iconsdir/hicolor/256x256/apps/voicevox.png %buildroot%_iconsdir/hicolor/256x256/apps/voicevox.png
 install -Dm644 squashfs-root/voicevox.desktop %buildroot%_datadir/applications/voicevox.desktop

 %files
@@ -2,4 +2,8 @@ project pkg {
 	rpm {
 		spec = "youtube-music.spec"
 	}
+	
+	labels = {
+	    mock = 1
+	}
 }
@@ -5,6 +5,6 @@ TryExec=/usr/bin/youtube-music
 Icon=youtube-music
 Terminal=false
 Type=Application
-StartupWMClass=YouTube Music
+StartupWMClass=com.github.th_ch.youtube_music
 Comment=YouTube Music Desktop App - including custom plugins
 Categories=AudioVideo;
@@ -1,12 +1,19 @@
 %define debug_package %nil

+# Exclude private libraries since this is bundled with electron
+%global __provides_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*))$
+%global __requires_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*))$

 # macro shorthand for calling pnpm
 %global pnpm npx pnpm@%{pnpm_version}

+# Try to vendor PNPM directly from Fedora
+# but if this fails, you can try setting this to 1 to vendor PNPM directly from upstream
+%global vendor_pnpm 1
+
 Name:           youtube-music
-Version:        3.7.1
-Release:        1%?dist
+Version:        3.7.5
+Release:        3%?dist
 Summary:        YouTube Music Desktop App bundled with custom plugins (and built-in ad blocker / downloader)
 Source1:        youtube-music.desktop
 License:        MIT
@@ -21,6 +28,15 @@ BuildRequires:  git-core gcc make
 # Required for usocket native module built with node-gyp
 BuildRequires:  python3 gcc-c++

+%if !0%{?vendor_pnpm}
+BuildRequires:  pnpm nodejs20
+%endif
+
+Requires:       nss
+Requires:       libXext
+Requires:       libXfixes
+AutoReq:        no
+
 %description
 YouTube Music Desktop App bundled with custom plugins (and built-in ad blocker / downloader)

@@ -35,9 +51,11 @@ git checkout v%{version}
 %build
 # Vendor PNPM directly instead of installing from packages, because we need to somehow force PNPM to use Node.js 20
 # We are not using Fedora's PNPM because we need to use `pnpm env`, which PNPM does not support when not vendored directly from upstream
+%if 0%{?vendor_pnpm}
 curl -fsSL https://get.pnpm.io/install.sh | sh -
-source /builddir/.bashrc
+source $HOME/.bashrc
 pnpm env use --global 20
+%endif
 pnpm install
 pnpm build
 pnpm electron-builder --linux --dir
@@ -1,12 +0,0 @@
-diff --color -ru budgie-extras-1.4.0/budgie-weathershow/src/desktop_weather/desktop_weather.vala budgie-extras-1.4.0-patched/budgie-weathershow/src/desktop_weather/desktop_weather.vala
--- budgie-extras-1.4.0/budgie-weathershow/src/desktop_weather/desktop_weather.vala	2022-03-11 06:24:44.000000000 +0700
-+++ budgie-extras-1.4.0-patched/budgie-weathershow/src/desktop_weather/desktop_weather.vala	2022-06-09 14:57:46.677283438 +0700
-@@ -308,7 +308,7 @@
-     private void get_icondata () {
-         // fetch the icon list
-         string icondir = "/".concat(
-            "usr/lib/budgie-desktop/plugins",
-+            "usr/lib64/budgie-desktop/plugins",
-             "/budgie-weathershow/weather_icons"
-         );
-         iconnames = {};
@@ -1,13 +1,12 @@
 Name:           budgie-extras
-Version:        1.8.0
-Release:        2%{?dist}
+Version:        1.9.0
+Release:        1%?dist

 License:        GPL-3.0
 Summary:        Additional Budgie Desktop enhancements for user experience
 URL:            https://ubuntubudgie.org/

 Source0:        https://github.com/UbuntuBudgie/budgie-extras/releases/download/v%{version}/budgie-extras-%{version}.tar.xz
-Patch0:         0001-fix-weathershow-desktop-widget-icon-path.patch

 BuildRequires:  rpm_macro(fdupes)
 BuildRequires:  cmake
@@ -277,7 +276,7 @@ workspaces.
 # Remove absolute symlink and replace with relative symlink
 rm -f %{buildroot}%{_bindir}/quickchar

-%fdupes %_libdir/budgie-desktop/plugins/budgie-weathershow/weather_icons
+%fdupes %{buildroot}%{_datadir}/budgie-desktop/budgie-weathershow/weather_icons

 %post

@@ -403,6 +402,8 @@ rm -f %{buildroot}%{_bindir}/quickchar

 %files -n budgie-applet-weathershow
 %{_libdir}/budgie-desktop/plugins/budgie-weathershow
+%{_datadir}/budgie-desktop/budgie-weathershow/cities
+%{_datadir}/budgie-desktop/budgie-weathershow/weather_icons/*
 %{_datadir}/glib-2.0/schemas/org.ubuntubudgie.plugins.weathershow.gschema.xml
 %{_datadir}/pixmaps/budgie-wticon-symbolic.svg

@@ -3,6 +3,7 @@ project pkg {
 		spec = "gnome-shell.spec"
 	}
 	labels {
-		extra = 1
+		subrepo = "extras"
+		updbranch = 1
 	}
 }
@@ -1,6 +1,6 @@
 %global tarball_version %%(echo %{version} | tr '~' '.')
 %global major_version 47
-%global minor_version 1
+%global minor_version 3

 %if 0%{?rhel}
 %global portal_helper 0
@@ -8,14 +8,15 @@
 %global portal_helper 1
 %endif

-Name:           gnome-shell
+Name:           gnome-shell.switcheroo
 Version:        %{major_version}.%{minor_version}
-Release:        %autorelease.switcheroo
+Release:        1%{?dist}.switcheroo
 Summary:        Window management and application launching for GNOME

+Provides:       gnome-shell = %version-%release
 License:        GPL-2.0-or-later
 URL:            https://wiki.gnome.org/Projects/GnomeShell
-Source0:        https://download.gnome.org/sources/gnome-shell/%{major_version}/%{name}-%{tarball_version}.tar.xz
+Source0:        https://download.gnome.org/sources/gnome-shell/%{major_version}/gnome-shell-%{tarball_version}.tar.xz

 # Replace Epiphany with Firefox in the default favourite apps list
 Patch: gnome-shell-favourite-apps-firefox.patch
@@ -178,7 +179,7 @@ innovative user interface concepts to provide a visually attractive and
 easy to use experience.

 %prep
-%autosetup -S git -n %{name}-%{tarball_version}
+%autosetup -S git -n gnome-shell-%{tarball_version}

 %build
 %meson \
@@ -198,7 +199,7 @@ easy to use experience.
 mkdir -p %{buildroot}%{_datadir}/gnome-shell/extensions
 mkdir -p %{buildroot}%{_datadir}/gnome-shell/search-providers

-%find_lang %{name}
+%find_lang gnome-shell

 %check
 desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Shell.desktop
@@ -208,7 +209,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Shell.Exten
 desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Shell.PortalHelper.desktop
 %endif

-%files -f %{name}.lang
+%files -f gnome-shell.lang
 %license COPYING
 %doc NEWS README.md
 %{_bindir}/gnome-shell
@@ -0,0 +1,25 @@
+import "andax/bump_extras.rhai" as bump;
+
+let pkg = "gnome-shell";
+let branch = bump::as_bodhi_ver(labels.branch);
+
+let url = `https://bodhi.fedoraproject.org/updates/?search=${pkg}&status=stable&releases=${branch}&rows_per_page=10&page=1`;
+
+let done = false;
+
+for entry in get(url).json().updates {
+  for entry in entry.title.split(' ') {
+    let matches = find_all(`${pkg}-([\d.]+)-(\d+)\.[\w\d]+$`, entry);
+    if matches.len() == 0 { continue; }
+    let majminv = matches[0][1].split('.');
+    if majminv.len() != 2 {
+      print(`gnome-shell: ${matches[0][1]} has invalid version?`);
+      terminate();
+    }
+    rpm.global("major_version", majminv[0]);
+    rpm.global("minor_version", majminv[1]);
+    rpm.f = sub(`Release:(\s+)(.+?)\n`, "Release:${1}" + matches[0][2] + "%{?dist}.switcheroo\n", rpm.f);
+    done = true;
+  }
+  if done { break; }
+}
@@ -3,6 +3,7 @@ project pkg {
 		spec = "kf6-kio.spec"
 	}
 	labels {
-		extra = 1
+		subrepo = "extras"
+		updbranch = 1
 	}
 }
@@ -1,11 +1,11 @@
 %global framework kio

 %global stable_kf6 stable
-%global majmin_ver_kf6 6.7
+%global majmin_ver_kf6 6.11

-Name:    kf6-%{framework}
+Name:    kf6-%{framework}.switcheroo
 Version: %{majmin_ver_kf6}.0
-Release: 2%{?dist}.switcheroo
+Release: 1%{?dist}.switcheroo
 Summary: KDE Frameworks 6 Tier 3 solution for filesystem abstraction

 License: BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND LGPL-3.0-only AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only) AND MIT
@@ -28,6 +28,7 @@ Patch101: kio-no-help-protocol.patch
 # https://invent.kde.org/frameworks/kio/-/merge_requests/1556
 Patch201: 1556.patch

+Provides:       kf6-%{framework}
 BuildRequires:  extra-cmake-modules
 BuildRequires:  gcc-c++
 BuildRequires:  kf6-rpm-macros
@@ -98,6 +99,7 @@ Requires:       cmake(KF6Solid)
 Requires:       cmake(KF6XmlGui)
 Requires:       cmake(KF6WindowSystem)
 Requires:       qt6-qtbase-devel
+Provides:       kf6-kio-devel = %version-%release
 %description    devel
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
@@ -106,6 +108,7 @@ developing applications that use %{name}.
 Summary:        Documentation files for %{name}
 Requires:       %{name}-core = %{version}-%{release}
 BuildArch:      noarch
+Provides:       kf6-kio-doc = %version-%release
 %description    doc
 Documentation for %{name}.

@@ -116,12 +119,14 @@ Requires:       %{name}-core-libs%{?_isa} = %{version}-%{release}
 Requires:       %{name}-doc = %{version}-%{release}
 Requires:       kf6-filesystem
 Recommends:     switcheroo-control
+Provides:       kf6-kio-core = %version-%release
 %description    core
 KIOCore library provides core non-GUI components for working with KIO.

 %package        core-libs
 Summary:        Runtime libraries for KIO Core
 Requires:       %{name}-core%{?_isa} = %{version}-%{release}
+Provides:       kf6-kio-core-libs = %version-%release
 %description    core-libs
 %{summary}.

@@ -131,6 +136,7 @@ Summary:        Widgets for KIO Framework
 ## included here for completeness, even those -core already has a dependency.
 %{?kf6_kinit_requires}
 Requires:       %{name}-core%{?_isa} = %{version}-%{release}
+Provides:       kf6-kio-widgets = %version-%release
 %description    widgets
 KIOWidgets contains classes that provide generic job control, progress
 reporting, etc.
@@ -138,12 +144,14 @@ reporting, etc.
 %package        widgets-libs
 Summary:        Runtime libraries for KIO Widgets library
 Requires:       %{name}-widgets%{?_isa} = %{version}-%{release}
+Provides:       kf6-kio-widgets-libs = %version-%release
 %description    widgets-libs
 %{summary}.

 %package        file-widgets
 Summary:        Widgets for file-handling for KIO Framework
 Requires:       %{name}-widgets%{?_isa} = %{version}-%{release}
+Provides:       kf6-kio-file-widgets = %version-%release
 %description    file-widgets
 The KIOFileWidgets library provides the file selection dialog and
 its components.
@@ -151,12 +159,14 @@ its components.
 %package        gui
 Summary:        Gui components for the KIO Framework
 Requires:       %{name}-core%{?_isa} = %{version}-%{release}
+Provides:       kf6-kio-gui = %version-%release
 %description    gui
 %{summary}.

 %package        qch-doc
 Summary:        Developer Documentation files for %{name}
 BuildArch:      noarch
+Provides:       kf6-kio-qch-doc = %version-%release
 %description    qch-doc
 Developer Documentation files for %{name} for use with KDevelop or QtCreator.

@@ -172,7 +182,7 @@ Developer Documentation files for %{name} for use with KDevelop or QtCreator.

 %install
 %cmake_install
-%find_lang %{name} --all-name --with-man --with-html
+%find_lang kf6-kio --all-name --with-man --with-html

 %files
 %license LICENSES/*.txt
@@ -187,6 +197,7 @@ Developer Documentation files for %{name} for use with KDevelop or QtCreator.
 %{_kf6_plugindir}/kio/
 %{_kf6_plugindir}/kded/
 %{_kf6_plugindir}/kiod/
+%{_kf6_plugindir}/kio_dnd/
 %{_kf6_datadir}/kf6/searchproviders/*.desktop
 %{_kf6_datadir}/applications/*.desktop
 %{_datadir}/dbus-1/services/org.kde.*.service
@@ -195,7 +206,7 @@ Developer Documentation files for %{name} for use with KDevelop or QtCreator.
 %files core-libs
 %{_kf6_libdir}/libKF6KIOCore.so.*

-%files doc -f %{name}.lang
+%files doc -f kf6-kio.lang

 %files gui
 %{_kf6_libdir}/libKF6KIOGui.so.*
@@ -223,6 +234,28 @@ Developer Documentation files for %{name} for use with KDevelop or QtCreator.
 %{_qt6_docdir}/*.qch

 %changelog
+* Fri Feb 07 2025 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 6.11.0-1
+- 6.11.0
+
+* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 6.10.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Tue Jan 07 2025 Steve Cossette <farchord@gmail.com> - 6.10.0-2
+- File Picker: Fix 'All supported files' for more than 3
+ filters
+
+* Fri Jan 03 2025 Steve Cossette <farchord@gmail.com> - 6.10.0-1
+- 6.10.0
+
+* Sat Dec 14 2024 Steve Cossette <farchord@gmail.com> - 6.9.0-1
+- 6.9.0
+
+* Sat Nov 02 2024 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 6.8.0-1
+- 6.8.0
+
+* Mon Oct 14 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.0-2
+- Rebuild (qt6)
+
 * Fri Oct 04 2024 Steve Cossette <farchord@gmail.com> - 6.7.0-1
 - 6.7.0

@@ -0,0 +1,16 @@
+import "andax/bump_extras.rhai" as bump;
+
+let pkg = "kf6-kio";
+let branch = bump::as_bodhi_ver(labels.branch);
+
+let url = `https://bodhi.fedoraproject.org/updates/?search=${pkg}&status=stable&releases=${branch}&rows_per_page=1&page=1`;
+
+for entry in get(url).json().updates[0].title.split(' ') {
+  let matches = find_all(`${pkg}-([\d.]+)-(\d+)\.[\w\d]+$`, entry);
+  if matches.len() == 0 { continue; }
+  if matches[0][1].ends_with(".0") {
+    rpm.global("majmin_ver_kf6", matches[0][1][0..matches[0][1].len()-2]);
+    rpm.f = sub(`Release: (.+?)\n`, "Release: " + matches[0][2] + "%{?dist}.switcheroo\n", rpm.f);
+  }
+  break;
+}
@@ -1,8 +0,0 @@
-project pkg {
-	rpm {
-		spec = "latte-dock-nightly.spec"
-	}
-	labels {
-		nightly = "1"
-	}
-}
@@ -1,113 +0,0 @@
-%global forgeurl https://github.com/KDE/latte-dock/
-
-%global commit f79594dd01d4ff4d7e86ac7bf70d1c371d6d9e4e
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date %(date '+%Y%m%d')
-%global snapshot_info %{commit_date}.%{shortcommit}
-
-Name:     latte-dock-nightly
-Version:  0.10.0^%{snapshot_info}
-
-%forgemeta
-Release:  1%?dist
-Summary:  Latte is a dock based on plasma frameworks
-License:  GPL-2.0-or-later
-
-URL:      %{forgeurl}
-Source0:  https://github.com/KDE/latte-dock/archive/%{commit}.tar.gz
-
-BuildRequires:  libxcb-devel
-BuildRequires:  xcb-util-devel
-BuildRequires:  libSM-devel
-BuildRequires:  extra-cmake-modules
-BuildRequires:  qt5-qtx11extras-devel
-BuildRequires:  kf5-karchive-devel
-BuildRequires:  kf5-kio-devel
-BuildRequires:  kf5-kirigami2-devel
-BuildRequires:  kf5-kactivities-devel
-BuildRequires:  kf5-kcoreaddons-devel
-BuildRequires:  kf5-kdbusaddons-devel
-BuildRequires:  kf5-kdeclarative-devel
-BuildRequires:  kf5-knewstuff-devel
-BuildRequires:  kf5-knotifications-devel
-BuildRequires:  kf5-kiconthemes-devel
-BuildRequires:  kf5-kitemmodels-devel
-BuildRequires:  kf5-ki18n-devel
-BuildRequires:  kf5-kpackage-devel
-BuildRequires:  kf5-plasma-devel
-BuildRequires:  kf5-kwayland-devel
-BuildRequires:  kf5-kwindowsystem-devel
-BuildRequires:  kf5-kxmlgui-devel
-BuildRequires:  kf5-kglobalaccel-devel
-BuildRequires:  kf5-kguiaddons-devel
-BuildRequires:  kf5-kcrash-devel
-BuildRequires:  qt5-qtwayland-devel
-BuildRequires:  plasma-wayland-protocols-devel
-BuildRequires:  wayland-devel
-BuildRequires:  plasma-workspace-devel
-
-Recommends:     %{name}-lang
-
-Conflicts:      latte-dock
-Provides:       latte-dock = 0.10.0^%{snapshot_info}
-Provides:       latte-dock%{?_isa} = 0.10.0^%{snapshot_info}
-
-%description
-Latte is a dock based on plasma frameworks that provides an elegant and
-intuitive experience for your tasks and plasmoids. It animates its contents by
-using parabolic zoom effect and tries to be there only when it is needed.
-
-"Art in Coffee"
-
-%package lang
-Summary: Translation files for latte-dock
-Requires: %{name} = %{version}-%{release}
-BuildArch: noarch
-%description lang
-%{summary}.
-
-%prep
-%{forgesetup}
-%autosetup -n %{archivename}
-
-%build
-%cmake_kf5 \
-  -Wno-dev
-
-%cmake_build
-%install
-
-%cmake_install
-%find_lang %{name} --all-name
-
-%files
-%doc README.md
-%license LICENSES/*
-%{_bindir}/latte-dock
-%{_datadir}/metainfo/org.kde.latte-dock.appdata.xml
-%{_datadir}/metainfo/org.kde.latte.plasmoid.appdata.xml
-%{_datadir}/metainfo/org.kde.latte.shell.appdata.xml
-%{_kf5_datadir}/applications/org.kde.latte-dock.desktop
-%{_kf5_datadir}/dbus-1/interfaces/org.kde.LatteDock.xml
-%{_kf5_datadir}/icons/breeze/*/*/*
-%{_kf5_datadir}/icons/hicolor/*/*/*
-%{_kf5_datadir}/knotifications5/lattedock.notifyrc
-%{_kf5_datadir}/kservicetypes5/latte-indicator.desktop
-%{_kf5_datadir}/plasma/plasmoids/org.kde.latte.plasmoid/
-%{_kf5_datadir}/plasma/plasmoids/org.kde.latte.containment/
-%{_kf5_datadir}/plasma/shells/org.kde.latte.shell/
-%{_kf5_datadir}/latte
-%{_kf5_datadir}/knsrcfiles/latte-indicators.knsrc
-%{_kf5_datadir}/knsrcfiles/latte-layouts.knsrc
-%{_kf5_qmldir}/org/kde/latte
-%{_qt5_plugindir}/kpackage/packagestructure/latte_indicator.so
-%{_qt5_plugindir}/plasma/containmentactions/plasma_containmentactions_lattecontextmenu.so
-
-%files lang -f %{name}.lang
-
-%changelog
-* Sun Dec 25 2022 lleyton <lleyton@fyralabs.com> - 0.10.0^20221226.93c50a7-1
- Comply with packaging policy
-* Sun Dec 25 2022 windowsboy111 <windowsboy111@fyralabs.com> - 0.10.9-1
- Initial package
-
@@ -1,7 +0,0 @@
-if filters.contains("nightly") {
-	let req = new_req("https://api.github.com/repos/KDE/latte-dock/commits/HEAD");
-	req.head("Authorization", `Bearer ${env("GITHUB_TOKEN")}`);
-	let sha = json(req.get()).sha;
-	rpm.global("commit", sha);
-	rpm.release();
-}
@@ -3,8 +3,8 @@
 %forgemeta

 Name:          lomiri-api
-Version:       0.2.1
-Release:       2%{?dist}
+Version:       0.2.2
+Release:       1%?dist
 Summary:       API for Lomiri

 License:       LGPL-3.0-or-later
@@ -1,10 +1,10 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-app-launch
-%global commit a057a37b56b96efddc7f42577407a3a08a0575cf
+%global commit 3a0dacbbf99b45b67c39bb92449235c576cbf05a
 %forgemeta

 Name:           lomiri-app-launch
-Version:        0.1.9
-Release:        1%{?dist}
+Version:        0.1.11
+Release:        1%?dist
 Summary:        Provides the Lomiri App Launch user space daemon
 License:        GPL-3.0
 URL:            https://gitlab.com/ubports/development/core/lomiri-app-launch
@@ -1,10 +1,10 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-indicator-network
-%global commit a4522caf548d7e7f63f98f9e5c98314ee8d4c8fb
+%global commit 8393f80825de7447a5567a90d3725b469fae471b
 %forgemeta

 Name:       lomiri-indicator-network
-Version:    1.0.2
-Release:    1%{?dist}
+Version:    1.1.0
+Release:    1%?dist
 Summary:    The Network indicator for Ubuntu Touch
 License:    GPL-3.0 AND LGPL-3.0
 URL:        https://gitlab.com/ubports/development/core/lomiri-indicator-network
@@ -1,9 +1,9 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-schemas
-%global commit 0f3990afa510bc2b4af2cb198a23853e5bb3f068
+%global commit 4a74eca0e4dcb745521abf20f975854cc3478a70
 %forgemeta

 Name:       lomiri-schemas
-Version:    0.1.6
+Version:    0.1.7
 Release:    1%?dist
 Summary:    Configuration schemas for lomiri
 License:    LGPL-2.0-or-later
@@ -1,10 +1,10 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-settings-components
-%global commit 2bd84b9a59563dce7a791e0c882e2533ecdd4812
+%global commit 8be505f0a54e9803adcaa20fefe334b3c3b7d4e7
 %forgemeta

 Name:       lomiri-settings-components
-Version:    1.1.1
-Release:    1%{?dist}
+Version:    1.1.2
+Release:    1%?dist
 Summary:    The system settings components for Lomiri
 License:    GPLv3 AND LGPLv3
 URL:        https://gitlab.com/ubports/development/core/lomiri-settings-components
@@ -1,9 +1,9 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings
-%global commit b76a186705dcd4df15a941649c9de8586cf316bc
+%global commit 385ad7b7354da4eaf4b1bc1056a8e7bf241534e3
 %forgemeta

 Name:       lomiri-system-settings
-Version:    1.2.0
+Version:    1.3.0
 Release:    1%?dist
 Summary:    The system settings application for Lomiri
 License:    GPLv3
@@ -1,9 +1,9 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-ui-toolkit
-%global commit 8f490672f9853278b0aec6435a68d56b9eaf8207
+%global commit 4111d119b21d58754f8b4bcaa7665cab7263be00
 %forgemeta

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

@@ -1,8 +1,8 @@
-%define _ubuntu_rel 8ubuntu1
+%define _ubuntu_rel 2ubuntu1

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

 License:   GPL-2.0
@@ -1,6 +1,6 @@
 Name:       ayatana-indicator-sound
 Summary:    Ayatana Indicator Sound Applet
-Version:    24.5.1
+Version:    24.5.2
 Release:    1%?dist
 License:    GPLv3
 URL:        https://github.com/AyatanaIndicators/ayatana-indicator-sound
@@ -67,7 +67,7 @@ This package contains the development header files for %{name}.
 %{_datadir}/glib-2.0/schemas/org.ayatana.indicator.sound.gschema.xml
 %{_datadir}/polkit-1/actions/org.ayatana.indicator.sound.AccountsService.policy
 %{_datadir}/polkit-1/rules.d/50-org.ayatana.indicator.sound.AccountsService.rules
-%{_sharedstatedir}/polkit-1/localauthority/10-vendor.d/50-org.ayatana.indicator.sound.AccountsService.pkla
+%dnl %{_sharedstatedir}/polkit-1/localauthority/10-vendor.d/50-org.ayatana.indicator.sound.AccountsService.pkla

 %changelog
 %autochangelog
@@ -0,0 +1,8 @@
+project pkg {
+  rpm {
+    spec = "mwc.spec"
+  }
+  labels {
+    nightly = 1
+  }
+}
@@ -0,0 +1,69 @@
+%global commit be77084627d74f8e84615e9b192dace9649181e2
+%global commit_date 20250307
+%global shortcommit %{sub %{commit} 1 7 }
+%global ver 0.1.3
+
+Name:           mwc
+Version:        %{ver}^%{commit_date}git.%{shortcommit}
+Release:        1%{?dist}
+Summary:        Tiling Wayland compositor based on wlroots and scenefx
+
+License:        MIT
+URL:            https://github.com/dqrk0jeste/mwc
+Source0:        %{url}/archive/%{commit}.tar.gz
+
+BuildRequires:  meson
+BuildRequires:  gcc
+BuildRequires:  pkgconfig(libinput)
+BuildRequires:  pkgconfig(scenefx-0.2)
+BuildRequires:  pkgconfig(wlroots-0.18)
+BuildRequires:  pkgconfig(wayland-protocols)
+BuildRequires:  pkgconfig(xkbcommon)
+BuildRequires:  wayland-devel
+
+Requires:       libdrm
+Requires:       libinput
+Requires:       libxkbcommon
+Requires:       pixman
+Requires:       wayland-devel
+Requires:       wlroots
+Requires:       xdg-desktop-portal-wlr
+
+Recommends:     waybar kitty rofi-wayland
+
+Packager:       sadlerm <lerm@chromebooks.lol>
+
+Provides:       owl = %{version}-%{release}
+Obsoletes:      owl < 0^20250124.9999999
+
+%description
+%{summary}.
+
+%prep
+%autosetup -n %{name}-%{commit}
+
+%build
+%meson
+%meson_build
+
+%install
+%meson_install
+install -Dm644 examples/example.conf %{buildroot}%{_datadir}/%{name}/example.conf
+
+%files
+%license LICENSE
+%doc README.md
+%{_bindir}/%{name}
+%{_bindir}/%{name}-ipc
+%{_datadir}/%{name}/default.conf
+%{_datadir}/%{name}/example.conf
+%{_datadir}/wayland-sessions/%{name}.desktop
+%{_datadir}/xdg-desktop-portal/%{name}-portals.conf
+
+
+%changelog
+* Thu Feb 27 2025 sadlerm <lerm@chromebooks.lol>
+- New upstream name
+- Package is now built with meson
+* Fri Jan 31 2025 sadlerm <lerm@chromebooks.lol>
+- Initial package
@@ -0,0 +1,9 @@
+if filters.contains("nightly") {
+    rpm.global("commit", gh_commit("dqrk0jeste/mwc"));
+    let v = gh("dqrk0jeste/mwc");
+    if rpm.changed() {
+        rpm.global("commit_date", date());
+        v.crop(1);
+        rpm.global("ver", v);
+    }
+}
@@ -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"
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`rpm.version(gitlab("gitlab.freedesktop.org", "4339"));`