Merge branch 'f38' into p/rustdesk

feat: port #994 to 38 (#997 )
bump: iosevka-fusion anda
2026-05-31 09:01:55 +00:00 · 2024-03-25 22:21:47 +08:00 · 2024-03-25 18:36:15 +08:00 · 2024-03-25 09:15:32 +00:00 · 2024-03-25 04:45:46 +00:00 · 2024-03-24 23:35:57 +00:00
146 changed files with 771 additions and 1625 deletions
@@ -1,9 +0,0 @@
-{
-  "repoOwner": "terrapkg",
-  "repoName": "packages",
-  "resetAuthor": true,
-  "targetBranchChoices": ["f38", "f39", "f40", "frawhide"],
-  "branchLabelMapping": {
-    "^sync-(.+)$": "$1"
-  }
-}
@@ -6,13 +6,13 @@ on:
    paths:
      - anda/**
    branches:
-      - f40
+      - f38
  pull_request:
    branches:
-      - f40
+      - f38
  merge_group:
    branches:
-      - f40
+      - f38
  workflow_dispatch:
  workflow_call:

@@ -23,7 +23,7 @@ jobs:
    outputs:
      build_matrix: ${{ steps.generate_build_matrix.outputs.build_matrix }}
    container:
-      image: ghcr.io/terrapkg/builder:f40
+      image: ghcr.io/terrapkg/builder:f38
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Set workspace as safe
@@ -40,11 +40,11 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }}
-        version: ["40"]
+        version: ["38"]
      fail-fast: false
    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
    container:
-      image: ghcr.io/terrapkg/builder:f${{ matrix.version}}
+      image: ghcr.io/terrapkg/builder:f38
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
@@ -54,6 +54,13 @@ jobs:
      - name: Set up git repository
        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"

+      - name: Cache buildroot
+        id: br-cache
+        uses: actions/cache@v3
+        with:
+          path: /var/cache
+          key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}
+
      - name: Include custom build template instead of package default
        run: |
          cp -v anda/terra/mock-configs/terra.tpl /etc/mock/templates/terra.tpl
@@ -71,9 +78,7 @@ jobs:
      - uses: actions/upload-artifact@v3
        with:
          name: ${{ steps.art.outputs.name }}
-          path: |
-            anda-build/rpm/rpms/*
-            anda-build/rpm/srpm/*
+          path: anda-build/rpm/rpms/*

      - name: Upload packages to subatomic
        if: github.event_name == 'push'
@@ -83,14 +88,6 @@ jobs:
            --token ${{ secrets.SUBATOMIC_TOKEN }} \
            terra${{ matrix.version }} anda-build/rpm/rpms/*

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

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

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

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

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

-      - name: Upload packages to subatomic
+
+      - name: Upload to Subatomic
        run: |
          subatomic-cli upload --prune \
            --server https://subatomic.fyralabs.com \
            --token ${{ secrets.SUBATOMIC_TOKEN }} \
            terra${{ matrix.version }} anda-build/rpm/rpms/*
-
-      - name: Upload source packages to subatomic
-        if: github.event_name == 'push'
-        run: |
-          subatomic-cli upload --prune \
-            --server https://subatomic.fyralabs.com \
-            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }}-source anda-build/rpm/srpm/*
@@ -21,12 +21,12 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(needs.parse.outputs.pkgs) }}
-        version: ["40"]
+        version: ["38"]
        arch: ["x86_64", "aarch64"]
      fail-fast: false
    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
    container:
-      image: ghcr.io/terrapkg/builder:f${{ matrix.version }}
+      image: ghcr.io/terrapkg/builder:f38
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
@@ -56,9 +56,7 @@ jobs:
      - uses: actions/upload-artifact@v3
        with:
          name: ${{ steps.art.outputs.name }}
-          path: |
-            anda-build/rpm/rpms/*
-            anda-build/rpm/srpm/*
+          path: anda-build/rpm/rpms/*

      - name: Upload packages to subatomic
        run: |
@@ -67,16 +65,9 @@ jobs:
            --token ${{ secrets.SUBATOMIC_TOKEN }} \
            terra${{ matrix.version }} anda-build/rpm/rpms/*

-      - name: Upload source packages to subatomic
-        run: |
-          subatomic-cli upload --prune \
-            --server https://subatomic.fyralabs.com \
-            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }}-source anda-build/rpm/srpm/*
-
      - name: Notify Madoguchi (Success)
-        if: success()
+        if: success() && github.event_name == 'push'
        run: ./.github/workflows/mg.sh true ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
      - name: Notify Madoguchi (Failure)
-        if: cancelled() || failure()
+        if: ( cancelled() || failure() ) && github.event_name == 'push'
        run: ./.github/workflows/mg.sh false ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
@@ -11,11 +11,11 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(inputs.packages) }}
-        version: ["40"]
+        version: ["38"]
      fail-fast: false
    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
    container:
-      image: ghcr.io/terrapkg/builder:f${{ matrix.version }}
+      image: ghcr.io/terrapkg/builder:f38
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
@@ -45,9 +45,7 @@ jobs:
      - uses: actions/upload-artifact@v3
        with:
          name: ${{ steps.art.outputs.name }}
-          path: |
-            anda-build/rpm/rpms/*
-            anda-build/rpm/srpm/*
+          path: anda-build/rpm/rpms/*

      - name: Upload packages to subatomic
        run: |
@@ -56,17 +54,9 @@ jobs:
            --token ${{ secrets.SUBATOMIC_TOKEN }} \
            terra${{ matrix.version }} anda-build/rpm/rpms/*

-      - name: Upload source packages to subatomic
-        if: github.event_name == 'push'
-        run: |
-          subatomic-cli upload --prune \
-            --server https://subatomic.fyralabs.com \
-            --token ${{ secrets.SUBATOMIC_TOKEN }} \
-            terra${{ matrix.version }}-source anda-build/rpm/srpm/*
-
      - name: Notify Madoguchi (Success)
-        if: success()
+        if: success() && github.event_name == 'push'
        run: ./.github/workflows/mg.sh true ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
      - name: Notify Madoguchi (Failure)
-        if: cancelled() || failure()
+        if: ( cancelled() || failure() ) && github.event_name == 'push'
        run: ./.github/workflows/mg.sh false ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
@@ -3,18 +3,18 @@ name: Lint
 on:
  push:
    branches:
-      - f40
+      - f38
  pull_request:
    branches:
-      - f40
+      - f38
  merge_group:
    branches:
-      - f40
+      - f38
 jobs:
  lint:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:f40
+      image: ghcr.io/terrapkg/builder:f38
    steps:
      - name: Checkout repository
        uses: actions/checkout@v3
@@ -1,37 +0,0 @@
-name: Automatic backport/sync action
-
-on:
-  pull_request_target:
-    types: ["labeled", "closed"]
-
-jobs:
-  backport:
-    name: Backport/sync PR
-    runs-on: ubuntu-latest
-    if: github.event.pull_request.merged
-    steps:
-      - name: Install SSH signing key
-        run: |
-          mkdir -p ${{ runner.temp }}
-          echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key
-          chmod 0700 ${{ runner.temp }}/signing_key
-
-      - name: Setup Raboneko Signing
-        run: |
-          git config --global gpg.format "ssh"
-          git config --global user.signingkey "${{ runner.temp }}/signing_key"
-          git config --global commit.gpgsign true
-
-      - name: Backport Action
-        uses: sorenlouv/backport-github-action@v9.3.0
-        with:
-          github_token: ${{ secrets.RABONEKO_BACKPORT_GITHUB_TOKEN }}
-          auto_backport_label_prefix: sync-
-
-      - name: Info log
-        if: ${{ success() }}
-        run: cat ~/.backport/backport.info.log
-
-      - name: Debug log
-        if: ${{ failure() }}
-        run: cat ~/.backport/backport.debug.log
@@ -3,8 +3,6 @@ name: Push comps updates
 on:
  push:
    branches:
-      - f40
-      - f39
      - f38
      - f37
    paths:
@@ -15,7 +13,7 @@ jobs:
  update-comps:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:f40
+      image: ghcr.io/terrapkg/builder:f38
    steps:
      - uses: actions/checkout@v3
      - name: Push to subatomic
@@ -8,7 +8,7 @@ jobs:
  autoupdate:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:f40
+      image: ghcr.io/terrapkg/builder:f38
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
@@ -47,7 +47,6 @@ jobs:
              git commit -S -a -m "$msg"
            }
            copy_over f37 || true
-            copy_over f38 || true
-            copy_over frawhide || true
+            copy_over f39 || true
            git push -u origin --all
          fi
@@ -8,7 +8,7 @@ jobs:
  autoupdate:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:f40
+      image: ghcr.io/terrapkg/builder:f38
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
@@ -47,9 +47,7 @@ jobs:
              git add *
              git commit -S -a -m "$msg"
            }
-            copy_over f39 || true
            copy_over f37 || true
-            copy_over f38 || true
-            copy_over frawhide || true
+            copy_over f39 || true
            git push -u origin --all
          fi
@@ -1,7 +1,7 @@
 # Contributing

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

-* [Contribution Guide](https://developer.fyralabs.com/terra/contributing)
-* [FAQ](https://developer.fyralabs.com/terra/faq)
-* [Policy](https://developer.fyralabs.com/terra/policy)
+* [Contribution Guide](https://github.com/terrapkg/packages/wiki/Contribute)
+* [FAQ](https://github.com/terrapkg/packages/wiki/FAQ)
+* [Policy](https://github.com/terrapkg/packages/wiki/Policy)
@@ -3,7 +3,7 @@
 ## Our Process

 Fyra Labs is committed to ensuring user security and privacy.
-As such, we constantly try our best to ensure that our infrastructure and process are secure, which you may read about in our [FAQ](https://developer.fyralabs.com/terra/faq#technical-details).
+As such, we constantly try our best to ensure that our infrastructure and process are secure, which you may read about in our [FAQ](https://github.com/terrapkg/packages/wiki/FAQ#technical-details).

 As a part of Fyra Labs's transparency measures, we will publicize details of any known breaches. This information will include, but will not be limited to:
 * Affected users, infrastructure, and data.
@@ -11,7 +11,7 @@ As a part of Fyra Labs's transparency measures, we will publicize details of any
 * An in-depth explanation of how the breach occurred, including relevant security vulnerabilities.
 * How Fyra Labs will better protect user data in the future, ensuring our commitment to security and privacy.

-We will publish these updates on our [Twitter](https://twitter.com/TeamFyraLabs), [Fedi](https://fedi.fyralabs.com/@hq), and [Discord](https://discord.gg/5fdPuxTg5Q).
+We will publish these updates on our [Twitter](https://twitter.com/TeamFyraLabs) and [Discord](https://discord.gg/5fdPuxTg5Q).

 ## Reporting a Vulnerability

@@ -1,6 +1,6 @@
 Name:			anki-bin
-Version:		24.04.1
-Release:		1%?dist
+Version:		23.12.1
+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/
@@ -1,6 +1,6 @@
 Name:           anki-qt5
-Version:        24.04.1
-Release:        1%?dist
+Version:        23.12.1
+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
 URL:            https://apps.ankiweb.net/
@@ -1,6 +1,6 @@
 Name:           anki
-Version:        24.04.1
-Release:        1%?dist
+Version:        23.12.1
+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
 URL:            https://apps.ankiweb.net/
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-canary-openasar
-Version:        0.0.346
+Version:        0.0.324
 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.324
 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.52
+Version:        0.0.46
 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.81
+Version:        0.0.76
 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.81
+Version:        0.0.76
 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.52
+Version:		0.0.46
 Release:		1%?dist
 Summary:		Free Voice and Text Chat for Gamers
 URL:			https://discord.com
@@ -1,6 +1,6 @@
-%global commit a46ce9e28cd97f7280c085649a79f85aa1d0fe70
+%global commit 27fb4c474f5ca850470cd07dfc789ba8bf94b35c
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240325
+%global commit_date 20240312
 %global ver v0.37.0

 Name:           mpv-nightly
@@ -13,8 +13,8 @@
 %global crate sccache

 Name:           rust-sccache
-Version:        0.8.0
-Release:        1%?dist
+Version:        0.7.7
+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.2.alpha.1
+Version:	1.5.1
 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 20.12.2
-%global npmv 10.5.0
-%global ver 0.19.1
+%global nodev 18.13.0
+%global npmv 8.19.3
+%global ver 0.18.0
 %define debug_package %nil
 %global _build_id_links none

@@ -1,4 +1,4 @@
-%define _ubuntu_rel 22.10.20220822-0ubuntu12
+%define _ubuntu_rel 22.10.20220822-0ubuntu11
 %global _hardened_build 0

 Name:           compiz9
@@ -11,7 +11,7 @@ URL:            https://github.com/elementary/greeter
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 Source1:        40-%{appname}.conf

-Patch0:         https://github.com/elementary/greeter/compare/7.0.0..42320c266395606b0c20782603e7407124c3f7a4.patch
+Patch0:         https://github.com/elementary/greeter/commit/dbd9b6f9701f5992c3b3257c025b9cd80d041cc8.patch

 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -36,9 +36,9 @@ BuildRequires:  pkgconfig(granite) >= 5.0
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(libhandy-1)
 BuildRequires:  pkgconfig(liblightdm-gobject-1)
-BuildRequires:  pkgconfig(mutter-clutter-14)
-BuildRequires:  pkgconfig(mutter-cogl-14)
-BuildRequires:  pkgconfig(mutter-cogl-pango-14)
+BuildRequires:  pkgconfig(mutter-clutter-13)
+BuildRequires:  pkgconfig(mutter-cogl-13)
+BuildRequires:  pkgconfig(mutter-cogl-pango-13)
 BuildRequires:  pkgconfig(x11)

 Provides:       pantheon-greeter = %{version}-%{release}
@@ -5,14 +5,12 @@ Summary:        Gala window manager
 Version:        7.1.3
 Release:        1%{?dist}
 License:        GPL-3.0-or-later
-Epoch:          1

 URL:            https://github.com/elementary/gala
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz

 # patch some default settings to better match Fedora
 Patch0:         0000-Modify-default-settings-for-Fedora.patch
-Patch:          https://github.com/elementary/gala/compare/7.1.3..43d1e6a01b56a84a4e752e1970a35c19402941eb.patch

 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -33,11 +31,9 @@ BuildRequires:  pkgconfig(granite) >= 5.4.0
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(libbamf3)
 BuildRequires:  pkgconfig(libcanberra)
-BuildRequires:  pkgconfig(libhandy-1)
-BuildRequires:  pkgconfig(sqlite3)
-BuildRequires:  pkgconfig(mutter-clutter-14)
-BuildRequires:  pkgconfig(mutter-cogl-14)
-BuildRequires:  pkgconfig(mutter-cogl-pango-14)
+BuildRequires:  pkgconfig(mutter-clutter-13)
+BuildRequires:  pkgconfig(mutter-cogl-13)
+BuildRequires:  pkgconfig(mutter-cogl-pango-13)

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

@@ -89,8 +85,8 @@ This package contains the development headers.


 %check
-%dnl desktop-file-validate \
-%dnl    %{buildroot}/%{_sysconfdir}/xdg/autostart/gala-daemon.desktop
+desktop-file-validate \
+    %{buildroot}/%{_sysconfdir}/xdg/autostart/gala-daemon.desktop

 desktop-file-validate \
    %{buildroot}/%{_datadir}/applications/gala*.desktop
@@ -102,7 +98,7 @@ desktop-file-validate \
 %files -f gala.lang
 %doc README.md
 %license COPYING
-%dnl %config(noreplace) %{_sysconfdir}/xdg/autostart/gala-daemon.desktop
+%config(noreplace) %{_sysconfdir}/xdg/autostart/gala-daemon.desktop

 %{_bindir}/gala
 %{_bindir}/gala-daemon
@@ -3,7 +3,7 @@

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

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

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

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

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

-%global commit 8328f9a6863b4bae48adfdbc29b32b4c571c6530
+%global commit d3cc4aad003b8f5d4d24a6e20237797966a74fb4
 %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 86e830265b067a239aca6d18094ece43f5a549b7
 %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 bac3baa2876c61fe2963ad5e861f574d4b9c4402
 %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 @@
-%global rn 4
+%global rn 3

 Name:           unity-greeter
 Version:        23.10.1
@@ -1,4 +1,4 @@
-%define _ubuntu_rel 1ubuntu4
+%define _ubuntu_rel 1ubuntu1

 Name:    unity-session
 Summary: Lightdm profile for Unity 7
@@ -1,4 +1,4 @@
-%define archive unity_7.7.0+23.04.20230222.2-0ubuntu7.tar.xz
+%define archive unity_7.7.0+23.04.20230222.2-0ubuntu6.tar.xz

 Name:		unity-shell
 Version:	7.7.0
@@ -1,7 +1,7 @@
 Name:       ayatana-indicator-notifications
 Summary:    Ayatana Indicator Notifications Applet
-Version:    23.10.1
-Release:    1%?dist
+Version:    23.10.0
+Release:    1%{?dist}
 License:    GPL-3.0
 URL:        https://github.com/AyatanaIndicators/ayatana-indicator-notifications
 Source0:    %{url}/archive/refs/tags/%{version}.tar.gz
@@ -1,7 +1,7 @@
 Name:       ayatana-indicator-sound
 Summary:    Ayatana Indicator Sound Applet
-Version:    24.4.0
-Release:    1%?dist
+Version:    23.10.3
+Release:    1%{?dist}
 License:    GPLv3
 URL:        https://github.com/AyatanaIndicators/ayatana-indicator-sound
 Source0:    %{url}/archive/refs/tags/%{version}.tar.gz
@@ -12,7 +12,7 @@
 %endif

 Name:			codium
-Version:		1.88.1.24104
+Version:		1.87.2.24072
 Release:		1%?dist
 Summary:		Code editing. Redefined.
 License:		MIT
@@ -1,5 +1,5 @@
 Name:			flutter
-Version:		3.19.6
+Version:		3.19.4
 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.16
+Version:                1.7.14

 %gometa

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

 Name:           moby-buildx
-Version:        0.14.0
+Version:        0.13.1
 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.27.0
+Version:        2.26.0
 Release:        1%?dist
 Summary:        Define and run multi-container applications with Docker

@@ -2,7 +2,7 @@
 %global         debug_package %{nil}

 Name:           iosevka-fusion-fonts
-Version:        29.2.0
+Version:        29.0.4
 Release:        1%?dist
 Summary:        A custom font based on iosevka

@@ -4,8 +4,8 @@ Nerd Fonts is a project that patches developer targeted fonts with a high
 number of glyphs (icons).}

 Name:		nerd-fonts
-Version:	3.2.1
-Release:	1%?dist
+Version:	3.1.1
+Release:	1%{?dist}
 URL:		https://nerdfonts.com/
 Source0:	https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v%version/readme.md
 Source1:	https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v%version/LICENSE
@@ -1,5 +1,5 @@
 Name:		sarasa-gothic-fonts
-Version:	1.0.10
+Version:	1.0.8
 Release:	1%?dist
 URL:		https://github.com/be5invis/Sarasa-Gothic
 Source0:	%url/releases/download/v%version/Sarasa-TTC-%version.7z
@@ -1,9 +1,9 @@
-%define osuresver 2024.410.0
+%define osuresver 2024.321.0
 %global debug_package %{nil}
 %define __strip /bin/true

 Name:			osu-lazer
-Version:		2024.412.1
+Version:		2024.312.1
 Release:		1%?dist
 Summary:		The future of osu! and the beginning of an open era! Commonly known by the codename osu!lazer. Pew pew.
 ExclusiveArch:	x86_64
@@ -1,13 +1,13 @@
 %global real_name prismlauncher
 %global nice_name PrismLauncher

-%global commit df0280f52b68f4352d8da711136609c16ce4db7b
+%global commit 3b0564f098c49be2fd3082928c91440c73df4d80
 %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 20240311
 %global snapshot_info %{commit_date}.%{shortcommit}

 %bcond_without qt6
@@ -76,9 +76,8 @@ Requires(postun): desktop-file-utils
 Requires:         qt%{qt_version}-qtimageformats
 Requires:         qt%{qt_version}-qtsvg
 Requires:         javapackages-filesystem
-Recommends:       java-21-openjdk
-Recommends:       java-17-openjdk
-Suggests:         java-1.8.0-openjdk
+Requires:         java-17-openjdk
+Requires:         java-1.8.0-openjdk

 # xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
 Recommends:       xrandr
@@ -1,13 +1,13 @@
 %global real_name prismlauncher
 %global nice_name PrismLauncher

-%global commit df0280f52b68f4352d8da711136609c16ce4db7b
+%global commit 3b0564f098c49be2fd3082928c91440c73df4d80
 %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 20240311
 %global snapshot_info %{commit_date}.%{shortcommit}

 %bcond_with qt6
@@ -76,9 +76,8 @@ Requires(postun): desktop-file-utils
 Requires:         qt%{qt_version}-qtimageformats
 Requires:         qt%{qt_version}-qtsvg
 Requires:         javapackages-filesystem
-Recommends:       java-21-openjdk
-Recommends:       java-17-openjdk
-Suggests:         java-1.8.0-openjdk
+Requires:         java-17-openjdk
+Requires:         java-1.8.0-openjdk

 # xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
 Recommends:       xrandr
@@ -23,7 +23,7 @@ Name:             prismlauncher
 Name:             prismlauncher-qt5
 %endif
 Version:          8.2
-Release:          2%?dist
+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
@@ -61,9 +61,8 @@ Requires(postun): desktop-file-utils
 Requires:         qt%{qt_version}-qtimageformats
 Requires:         qt%{qt_version}-qtsvg
 Requires:         javapackages-filesystem
-Recommends:       java-21-openjdk
-Recommends:       java-17-openjdk
-Suggests:         java-1.8.0-openjdk
+Requires:         java-17-openjdk
+Requires:         java-1.8.0-openjdk

 # xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
 Recommends:       xrandr
@@ -132,9 +131,6 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt


 %changelog
-* Wed Apr 03 2024 seth <getchoo at tuta dot io> - 8.2-2
- move JREs to weak deps, add java 21 for snapshots
-
 * Wed Jul 26 2023 seth <getchoo at tuta dot io> - 7.2-2
 - remove terra-fractureiser-detector from recommends, use proper build platform

@@ -22,7 +22,7 @@ Name:             prismlauncher
 %else
 Name:             prismlauncher-qt5
 %endif
-Version:          8.3
+Version:          8.2
 Release:          1%?dist
 Summary:          Minecraft launcher with ability to manage multiple instances
 # see COPYING.md for more information
@@ -61,9 +61,8 @@ Requires(postun): desktop-file-utils
 Requires:         qt%{qt_version}-qtimageformats
 Requires:         qt%{qt_version}-qtsvg
 Requires:         javapackages-filesystem
-Recommends:       java-21-openjdk
-Recommends:       java-17-openjdk
-Suggests:         java-1.8.0-openjdk
+Requires:         java-17-openjdk
+Requires:         java-1.8.0-openjdk

 # xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
 Recommends:       xrandr
@@ -132,9 +131,6 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt


 %changelog
-* Wed Apr 03 2024 seth <getchoo at tuta dot io> - 8.2-2
- move JREs to weak deps, add java 21 for snapshots
-
 * Wed Jul 26 2023 seth <getchoo at tuta dot io> - 7.2-2
 - remove terra-fractureiser-detector from recommends, use proper build platform

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

 Name: dart
-Version: 3.3.4
+Version: 3.3.2
 Release: 1%?dist
 Summary: The Dart Language
 License: BSD-3-Clause
@@ -20,7 +20,7 @@ of information.}
 %global godocs          README.md

 Name:           %{goname}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Generate .desktop files and download .png icons

 License:        BSD-3-Clause
@@ -1,5 +1,5 @@
 Name:		groovy-docs
-Version:	4.0.21
+Version:	4.0.20
 Release:	1%?dist
 Summary:	Documentation for the Groovy programming language
 URL:		https://groovy-lang.org/
@@ -1,5 +1,5 @@
 Name:			groovy
-Version:		4.0.21
+Version:		4.0.20
 Release:		1%?dist
 Summary:		A multi-faceted language for the Java platform
 BuildArch:		noarch
@@ -1,13 +1,12 @@
 %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10
-%global commit 33902d9dbb65fbfdfbd6e3b2a34c6e19eccb762f
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commit 78c834dd76f273d8813247647531005a1f7db1a6
 %global ver 2.1.1
-%global commit_date 20240322
+%global commit_date 20240312
 %global debug_package %nil

-Name:			nim-nightly
-Version:		%ver^%commit_date.%shortcommit
-Release:		2%?dist
+Name:			nim-nighlty
+Version:		%ver^%commit_date.%commit
+Release:		1%?dist
 Summary:		Imperative, multi-paradigm, compiled programming language
 License:		MIT and BSD
 URL:			https://nim-lang.org
@@ -19,9 +18,6 @@ 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
@@ -32,9 +28,6 @@ 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
@@ -43,12 +36,9 @@ order of priority).
 This package provides various tools, which help Nim programmers.


-%ifarch x86_64
 %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
@@ -56,15 +46,12 @@ order of priority).

 This package provides documentation and reference manual for the language
 and its standard library.
-%endif
-

 %prep
 %autosetup -n Nim-%commit
 # hack
 cp /usr/bin/mold /usr/bin/ld

-
 %build
 export CFLAGS="${CFLAGS} -Ofast"
 export CXXFLAGS="${CXXFLAGS} -Ofast"
@@ -79,18 +66,13 @@ nimBuildCsourcesIfNeeded CFLAGS="${CFLAGS} -Ic_code -w -O3 -fno-strict-aliasing
 nim c --noNimblePath --skipUserCfg --skipParentCfg --hints:off -d:danger koch.nim
 koch boot -d:release -d:nimStrictMode --lib:lib

-%ifarch x86_64
 koch docs &
-%endif
 (cd lib; nim c --app:lib -d:danger -d:createNimRtl -t:-fPIE -l:-pie nimrtl.nim) &
 koch tools --skipUserCfg --skipParentCfg --hints:off -d:release -t:-fPIE -l:-pie &
 nim c -d:danger -t:-fPIE -l:-pie nimsuggest/nimsuggest.nim &
 wait

-%ifarch x86_64
 sed -i '/<link.*fonts.googleapis.com/d' doc/html/*.html
-%endif
-

 %install
 export PATH="$(pwd):$(pwd)/bin:${PATH}"
@@ -100,28 +82,24 @@ mold -run bin/nim cc -d:nimCallDepthLimit=10000 -r tools/niminst/niminst --var:v

 sh ./install.sh %buildroot/usr/bin

-mkdir -p %buildroot/%_bindir %buildroot/%_datadir/bash-completion/completions %buildroot/usr/lib/nim
+mkdir -p %buildroot/%_bindir %buildroot/%_datadir/bash-completion/completions
 install -Dpm755 bin/nim{grep,suggest,pretty} %buildroot/%_bindir
 install -Dpm644 tools/nim.bash-completion %buildroot/%_datadir/bash-completion/completions/nim
 install -Dpm644 dist/nimble/nimble.bash-completion %buildroot/%_datadir/bash-completion/completions/nimble
 install -Dpm644 -t%buildroot/%_mandir/man1 %SOURCE1 %SOURCE2 %SOURCE3 %SOURCE4

-%ifarch x86_64
-mkdir -p %buildroot/%_docdir/%name/html
+mkdir -p %buildroot/%_docdir/%name/html %buildroot/usr/lib/nim
 cp -a doc/html/*.html %buildroot/%_docdir/%name/html/
 cp tools/dochack/dochack.js %buildroot/%_docdir/%name/
-%endif

 cp -r lib/* %buildroot%_prefix/lib/nim/
-cp -a compiler %buildroot%_prefix/lib/nim/
-install -Dm644 nim.nimble %buildroot%_prefix/lib/nim/compiler
-install -Dm644 config/* -t %buildroot/etc/nim
-install -d %buildroot%_includedir || true
-cp -a %buildroot%_prefix/lib/nim/lib/*.h %buildroot%_includedir || true
-ln -s %_prefix/lib/nim %buildroot%_prefix/lib/nim/lib || true
-rm -rf %buildroot/nim || true
-rm %buildroot%_bindir/*.bat || true

+#check
+# export PATH=$PATH:$(realpath ./bin)
+# for cat in manyloc gc threads nimble-all lib io async rodfiles debugger examples dll flags
+# do
+#   ./koch tests --pedantic category $cat -d:nimCoroutines || (echo "$cat test category failed" && exit 1)
+# done

 %files
 %license copying.txt dist/nimble/license.txt
@@ -130,17 +108,16 @@ rm %buildroot%_bindir/*.bat || true
 %_mandir/man1/nim{,ble}.1*
 %_datadir/bash-completion/completions/nim{,ble}
 %_prefix/lib/nim/
-%_sysconfdir/nim/

 %files tools
 %license copying.txt
 %_bindir/nim{grep,suggest,pretty}
 %_mandir/man1/nim{grep,suggest}.1*

-%ifarch x86_64
 %files doc
 %doc %_docdir/%name
-%endif
+

 %changelog
-%autochangelog
+* Mon Jan 9 2023 windowsboy111 <windowsboy111@fyralabs.com> - 1.9.3^fcc383d89994241f1b73fe4f85ef38528c135e2e-1
+- Initial Package.
@@ -2,8 +2,8 @@
 %global debug_package %{nil}

 Name:			nim
-Version:		2.0.4
-Release:		1%?dist
+Version:		2.0.2
+Release:		2%{?dist}
 Summary:		Imperative, multi-paradigm, compiled programming language
 License:		MIT and BSD
 URL:			https://nim-lang.org
@@ -13,7 +13,8 @@ Source2:		nimgrep.1
 Source3:		nimble.1
 Source4:		nimsuggest.1
 BuildRequires:	gcc mold git gcc-c++ nodejs openssl-devel pkgconfig(bash-completion) gc-devel pcre-devel
-Requires:		gcc
+Requires:		redhat-rpm-config gcc
+Conflicts:		choosenim


 %description
@@ -31,7 +32,7 @@ order of priority).

 This package provides various tools, which help Nim programmers.

-%ifarch x86_64
+
 %package doc
 Summary:	Documentation for Nim programming language
 BuildArch:	noarch
@@ -42,13 +43,10 @@ order of priority).

 This package provides documentation and reference manual for the language
 and its standard library.
-%endif
-

 %prep
 %autosetup -n nim-%{version}

-
 %build
 export CFLAGS="${CFLAGS} -Ofast"
 export CXXFLAGS="${CXXFLAGS} -Ofast"
@@ -60,24 +58,20 @@ export PATH="$(pwd):$(pwd)/bin:${PATH}"
 mold -run nim c -d:danger koch.nim
 mold -run koch boot -d:useLinenoise -t:-fPIE -l:-pie -d:release -d:nativeStacktrace -d:useGnuReadline

-%ifarch x86_64
 mold -run koch docs &
-%endif
 (cd lib && nim c --app:lib -d:createNimRtl -d:release nimrtl.nim) &
 mold -run koch tools -t:-fPIE -l:-pie &
 mold -run nim c -t:-fPIE -l:-pie -d:release nimsuggest/nimsuggest.nim &
 wait

-%ifarch x86_64
 sed -i '/<link.*fonts.googleapis.com/d' doc/html/*.html
-%endif


 %install
 export PATH="$(pwd):$(pwd)/bin:${PATH}"
 sh install.sh %{buildroot}usr/bin

-mkdir -p %buildroot{%_bindir,%_prefix/lib/nim}
+mkdir -p %buildroot{%_bindir,%_docdir/%name/html,%_prefix/lib/nim}
 install -Dp -m755 bin/nim{,ble,grep,suggest,pretty} %buildroot/%_bindir
 install -Dp -m644 dist/nimble/nimble.bash-completion %{buildroot}%{bashcompdir}/nimble
 install -Dp -m644 -t%{buildroot}%{_mandir}/man1 %SOURCE1 %SOURCE2 %SOURCE3 %SOURCE4
@@ -89,27 +83,34 @@ for comp in tools/*.zsh-completion; do
 	install -Dm644 $comp %zshcompdir/_$(basename "${comp/.zsh-completion}")
 done

-%ifarch x86_64
-mkdir -p %buildroot%_docdir/%name/html
 cp -a doc/html/*.html %buildroot%_docdir/%name/html/
 cp tools/dochack/dochack.js %{buildroot}%{_docdir}/%{name}/
-ln -s %_datadir/nim/doc %buildroot%_prefix/lib/nim/doc
-%endif
-
-cp -a lib %buildroot%_prefix/lib/
-mv %buildroot%_prefix/lib/{lib,nim}
+cp -a lib %buildroot%_prefix/lib/nim
 cp -a compiler %buildroot%_prefix/lib/nim
 install -Dm644 nim.nimble %buildroot%_prefix/lib/nim/compiler
-install -m755 lib/libnimrtl.so %buildroot%_prefix/lib/libnimrtl.so  # compiler needs
+ls **
+ls %buildroot%_prefix/lib/nim/*
+install -m755 lib/libnimrtl.so %buildroot%_prefix/lib/libnimrtl.so
+
 install -Dm644 config/* -t %buildroot/etc/nim
 install -Dm755 bin/* -t %buildroot%_bindir
+
 install -d %buildroot%_includedir
 cp -a %buildroot%_prefix/lib/nim/lib/*.h %buildroot%_includedir
-ln -s %_prefix/lib/nim %buildroot%_prefix/lib/nim/lib  # compiler needs lib from here
-ln -s %_prefix/lib/nim/system.nim %_prefix/lib/system.nim  # nimsuggest bug
+
+ln -s %_datadir/nim/doc %buildroot%_prefix/lib/nim/doc
+
+ln -s %_prefix/lib/nim %buildroot%_prefix/lib/nim/lib
+
 rm -rf %buildroot/nim || true
 rm %buildroot%_bindir/*.bat || true

+%check
+# export PATH=$PATH:$(realpath ./bin)
+# for cat in manyloc gc threads nimble-all lib io async rodfiles debugger examples dll flags
+# do
+#   ./koch tests --pedantic category $cat -d:nimCoroutines || (echo "$cat test category failed" && exit 1)
+# done

 %files
 %license copying.txt dist/nimble/license.txt
@@ -132,10 +133,8 @@ rm %buildroot%_bindir/*.bat || true
 %{_bindir}/nim{grep,suggest,pretty}
 %{_mandir}/man1/nim{grep,suggest}.1*

-%ifarch x86_64
 %files doc
 %doc %{_docdir}/nim
-%endif

 %changelog
 %autochangelog
@@ -1,8 +1,8 @@
 %define debug_package %nil

 Name:			python3-mpv
-Version:		1.0.6
-Release:		1%?dist
+Version:		1.0.5
+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
@@ -2,7 +2,7 @@
 %global pypi_name protobuf

 Name:           python-%{pypi_name}
-Version:        5.26.1
+Version:        5.26.0
 Release:        1%?dist
 Summary:        Protocol Buffers

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

 Name:			python3-ruff
-Version:		0.4.2
+Version:		0.3.4
 Release:		1%?dist
 Summary:		An extremely fast Python linter, written in Rust
 License:		MIT
@@ -2,8 +2,8 @@
 %global crate felix

 Name:           rust-felix
-Version:        2.13.0
-Release:        1%?dist
+Version:        2.12.1
+Release:        1%{?dist}
 Summary:        Tui file manager with vim-like key mapping

 License:        MIT
@@ -4,7 +4,7 @@
 %global crate gitoxide

 Name:           rust-gitoxide
-Version:        0.35.0
+Version:        0.33.0
 Release:        1%?dist
 Summary:        Command-line application for interacting with git repositories

@@ -1,5 +1,5 @@
 Name:			nushell
-Version:		0.92.2
+Version:		0.91.0
 Release:		1%?dist
 Summary:		A new type of shell
 License:		MIT
@@ -4,8 +4,8 @@
 %global crate oxipng

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

 License:        MIT
@@ -1,5 +1,5 @@
 Name:           rnote
-Version:        0.10.2
+Version:        0.10.1
 Release:        1%?dist
 Summary:        Sketch and take handwritten notes.
 License:        GPL-3.0
@@ -5,8 +5,8 @@
 %global crate zellij

 Name:           rust-zellij
-Version:        0.40.0
-Release:        1%?dist
+Version:        0.39.2
+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 3b5fe941bea6ecd5c8fcb84930c40b8582eea165
 %global shortcommit %(c=%{commit}; echo ${c:0:7})

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

@@ -3,7 +3,7 @@
 %global commit 8ae2bb65fe66458263d94711ae4ddd978faece00
 %global shortcommit %(c=%{commit}; echo ${c:0:7})

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

 Name:			vala-lint-nightly
@@ -7,7 +7,7 @@
 %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 240218
 %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 a819ab7b36a449c2d5d0104b896c04115f875d05
+%global commit 241873e2e795be03a4bf38f7c8d3bb3b5bb10e23
 %forgemeta

 Name:    vala-panel-appmenu
@@ -21,7 +21,6 @@ BuildRequires: vala
 BuildRequires: systemd-rpm-macros
 BuildRequires: pkgconfig(libxfce4panel-2.0)
 BuildRequires: pkgconfig(gtk+-2.0)
-BuildRequires: java-devel
 BuildRequires: pkgconfig(gtk+-3.0)
 BuildRequires: pkgconfig(libxfconf-0)
 BuildRequires: pkgconfig(budgie-1.0)
@@ -83,13 +82,6 @@ Summary:    Gtk3MenuShell D-Bus exporter
 %description -n vala-panel-appmenu-gtk-module
 GTK (2, 3) module that exports GtkMenuShells over D-Bus.

-
-%package -n vala-panel-appmenu-jayatana-module
-Summary:    Vala appmenu support for Java Swing applications
-
-%description -n vala-panel-appmenu-jayatana-module
-Vala appmenu support for Java Swing applications.
-
 %prep
 %forgeautosetup

@@ -131,11 +123,6 @@ Vala appmenu support for Java Swing applications.
 %{_libdir}/gtk-3.0/modules/libappmenu-gtk-module.so
 %{_datadir}/glib-2.0/schemas/org.appmenu.gtk-module.gschema.xml

-%files -n vala-panel-appmenu-jayatana-module
-%{_datadir}/java/*.jar
-%dir %{_libdir}/jayatana
-%{_libdir}/jayatana/*.so
-
 %files -n xfce4-vala-panel-appmenu-plugin
 %{_libdir}/xfce4/panel/plugins/libappmenu-xfce.so
 %{_datadir}/xfce4/panel/plugins/appmenu.desktop
@@ -1,36 +1,29 @@
-# ref: https://src.fedoraproject.org/rpms/openh264
+# ref: https://src.fedoraproject.org/rpms/openh264/blob/rawhide/f/openh264.spec
+# To get the gmp-api commit to use, run:
+# rm -rf gmp-api;make gmp-bootstrap;cd gmp-api;git rev-parse HEAD
 %global commit1 e7d30b921df736a1121a0c8e0cf3ab1ce5b8a4b7
 %global shortcommit1 %(c=%{commit1}; echo ${c:0:7})

-%global openh264_version 2.4.0
-%global gst_version 1.23.2
+# Filter out soname provides for the mozilla plugin
+%global __provides_exclude_from ^%{_libdir}/mozilla/plugins/

 Name:           openh264
-Version:        %{openh264_version}
-# Also bump the Release tag for gstreamer1-plugin-openh264 down below
-Release:        1%{?dist}
+Version:        2.4.1
+Release:        2%{?dist}
 Summary:        H.264 codec library

-License:        BSD
+License:        BSD-2-Clause
 URL:            https://www.openh264.org/
-Source0:        https://github.com/cisco/openh264/archive/v%{openh264_version}/openh264-%{openh264_version}.tar.gz
+Source0:        https://github.com/cisco/openh264/archive/v%{version}/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

+# Replace the stub package
+Obsoletes:      noopenh264 < 1:0
+
 %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.
@@ -38,7 +31,9 @@ suitable for use in real time applications such as WebRTC.

 %package        devel
 Summary:        Development files for %{name}
-Requires:       %{name}%{?_isa} = %{openh264_version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+# Replace the stub package
+Obsoletes:      noopenh264-devel < 1:0

 %description    devel
 The %{name}-devel package contains libraries and header files for
@@ -47,7 +42,7 @@ developing applications that use %{name}.

 %package     -n mozilla-openh264
 Summary:        H.264 codec support for Mozilla browsers
-Requires:       %{name}%{?_isa} = %{openh264_version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       mozilla-filesystem%{?_isa}

 %description -n mozilla-openh264
@@ -55,18 +50,6 @@ 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

@@ -74,12 +57,6 @@ This package contains the H.264 plugin.
 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
@@ -96,20 +73,6 @@ 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
@@ -125,71 +88,32 @@ 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
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/gmpopenh264.sh << 'EOF'
+if [[ ":$MOZ_GMP_PATH:" != *":%{_libdir}/mozilla/plugins/gmp-gmpopenh264/system-installed:"* ]]; then
+    MOZ_GMP_PATH="${MOZ_GMP_PATH}${MOZ_GMP_PATH:+:}%{_libdir}/mozilla/plugins/gmp-gmpopenh264/system-installed"
+    export MOZ_GMP_PATH
+fi
+EOF
+
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/fish/vendor_conf.d
+cat > $RPM_BUILD_ROOT%{_datadir}/fish/vendor_conf.d/gmpopenh264.fish << 'EOF'
+set -x --path MOZ_GMP_PATH $MOZ_GMP_PATH
+set dir %{_libdir}/mozilla/plugins/gmp-gmpopenh264/system-installed
+if not contains $dir $MOZ_GMP_PATH
+    set -p MOZ_GMP_PATH $dir
+end
+set -e dir
 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}
+%{_libdir}/libopenh264.so.%{version}

 %files devel
 %{_includedir}/wels/
@@ -203,10 +127,9 @@ popd
 %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
+%dir %{_datadir}/fish
+%dir %{_datadir}/fish/vendor_conf.d
+%{_datadir}/fish/vendor_conf.d/gmpopenh264.fish


 %changelog
@@ -2,7 +2,4 @@ project pkg {
 	rpm {
 		spec = "pqmarble.spec"
 	}
-	labels {
-		nightly = "1"
-	}
 }
@@ -1,10 +1,8 @@
 %global commit f240b2ec7d5cdacb8fdcc553703420dc5101ffdb
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240310
 %global ver 2.0.0

 Name:			pqmarble
-Version:		%ver^%commit_date.%shortcommit
+Version:		%ver^%commit
 Release:		1%{?dist}
 Summary:		My GTK library
 License:		GPL-3.0
@@ -1,8 +1,4 @@
-if filters.contains("nightly") {
-	rpm.global("commit", gitlab_commit("gitlab.gnome.org", "20662", "master"));
-	if rpm.changed() {
-		let meson = get("https://gitlab.gnome.org/raggesilver/marble/-/raw/master/meson.build");
-		rpm.global("ver", find("(?m)^\\s+version:\\s*'(.+)',$", meson, 1));
-		rpm.global("commit_date", date());
-	}
-}
+let req = get("https://gitlab.gnome.org/api/v4/projects/20662/repository/branches/master").json();
+rpm.global("commit", req.commit.id);
+let meson = get("https://gitlab.gnome.org/raggesilver/marble/-/raw/master/meson.build");
+rpm.global("ver", find("(?m)^\\s+version:\\s*'(.+)',$", meson, 1));
@@ -1,10 +1,8 @@
-%global commit 586bc784138042d2710168cd0b29f5dd6d415f45
-%global ver 1.8.26
-%global commit_date 20240219
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-
+%global commit d0ff90bb19a235d9357f0874b0a62306e40d90b8
+%global ver 1.8.25
+%global commit_date 240219
 Name: tdlib-nightly
-Version: %ver^%commit_date.%shortcommit
+Version: %ver^%commit_date.%commit
 Release: 1%?dist
 License: BSL-1.0
 URL: https://github.com/tdlib/td
@@ -1,7 +1,7 @@
 if filters.contains("nightly") {
 	rpm.global("commit", gh_commit("tdlib/td"));
 	if rpm.changed() {
-		let v = find("\nproject\\(TDLib\\s+VERSION\\s+([\\d.]+)\\s+", gh_rawfile("tdlib/td", "master", "CMakeLists.txt"), 1);
+		let v = find("\nproject\\(TDLib\\s+VERSION\\s+([\\d.]+)\\s+", gh_rawfile("tdlib/td", "master", "CMakeLists.txt")), 1);
 		rpm.global("ver", v);
 		rpm.release();
 	}
@@ -1,8 +1,8 @@
 %define debug_package %nil

 Name:			alsa-ucm-cros
-Version:		0.5
-Release:		1%?dist
+Version:		0.4
+Release:		1%{?dist}
 Summary:		ALSA Use Case Manager configuration
 License:		BSD-3-Clause
 URL:			https://github.com/WeirdTreeThing/alsa-ucm-conf-cros/tree/standalone
@@ -1,31 +0,0 @@
-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,16 +1,14 @@
 %define debug_package %nil
-%define __strip /bin/true
-%global commit cca93db585dedf8acc1423f5e2db215de95c4c3b
+%global commit c6e23e7eb733ad396d3eebc328404cc656fed581

 Name:			arrpc
-Version:		3.4.0
-Release:		2%?dist
+Version:		3.3.1
+Release:		1%?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

@@ -22,15 +20,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 -p1
+%autosetup -n arrpc-%commit
 # 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 @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
+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

 %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" - -
@@ -1,20 +1,15 @@
 %global debug_package %nil

-Name:       kwin-system76-scheduler-integration
-
-%global forgeurl https://github.com/maxiberta/%{name}
-%global commit 093a269670275feaa240d02c712f1ec8b812fd80
-%global date 20240320
-%forgemeta
-
-Version:    0.1
-Release:    6%?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
+Name:			kwin-system76-scheduler-integration
+Version:		0.1
+Release:		4%?dist
+Summary:		Notify the System76 Scheduler which app has focus so it can be prioritized
+License:		MIT
+URL:			  https://github.com/maxiberta/kwin-system76-scheduler-integration
+Source0:		%url/archive/refs/tags/%version.tar.gz
+Source1:		system76-scheduler-dbus-proxy.sh
+Source2:		com.system76.Scheduler.dbusproxy.service
+Requires:		bash dbus-tools system76-scheduler kde-cli-tools systemd kf5-kconfig-core qt
 BuildRequires: systemd-rpm-macros

 %description
@@ -25,24 +20,21 @@ This KWin Script interactively notifies System76 Scheduler which app has focus
 via D-Bus, so it is prioritized.

 %prep
-%forgeautosetup
+%autosetup

 %build

 %install
-mkdir -p %buildroot%_datadir/kwin/scripts/%{name}/
-mkdir -p %buildroot%_libexecdir/
-mkdir -p %buildroot%_userunitdir/
-
-cp -r contents %buildroot%_datadir/kwin/scripts/%{name}/
-cp -r metadata.json %buildroot%_datadir/kwin/scripts/%{name}/
-cp -r system76-scheduler-dbus-proxy.sh %buildroot%_libexecdir/
-
-install -Dm644 %SOURCE1 %buildroot%_userunitdir/com.system76.Scheduler.dbusproxy.service
+mkdir -p %buildroot%_datadir/kwin/scripts/kwin-system76-scheduler-integration/
+cp -r * %buildroot%_datadir/kwin/scripts/kwin-system76-scheduler-integration/
+install -Dm755 %SOURCE1 %buildroot%_libexecdir/system76-scheduler-dbus-proxy.sh
+install -Dm644 %SOURCE2 %buildroot%_userunitdir/com.system76.Scheduler.dbusproxy.service
+install -Dm644 metadata.desktop %buildroot%_datadir/kservices5/kwin-system76-scheduler-integration.desktop

 %post
 %systemd_user_post com.system76.Scheduler.dbusproxy.service

+
 %preun
 %systemd_user_preun com.system76.Scheduler.dbusproxy.service

@@ -50,11 +42,10 @@ install -Dm644 %SOURCE1 %buildroot%_userunitdir/com.system76.Scheduler.dbusproxy
 %systemd_user_postun_with_restart com.system76.Scheduler.dbusproxy.service

 %files
-%license LICENSE
-%doc README.md
 %config %_userunitdir/com.system76.Scheduler.dbusproxy.service
 %_libexecdir/system76-scheduler-dbus-proxy.sh
-%_datadir/kwin/scripts/%{name}/
+%_datadir/kwin/scripts/kwin-system76-scheduler-integration/
+%_datadir/kservices5/kwin-system76-scheduler-integration.desktop

 %changelog
 %autochangelog
@@ -1,5 +1 @@
-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();
-}
+rpm.version(gh("maxiberta/kwin-system76-scheduler-integration"));
@@ -4,7 +4,7 @@
 %define _build_id_links none

 Name: sass
-Version: 1.75.0
+Version: 1.72.0
 Release: 1%?dist
 Summary: The reference implementation of Sass, written in Dart
 License: MIT
@@ -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" - -
@@ -0,0 +1,58 @@
+%define debug_package %nil
+
+Name:			systemd-sysusers-presets
+Version:		1.0
+Release:		%autorelease
+Summary:		A set of systemd system user presets to supplement Fedora's defaults
+License:		GPLv3+
+Source0:		polkit.conf
+Source1:		rpcbind.conf
+BuildRequires:  systemd-rpm-macros
+%{?systemd_requires}
+
+%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.
+
+%package polkit
+Summary:		Polkit system user
+Requires:       rpcbind
+%{?systemd_requires}
+Supplements:    polkit
+
+%description polkit
+Polkit system user preset
+
+%package rpcbind
+Summary:		RPC bind system user
+Requires:       rpcbind
+%{?systemd_requires}
+Supplements:    rpcbind
+
+%description rpcbind
+RPC bind system user preset
+
+%prep
+
+%install
+install -D %{SOURCE0} %{buildroot}%{_sysusersdir}/polkit.conf
+install -D %{SOURCE1} %{buildroot}%{_sysusersdir}/rpcbind.conf
+
+%post polkit
+systemd-sysusers %{_sysusersdir}/polkit.conf
+
+%post rpcbind
+systemd-sysusers %{_sysusersdir}/rpcbind.conf
+
+
+%files polkit
+%{_sysusersdir}/polkit.conf
+%files rpcbind
+%{_sysusersdir}/rpcbind.conf
+
+%changelog
+%autochangelog
@@ -1,6 +1,6 @@
 Name:			uxplay
-Version:		1.68.3
-Release:		1%?dist
+Version:		1.68.2
+Release:		1%{?dist}
 Summary:		AirPlay Unix mirroring server
 License:		GPL-3.0
 URL:			https://github.com/FDH2/UxPlay
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "rustdesk-selinux.spec"
+	}
+}
@@ -0,0 +1,69 @@
+# vim: sw=4:ts=4:et
+# Rustdesk will be added later, but for now this supplements the
+# external rustdesk package
+
+%define relabel_files() \
+restorecon -R /usr/lib/rustdesk/rustdesk; \
+
+%define selinux_policyver 38.28-1
+
+Name:   rustdesk-selinux
+Version:	1.0
+Release:	1%{?dist}
+Summary:	SELinux policy module for rustdesk
+
+Group:	System Environment/Base		
+License:	GPLv2+	
+URL:		http://rustdesk.com
+Source0:	rustdesk.te
+
+Requires: policycoreutils, libselinux-utils
+BuildRequires: policycoreutils, libselinux-utils, checkpolicy
+Supplements: rustdesk
+Enhances: rustdesk
+Requires(post): selinux-policy-base >= %{selinux_policyver}, policycoreutils
+Requires(postun): policycoreutils
+BuildArch: noarch
+
+%description
+This package installs and sets up the  SELinux policy security module for rustdesk.
+
+%build
+checkmodule -M -m -o rustdesk.mod %{SOURCE0}
+semodule_package -o rustdesk.pp -m rustdesk.mod
+
+
+%install
+install -d %{buildroot}%{_datadir}/selinux/packages
+install -m 644 rustdesk.pp %{buildroot}%{_datadir}/selinux/packages
+
+
+
+%post
+semodule -n -i %{_datadir}/selinux/packages/rustdesk.pp
+if /usr/sbin/selinuxenabled ; then
+    /usr/sbin/load_policy
+    %relabel_files
+
+fi;
+exit 0
+
+%postun
+if [ $1 -eq 0 ]; then
+    semodule -n -r rustdesk
+    if /usr/sbin/selinuxenabled ; then
+       /usr/sbin/load_policy
+       %relabel_files
+
+    fi;
+fi;
+exit 0
+
+%files
+%attr(0600,root,root) %{_datadir}/selinux/packages/rustdesk.pp
+
+
+%changelog
+* Sun Oct  1 2023 Cappy Ishihara <cappy@fyralabs.com> 1.0-1
+- Initial version
+
@@ -0,0 +1,44 @@
+module rustdesk 1.0;
+
+require {
+        type xdm_t;
+        type sudo_exec_t;
+        type cache_home_t;
+        type chronyc_t;
+        type xserver_misc_device_t;
+        type xserver_t;
+        type chronyd_restricted_t;
+        type device_t;
+        type unreserved_port_t;
+        type xserver_port_t;
+        type event_device_t;
+        type init_t;
+        type speech_dispatcher_t;
+        class capability dac_override;
+        class dir create;
+        class unix_dgram_socket sendto;
+        class unix_stream_socket connectto;
+        class tcp_socket name_connect;
+        class chr_file { getattr open read write };
+        class file execute;
+}
+
+#============= chronyc_t ==============
+allow chronyc_t chronyd_restricted_t:unix_dgram_socket sendto;
+
+#============= init_t ==============
+allow init_t event_device_t:chr_file open;
+allow init_t sudo_exec_t:file execute;
+
+#!!!! This avc can be allowed using the boolean 'nis_enabled'
+allow init_t unreserved_port_t:tcp_socket name_connect;
+allow init_t xserver_misc_device_t:chr_file { read write };
+allow init_t xserver_port_t:tcp_socket name_connect;
+allow init_t xserver_t:unix_stream_socket connectto;
+
+#============= speech_dispatcher_t ==============
+allow speech_dispatcher_t cache_home_t:dir create;
+allow speech_dispatcher_t self:capability dac_override;
+
+#============= xdm_t ==============
+allow xdm_t device_t:chr_file getattr;
@@ -1,5 +1,5 @@
 project pkg {
 	rpm {
-		spec = "sbctl.spec"
+		spec = "rustdesk.spec"
 	}
 }
@@ -0,0 +1,13 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index be7e2aef..1f0c1eac 100644
+--- a/Cargo.toml
+++ b/Cargo.toml
+@@ -17,7 +17,7 @@ travis-ci = { repository = "1wilkens/pam" }
+ 
+ [dependencies]
+ libc    = "^0.2"
+-pam-sys = "^0.5"
+pam-sys = { version = "1.0.0-alpha4", path = "./pam-sys" }
+ users   = "^0.8"
+ 
+ [dev-dependencies]
@@ -0,0 +1,23 @@
+From df8080b8b813f33963e8a169f157bff1607d54f4 Mon Sep 17 00:00:00 2001
+From: David Johnson <davidjohnson@rivosinc.com>
+Date: Tue, 5 Sep 2023 10:29:20 -0700
+Subject: [PATCH] Added __gnuc_va_list to the list of blocked types since this
+ type exists on at least some Linux platforms, and prevents pam-sys from
+ compiling without this exclusion.
+
+---
+ build.rs | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/build.rs b/build.rs
+index 7ac5cf3..cf44cde 100644
+--- a/build.rs
+++ b/build.rs
+@@ -29,6 +29,7 @@ fn main() {
+         .blocklist_type("va_list")
+         .blocklist_type("__va_list")
+         .blocklist_type("__builtin_va_list")
+        .blocklist_type("__gnuc_va_list")
+         .blocklist_type("__va_list_tag")
+         .blocklist_function("pam_v.*")
+         .blocklist_function("pam_syslog")
@@ -0,0 +1,13 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index 9e8224fc..8fbbe54c 100644
+--- a/Cargo.toml
+++ b/Cargo.toml
+@@ -127,7 +127,7 @@ mouce = { git="https://github.com/fufesou/mouce.git" }
+ evdev = { git="https://github.com/fufesou/evdev" }
+ dbus = "0.9"
+ dbus-crossroads = "0.5"
+-pam = { git="https://github.com/fufesou/pam", optional = true }
+pam = { path = "./pam", optional = true }
+ users = { version = "0.11" }
+ 
+ [target.'cfg(target_os = "android")'.dependencies]
@@ -0,0 +1,137 @@
+#global pamsys_ver v1.0.0-alpha5
+#global pamsys 1.0.0-alpha5
+#global pam_ver v0.7.0
+#global pam 0.7.0
+
+%ifarch x86_64
+%global scarch x64
+%else
+%ifarch aarch64
+%global scarch arm64
+%endif
+%endif
+
+Name:       rustdesk
+Version:	1.2.3
+Release:	1%{?dist}
+Summary:	An open-source remote desktop, and alternative to TeamViewer.
+
+Group:	    System Environment/Base
+License:	GPLv2+	
+URL:		http://rustdesk.com
+Source0:	https://github.com/rustdesk/rustdesk/archive/refs/tags/%{version}.tar.gz
+Source1:    https://github.com/c-smile/sciter-sdk/raw/master/bin.lnx/%{scarch}/libsciter-gtk.so
+%dnl Source2:    https://github.com/fufesou/pam/archive/refs/tags/%{pam_ver}.tar.gz
+%dnl Source3:    https://github.com/1wilkens/pam-sys/archive/refs/tags/%{pamsys_ver}.tar.gz
+%dnl Patch0:     pam-deps.diff
+%dnl Patch1:     pam-sys-build.patch
+%dnl Patch2:     rustdesk-deps.diff
+
+BuildRequires:  rust-packaging anda-srpm-macros gcc-c++ git curl wget nasm yasm gcc gtk3-devel clang libxcb-devel libxdo-devel libXfixes-devel pulseaudio-libs-devel cmake alsa-lib-devel
+BuildRequires:  gstreamer1-devel rust-gstreamer-devel pkgconfig(gstreamer-app-1.0)
+BuildRequires:  libvpx-devel opus-devel libyuv-devel libaom-devel pam-devel clang-devel
+Requires:   gtk3 libxcb libxdo libXfixes alsa-lib libappindicator libvdpau1 libva2 pam gstreamer1-plugins-base
+
+
+
+%description
+The best open-source remote desktop client software, written in Rust.
+
+%prep
+%setup -q -n rustdesk-%version
+%{dnl:
+%patch 2 -p1
+tar xf %SOURCE2
+mv pam-%pam pam
+cd pam
+git apply %PATCH0
+tar xf %SOURCE3
+mv pam-sys-%pamsys pam-sys
+cd pam-sys
+git apply %PATCH1
+cd ../..
+}
+%cargo_prep_online
+
+
+%build
+%cargo_build -a
+%global __python %{__python3}
+
+
+%install
+%cargo_install -a
+mkdir -p %buildroot/usr/lib/rustdesk/
+mkdir -p %buildroot%_datadir/rustdesk/files/
+mkdir -p %buildroot%_datadir/icons/hicolor/{256x256,scalable}/apps/
+install %SOURCE1 %buildroot/usr/lib/rustdesk/libsciter-gtk.so
+install res/rustdesk.service %buildroot%_datadir/rustdesk/files/
+install res/128x128@2x.png %buildroot%_datadir/icons/hicolor/256x256/apps/rustdesk.png
+install res/scalable.svg %buildroot%_datadir/icons/hicolor/scalable/apps/rustdesk.svg
+install res/rustdesk.desktop %buildroot%_datadir/rustdesk/files/
+install res/rustdesk-link.desktop %buildroot%_datadir/rustdesk/files/
+install -d %buildroot%_datadir/applications/
+install res/rustdesk.desktop %buildroot%_datadir/applications/
+install res/rustdesk-link.desktop %buildroot%_datadir/applications/
+install -d %buildroot%_unitdir
+install res/rustdesk.service %buildroot%_unitdir/rustdesk.service
+
+%files
+%_bindir/rustdesk
+%_bindir/naming
+/usr/lib/rustdesk/libsciter-gtk.so
+%_datadir/rustdesk/files/rustdesk.service
+%_datadir/icons/hicolor/256x256/apps/rustdesk.png
+%_datadir/icons/hicolor/scalable/apps/rustdesk.svg
+%_datadir/rustdesk/files/rustdesk.desktop
+%_datadir/rustdesk/files/rustdesk-link.desktop
+
+%_datadir/applications/rustdesk.desktop
+%_datadir/applications/rustdesk-link.desktop
+%_unitdir/rustdesk.service
+
+
+%pre
+# can do something for centos7
+case "$1" in
+  1)
+    # for install
+  ;;
+  2)
+    # for upgrade
+    systemctl stop rustdesk || true
+  ;;
+esac
+
+%post
+systemctl daemon-reload
+systemctl enable rustdesk
+systemctl start rustdesk
+update-desktop-database
+
+%preun
+case "$1" in
+  0)
+    # for uninstall
+    systemctl stop rustdesk || true
+    systemctl disable rustdesk || true
+  ;;
+  1)
+    # for upgrade
+  ;;
+esac
+
+%postun
+case "$1" in
+  0)
+    # for uninstall
+    update-desktop-database
+  ;;
+  1)
+    # for upgrade
+  ;;
+esac
+
+
+%changelog
+%autochangelog
@@ -0,0 +1 @@
+rpm.version(gh("rustdesk/rustdesk"));
@@ -1,5 +1,5 @@
 %global commit 7cb289b6466b662fdf9f7d7ccc9f3c08a7dc0cac
-%global commit_date 20240219
+%global commit_date 240219
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global debug_package %{nil}
 %define __os_install_post %{nil}
--- a/Show More
+++ b/Show More