fix: envision (#1499 )

Fedora pushed a breaking change splitting the openssl-devel package into also openssl-devel-engine Signed-off-by: madomado <madonuko@outlook.com> (cherry picked from commit fd1bc4f96b)
bump: preview stable
2026-05-31 17:11:56 +00:00 · 2024-07-12 04:07:52 +00:00 · 2024-07-12 03:31:35 +00:00 · 2024-07-12 10:15:00 +08:00 · 2024-07-12 01:16:53 +00:00 · 2024-07-11 21:39:10 +00:00
117 changed files with 1369 additions and 3414 deletions
@@ -2,7 +2,7 @@
  "repoOwner": "terrapkg",
  "repoName": "packages",
  "resetAuthor": true,
-  "targetBranchChoices": ["f39", "f40", "frawhide"],
+  "targetBranchChoices": ["f38", "f39", "f40", "frawhide"],
  "branchLabelMapping": {
    "^sync-(.+)$": "$1"
  }
@@ -1,4 +1,4 @@
-ARG VARIANT="rawhide"
+ARG VARIANT="38"
 FROM fedora:${VARIANT}

 RUN useradd -m vscode
@@ -2,7 +2,7 @@
  "name": "Fedora",
  "build": {
    "dockerfile": "Dockerfile",
-    "args": { "VARIANT": "rawhide" }
+    "args": { "VARIANT": "38" }
  },
  "remoteUser": "vscode",
  "runArgs": [
@@ -6,13 +6,13 @@ on:
    paths:
      - anda/**
    branches:
-      - frawhide
+      - f40
  pull_request:
    branches:
-      - frawhide
+      - f40
  merge_group:
    branches:
-      - frawhide
+      - f40
  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:frawhide
+      image: ghcr.io/terrapkg/builder:f40
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Set workspace as safe
@@ -40,7 +40,7 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }}
-        version: ["rawhide"]
+        version: ["40"]
      fail-fast: false
    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || matrix.pkg.labels['large'] && 'x86-64-lg' || 'ubuntu-latest' }}
    container:
@@ -94,7 +94,7 @@ jobs:

      - 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}} ${{github.sha}}
+        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() ) && github.event_name == 'push'
-        run: ./.github/workflows/mg.sh false ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} ${{github.sha}}
+        run: ./.github/workflows/mg.sh false ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
@@ -7,7 +7,7 @@ jobs:
  bootstrap:
    strategy:
      matrix:
-        version: ["rawhide"]
+        version: ["40"]
        arch: ["x86_64", "aarch64"]
      fail-fast: true
    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
@@ -14,6 +14,8 @@ on:
        required: false
        default: all
        type: string
+    
+

 jobs:
  parse:
@@ -26,25 +28,25 @@ jobs:
      - name: Parse Input
        id: parsing
        run: |
-          echo "${{ inputs.packages }}" | sed 's/ /\n/g' | sed 's/$/\//g' | jq -R . | jq -s . | jq -c . | sed 's/^/pkgs=/' >> $GITHUB_OUTPUT
-          echo "builder=${{ inputs.custom_builder }}" >> $GITHUB_OUTPUT
-          arch="${{ inputs.architecture }}"
-          # Convert to json array using jq
-          # if arch is not all, convert to array
-          if [ "$arch" != "all" ]; then
-            # jq, array with single element as string
-             arch=$(echo $arch | sed 's/,/\n/g')
-             echo "arch=$(echo $arch | jq -Rs 'split("\n")' | jq 'map(select(length > 0))' | jq -c .)" >> $GITHUB_OUTPUT
-          else
-             echo "arch=$(echo '["aarch64", "x86_64"]' | jq -c .)" >> $GITHUB_OUTPUT
-          fi
+            echo "${{ inputs.packages }}" | sed 's/ /\n/g' | sed 's/$/\//g' | jq -R . | jq -s . | jq -c . | sed 's/^/pkgs=/' >> $GITHUB_OUTPUT
+            echo "builder=${{ inputs.custom_builder }}" >> $GITHUB_OUTPUT
+            arch="${{ inputs.architecture }}"
+            # Convert to json array using jq
+            # if arch is not all, convert to array
+            if [ "$arch" != "all" ]; then
+              # jq, array with single element as string
+               arch=$(echo $arch | sed 's/,/\n/g')
+               echo "arch=$(echo $arch | jq -Rs 'split("\n")' | jq 'map(select(length > 0))' | jq -c .)" >> $GITHUB_OUTPUT
+            else
+               echo "arch=$(echo '["aarch64", "x86_64"]' | jq -c .)" >> $GITHUB_OUTPUT
+            fi

  build:
    needs: parse
    strategy:
      matrix:
        pkg: ${{ fromJson(needs.parse.outputs.pkgs) }}
-        version: ["rawhide"]
+        version: ["40"]
        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' }}
@@ -100,7 +102,7 @@ jobs:

      - name: Notify Madoguchi (Success)
        if: success()
-        run: ./.github/workflows/mg.sh true ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} ${{github.sha}}
+        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()
-        run: ./.github/workflows/mg.sh false ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} ${{github.sha}}
+        run: ./.github/workflows/mg.sh false ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
@@ -11,7 +11,7 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(inputs.packages) }}
-        version: ["rawhide"]
+        version: ["40"]
      fail-fast: false
    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
    container:
@@ -67,7 +67,7 @@ jobs:

      - name: Notify Madoguchi (Success)
        if: success()
-        run: ./.github/workflows/mg.sh true ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} ${{github.sha}}
+        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()
-        run: ./.github/workflows/mg.sh false ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} ${{github.sha}}
+        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:
-      - frawhide
+      - f40
  pull_request:
    branches:
-      - frawhide
+      - f40
  merge_group:
    branches:
-      - frawhide
+      - f40
 jobs:
  lint:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:f40
    steps:
      - name: Checkout repository
        uses: actions/checkout@v4
@@ -2,7 +2,7 @@ set -x

 dirs=$2
 dirs=${dirs/\/pkg/}
-export p="{\"id\":\"$5\",\"ver\":\"%v\",\"rel\":\"%r\",\"arch\":\"$4\",\"dirs\":\"$dirs\",\"succ\":$1,\"commit\":\"%6\"}"
+export p="{\"id\":\"$5\",\"ver\":\"%v\",\"rel\":\"%r\",\"arch\":\"$4\",\"dirs\":\"$dirs\",\"succ\":$1}"

 if [[ $1 == false ]]; then
 	d=${p/\%v/?}
@@ -3,9 +3,10 @@ name: Push comps updates
 on:
  push:
    branches:
-      - frawhide
      - f40
      - f39
+      - f38
+      - f37
    paths:
      - comps.xml
  workflow_dispatch:
@@ -14,7 +15,7 @@ jobs:
  update-comps:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:f40
    steps:
      - uses: actions/checkout@v4
      - name: Push to subatomic
@@ -8,7 +8,7 @@ jobs:
  autoupdate:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:f40
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
@@ -17,12 +17,11 @@ jobs:
          fetch-depth: 0
          ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}

-      - name: Install SSH signing key & Set up git repository
+      - 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
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"

      - name: Run Nightly Update
        run: anda update -vv --filters nightly=1
@@ -31,6 +30,7 @@ jobs:

      - name: Save
        run: |
+          git config --global --add safe.directory "*"
          if [[ `git status --porcelain` ]]; then
            git config user.name "Raboneko"
            git config user.email "raboneko@fyralabs.com"
@@ -46,7 +46,8 @@ jobs:
              git add *
              git commit -S -a -m "$msg"
            }
-            copy_over f39 || true
-            copy_over f40 || true
+            copy_over f37 || true
+            copy_over f38 || true
+            copy_over frawhide || true
            git push -u origin --all
          fi
@@ -8,7 +8,7 @@ jobs:
  autoupdate:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:f40
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
@@ -17,12 +17,11 @@ jobs:
          fetch-depth: 0
          ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}

-      - name: Install SSH signing key & Set up git repository
+      - 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
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"

      - name: Run Update
        run: anda update -vv
@@ -32,6 +31,7 @@ jobs:

      - name: Save
        run: |
+          git config --global --add safe.directory "*"
          if [[ `git status --porcelain` ]]; then
            git config user.name "Raboneko"
            git config user.email "raboneko@fyralabs.com"
@@ -48,6 +48,8 @@ jobs:
              git commit -S -a -m "$msg"
            }
            copy_over f39 || true
-            copy_over f40 || true
+            copy_over f37 || true
+            copy_over f38 || true
+            copy_over frawhide || true
            git push -u origin --all
          fi
@@ -1,9 +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).
-
-## Documentations
+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:

 * [Contribution Guide](https://developer.fyralabs.com/terra/contributing)
 * [FAQ](https://developer.fyralabs.com/terra/faq)
-* [Policy](https://developer.fyralabs.com/terra/policy)
+* [Policy](https://developer.fyralabs.com/terra/policy)
@@ -1,5 +1,6 @@
 # Terra Sources

+[![Repository status](https://repology.org/badge/repository-big/terra_38.svg?header=Terra+38)](https://repology.org/repository/terra_38)
 [![Repository status](https://repology.org/badge/repository-big/terra_39.svg?header=Terra+39)](https://repology.org/repository/terra_39)
 [![Repository status](https://repology.org/badge/repository-big/terra_40.svg?header=Terra+40)](https://repology.org/repository/terra_40)
 [![Repository status](https://repology.org/badge/repository-big/terra_rawhide.svg?header=Terra+Rawhide)](https://repology.org/repository/terra_rawhide)
@@ -11,7 +12,7 @@ This monorepo contains the package manifests for all packages in Terra.

 ## Installation
 ```bash
-sudo dnf install --repofrompath 'terra,https://repos.fyralabs.com/terra$releasever' --setopt='terra.gpgkey=https://repos.fyralabs.com/terra$releasever/key.asc' terra-release
+sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra.repo
 ```
 You should also install the `terra-release` package so that when our infrastructure has any migrations, you can be assured that your Terra installation will still work as-is.

@@ -1,26 +1,18 @@
-%global xurl https://files.pythonhosted.org/packages/51/5f/6f52b958fe38a36a0799c01fbd56a742ebdfcf41f89438dbee998b8ce692/anki-24.06.3-cp39-abi3-manylinux_2_28_x86_64.whl
-%global aurl https://files.pythonhosted.org/packages/df/bb/b0bfbc6a06a598b0b614d18dd8c4f40827828649f9742f1f44a4e44d6a2c/anki-24.06.3-cp39-abi3-manylinux_2_31_aarch64.whl
-%global qurl https://files.pythonhosted.org/packages/21/2a/d8e22a9521be04ef29a30d21a2c3008783ab03b6f07cc14696a040f747a4/aqt-24.06.3-py3-none-any.whl
-
 Name:			anki-bin
 Version:		24.06.3
 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
+BuildRequires:	python3-pip rpm_macro(fdupes)
 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
 Conflicts:		anki
-%ifarch x86_64
-Source0:		%xurl
-%elifarch aarch64
-Source0:        %aurl
-%endif
-Source1:		%qurl
+Source0:		https://files.pythonhosted.org/packages/cp39/a/anki/anki-%{version}-cp39-abi3-manylinux_2_28_%{_arch}.whl
+Source1:		https://files.pythonhosted.org/packages/py3/a/aqt/aqt-%{version}-py3-none-any.whl
 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
@@ -1,15 +1 @@
-let aarch64_regex = `<a href="https://files\.pythonhosted\.org/packages/(..)/(..)/(.{60})/anki-([\d.]+)-cp(\d+)-abi3-manylinux_.+?_aarch64.whl">`;
-let html = get("https://pypi.org/project/anki/");
-let relevant = find(aarch64_regex, html, 0);
-let ver = find(aarch64_regex, relevant, 4);
-rpm.version(ver);
-if rpm.changed() {
-    rpm.release();
-    rpm.global("aurl", find(`"(.+)"`, relevant, 1));
-    let cp = find(aarch64_regex, relevant, 5);
-    let x86_64_regex = `<a href="https://files\.pythonhosted\.org/packages/(..)/(..)/(.{60})/anki-${ver}-cp${cp}-abi3-manylinux_.+?_x86_64.whl">`;
-    let relevant1 = find(x86_64_regex, html, 0);
-    rpm.global("xurl", find(`"(.+)"`, relevant1, 1));
-    let qhtml = get("https://pypi.org/project/aqt/");
-    rpm.global("qurl", find(`<a href="(https://files\.pythonhosted\.org/packages/../../.{60}/aqt-${ver}-py3-none.any.whl)">`, qhtml, 1));
-}
+rpm.version(gh("ankitects/anki"));
@@ -20,7 +20,6 @@ phrases in a foreign language) as easily, quickly and efficiently as possible.
 Anki is based on a theory called spaced repetition.

 %prep
-rm -rf ./*
 git clone https://github.com/ankitects/anki .
 git checkout %version
 %patch 1 -p1
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-canary-openasar
-Version:        0.0.454
+Version:        0.0.452
 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.454
+Version:        0.0.452
 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.60
+Version:        0.0.59
 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.95
+Version:        0.0.94
 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.95
+Version:        0.0.94
 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.60
+Version:		0.0.59
 Release:		1%?dist
 Summary:		Free Voice and Text Chat for Gamers
 URL:			https://discord.com
@@ -1,5 +0,0 @@
-project pkg {
-  rpm {
-	  spec = "komikku.spec"
-  }
-}
@@ -1,109 +0,0 @@
-%global appname Komikku
-%global uuid    info.febvre.%{appname}
-%global gtk4_version        4.14.4
-%global libadwaita_version  1.5.1
-%global pure_protobuf_version 2.0.0
-
-Name:           komikku
-Version:        1.51.1
-%forgemeta
-Release:        %autorelease
-Summary:        A manga reader for GNOME
-
-BuildArch:      noarch
-
-License:        GPL-3.0-or-later
-URL:            https://valos.gitlab.io/Komikku
-Source0:        https://codeberg.org/valos/%{appname}/archive/v%{version}.tar.gz#/%{name}-v%{version}.tar.gz
-
-BuildRequires:  desktop-file-utils
-BuildRequires:  intltool
-BuildRequires:  libappstream-glib
-BuildRequires:  meson >= 0.59.0
-BuildRequires:  python3-devel >= 3.8
-BuildRequires:  blueprint-compiler
-
-BuildRequires:  pkgconfig(gobject-introspection-1.0) >= 1.35.9
-BuildRequires:  pkgconfig(gtk4) >= %{gtk4_version}
-BuildRequires:  pkgconfig(libadwaita-1) >= %{libadwaita_version}
-
-Requires:       hicolor-icon-theme
-Requires:       gtk4 >= %{gtk4_version}
-Requires:       libadwaita >= %{libadwaita_version}
-Requires:       libnotify
-Requires:       webkitgtk6.0
-Requires:       python3-beautifulsoup4
-Requires:       python3-brotli
-Requires:       python3-colorthief
-Requires:       python3-dateparser  %dnl >= 1.1.4 | https://bugzilla.redhat.com/show_bug.cgi?id=2115204
-Requires:       python3-emoji
-Requires:       python3-gobject
-Requires:       python3-keyring >= 21.6.0
-Requires:       python3-lxml
-Requires:       python3-natsort
-Requires:       python3-file-magic
-Requires:       python3-piexif
-Requires:       python3-pillow
-Requires:       python3-pillow-heif
-Requires:       python3-pure-protobuf >= %{pure_protobuf_version}
-Requires:       python3-rarfile
-Requires:       python3-requests
-Requires:       python3-unidecode
-
-%description
-Komikku is a manga reader for GNOME. It focuses on providing a clean, intuitive
-and adaptive interface.
-
-Keys features
-
-* Online reading from dozens of servers
-* Offline reading of downloaded comics
-* Categories to organize your library
-* RTL, LTR, Vertical and Webtoon reading modes
-* Several types of navigation:
-  * Keyboard arrow keys
-  * Right and left navigation layout via mouse click or tapping
-    (touchpad/touch screen)
-  * Mouse wheel
-  * 2-fingers swipe gesture (touchpad)
-  * Swipe gesture (touch screen)
-* Automatic update of comics
-* Automatic download of new chapters
-* Reading history
-* Light and dark themes
-
-%prep
-%autosetup -n %{name} -p1
-
-
-%build
-%meson
-%meson_build
-
-
-%install
-%meson_install
-%find_lang %{name}
-
-
-%check
-appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.xml
-desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
-
-
-%files -f %{name}.lang
-%license LICENSE
-%doc README.md
-%{_bindir}/%{name}
-%{_datadir}/%{name}/
-%{_datadir}/applications/*.desktop
-%{_datadir}/glib-2.0/schemas/*.gschema.xml
-%{_datadir}/icons/hicolor/scalable/*/*.svg
-%{_datadir}/icons/hicolor/symbolic/*/*.svg
-%{_metainfodir}/*.xml
-%{python3_sitelib}/%{name}/
-
-
-%changelog
-* Thu Jul 11 2024 Trung Lê <8@tle.id.au> - 1.51.1-0
- Initial RPM package
@@ -1,3 +0,0 @@
-let latest_tag = get("https://codeberg.org/api/v1/repos/valos/Komikku/tags").json_arr()[0].name;
-let new_version = find("([\\.\\d]+)", latest_tag, 1);
-rpm.version(new_version);
@@ -1,6 +1,6 @@
-%global commit e509ec0aaffce74e520702e16e3e21ea0f168940
+%global commit f470b63a04767ada809ae7d0c69c8f9ac4c80628
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240720
+%global commit_date 20240712
 %global ver v0.38.0

 Name:           mpv-nightly
@@ -1,4 +1,4 @@
-# Generated by rust2rpm 26
+# Generated by rust2rpm 25
 %bcond_with check
 # aarch64 dist is not available
 %ifarch aarch64
@@ -14,7 +14,7 @@

 Name:           rust-sccache
 Version:        0.8.1
-Release:        %autorelease
+Release:        1%?dist
 Summary:        Ccache-like tool

 License:        Apache-2.0
@@ -89,6 +89,17 @@ use the "default" feature of the "%{crate}" crate.
 %package     -n %{name}+all-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/all) = 0.7.4
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+Requires:       crate(sccache/azure) = 0.7.4
+Requires:       crate(sccache/dist-client) = 0.7.4
+Requires:       crate(sccache/gcs) = 0.7.4
+Requires:       crate(sccache/gha) = 0.7.4
+Requires:       crate(sccache/memcached) = 0.7.4
+Requires:       crate(sccache/redis) = 0.7.4
+Requires:       crate(sccache/s3) = 0.7.4
+Requires:       crate(sccache/webdav) = 0.7.4

 %description -n %{name}+all-devel %{_description}

@@ -101,6 +112,9 @@ use the "all" feature of the "%{crate}" crate.
 %package     -n %{name}+azure-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/azure) = 0.7.4
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4

 %description -n %{name}+azure-devel %{_description}

@@ -113,6 +127,9 @@ use the "azure" feature of the "%{crate}" crate.
 %package     -n %{name}+dist-client-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/dist-client) = 0.7.4
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4

 %description -n %{name}+dist-client-devel %{_description}

@@ -121,10 +138,13 @@ use the "dist-client" feature of the "%{crate}" crate.

 %files       -n %{name}+dist-client-devel
 %ghost %{crate_instdir}/Cargo.toml
-
+%if %{with dist_server}
 %package     -n %{name}+dist-server-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/dist-server) = 0.7.4
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4

 %description -n %{name}+dist-server-devel %{_description}

@@ -137,6 +157,11 @@ use the "dist-server" feature of the "%{crate}" crate.
 %package     -n %{name}+dist-tests-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/dist-tests) = 0.7.4
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+Requires:       crate(sccache/dist-client) = 0.7.4
+Requires:       crate(sccache/dist-server) = 0.7.4

 %description -n %{name}+dist-tests-devel %{_description}

@@ -145,10 +170,15 @@ use the "dist-tests" feature of the "%{crate}" crate.

 %files       -n %{name}+dist-tests-devel
 %ghost %{crate_instdir}/Cargo.toml
-
+%endif
 %package     -n %{name}+flate2-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/flate2) = 0.7.4
+Requires:       (crate(flate2) >= 1.0.0 with crate(flate2) < 2.0.0~)
+Requires:       (crate(flate2/rust_backend) >= 1.0.0 with crate(flate2/rust_backend) < 2.0.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4

 %description -n %{name}+flate2-devel %{_description}

@@ -161,6 +191,9 @@ use the "flate2" feature of the "%{crate}" crate.
 %package     -n %{name}+gcs-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/gcs) = 0.7.4
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4

 %description -n %{name}+gcs-devel %{_description}

@@ -173,6 +206,10 @@ use the "gcs" feature of the "%{crate}" crate.
 %package     -n %{name}+gha-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/gha) = 0.7.4
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+Requires:       crate(sccache/opendal) = 0.7.4

 %description -n %{name}+gha-devel %{_description}

@@ -182,21 +219,14 @@ use the "gha" feature of the "%{crate}" crate.
 %files       -n %{name}+gha-devel
 %ghost %{crate_instdir}/Cargo.toml

-%package     -n %{name}+http-body-util-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+http-body-util-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "http-body-util" feature of the "%{crate}" crate.
-
-%files       -n %{name}+http-body-util-devel
-%ghost %{crate_instdir}/Cargo.toml
-
 %package     -n %{name}+hyper-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/hyper) = 0.7.4
+Requires:       (crate(hyper/default) >= 0.14.27 with crate(hyper/default) < 0.15.0~)
+Requires:       (crate(hyper/server) >= 0.14.27 with crate(hyper/server) < 0.15.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4

 %description -n %{name}+hyper-devel %{_description}

@@ -206,21 +236,13 @@ use the "hyper" feature of the "%{crate}" crate.
 %files       -n %{name}+hyper-devel
 %ghost %{crate_instdir}/Cargo.toml

-%package     -n %{name}+hyper-util-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+hyper-util-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "hyper-util" feature of the "%{crate}" crate.
-
-%files       -n %{name}+hyper-util-devel
-%ghost %{crate_instdir}/Cargo.toml
-
 %package     -n %{name}+jwt-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/jwt) = 0.7.4
+Requires:       (crate(jsonwebtoken/default) >= 8.0.0 with crate(jsonwebtoken/default) < 9.0.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4

 %description -n %{name}+jwt-devel %{_description}

@@ -233,6 +255,10 @@ use the "jwt" feature of the "%{crate}" crate.
 %package     -n %{name}+libmount-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/libmount) = 0.7.4
+Requires:       (crate(libmount/default) >= 0.1.10 with crate(libmount/default) < 0.2.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4

 %description -n %{name}+libmount-devel %{_description}

@@ -245,6 +271,11 @@ use the "libmount" feature of the "%{crate}" crate.
 %package     -n %{name}+memcached-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/memcached) = 0.7.4
+Requires:       (crate(opendal/default) >= 0.40.0 with crate(opendal/default) < 0.41.0~)
+Requires:       (crate(opendal/services-memcached) >= 0.40.0 with crate(opendal/services-memcached) < 0.41.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4

 %description -n %{name}+memcached-devel %{_description}

@@ -257,6 +288,9 @@ use the "memcached" feature of the "%{crate}" crate.
 %package     -n %{name}+native-zlib-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/native-zlib) = 0.7.4
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4

 %description -n %{name}+native-zlib-devel %{_description}

@@ -269,6 +303,10 @@ use the "native-zlib" feature of the "%{crate}" crate.
 %package     -n %{name}+nix-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/nix) = 0.7.4
+Requires:       (crate(nix/default) >= 0.26.2 with crate(nix/default) < 0.27.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4

 %description -n %{name}+nix-devel %{_description}

@@ -281,6 +319,10 @@ use the "nix" feature of the "%{crate}" crate.
 %package     -n %{name}+opendal-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/opendal) = 0.7.4
+Requires:       (crate(opendal/default) >= 0.40.0 with crate(opendal/default) < 0.41.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4

 %description -n %{name}+opendal-devel %{_description}

@@ -293,6 +335,10 @@ use the "opendal" feature of the "%{crate}" crate.
 %package     -n %{name}+openssl-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/openssl) = 0.7.4
+Requires:       (crate(openssl/default) >= 0.10.55 with crate(openssl/default) < 0.11.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4

 %description -n %{name}+openssl-devel %{_description}

@@ -302,21 +348,16 @@ use the "openssl" feature of the "%{crate}" crate.
 %files       -n %{name}+openssl-devel
 %ghost %{crate_instdir}/Cargo.toml

-%package     -n %{name}+oss-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+oss-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "oss" feature of the "%{crate}" crate.
-
-%files       -n %{name}+oss-devel
-%ghost %{crate_instdir}/Cargo.toml
-
 %package     -n %{name}+redis-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/redis) = 0.7.4
+Requires:       (crate(opendal/default) >= 0.40.0 with crate(opendal/default) < 0.41.0~)
+Requires:       (crate(opendal/services-redis) >= 0.40.0 with crate(opendal/services-redis) < 0.41.0~)
+Requires:       (crate(opendal/services-redis-rustls) >= 0.40.0 with crate(opendal/services-redis-rustls) < 0.41.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+Requires:       crate(sccache/url) = 0.7.4

 %description -n %{name}+redis-devel %{_description}

@@ -329,6 +370,10 @@ use the "redis" feature of the "%{crate}" crate.
 %package     -n %{name}+reqsign-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/reqsign) = 0.7.4
+Requires:       (crate(reqsign/default) >= 0.14.1 with crate(reqsign/default) < 0.15.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4

 %description -n %{name}+reqsign-devel %{_description}

@@ -341,6 +386,15 @@ use the "reqsign" feature of the "%{crate}" crate.
 %package     -n %{name}+reqwest-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/reqwest) = 0.7.4
+Requires:       (crate(reqwest/blocking) >= 0.11.0 with crate(reqwest/blocking) < 0.12.0~)
+Requires:       (crate(reqwest/default) >= 0.11.0 with crate(reqwest/default) < 0.12.0~)
+Requires:       (crate(reqwest/json) >= 0.11.0 with crate(reqwest/json) < 0.12.0~)
+Requires:       (crate(reqwest/rustls-tls) >= 0.11.0 with crate(reqwest/rustls-tls) < 0.12.0~)
+Requires:       (crate(reqwest/stream) >= 0.11.0 with crate(reqwest/stream) < 0.12.0~)
+Requires:       (crate(reqwest/trust-dns) >= 0.11.0 with crate(reqwest/trust-dns) < 0.12.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4

 %description -n %{name}+reqwest-devel %{_description}

@@ -353,6 +407,11 @@ use the "reqwest" feature of the "%{crate}" crate.
 %package     -n %{name}+rouille-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/rouille) = 0.7.4
+Requires:       (crate(rouille) >= 3.6.0 with crate(rouille) < 4.0.0~)
+Requires:       (crate(rouille/ssl) >= 3.6.0 with crate(rouille/ssl) < 4.0.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4

 %description -n %{name}+rouille-devel %{_description}

@@ -365,6 +424,11 @@ use the "rouille" feature of the "%{crate}" crate.
 %package     -n %{name}+s3-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/s3) = 0.7.4
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+Requires:       crate(sccache/opendal) = 0.7.4
+Requires:       crate(sccache/reqsign) = 0.7.4

 %description -n %{name}+s3-devel %{_description}

@@ -377,6 +441,10 @@ use the "s3" feature of the "%{crate}" crate.
 %package     -n %{name}+sha2-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/sha2) = 0.7.4
+Requires:       (crate(sha2/default) >= 0.10.6 with crate(sha2/default) < 0.11.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4

 %description -n %{name}+sha2-devel %{_description}

@@ -389,6 +457,10 @@ use the "sha2" feature of the "%{crate}" crate.
 %package     -n %{name}+syslog-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/syslog) = 0.7.4
+Requires:       (crate(syslog/default) >= 6.0.0 with crate(syslog/default) < 7.0.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4

 %description -n %{name}+syslog-devel %{_description}

@@ -398,9 +470,29 @@ use the "syslog" feature of the "%{crate}" crate.
 %files       -n %{name}+syslog-devel
 %ghost %{crate_instdir}/Cargo.toml

+%{dnl ## BEGIN: multiline comment
+%package     -n %{name}+trust-dns-resolver-devel
+Summary:        %{summary}
+BuildArch:      noarch
+Provides:       crate(sccache/trust-dns-resolver) = 0.7.4
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+
+%description -n %{name}+trust-dns-resolver-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "trust-dns-resolver" feature of the "%{crate}" crate.
+
+%files       -n %{name}+trust-dns-resolver-devel
+%ghost %{crate_instdir}/Cargo.toml
+}    ## END OF multiline comment
+
 %package     -n %{name}+unstable-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/unstable) = 0.7.4
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4

 %description -n %{name}+unstable-devel %{_description}

@@ -413,6 +505,10 @@ use the "unstable" feature of the "%{crate}" crate.
 %package     -n %{name}+url-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/url) = 0.7.4
+Requires:       (crate(url/default) >= 2.0.0 with crate(url/default) < 3.0.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4

 %description -n %{name}+url-devel %{_description}

@@ -425,6 +521,9 @@ use the "url" feature of the "%{crate}" crate.
 %package     -n %{name}+vendored-openssl-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/vendored-openssl) = 0.7.4
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4

 %description -n %{name}+vendored-openssl-devel %{_description}

@@ -437,6 +536,10 @@ use the "vendored-openssl" feature of the "%{crate}" crate.
 %package     -n %{name}+version-compare-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/version-compare) = 0.7.4
+Requires:       (crate(version-compare/default) >= 0.1.1 with crate(version-compare/default) < 0.2.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4

 %description -n %{name}+version-compare-devel %{_description}

@@ -449,6 +552,10 @@ use the "version-compare" feature of the "%{crate}" crate.
 %package     -n %{name}+webdav-devel
 Summary:        %{summary}
 BuildArch:      noarch
+Provides:       crate(sccache/webdav) = 0.7.4
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+Requires:       crate(sccache/opendal) = 0.7.4

 %description -n %{name}+webdav-devel %{_description}

@@ -1,6 +1,6 @@
--- sccache-0.8.1/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ sccache-0.8.1/Cargo.toml	2024-07-10T16:31:31.705674+00:00
-@@ -403,13 +403,3 @@
+--- sccache-0.7.6/Cargo.toml	1970-01-01T00:00:01+00:00
+++ sccache-0.7.6/Cargo.toml	2024-02-02T06:05:53.548100+00:00
+@@ -378,11 +378,3 @@
 [target."cfg(unix)".dependencies.daemonize]
 version = "0.5"
 
@@ -11,6 +11,4 @@
 -    "handleapi",
 -    "stringapiset",
 -    "winnls",
-    "processenv",
-    "std",
 -]
@@ -0,0 +1,22 @@
+From 6b8c81d1d4ac0ac562b69e7f8164c8a92dafe13a Mon Sep 17 00:00:00 2001
+From: windowsboy111 <wboy111@outlook.com>
+Date: Mon, 19 Jun 2023 10:33:20 +0800
+Subject: [PATCH] feat: add repository entry in package.json
+
+---
+ package.json | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/package.json b/package.json
+index 622756a..b3d3dfa 100644
+--- a/package.json
+++ b/package.json
+@@ -1,4 +1,5 @@
+ {
+  "repository": "github:VOICEVOX/voicevox",
+   "name": "voicevox",
+   "version": "999.999.999",
+   "author": "Hiroshiba Kazuyuki",
+-- 
+2.40.1
+
@@ -1,5 +1,4 @@
 project pkg {
-	arches = ["x86_64"]
 	rpm {
 		spec = "voicevox.spec"
 	}
@@ -1 +1,5 @@
-rpm.version(gh("VOICEVOX/voicevox"));
+let v = gh("VOICEVOX/voicevox");
+rpm.global("ver", v);
+let engines = get(`https://raw.githubusercontent.com/VOICEVOX/voicevox/${v}/package.json`).json().engines;
+rpm.global("nodev", find(">=([\\d.]+)", engines.node, 1));
+rpm.global("npmv", find(">=([\\d.]+)", engines.npm, 1));
@@ -1,3 +1,6 @@
+%global nodev 20.12.2
+%global npmv 10.5.0
+%global ver 0.19.2
 %define debug_package %nil
 %global _build_id_links none

@@ -6,16 +9,20 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:			voicevox
-Version:		0.19.2
+Version:		%ver
 Release:		4%?dist
 Summary:		Free Japanese text-to-speech editor
 License:		LGPL-3.0
 URL:			https://voicevox.hiroshiba.jp
-Source0:        https://github.com/VOICEVOX/voicevox/releases/download/%version/VOICEVOX.AppImage.7z.001
-Source1:        https://github.com/VOICEVOX/voicevox/releases/download/%version/VOICEVOX.AppImage.7z.002
-Source2:        https://github.com/VOICEVOX/voicevox/releases/download/%version/VOICEVOX.AppImage.7z.003
-BuildRequires:  p7zip-plugins
-ExclusiveArch:  x86_64
+Source0:		https://github.com/VOICEVOX/voicevox/archive/refs/tags/%version.tar.gz
+# requires specific node and npm version
+%ifarch x86_64
+%global a x64
+%elifarch aarch64
+%global a arm64
+%endif
+Source1:		https://nodejs.org/download/release/v%nodev/node-v%nodev-linux-%a.tar.xz
+Patch0:			0001-feat-add-repository-entry-in-package.json.patch

 %description
 VOICEVOX is a free Japanese text-to-speech software with medium output quality.
@@ -27,28 +34,33 @@ Summary: Documentation files for voicevox (Japanese)
 %summary.

 %prep
-cat<<EOF > voicevox.sh
-#!/bin/sh
-/usr/share/voicevox/VOICEVOX.AppImage
-EOF
-7z x %SOURCE0
-chmod a+x VOICEVOX.AppImage
-
-./VOICEVOX.AppImage --appimage-extract '*.desktop'
-./VOICEVOX.AppImage --appimage-extract 'usr/share/icons/**'
-
-sed -i "s|Exec=.*|Exec=/usr/share/voicevox/VOICEVOX.AppImage|" squashfs-root/voicevox.desktop
+%autosetup -p1
+tar xf %SOURCE1
+PATH="$PATH:$PWD/node-v%nodev-linux-%a/bin/"
+npx npm@%npmv i

 %build
+PATH="$PATH:$PWD/node-v%nodev-linux-%a/bin/"
+npx browserslist@latest --update-db
+PATH="$PATH:$PWD/node-v%nodev-linux-%a/bin/"
+npm run electron:build

 %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/voicevox.desktop %buildroot%_datadir/applications/voicevox.desktop
+rm dist_electron/linux-unpacked/README.txt # dummy
+mkdir -p %buildroot%_datadir/%name %buildroot%_bindir %buildroot%_docdir/%name/res
+mv dist_electron/linux-unpacked/* %buildroot%_datadir/%name/
+ln -s %_datadir/%name/%name %buildroot%_bindir/%name
+install -Dm644 docs/*.md %buildroot%_docdir/%name/
+install -Dm644 docs/res/* %buildroot%_docdir/%name/res/

 %files
-%_bindir/voicevox
-%_datadir/applications/voicevox.desktop
-%_datadir/voicevox/VOICEVOX.AppImage
-%_iconsdir/hicolor/256x256/apps/voicevox.png
+%doc README.md
+%license LICENSE LGPL_LICENSE
+%_bindir/%name
+%_datadir/%name/
+
+%files doc
+%doc %_docdir/%name/
+
+%changelog
+%autochangelog
@@ -3,8 +3,8 @@

 Name:           elementary-terminal
 Summary:        The terminal of the 21st century
-Version:        6.2.0
-Release:        1%?dist
+Version:        6.1.2
+Release:        2%{?dist}
 License:        LGPL-3.0

 URL:            https://github.com/elementary/%{srcname}
@@ -90,9 +90,16 @@ appstream-util validate-relax --nonet \
 %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
 %{_datadir}/%{appname}/
 %{_datadir}/metainfo/%{appname}.appdata.xml
-%{_mandir}/man1/%{appname}.1.gz

 %files fish
 %doc README.md
 %license COPYING
 %{_datadir}/fish/vendor_conf.d/pantheon_terminal_process_completion_notifications.fish
+
+
+%changelog
+* Thu Nov 17 2022 windowsboy111 <wboy111@outlook.com> - 6.1.1-1
+- new version
+
+* Sat Oct 15 2022 windowsboy111 <windowsboy111@fyralabs.com>
+- Repackaged for Terra
@@ -13,7 +13,7 @@ Epoch:          1

 URL:            https://github.com/elementary/wingpanel
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
-Patch0:         https://github.com/elementary/wingpanel/compare/23a3eb7c2448b4f35398116df7d01b075361ef1f..5d22d436b45decfb2a50d9a7c27f2c961f1dd39f.patch
+Patch0:         https://github.com/elementary/wingpanel/compare/3.0.5..5d22d436b45decfb2a50d9a7c27f2c961f1dd39f.patch

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

 BuildRequires:  mesa-libEGL-devel

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

 Name:           gnome-shell-extension-%{extension}
 Version:        2
-Release:        1%{?dist}
+Release:        2%{?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,8 +11,9 @@ 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 >= 45~ with gnome-shell < 46~)
+Requires:       (gnome-shell >= 46~ with gnome-shell < 47~)
 Recommends:     gnome-extensions-app

 %description
@@ -30,5 +31,8 @@ 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 4f1c08054b1f975176375f615cf9d2470f7ec7ed
+%global commit 8328f9a6863b4bae48adfdbc29b32b4c571c6530
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global commit_date %(date '+%Y%m%d')
 %global snapshot_info %{commit_date}.%{shortcommit}
@@ -4,7 +4,7 @@

 Name:       lomiri-download-manager
 Version:    0.1.3
-Release:    1%?dist
+Release:    1%{?dist}
 Summary:    Upload Download Manager for Lomiri
 License:    LGPLv3
 URL:        https://gitlab.com/ubports/development/core/lomiri-download-manager
@@ -1,10 +1,10 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-schemas
-%global commit 814c0b16b3753fef918bfe624710cb4809a690fa
+%global commit 6acdde9e890685bd5a5d6fbd4446d9e8b3e6c698
 %forgemeta

 Name:       lomiri-schemas
-Version:    0.1.5
-Release:    1%?dist
+Version:    0.1.4
+Release:    1%{?dist}
 Summary:    Configuration schemas for lomiri
 License:    LGPL-2.0-or-later
 URL:        https://gitlab.com/ubports/development/core/lomiri-schemas
@@ -1,16 +1,15 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings
-%global commit 1530c1fcfd8b8b7eec3a30e2db20cfc9946fa34a
+%global commit 30d9df926b6837b139990a622d39171ea42c9017
 %forgemeta

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

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

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

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

 Name:          lomiri
@@ -1,8 +0,0 @@
-project pkg {
-    rpm {
-        spec = "flow-control-nightly.spec"
-    }
-    labels {
-        nightly = 1
-    }
-}
@@ -1,30 +0,0 @@
-%global commit 787bf3c6585701ec718c740ccb424794c39a2b43
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240714
-
-Name:           flow-control-nightly
-Version:        %commit_date.%shortcommit
-Release:        1%?dist
-Summary:        A programmer's text editor 
-License:        MIT
-URL:            https://github.com/neurocyte/flow
-Source0:        %url/archive/%commit.tar.gz
-BuildRequires:  zig
-Provides:       flow = %version-%release
-
-%description
-%summary.
-
-%prep
-%autosetup -n flow-%commit
-
-%build
-zig build -Doptimize=ReleaseFast --release=fast
-
-%install
-install -Dpm755 zig-out/bin/flow %buildroot%_bindir/flow
-
-%files
-%doc README.md help.md
-%license LICENSE
-%_bindir/flow
@@ -1,7 +0,0 @@
-if filters.contains("nightly") {
-    rpm.global("commit", gh_commit("neurocyte/flow"));
-    if rpm.changed() {
-        rpm.release();
-        rpm.global("commit_date", date());
-    }
-}
@@ -1,5 +1,5 @@
 Name:			flutter
-Version:		3.22.3
+Version:		3.22.2
 Release:		1%?dist
 Summary:		SDK for crafting beautiful, fast user experiences from a single codebase
 License:		BSD-3-Clause
@@ -1,6 +0,0 @@
-project pkg {
-  arches = ["x86_64", "aarch64"]
-  rpm {
-    spec = "kvrocks.spec"
-  }
-}
@@ -1,50 +0,0 @@
-Name:           kvrocks
-Version:        2.9.0
-Release:        1%?dist
-Summary:        Distributed key value NoSQL database that uses RocksDB
-License:        Apache-2.0
-URL:            https://kvrocks.apache.org/
-Source0:        https://github.com/apache/kvrocks/archive/refs/tags/v%version.tar.gz
-Requires:       openssl
-BuildRequires:  autoconf
-BuildRequires:  cmake
-BuildRequires:  gcc-c++
-BuildRequires:  git
-BuildRequires:  openssl-devel
-BuildRequires:  python3
-BuildRequires:  systemd-rpm-macros
-
-%description
-Apache Kvrocks is a distributed key value NoSQL database that uses RocksDB as storage
-engine and is compatible with Redis protocol.
-
-%prep
-%autosetup
-
-%build
-unset LDFLAGS
-./x.py build -DPORTABLE=1 -DENABLE_STATIC_LIBSTDCXX=OFF -DENABLE_OPENSSL=ON -DCMAKE_BUILD_TYPE=Release --ghproxy -j $(nproc)
-
-%install
-mkdir -p %{buildroot}%{_bindir}
-mkdir -p %{buildroot}%{_datadir}
-
-install -pm755 build/%{name} %{buildroot}%{_bindir}/%{name}
-install -pm755 build/kvrocks2redis %{buildroot}%{_bindir}/kvrocks2redis
-
-install -pDm640 %{name}.conf %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
-install -pDm644 utils/systemd/%{name}.service %{buildroot}%{_unitdir}/%{name}.service
-
-%files
-%{_bindir}/%{name}
-%{_bindir}/kvrocks2redis
-%attr(0750, root, root) %dir %{_sysconfdir}/%{name}
-%attr(0640, root, root) %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
-%{_unitdir}/%{name}.service
-%license LICENSE
-%license NOTICE
-%license licenses/LICENSE-*
-
-
-%changelog
-%autochangelog
@@ -1 +0,0 @@
-rpm.version(gh("apache/kvrocks"));
@@ -1,7 +1,7 @@
 %define debug_package %nil

 Name:		neovide
-Version:	0.13.3
+Version:	0.13.1
 Release:	1%?dist
 Summary:	No Nonsense Neovim Client in Rust
 License:	MIT
@@ -54,8 +54,6 @@ export APP_ID="%app_id"
 export APP_ICON="%app_id"
 export APP_NAME="Zed Nightly"
 export APP_CLI="zed"
-export APP="%{_libexecdir}/zed-editor"
-export APP_ARGS="%U"
 export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed Nightly from Terra."
 export ZED_RELEASE_CHANNEL=nightly
 export BRANDING_LIGHT="#e9aa6a"
@@ -1,6 +1,6 @@
 %bcond_without check
 %global debug_package %{nil}
-%global ver 0.145.1
+%global ver 0.144.2

 %global crate zed
 %global app_id dev.zed.Zed-Preview
@@ -27,7 +27,7 @@ BuildRequires:  alsa-lib-devel
 BuildRequires:  fontconfig-devel
 BuildRequires:  wayland-devel
 BuildRequires:  libxkbcommon-x11-devel
-BuildRequires:  openssl-devel-engine
+BuildRequires:  openssl-devel
 BuildRequires:  libzstd-devel
 BuildRequires:  perl-FindBin
 BuildRequires:  perl-IPC-Cmd
@@ -48,8 +48,6 @@ export APP_ID="%app_id"
 export APP_ICON="%app_id"
 export APP_NAME="Zed Preview"
 export APP_CLI="zed"
-export APP="%{_libexecdir}/zed-editor"
-export APP_ARGS="%U"
 export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed Preview from Terra."
 export ZED_RELEASE_CHANNEL=preview
 export BRANDING_LIGHT="#99c1f1"
@@ -7,7 +7,7 @@
 %global app_id dev.zed.Zed

 Name:           zed
-Version:        0.144.4
+Version:        0.143.7
 Release:        1%?dist
 Summary:        Zed is a high-performance, multiplayer code editor

@@ -28,7 +28,7 @@ BuildRequires:  alsa-lib-devel
 BuildRequires:  fontconfig-devel
 BuildRequires:  wayland-devel
 BuildRequires:  libxkbcommon-x11-devel
-BuildRequires:  openssl-devel-engine
+BuildRequires:  openssl-devel
 BuildRequires:  libzstd-devel
 BuildRequires:  perl-FindBin
 BuildRequires:  perl-IPC-Cmd
@@ -50,8 +50,6 @@ export APP_ID="%app_id"
 export APP_ICON="%app_id"
 export APP_NAME="Zed Editor"
 export APP_CLI="zed"
-export APP="%{_libexecdir}/zed-editor"
-export APP_ARGS="%U"
 export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed from Terra."
 export ZED_RELEASE_CHANNEL=stable
 export BRANDING_LIGHT="#e9aa6a"
@@ -7,7 +7,7 @@

 # https://github.com/containerd/containerd
 %global goipath         github.com/containerd/containerd
-Version:                1.7.20
+Version:                1.7.19

 %gometa

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

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

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

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

@@ -0,0 +1,6 @@
+project pkg {
+	arches = ["x86_64"]
+	rpm {
+		spec = "iosevka-fusion-fonts.spec"
+	}
+}
@@ -0,0 +1,142 @@
+%global         source_name Iosevka
+%global         debug_package %{nil}
+
+Name:           iosevka-fusion-fonts
+Version:        29.2.0
+Release:        1%?dist
+Summary:        A custom font based on iosevka
+
+License:        OFL-1.1
+URL:            https://github.com/be5invis/Iosevka
+Source0:        %{url}/archive/v%{version}.tar.gz
+Source1:        iosevka-fusion.toml
+
+BuildArch:      noarch
+
+BuildRequires:  clang
+BuildRequires:  nodejs-npm
+BuildRequires:  ttfautohint
+
+%description
+Based on Iosevka font, https://github.com/be5invis/Iosevka,
+this font mixes elements from various fonts tailored to my personal taste.
+
+%prep
+%autosetup -n %{source_name}-%{version}
+%__cp %SOURCE1 %{_builddir}/%{source_name}-%{version}/private-build-plans.toml
+
+%build
+npm install
+npm run build -- ttf::iosevka-fusion
+
+%install
+%__mkdir -p %{buildroot}%{_datadir}/fonts/%{name}
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-bold.ttf             \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-Bold.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-bolditalic.ttf       \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-BoldItalic.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-book.ttf             \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-Book.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-bookitalic.ttf       \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-BookItalic.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-extrabold.ttf        \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-ExtraBold.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-extrabolditalic.ttf  \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-ExtraBoldItalic.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-extralight.ttf       \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-ExtraLight.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-extralightitalic.ttf \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-ExtraLightItalic.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-heavy.ttf            \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-Heavy.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-heavyitalic.ttf      \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-HeavyItalic.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-italic.ttf           \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-Italic.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-light.ttf            \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-Light.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-lightitalic.ttf      \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-LightItalic.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-medium.ttf           \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-Medium.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-mediumitalic.ttf     \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-MediumItalic.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-regular.ttf          \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-Regular.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-semibold.ttf         \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-SemiBold.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-semibolditalic.ttf   \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-SemiBoldItalic.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-thin.ttf             \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-Thin.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-thinitalic.ttf       \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-ThinItalic.ttf
+
+%files
+%license LICENSE.md
+%doc README.md
+%{_datadir}/fonts/*
+
+%changelog
+* Wed Dec 28 2022 windowsboy111 <windowsboy111@fyralabs.com> - 16.8.4
+- Initial package
@@ -0,0 +1,190 @@
+[buildPlans.iosevka-fusion]
+family      = "Iosevka Fusion"
+spacing     = "fixed"
+serifs      = "sans"
+
+[buildPlans.iosevka-fusion.variants.design]
+cv01 = 1    # A cap straight
+cv02 = 1    # B cap straight
+cv03 = 1    # C cap serifless
+cv04 = 1    # D cap serifless
+cv05 = 1    # E cap serifless
+cv06 = 1    # F cap serifless
+cv07 = 6    # G cap toothless rounded serifless hooked
+cv08 = 1    # H cap serifless
+cv09 = 1    # I cap long serifs
+cv10 = 2    # J cap serified
+cv11 = 2    # K cap curly
+cv12 = 1    # L cap serifless
+cv13 = 1    # M cap short middle leg
+cv14 = 1    # N cap symmetric
+cv15 = 1    # P cap straight
+cv16 = 4    # Q cap crossing tail
+cv17 = 1    # R cap straight
+cv18 = 1    # S cap serifless
+cv19 = 1    # T cap serifless
+cv20 = 3    # U cap serifless
+cv21 = 1    # V cap straight
+cv22 = 1    # W straight
+cv23 = 1    # X cap straight
+cv24 = 1    # Y cap straight
+cv25 = 1    # Z cap straight
+cv28 = 1    # c serifless
+cv33 = 1    # h straight
+cv34 = 10   # i serified flat tailed
+cv35 = 6    # j flat hook serified
+cv37 = 10   # l serified flat tailed
+cv42 = 9    # r compact
+cv43 = 1    # s serifless
+cv44 = 2    # t flat hook
+cv49 = 6    # y cursive flat terminal hook
+cv53 = 1    # Λ, Δ lambda and delta cap straight
+cv54 = 2    # α alpha straight tailed
+cv55 = 1    # δ delta rounded top
+cv56 = 1    # Γ gamma cap straight
+cv57 = 6    # ι iota serified flat tailed
+cv58 = 2    # λ lambda top tailed
+cv59 = 1    # μ me tailless
+cv60 = 2    # ξ xe flat top
+cv77 = 13   # 0 oval dashed forward slash
+cv80 = 2    # 3 arched
+cv82 = 2    # 5 open contour
+cv84 = 1    # 7 straight
+cv85 = 3    # 8 two asymmetric circles
+cv89 = 2    # ~ tilde low
+cv90 = 3    # * asterisk five-pointed low
+cv91 = 1    # _ underscore right below baseline
+cv92 = 1    # ^ uptick high
+cv93 = 1    # ( parentheses normal slope
+cv94 = 2    # { braces curly
+cv95 = 1    # # column straight
+cv97 = 4    # @ three-fold, tall height
+cv98 = 2    # $ dollar strike through
+VXSF = 2    # ¢ cent strike through
+cv99 = 1    # % percent dots
+VXSA = 1    # | bar natural slope
+VXSB = 1    # ' single quote straight
+VXSC = 1    # ` grave/backtick straight
+VXSD = 1    # ? smooth
+cv88 = 2    # .:; square punctuation marks
+cv87 = 2    # ijäöü square diacretics
+
+[buildPlans.iosevka-fusion.variants.upright]
+cv26 = 3    # a double storey rounded
+cv27 = 2    # b rounded
+cv29 = 2    # d rounded
+cv30 = 1    # e straight
+cv31 = 16   # f serifless bottom flat top crossbar at x height
+cv32 = 9    # g single storey flat hook earless cornered top
+cv36 = 1    # k straight
+cv38 = 5    # m earless normal middle leg
+cv39 = 3    # n earless straight
+cv40 = 2    # p earless
+cv41 = 2    # q earless
+cv45 = 2    # u rounded
+cv46 = 1    # v straight
+cv47 = 1    # w straight
+cv48 = 1    # x straight
+cv50 = 1    # z straight
+cv78 = 3    # 1 serified with base
+cv79 = 1    # 2 straight
+cv81 = 3    # 4 semi-open contour
+cv83 = 3    # 6 straight
+cv86 = 3    # 9 straight
+cv96 = 2    # & et open top (ampersand)
+
+[buildPlans.iosevka-fusion.variants.italic]
+cv26 = 1    # a double storey straight
+cv27 = 1    # b straight
+cv29 = 1    # d straight
+cv30 = 2    # e curly
+cv31 = 18   # f flat hook tailed crossbar at x height
+cv32 = 7    # g single storey flat hook
+cv36 = 2    # k curly
+cv38 = 1    # m straight normal middle leg
+cv39 = 1    # n straight
+cv40 = 1    # p straight
+cv41 = 1    # q straight
+cv45 = 1    # u straight
+cv46 = 2    # v curly
+cv47 = 2    # w curly short middle top
+cv48 = 2    # x curly
+cv50 = 4    # z curly
+cv78 = 2    # 1 serified no base
+cv79 = 2    # 2 curly
+cv81 = 1    # 4 closed contour crossing
+cv83 = 1    # 6 closed contour
+cv86 = 1    # 9 closed contour
+cv96 = 4    # & et open top toothed (ampersand)
+
+[buildPlans.iosevka-fusion.weights.thin]
+shape = 100
+menu  = 100
+css   = 100
+
+[buildPlans.iosevka-fusion.weights.extralight]
+shape = 200
+menu  = 200
+css   = 200
+
+[buildPlans.iosevka-fusion.weights.light]
+shape = 300
+menu  = 300
+css   = 300
+
+[buildPlans.iosevka-fusion.weights.regular]
+shape = 400
+menu  = 400
+css   = 400
+
+[buildPlans.iosevka-fusion.weights.book]
+shape = 450
+menu  = 450
+css   = 450
+
+[buildPlans.iosevka-fusion.weights.medium]
+shape = 500
+menu  = 500
+css   = 500
+
+[buildPlans.iosevka-fusion.weights.semibold]
+shape = 600
+menu  = 600
+css   = 600
+
+[buildPlans.iosevka-fusion.weights.bold]
+shape = 700
+menu  = 700
+css   = 700
+
+[buildPlans.iosevka-fusion.weights.extrabold]
+shape = 800
+menu  = 800
+css   = 800
+
+[buildPlans.iosevka-fusion.weights.heavy]
+shape = 900
+menu  = 900
+css   = 900
+
+[buildPlans.iosevka-fusion.slopes.upright]
+angle = 0
+shape = "upright"
+menu  = "upright"
+css   = "normal"
+
+[buildPlans.iosevka-fusion.slopes.italic]
+angle = 9.4
+shape = "italic"
+menu  = "italic"
+css   = "italic"
+
+[buildPlans.iosevka-fusion.widths.normal]
+shape = 600
+menu  = 5
+css   = "normal"
+
+[buildPlans.iosevka-fusion.metric-override]
+leading = 1350
+sb = 60
+xHeight = 530
@@ -0,0 +1 @@
+rpm.version(gh("be5invis/Iosevka"));
@@ -1,8 +0,0 @@
-project pkg {
-    rpm {
-        spec = "gamescope-session-steam.spec"
-    }
-    labels {
-        nightly = 1
-    }
-}
@@ -1,40 +0,0 @@
-%define debug_package %nil
-
-%global commit 015e09825d4f9a2dfdbc20fc2711e2dcee2af68a
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240719
-
-Name:           gamescope-session-steam
-Version:        %commit_date.%shortcommit
-Release:        1%?dist
-Summary:        gamescope-session-steam
-License:        MIT
-URL:            https://github.com/ChimeraOS/gamescope-session-steam
-Source0:        %url/archive/%commit.tar.gz
-
-%description
-%summary.
-
-%prep
-%autosetup -n %name-%commit
-
-%build
-
-%install
-mkdir -p %buildroot
-cp -r usr %buildroot/
-
-%files
-%license LICENSE
-%_bindir/steamos-polkit-helpers/
-%_bindir/jupiter-biosupdate
-%_bindir/steam-http-loader
-%_bindir/steamos-select-branch
-%_bindir/steamos-session-select
-%_bindir/steamos-update
-%_datadir/applications/gamescope-mimeapps.list
-%_datadir/applications/steam_http_loader.desktop
-%_datadir/gamescope-session-plus/sessions.d/steam
-%_datadir/polkit-1/actions/org.chimeraos.update.policy
-%_datadir/wayland-sessions/gamescope-session-steam.desktop
-%_datadir/wayland-sessions/gamescope-session.desktop
@@ -1,7 +0,0 @@
-if filters.contains("nightly") {
-    rpm.global("commit", gh_commit("ChimeraOS/gamescope-session-steam"));
-    if rpm.changed() {
-        rpm.release();
-        rpm.global("commit_date", date());
-    }
-}
@@ -1,8 +0,0 @@
-project pkg {
-    rpm {
-        spec = "gamescope-session.spec"
-    }
-    labels {
-        nightly = 1
-    }
-}
@@ -1,35 +0,0 @@
-%define debug_package %nil
-
-%global commit 4aa204e6ef332457d277488ffa61959f2dcde470
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240719
-
-Name:           gamescope-session
-Version:        %commit_date.%shortcommit
-Release:        1%?dist
-Summary:        ChimeraOS session on Gamescope
-License:        MIT
-URL:            https://github.com/ChimeraOS/gamescope-session
-Source0:        %url/archive/%commit.tar.gz
-BuildRequires:  systemd-rpm-macros
-
-%description
-Gamescope session plus based on Valve's gamescope.
-
-%prep
-%autosetup -n gamescope-session-%commit
-
-%build
-
-%install
-mkdir -p %buildroot
-cp -r usr %buildroot/
-
-%files
-%doc README.md
-%license LICENSE
-%_bindir/export-gpu
-%_bindir/gamescope-session-plus
-%_userunitdir/gamescope-session-plus@.service
-%_datadir/gamescope-session-plus/device-quirks
-%_datadir/gamescope-session-plus/gamescope-session-plus
@@ -1,7 +0,0 @@
-if filters.contains("nightly") {
-    rpm.global("commit", gh_commit("ChimeraOS/gamescope-session"));
-    if rpm.changed() {
-        rpm.release();
-        rpm.global("commit_date", date());
-    }
-}
@@ -1,239 +0,0 @@
-From ab115896be1a448bde0eb7673c26300ea4ca5040 Mon Sep 17 00:00:00 2001
-From: sharkautarch <128002472+sharkautarch@users.noreply.github.com>
-Date: Sun, 19 May 2024 20:15:36 -0400
-Subject: [PATCH 1/2] QueuePresent: canBypassXWayland(): fetch multiple xcb
- cookies initially before waiting on any of them
-
---
- layer/VkLayer_FROG_gamescope_wsi.cpp |   1 +
- layer/xcb_helpers.hpp                | 105 +++++++++++++++++++++++----
- 2 files changed, 93 insertions(+), 13 deletions(-)
-
-diff --git a/layer/VkLayer_FROG_gamescope_wsi.cpp b/layer/VkLayer_FROG_gamescope_wsi.cpp
-index 5844c2a63..ca44849f2 100644
--- a/layer/VkLayer_FROG_gamescope_wsi.cpp
-+++ b/layer/VkLayer_FROG_gamescope_wsi.cpp
-@@ -975,6 +975,7 @@ namespace GamescopeWSILayer {
-             continue;
-           }
- 
-+          xcb::Prefetcher prefetcher(gamescopeSurface->connection, gamescopeSurface->window);
-           const bool canBypass = gamescopeSurface->canBypassXWayland();
-           if (canBypass != gamescopeSwapchain->isBypassingXWayland)
-             UpdateSwapchainResult(canBypass ? VK_SUBOPTIMAL_KHR : VK_ERROR_OUT_OF_DATE_KHR);
-diff --git a/layer/xcb_helpers.hpp b/layer/xcb_helpers.hpp
-index 8fac5635b..72d0ec092 100644
--- a/layer/xcb_helpers.hpp
-+++ b/layer/xcb_helpers.hpp
-@@ -4,22 +4,106 @@
- #include <xcb/composite.h>
- #include <cstdio>
- #include <optional>
-+#include <pthread.h>
- 
- namespace xcb {
-+  inline static constinit pthread_t g_cache_tid; //incase g_cache could otherwise be accessed by one thread, while it is being deleted by another thread
-+  inline static constinit struct cookie_cache_t {
-+    xcb_window_t window;
-+    std::tuple<xcb_get_geometry_cookie_t, xcb_query_tree_cookie_t> cached_cookies;
-+    std::tuple<xcb_get_geometry_reply_t*, xcb_query_tree_reply_t*> cached_replies;
-+  } g_cache = {};
-+  
-+  //Note: this class is currently only meant to be used within GamescopeWSILayer::VkDeviceOverrides::QueuePresentKHR:
-+  struct Prefetcher {
-+    explicit Prefetcher(xcb_connection_t* connection, const xcb_window_t window) {
-+        g_cache = {
-+            .window = window,
-+            .cached_cookies = {
-+                xcb_get_geometry(connection, window),
-+                xcb_query_tree(connection, window)
-+            }
-+        };
-+        g_cache_tid = pthread_self();
-+    }
- 
-+    ~Prefetcher() {
-+        g_cache_tid = {};
-+        free(std::get<0>(g_cache.cached_replies));
-+        free(std::get<1>(g_cache.cached_replies));
-+        g_cache.cached_replies = {nullptr,nullptr};
-+    }
-+  };
-+  
-   struct ReplyDeleter {
-+    const bool m_bOwning = true;
-+    consteval ReplyDeleter(bool bOwning = true) : m_bOwning{bOwning} {}
-     template <typename T>
-     void operator()(T* ptr) const {
-      free(const_cast<std::remove_const_t<T>*>(ptr));
-+      if (m_bOwning)
-+        free(const_cast<std::remove_const_t<T>*>(ptr));
-     }
-   };
- 
-   template <typename T>
-   using Reply = std::unique_ptr<T, ReplyDeleter>;
-+  
-+  template <typename Cookie_RetType, typename Reply_RetType, typename XcbConn=xcb_connection_t*, typename... Args>
-+  class XcbFetch {
-+    using cookie_f_ptr_t = Cookie_RetType (*)(XcbConn, Args...);
-+    using reply_f_ptr_t = Reply_RetType* (*)(XcbConn, Cookie_RetType, xcb_generic_error_t**);
-+    
-+    const cookie_f_ptr_t m_cookieFunc;
-+    const reply_f_ptr_t m_replyFunc;
-+    
-+    public:
-+        consteval XcbFetch(cookie_f_ptr_t cookieFunc, reply_f_ptr_t replyFunc) : m_cookieFunc{cookieFunc}, m_replyFunc{replyFunc} {}
-+        
-+        inline Reply<Reply_RetType> operator()(XcbConn conn, auto... args) { //have to use auto for argsTwo, since otherwise there'd be a type deduction conflict
-+            return Reply<Reply_RetType> { m_replyFunc(conn, m_cookieFunc(conn, args...), nullptr) };
-+        }
-+  };
-+  
-+  template <typename CookieType>
-+  concept CacheableCookie = std::is_same<CookieType, xcb_get_geometry_cookie_t>::value 
-+                            || std::is_same<CookieType, xcb_query_tree_cookie_t>::value;
-+  
-+  template <CacheableCookie Cookie_RetType, typename Reply_RetType>
-+  class XcbFetch<Cookie_RetType, Reply_RetType, xcb_connection_t*, xcb_window_t> {
-+    using cookie_f_ptr_t = Cookie_RetType (*)(xcb_connection_t*, xcb_window_t);
-+    using reply_f_ptr_t = Reply_RetType* (*)(xcb_connection_t*, Cookie_RetType, xcb_generic_error_t**);
-+    
-+    const cookie_f_ptr_t m_cookieFunc;
-+    const reply_f_ptr_t m_replyFunc;
-+    
-+    inline Reply<Reply_RetType> getCachedReply(xcb_connection_t* connection) {
-+        if (std::get<Reply_RetType*>(g_cache.cached_replies) == nullptr) {
-+            std::get<Reply_RetType*>(g_cache.cached_replies) = m_replyFunc(connection, std::get<Cookie_RetType>(g_cache.cached_cookies), nullptr);
-+        }
- 
-+        return Reply<Reply_RetType>{std::get<Reply_RetType*>(g_cache.cached_replies), ReplyDeleter{false}}; // return 'non-owning' unique_ptr
-+    }
-+    
-+    public:
-+        consteval XcbFetch(cookie_f_ptr_t cookieFunc, reply_f_ptr_t replyFunc) : m_cookieFunc{cookieFunc}, m_replyFunc{replyFunc} {}
-+        
-+        inline Reply<Reply_RetType> operator()(xcb_connection_t* conn, xcb_window_t window) {
-+            const bool tryCached = pthread_equal(g_cache_tid, pthread_self())
-+                                   && g_cache.window == window;
-+            if (!tryCached) [[unlikely]]
-+                return Reply<Reply_RetType> { m_replyFunc(conn, m_cookieFunc(conn, window), nullptr) };
-+            
-+            auto ret = getCachedReply(conn);
-+            #if !defined(NDEBUG) || NDEBUG == 0
-+            if (!ret)
-+                fprintf(stderr, "[Gamescope WSI] getCachedReply() failed.\n");
-+            #endif
-+            return ret;
-+        }
-+  };
-+ 
-   static std::optional<xcb_atom_t> getAtom(xcb_connection_t* connection, std::string_view name) {
-    xcb_intern_atom_cookie_t cookie = xcb_intern_atom(connection, false, name.length(), name.data());
-    auto reply = Reply<xcb_intern_atom_reply_t>{ xcb_intern_atom_reply(connection, cookie, nullptr) };
-+    auto reply = XcbFetch{xcb_intern_atom, xcb_intern_atom_reply}(connection, false, name.length(), name.data());
-     if (!reply) {
-       fprintf(stderr, "[Gamescope WSI] Failed to get xcb atom.\n");
-       return std::nullopt;
-@@ -34,8 +118,7 @@ namespace xcb {
- 
-     xcb_screen_t* screen = xcb_setup_roots_iterator(xcb_get_setup(connection)).data;
- 
-    xcb_get_property_cookie_t cookie = xcb_get_property(connection, false, screen->root, atom, XCB_ATOM_CARDINAL, 0, sizeof(T) / sizeof(uint32_t));
-    auto reply = Reply<xcb_get_property_reply_t>{ xcb_get_property_reply(connection, cookie, nullptr) };
-+    auto reply = XcbFetch{xcb_get_property, xcb_get_property_reply}(connection, false, screen->root, atom, XCB_ATOM_CARDINAL, 0, sizeof(T) / sizeof(uint32_t));
-     if (!reply) {
-       fprintf(stderr, "[Gamescope WSI] Failed to read T root window property.\n");
-       return std::nullopt;
-@@ -61,8 +144,7 @@ namespace xcb {
- 
-   static std::optional<xcb_window_t> getToplevelWindow(xcb_connection_t* connection, xcb_window_t window) {
-     for (;;) {
-      xcb_query_tree_cookie_t cookie = xcb_query_tree(connection, window);
-      auto reply = Reply<xcb_query_tree_reply_t>{ xcb_query_tree_reply(connection, cookie, nullptr) };
-+      auto reply = XcbFetch{xcb_query_tree, xcb_query_tree_reply}(connection, window);
- 
-       if (!reply) {
-         fprintf(stderr, "[Gamescope WSI] getToplevelWindow: xcb_query_tree failed for window 0x%x.\n", window);
-@@ -77,8 +159,7 @@ namespace xcb {
-   }
- 
-   static std::optional<VkRect2D> getWindowRect(xcb_connection_t* connection, xcb_window_t window) {
-    xcb_get_geometry_cookie_t cookie = xcb_get_geometry(connection, window);
-    auto reply = Reply<xcb_get_geometry_reply_t>{ xcb_get_geometry_reply(connection, cookie, nullptr) };
-+    auto reply = XcbFetch{xcb_get_geometry, xcb_get_geometry_reply}(connection, window);
-     if (!reply) {
-       fprintf(stderr, "[Gamescope WSI] getWindowRect: xcb_get_geometry failed for window 0x%x.\n", window);
-       return std::nullopt;
-@@ -112,8 +193,7 @@ namespace xcb {
-   static std::optional<VkExtent2D> getLargestObscuringChildWindowSize(xcb_connection_t* connection, xcb_window_t window) {
-     VkExtent2D largestExtent = {};
- 
-    xcb_query_tree_cookie_t cookie = xcb_query_tree(connection, window);
-    auto reply = Reply<xcb_query_tree_reply_t>{ xcb_query_tree_reply(connection, cookie, nullptr) };
-+    auto reply = XcbFetch{xcb_query_tree, xcb_query_tree_reply}(connection, window);
- 
-     if (!reply) {
-       fprintf(stderr, "[Gamescope WSI] getLargestObscuringWindowSize: xcb_query_tree failed for window 0x%x.\n", window);
-@@ -130,8 +210,7 @@ namespace xcb {
-     for (uint32_t i = 0; i < reply->children_len; i++) {
-       xcb_window_t child = children[i];
- 
-      xcb_get_window_attributes_cookie_t attributeCookie = xcb_get_window_attributes(connection, child);
-      auto attributeReply = Reply<xcb_get_window_attributes_reply_t>{ xcb_get_window_attributes_reply(connection, attributeCookie, nullptr) };
-+      auto attributeReply = XcbFetch{xcb_get_window_attributes, xcb_get_window_attributes_reply}(connection, child);
- 
-       const bool obscuring =
-         attributeReply &&
-
-From 1b59621f4de5c05096d1f279cba2e04264124154 Mon Sep 17 00:00:00 2001
-From: sharkautarch <128002472+sharkautarch@users.noreply.github.com>
-Date: Tue, 18 Jun 2024 22:21:23 -0400
-Subject: [PATCH 2/2] WSI: prefetcher: fix issue w/ attempting to prefetch xcb
- stuff for pure wayland surfaces
-
---
- layer/VkLayer_FROG_gamescope_wsi.cpp | 2 +-
- layer/xcb_helpers.hpp                | 9 ++++++++-
- 2 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/layer/VkLayer_FROG_gamescope_wsi.cpp b/layer/VkLayer_FROG_gamescope_wsi.cpp
-index f26819a60..ce011dcd7 100644
--- a/layer/VkLayer_FROG_gamescope_wsi.cpp
-+++ b/layer/VkLayer_FROG_gamescope_wsi.cpp
-@@ -1234,7 +1234,7 @@ namespace GamescopeWSILayer {
-             continue;
-           }
- 
-          xcb::Prefetcher prefetcher(gamescopeSurface->connection, gamescopeSurface->window);
-+          auto prefetcher = xcb::Prefetcher::GetPrefetcherIf(!gamescopeSurface->isWayland(), gamescopeSurface->connection, gamescopeSurface->window);
-           const bool canBypass = gamescopeSurface->canBypassXWayland();
-           if (canBypass != gamescopeSwapchain->isBypassingXWayland)
-             UpdateSwapchainResult(canBypass ? VK_SUBOPTIMAL_KHR : VK_ERROR_OUT_OF_DATE_KHR);
-diff --git a/layer/xcb_helpers.hpp b/layer/xcb_helpers.hpp
-index 72d0ec092..f26aef38b 100644
--- a/layer/xcb_helpers.hpp
-+++ b/layer/xcb_helpers.hpp
-@@ -16,6 +16,13 @@ namespace xcb {
-   
-   //Note: this class is currently only meant to be used within GamescopeWSILayer::VkDeviceOverrides::QueuePresentKHR:
-   struct Prefetcher {
-+    static std::optional<Prefetcher> GetPrefetcherIf(bool bCond, xcb_connection_t* connection, const xcb_window_t window) {
-+       if (bCond)
-+         return std::optional<Prefetcher>(std::in_place_t{}, connection, window);
-+       
-+       return std::nullopt;
-+    }
-+    
-     explicit Prefetcher(xcb_connection_t* connection, const xcb_window_t window) {
-         g_cache = {
-             .window = window,
-@@ -90,7 +97,7 @@ namespace xcb {
-         inline Reply<Reply_RetType> operator()(xcb_connection_t* conn, xcb_window_t window) {
-             const bool tryCached = pthread_equal(g_cache_tid, pthread_self())
-                                    && g_cache.window == window;
-            if (!tryCached) [[unlikely]]
-+            if (!tryCached)
-                 return Reply<Reply_RetType> { m_replyFunc(conn, m_cookieFunc(conn, window), nullptr) };
-             
-             auto ret = getCachedReply(conn);
@@ -1,5 +0,0 @@
-project pkg {
-    rpm {
-        spec = "terra-gamescope.spec"
-    }
-}
@@ -1,136 +0,0 @@
-diff --git a/src/Backends/DRMBackend.cpp b/src/Backends/DRMBackend.cpp
-index 85e5126..be418b4 100644
--- a/src/Backends/DRMBackend.cpp
-+++ b/src/Backends/DRMBackend.cpp
-@@ -2149,6 +2149,7 @@ namespace gamescope
- 			( m_Mutable.szMakePNP == "WLC"sv && m_Mutable.szModel == "ANX7530 U"sv ) ||
- 			( m_Mutable.szMakePNP == "ANX"sv && m_Mutable.szModel == "ANX7530 U"sv ) ||
- 			( m_Mutable.szMakePNP == "VLV"sv && m_Mutable.szModel == "ANX7530 U"sv ) ||
-+			( m_Mutable.szMakePNP == "DHD"sv && m_Mutable.szModel == "DeckHD-1200p"sv ) ||
- 			( m_Mutable.szMakePNP == "VLV"sv && m_Mutable.szModel == "Jupiter"sv ) ||
- 			( m_Mutable.szMakePNP == "VLV"sv && m_Mutable.szModel == "Galileo"sv );
- 
-@@ -2160,6 +2161,7 @@ namespace gamescope
- 		{
- 			static constexpr uint32_t kPIDGalileoSDC = 0x3003;
- 			static constexpr uint32_t kPIDGalileoBOE = 0x3004;
-+			static constexpr uint32_t kPIDJupiterDHD = 0x4001;
- 
- 			if ( pProduct->product == kPIDGalileoSDC )
- 			{
-@@ -2171,6 +2173,10 @@ namespace gamescope
- 				m_Mutable.eKnownDisplay = GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_OLED_BOE;
- 				m_Mutable.ValidDynamicRefreshRates = std::span( s_kSteamDeckOLEDRates );
- 			}
-+			else if (pProduct-> product == kPIDJupiterDHD ) {
-+				m_Mutable.eKnownDisplay = GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_LCD_DHD;
-+				m_Mutable.ValidDynamicRefreshRates = std::span( s_kSteamDeckLCDRates );
-+			}
- 			else
- 			{
- 				m_Mutable.eKnownDisplay = GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_LCD;
-@@ -2200,7 +2206,8 @@ namespace gamescope
- 			drm_log.infof( "[colorimetry]: Steam Deck LCD detected. Using known colorimetry" );
- 			m_Mutable.DisplayColorimetry = displaycolorimetry_steamdeck_measured;
- 		}
-		else
-+		else if (m_Mutable.eKnownDisplay == GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_OLED_BOE ||
-+				 m_Mutable.eKnownDisplay == GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_OLED_SDC )
- 		{
- 			// Steam Deck OLED has calibrated chromaticity coordinates in the EDID
- 			// for each unit.
-@@ -2330,7 +2337,7 @@ namespace gamescope
- 				.uMinContentLightLevel = nits_to_u16_dark( 0 ),
- 			};
- 		}
-		else if ( eKnownDisplay == GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_LCD )
-+		else if ( eKnownDisplay == GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_LCD || eKnownDisplay == GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_LCD_DHD )
- 		{
- 			// Set up some HDR fallbacks for undocking
- 			return BackendConnectorHDRInfo
-diff --git a/src/gamescope_shared.h b/src/gamescope_shared.h
-index ed30d8c..3b60774 100644
--- a/src/gamescope_shared.h
-+++ b/src/gamescope_shared.h
-@@ -8,6 +8,7 @@ namespace gamescope
- 	{
- 		GAMESCOPE_KNOWN_DISPLAY_UNKNOWN,
- 		GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_LCD,      // Jupiter
-+		GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_LCD_DHD,  // Jupiter Deck HD
- 		GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_OLED_SDC, // Galileo SDC
- 		GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_OLED_BOE, // Galileo BOE
- 	};
-diff --git a/src/modegen.cpp b/src/modegen.cpp
-index d174c2d..5dd1136 100644
--- a/src/modegen.cpp
-+++ b/src/modegen.cpp
-@@ -293,13 +293,32 @@ unsigned int galileo_boe_vfp[] =
- 	172,152,136,120,100,84,68,52,36,20,8
- };
- 
-#define GALILEO_MIN_REFRESH 45
-+//SD LCD Stock Timings
-+#define JUPITER_BOE_PID     0x3001
-+#define JUPITER_B_PID       0x3002
-+#define JUPITER_HFP         40
-+#define JUPITER_HSYNC       4
-+#define JUPITER_HBP         40
-+#define JUPITER_VFP         30
-+#define JUPITER_VSYNC       4
-+#define JUPITER_VBP         8
-+//SD LCD DeckHD Timings
-+#define JUPITER_DHD_PID     0x4001
-+#define JUPITER_DHD_HFP     40
-+#define JUPITER_DHD_HSYNC   20
-+#define JUPITER_DHD_HBP     40
-+#define JUPITER_DHD_VFP     18
-+#define JUPITER_DHD_VSYNC   2
-+#define JUPITER_DHD_VBP     20
-+//SD OLED SDC Timings
- #define GALILEO_SDC_PID     0x3003
- #define GALILEO_SDC_VSYNC   1
- #define GALILEO_SDC_VBP     22
-+//SD OLED BOE Timings
- #define GALILEO_BOE_PID     0x3004
- #define GALILEO_BOE_VSYNC   2
- #define GALILEO_BOE_VBP     30
-+#define GALILEO_MIN_REFRESH 45
- #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
- 
- unsigned int get_galileo_vfp( int vrefresh, unsigned int * vfp_array, unsigned int num_rates )
-@@ -344,17 +363,28 @@ void generate_fixed_mode(drmModeModeInfo *mode, const drmModeModeInfo *base, int
- 		mode->vsync_end = mode->vsync_start + vsync;
- 		mode->vtotal = mode->vsync_end + vbp;
- 	} else {
-		if ( eKnownDisplay == gamescope::GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_LCD )
-+		if ( eKnownDisplay == gamescope::GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_LCD_DHD ) {
-+			mode->hdisplay = 1200;
-+			mode->hsync_start = mode->hdisplay + JUPITER_DHD_HFP;
-+			mode->hsync_end = mode->hsync_start + JUPITER_DHD_HSYNC;
-+			mode->htotal = mode->hsync_end + JUPITER_DHD_HBP;
-+
-+			mode->vdisplay = 1920;
-+			mode->vsync_start = mode->vdisplay + JUPITER_DHD_VFP;
-+			mode->vsync_end = mode->vsync_start + JUPITER_DHD_VSYNC;
-+			mode->vtotal = mode->vsync_end + JUPITER_DHD_VBP;
-+		}
-+		else if ( eKnownDisplay == gamescope::GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_LCD )
- 		{
- 			mode->hdisplay = 800;
-			mode->hsync_start = 840;
-			mode->hsync_end = 844;
-			mode->htotal = 884;
-+			mode->hsync_start = mode->hdisplay + JUPITER_HFP;
-+			mode->hsync_end = mode->hsync_start + JUPITER_HSYNC;
-+			mode->htotal = mode->hsync_end + JUPITER_HBP;
- 
- 			mode->vdisplay = 1280;
-			mode->vsync_start = 1310;
-			mode->vsync_end = 1314;
-			mode->vtotal = 1322;
-+			mode->vsync_start = mode->vdisplay + JUPITER_VFP;
-+			mode->vsync_end = mode->vsync_start + JUPITER_VSYNC;
-+			mode->vtotal = mode->vsync_end + JUPITER_VBP;
- 		}
- 
- 		mode->clock = ( ( mode->htotal * mode->vtotal * vrefresh ) + 999 ) / 1000;
@@ -1,51 +0,0 @@
-diff --git a/src/main.cpp b/src/main.cpp
-index 119e043..6c46d97 100644
--- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -148,6 +148,8 @@ const struct option *gamescope_options = (struct option[]){
- 	{ "reshade-effect", required_argument, nullptr, 0 },
- 	{ "reshade-technique-idx", required_argument, nullptr, 0 },
- 
-+	{ "disable-touch-click", no_argument, nullptr, 0 },
-+
- 	// Steam Deck options
- 	{ "mura-map", required_argument, nullptr, 0 },
- 
-@@ -193,6 +195,7 @@ const char usage[] =
- 	"  -e, --steam                    enable Steam integration\n"
- 	"  --bypass-steam-resolution      bypass Steam's default 720p/800p default resolution\n"
- 	"  --touch-gestures               enable touch gestures for Steam menus\n"
-+	"  --disable-touch-click          disable touchscreen tap acting as a click\n"
- 	"  --xwayland-count               create N xwayland servers\n"
- 	"  --prefer-vk-device             prefer Vulkan device for compositing (ex: 1002:7300)\n"
- 	"  --force-orientation            rotate the internal display (left, right, normal, upsidedown)\n"
-diff --git a/src/steamcompmgr.cpp b/src/steamcompmgr.cpp
-index 92bf617..d7498e5 100644
--- a/src/steamcompmgr.cpp
-+++ b/src/steamcompmgr.cpp
-@@ -347,6 +347,7 @@ bool g_bHDRItmEnable = false;
- int g_nCurrentRefreshRate_CachedValue = 0;
- gamescope::ConVar<bool> cv_bypass_steam_resolution{ "bypass_steam_resolution", false, "Workaround the 720p/800p limits Steam uses for games" };
- 
-+gamescope::ConVar<bool> cv_disable_touch_click{ "disable_touch_click", false, "Prevents touchscreen taps acting as clicks" };
- 
- static void
- update_color_mgmt()
-@@ -5128,7 +5129,7 @@ handle_property_notify(xwayland_ctx_t *ctx, XPropertyEvent *ev)
- 			MakeFocusDirty();
- 		}
- 	}
-	if (ev->atom == ctx->atoms.steamTouchClickModeAtom )
-+	if (ev->atom == ctx->atoms.steamTouchClickModeAtom && !cv_disable_touch_click)
- 	{
- 		gamescope::cv_touch_click_mode = (gamescope::TouchClickMode) get_prop(ctx, ctx->root, ctx->atoms.steamTouchClickModeAtom, 0u );
- 	}
-@@ -7301,6 +7302,8 @@ steamcompmgr_main(int argc, char **argv)
- 					g_reshade_technique_idx = atoi(optarg);
- 				} else if (strcmp(opt_name, "mura-map") == 0) {
- 					set_mura_overlay(optarg);
-+				} else if (strcmp(opt_name, "disable-touch-click") == 0) {
-+					cv_disable_touch_click = true;
- 				}
- 				break;
- 			case '?':
@@ -1,63 +0,0 @@
-From 2e4d7ad1bf2cb98eb67ff8f9385cf6657cf2e912 Mon Sep 17 00:00:00 2001
-From: Matthew Schwartz <njtransit215@gmail.com>
-Date: Wed, 3 Jul 2024 15:20:08 -0700
-Subject: [PATCH] drm: Separate BOE and SDC OLED Deck panel valid refresh rates
-
-OLED Decks with BOE panels seem to struggle with a few different
-specific modesets (51hz/55hz/65hz) that SDC panels have no issues with.
-To work around this, let's make use of Gamescope recognizing each
-display manufacturer to correct the bad modesets while leaving
-SDC panel units alone. This can be reverted if an underlying cause can
-be found in the kernel in the future.
---
- src/Backends/DRMBackend.cpp | 16 +++++++++++++---
- 1 file changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/src/Backends/DRMBackend.cpp b/src/Backends/DRMBackend.cpp
-index 97ef446..9f93c7f 100644
--- a/src/Backends/DRMBackend.cpp
-+++ b/src/Backends/DRMBackend.cpp
-@@ -554,7 +554,7 @@ static constexpr uint32_t s_kSteamDeckLCDRates[] =
- 	60,
- };
- 
-static constexpr uint32_t s_kSteamDeckOLEDRates[] =
-+static constexpr uint32_t s_kSteamDeckOLEDSDCRates[] =
- {
- 	45, 47, 48, 49, 
- 	50, 51, 53, 55, 56, 59, 
-@@ -564,6 +564,16 @@ static constexpr uint32_t s_kSteamDeckOLEDRates[] =
- 	90, 
- };
- 
-+static constexpr uint32_t s_kSteamDeckOLEDBOERates[] =
-+{
-+	45, 47, 48, 49, 
-+	50, 53, 56, 59, 
-+	60, 62, 64, 66, 68, 
-+	72, 73, 76, 77, 78, 
-+	80, 81, 82, 84, 85, 86, 87, 88, 
-+	90, 
-+};
-+
- static void update_connector_display_info_wl(struct drm_t *drm)
- {
- 	wlserver_lock();
-@@ -2128,12 +2138,12 @@ namespace gamescope
- 			if ( pProduct->product == kPIDGalileoSDC )
- 			{
- 				m_Mutable.eKnownDisplay = GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_OLED_SDC;
-				m_Mutable.ValidDynamicRefreshRates = std::span( s_kSteamDeckOLEDRates );
-+				m_Mutable.ValidDynamicRefreshRates = std::span( s_kSteamDeckOLEDSDCRates );
- 			}
- 			else if ( pProduct->product == kPIDGalileoBOE )
- 			{
- 				m_Mutable.eKnownDisplay = GAMESCOPE_KNOWN_DISPLAY_STEAM_DECK_OLED_BOE;
-				m_Mutable.ValidDynamicRefreshRates = std::span( s_kSteamDeckOLEDRates );
-+				m_Mutable.ValidDynamicRefreshRates = std::span( s_kSteamDeckOLEDBOERates );
- 			}
- 			else
- 			{
-- 
-2.45.2
-
@@ -1,65 +0,0 @@
-diff --git a/src/steamcompmgr.cpp b/src/steamcompmgr.cpp
-index d7498e5..d1800a8 100644
--- a/src/steamcompmgr.cpp
-+++ b/src/steamcompmgr.cpp
-@@ -3271,7 +3271,7 @@ found:;
- 		if ( window_has_commits( focus ) ) 
- 			out->focusWindow = focus;
- 		else
-			focus->outdatedInteractiveFocus = true;
-+			out->outdatedInteractiveFocus = true;
- 
- 		// Always update X's idea of focus, but still dirty
- 		// the it being outdated so we can resolve that globally later.
-@@ -5995,28 +5995,37 @@ bool handle_done_commit( steamcompmgr_win_t *w, xwayland_ctx_t *ctx, uint64_t co
- 			// Window just got a new available commit, determine if that's worth a repaint
- 
- 			// If this is an overlay that we're presenting, repaint
-			if ( w == global_focus.overlayWindow && w->opacity != TRANSLUCENT )
-+			if ( gameFocused )
- 			{
-				hasRepaintNonBasePlane = true;
-			}
-+				if ( w == global_focus.overlayWindow && w->opacity != TRANSLUCENT )
-+				{
-+					hasRepaintNonBasePlane = true;
-+				}
- 
-			if ( w == global_focus.notificationWindow && w->opacity != TRANSLUCENT )
-			{
-				hasRepaintNonBasePlane = true;
-+				if ( w == global_focus.notificationWindow && w->opacity != TRANSLUCENT )
-+				{
-+					hasRepaintNonBasePlane = true;
-+				}
- 			}
-
-			// If this is an external overlay, repaint
-			if ( w == global_focus.externalOverlayWindow && w->opacity != TRANSLUCENT )
-+			if ( ctx )
- 			{
-				hasRepaintNonBasePlane = true;
-+				if ( ctx->focus.outdatedInteractiveFocus )
-+				{
-+					MakeFocusDirty();
-+					ctx->focus.outdatedInteractiveFocus = false;
-+				}
- 			}
-
-			if ( w->outdatedInteractiveFocus )
-+			if ( global_focus.outdatedInteractiveFocus )
- 			{
- 				MakeFocusDirty();
-				w->outdatedInteractiveFocus = false;
-			}
-+				global_focus.outdatedInteractiveFocus = false;
- 
-+				// If this is an external overlay, repaint
-+				if ( w == global_focus.externalOverlayWindow && w->opacity != TRANSLUCENT )
-+				{
-+					hasRepaintNonBasePlane = true;
-+				}
-+			}
- 			// If this is the main plane, repaint
- 			if ( w == global_focus.focusWindow && !w->isSteamStreamingClient )
- 			{
@@ -1,7 +0,0 @@
-prefix=/usr
-includedir=${prefix}/include/stb
-
-Name: stb
-Description: Single-file public domain libraries for C/C++
-Version: 0.1.0
-Cflags: -I${includedir}
@@ -1,137 +0,0 @@
-%global libliftoff_minver 0.4.1
-
-%global _default_patch_fuzz 2
-%global gamescope_tag 3.14.24
-
-Name:           terra-gamescope
-Version:        100.%{gamescope_tag}
-Release:        1%?dist
-Summary:        Micro-compositor for video games on Wayland
-
-License:        BSD
-URL:            https://github.com/ValveSoftware/gamescope
-
-# Create stb.pc to satisfy dependency('stb')
-Source0:        stb.pc
-
-# https://github.com/ChimeraOS/gamescope
-Patch0:         chimeraos.patch
-# https://hhd.dev/
-Patch1:         disable-steam-touch-click-atom.patch
-# https://github.com/ValveSoftware/gamescope/pull/1281
-Patch2:         deckhd.patch
-# https://github.com/ValveSoftware/gamescope/issues/1398
-Patch3:         drm-Separate-BOE-and-SDC-OLED-Deck-panel-rates.patch
-# https://github.com/ValveSoftware/gamescope/issues/1369
-Patch4:         revert-299bc34.patch
-# https://github.com/ValveSoftware/gamescope/pull/1231
-Patch5:         1231.patch
-
-BuildRequires:  meson >= 0.54.0
-BuildRequires:  ninja-build
-BuildRequires:  cmake
-BuildRequires:  gcc
-BuildRequires:  gcc-c++
-BuildRequires:  glm-devel
-BuildRequires:  google-benchmark-devel
-BuildRequires:  libXmu-devel
-BuildRequires:  libXcursor-devel
-BuildRequires:  libeis-devel
-BuildRequires:  pixman-devel
-BuildRequires:  pkgconfig(libdisplay-info)
-BuildRequires:  pkgconfig(pixman-1)
-BuildRequires:  pkgconfig(x11)
-BuildRequires:  pkgconfig(xdamage)
-BuildRequires:  pkgconfig(xcomposite)
-BuildRequires:  pkgconfig(xrender)
-BuildRequires:  pkgconfig(xext)
-BuildRequires:  pkgconfig(xfixes)
-BuildRequires:  pkgconfig(xxf86vm)
-BuildRequires:  pkgconfig(xtst)
-BuildRequires:  pkgconfig(xres)
-BuildRequires:  pkgconfig(libdrm)
-BuildRequires:  pkgconfig(vulkan)
-BuildRequires:  pkgconfig(wayland-scanner)
-BuildRequires:  pkgconfig(wayland-server)
-BuildRequires:  pkgconfig(wayland-protocols) >= 1.17
-BuildRequires:  pkgconfig(xkbcommon)
-BuildRequires:  pkgconfig(sdl2)
-BuildRequires:  pkgconfig(libpipewire-0.3)
-BuildRequires:  pkgconfig(libavif)
-#BuildRequires:  (pkgconfig(wlroots) >= 0.18.0 with pkgconfig(wlroots) < 0.19.0)
-#BuildRequires:  (pkgconfig(libliftoff) >= 0.4.1 with pkgconfig(libliftoff) < 0.5)
-BuildRequires:  pkgconfig(libliftoff)
-BuildRequires:  pkgconfig(libcap)
-BuildRequires:  pkgconfig(hwdata)
-BuildRequires:  pkgconfig(libudev)
-BuildRequires:  pkgconfig(libseat)
-BuildRequires:  pkgconfig(libinput)
-BuildRequires:  xcb-util-wm-devel
-BuildRequires:  pkgconfig(xcb-errors)
-BuildRequires:  spirv-headers-devel
-# Enforce the the minimum EVR to contain fixes for all of:
-# CVE-2021-28021 CVE-2021-42715 CVE-2021-42716 CVE-2022-28041 CVE-2023-43898
-# CVE-2023-45661 CVE-2023-45662 CVE-2023-45663 CVE-2023-45664 CVE-2023-45666
-# CVE-2023-45667
-BuildRequires:  stb_image-devel >= 2.28^20231011gitbeebb24-12
-# Header-only library: -static is for tracking per guidelines
-BuildRequires:  stb_image-static
-BuildRequires:  stb_image_resize-devel
-BuildRequires:  stb_image_resize-static
-BuildRequires:  stb_image_write-devel
-BuildRequires:  stb_image_write-static
-BuildRequires:  /usr/bin/glslangValidator
-BuildRequires:  libdecor-devel
-BuildRequires:  libXdamage-devel
-BuildRequires:  xorg-x11-server-Xwayland-devel
-BuildRequires:  git
-
-# libliftoff hasn't bumped soname, but API/ABI has changed for 0.2.0 release
-Requires:       libliftoff%{?_isa} >= %{libliftoff_minver}
-Requires:       xorg-x11-server-Xwayland
-Requires:       gamescope-libs = %{version}-%{release}
-Requires:       gamescope-libs(x86-32) = %{version}-%{release}
-Recommends:     mesa-dri-drivers
-Recommends:     mesa-vulkan-drivers
-
-%description
-Gamescope is the micro-compositor optimized for running video games on Wayland.
-
-%package libs
-Summary:	libs for Gamescope
-%description libs
-%summary
-
-%prep
-git clone --depth 1 --branch %{gamescope_tag} %{url}.git
-cd gamescope
-git submodule update --init --recursive
-mkdir -p pkgconfig
-cp %{SOURCE0} pkgconfig/stb.pc
-
-# Replace spirv-headers include with the system directory
-sed -i 's^../thirdparty/SPIRV-Headers/include/spirv/^/usr/include/spirv/^' src/meson.build
-
-%autopatch -p1
-
-%build
-cd gamescope
-export PKG_CONFIG_PATH=pkgconfig
-%meson -Dpipewire=enabled -Dinput_emulation=enabled -Ddrm_backend=enabled -Drt_cap=enabled -Davif_screenshots=enabled -Dsdl2_backend=enabled
-%meson_build
-
-%install
-cd gamescope
-%meson_install --skip-subprojects
-
-%files
-%license gamescope/LICENSE
-%doc gamescope/README.md
-%caps(cap_sys_nice=eip) %{_bindir}/gamescope
-%{_bindir}/gamescopectl
-%{_bindir}/gamescopestream
-%{_bindir}/gamescopereaper
-
-%files libs
-%{_libdir}/libVkLayer_FROG_gamescope_wsi_*.so
-%{_datadir}/vulkan/implicit_layer.d/VkLayer_FROG_gamescope_wsi.*.json
@@ -1 +0,0 @@
-rpm.global("gamescope_tag", gh_tag("ValveSoftware/gamescope"));
@@ -1,9 +1,9 @@
-%define osuresver 2024.713.0
+%define osuresver 2024.705.0
 %global debug_package %{nil}
 %define __strip /bin/true

 Name:			osu-lazer
-Version:		2024.718.0
+Version:		2024.625.2
 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,11 +1,11 @@
 %global real_name prismlauncher
 %global nice_name PrismLauncher

-%global commit 0041d2a126ae6f35ce1ca2bb5c793ec5853c4343
+%global commit 5f345cedea44ec0037e684436d1bcd94e1ae5b95
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f

-%global commit_date 20240720
+%global commit_date 20240710
 %global snapshot_info %{commit_date}.%{shortcommit}

 %bcond_without qt6
@@ -0,0 +1,79 @@
+From 5a38fc2c9a329e88c8337af541dfeccaeff1fefb Mon Sep 17 00:00:00 2001
+From: seth <getchoo@tuta.io>
+Date: Sun, 15 Jan 2023 14:47:49 -0500
+Subject: [PATCH] find cmark with pkgconfig
+
+Signed-off-by: seth <getchoo@tuta.io>
+---
+ cmake/Findcmark.cmake | 59 +++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 59 insertions(+)
+ create mode 100755 cmake/Findcmark.cmake
+
+diff --git a/cmake/Findcmark.cmake b/cmake/Findcmark.cmake
+new file mode 100755
+index 00000000..9858e5df
+--- /dev/null
+++ b/cmake/Findcmark.cmake
+@@ -0,0 +1,59 @@
+# SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
+# SPDX-License-Identifier: GPL-3.0-only
+
+#
+# CMake module to search for the cmark library
+#
+
+# first try to find cmark-config.cmake
+# path to a file not in the search path can be set with 'cmake -Dcmark_DIR=some/path/'
+find_package(cmark CONFIG QUIET)
+if(cmark_FOUND AND TARGET cmark::cmark)
+  # found it!
+  return()
+endif()
+
+find_package(PkgConfig QUIET)
+if(PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_CMARK QUIET cmark)
+endif()
+
+if(NOT CMARK_INCLUDE_DIR)
+  find_path(CMARK_INCLUDE_DIR
+            NAMES cmark.h
+            PATHS
+            ${PC_CMARK_INCLUDEDIR}
+            ${PC_CMARK_INCLUDE_DIRS}
+            /usr/include
+            /usr/local/include)
+endif()
+
+if(NOT CMARK_LIBRARY)
+  find_library(CMARK_LIBRARY
+               NAMES cmark
+               HINTS
+               ${PC_CMARK_LIBDIR}
+               ${PC_CMARK_LIBRARY_DIRS}
+               /usr/lib
+               /usr/local/lib)
+endif()
+
+if(NOT TARGET cmark::cmark)
+  add_library(cmark::cmark UNKNOWN IMPORTED)
+  set_target_properties(cmark::cmark
+                        PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
+                                   ${CMARK_INCLUDE_DIR})
+  set_property(TARGET cmark::cmark APPEND
+               PROPERTY IMPORTED_LOCATION ${CMARK_LIBRARY})
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(cmark
+                                  DEFAULT_MSG
+                                  CMARK_INCLUDE_DIR
+                                  CMARK_LIBRARY)
+
+mark_as_advanced(CMARK_LIBRARY CMARK_INCLUDE_DIR)
+
+set(CMARK_LIBRARIES ${CMARK_LIBRARY})
+set(CMARK_INCLUDE_DIRS ${CMARK_INCLUDE_DIR})
+-- 
+2.39.0
+
@@ -0,0 +1,8 @@
+project pkg {
+	rpm {
+		spec = "prismlauncher-qt5-nightly.spec"
+	}
+	labels {
+		nightly = "1"
+	}
+}
@@ -0,0 +1,198 @@
+%global real_name prismlauncher
+%global nice_name PrismLauncher
+
+%global commit 2012b2c243dcfad8860847c0d85f184b6dd24504
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f
+%global quazip_commit 6117161af08e366c37499895b00ef62f93adc345
+%global tomlplusplus_commit 7eb2ffcc09f8e9890dc0b77ff8ab00fc53b1f2b8
+
+%global commit_date 20240329
+%global snapshot_info %{commit_date}.%{shortcommit}
+
+%bcond_with qt6
+
+# Change this variables if you want to use custom keys
+# Leave blank if you want to build Prism Launcher without MSA id or curseforge api key
+%define msa_id default
+%define curseforge_key default
+
+%if %{with qt6}
+%global qt_version 6
+%global min_qt_version 6
+%else
+%global qt_version 5
+%global min_qt_version 5.12
+%endif
+
+%global build_platform terra
+
+%if %{with qt6}
+Name:             prismlauncher-nightly
+%else
+Name:             prismlauncher-qt5-nightly
+%endif
+Version:          9.0^%{snapshot_info}
+Release:          1%?dist
+Summary:          Minecraft launcher with ability to manage multiple instances
+License:          GPL-3.0-only AND Apache-2.0 AND LGPL-3.0-only AND GPL-3.0-or-later AND GPL-2.0-or-later AND ISC AND OFL-1.1 AND LGPL-2.1-only AND MIT AND BSD-2-Clause-FreeBSD AND BSD-3-Clause AND LGPL-3.0-or-later
+Group:            Amusements/Games
+URL:              https://prismlauncher.org/
+Source0:          https://github.com/PrismLauncher/PrismLauncher/archive/%{commit}/%{real_name}-%{shortcommit}.tar.gz
+Source1:          https://github.com/PrismLauncher/libnbtplusplus/archive/%{libnbtplusplus_commit}/libnbtplusplus-%{libnbtplusplus_commit}.tar.gz
+Source2:          https://github.com/stachenov/quazip/archive/%{quazip_commit}/quazip-%{quazip_commit}.tar.gz
+Source3:          https://github.com/marzer/tomlplusplus/archive/%{tomlplusplus_commit}/tomlplusplus-%{tomlplusplus_commit}.tar.gz
+Patch0:           0001-find-cmark-with-pkgconfig.patch
+
+BuildRequires:    cmake >= 3.15
+BuildRequires:    extra-cmake-modules
+BuildRequires:    gcc-c++
+BuildRequires:    java-17-openjdk-devel
+BuildRequires:    desktop-file-utils
+BuildRequires:    libappstream-glib
+BuildRequires:    cmake(ghc_filesystem)
+BuildRequires:    cmake(Qt%{qt_version}Concurrent) >= %{min_qt_version}
+BuildRequires:    cmake(Qt%{qt_version}Core) >= %{min_qt_version}
+BuildRequires:    cmake(Qt%{qt_version}Gui) >= %{min_qt_version}
+BuildRequires:    cmake(Qt%{qt_version}Network) >= %{min_qt_version}
+BuildRequires:    cmake(Qt%{qt_version}Test) >= %{min_qt_version}
+BuildRequires:    cmake(Qt%{qt_version}Widgets) >= %{min_qt_version}
+BuildRequires:    cmake(Qt%{qt_version}Xml) >= %{min_qt_version}
+
+%if %{with qt6}
+BuildRequires:    cmake(Qt6Core5Compat)
+%endif
+
+BuildRequires:    pkgconfig(libcmark)
+%if 0%{fedora} < 38
+BuildRequires:    cmark
+%endif
+BuildRequires:    pkgconfig(scdoc)
+BuildRequires:    pkgconfig(zlib)
+
+Requires(post):   desktop-file-utils
+Requires(postun): desktop-file-utils
+
+Requires:         qt%{qt_version}-qtimageformats
+Requires:         qt%{qt_version}-qtsvg
+Requires:         javapackages-filesystem
+Recommends:       java-21-openjdk
+Recommends:       java-17-openjdk
+Suggests:         java-1.8.0-openjdk
+
+# xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
+Recommends:       xrandr
+# libflite needed for using narrator in minecraft
+Recommends:       flite
+# Prism supports enabling gamemode
+Suggests:         gamemode
+
+Conflicts:        %{real_name}
+Conflicts:        %{real_name}-qt5
+%if %{without qt6}
+Conflicts:        %{real_name}-nightly
+%endif
+
+
+%description
+A custom launcher for Minecraft that allows you to easily manage
+multiple installations of Minecraft at once (Fork of MultiMC)
+
+
+%prep
+%autosetup -p1 -n PrismLauncher-%{commit}
+
+tar -xzf %{SOURCE1} -C libraries
+tar -xvf %{SOURCE2} -C libraries
+tar -xvf %{SOURCE3} -C libraries
+
+rmdir libraries/{extra-cmake-modules,filesystem,libnbtplusplus,quazip,tomlplusplus,zlib}/
+mv -f libraries/libnbtplusplus-%{libnbtplusplus_commit} libraries/libnbtplusplus
+mv -f libraries/quazip-%{quazip_commit} libraries/quazip
+mv -f libraries/tomlplusplus-%{tomlplusplus_commit} libraries/tomlplusplus
+
+# Do not set RPATH
+sed -i "s|\$ORIGIN/||" CMakeLists.txt
+
+
+%build
+%cmake \
+  -DLauncher_QT_VERSION_MAJOR="%{qt_version}" \
+  -DLauncher_BUILD_PLATFORM="%{build_platform}" \
+  %if "%{msa_id}" != "default"
+  -DLauncher_MSA_CLIENT_ID="%{msa_id}" \
+  %endif
+  %if "%{curseforge_key}" != "default"
+  -DLauncher_CURSEFORGE_API_KEY="%{curseforge_key}" \
+  %endif
+  -DBUILD_TESTING=OFF
+
+%cmake_build
+
+
+%install
+%cmake_install
+
+
+%check
+%ctest
+
+
+%files
+%doc README.md
+%license LICENSE COPYING.md
+%dir %{_datadir}/%{nice_name}
+%{_bindir}/%{real_name}
+%{_datadir}/%{nice_name}/NewLaunch.jar
+%{_datadir}/%{nice_name}/JavaCheck.jar
+%{_datadir}/%{nice_name}/qtlogging.ini
+%{_datadir}/%{nice_name}/NewLaunchLegacy.jar
+%{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop
+%{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml
+%{_datadir}/icons/hicolor/scalable/apps/org.prismlauncher.PrismLauncher.svg
+%{_datadir}/mime/packages/modrinth-mrpack-mime.xml
+%{_datadir}/qlogging-categories%{qt_version}/prismlauncher.categories
+%{_mandir}/man?/prismlauncher.*
+
+
+%changelog
+* Wed Jul 26 2023 seth <getchoo at tuta dot io> - 8.0^20230726.4f00012-1
+- remove terra-fractureiser-detector from recommends, use proper build platform,
+  and add patches for epel/older fedora versions
+
+* Sun Jul 23 2023 seth <getchoo at tuta dot io> - 8.0^20230722.273d75f-1
+- update submodules, version, & use autorelease
+
+* Wed Jun 07 2023 seth <getchoo at tuta dot io> - 7.0^20230603.954d4d7-1
+- specify jdk 17 + cleanup outdated patches/scriptlets
+
+* Sun May 14 2023 seth <getchoo at tuta dot io> - 7.0^20230513.c5aff7c-1
+- add qtlogging.ini to files list
+
+* Mon Mar 20 2023 seth <getchoo at tuta dot io> - 7.0^20230319.6dcf34a-1
+- recommend flite to support narrator in minecraft
+
+* Fri Feb 03 2023 seth <getchoo at tuta dot io> - 7.0^20230203.58d9ced-1
+- disable tests and explicitly require cmark
+
+* Sun Jan 15 2023 seth <getchoo at tuta dot io> - 7.0^20230115.f1247d2-1
+- add 0001-find-cmark-with-pkgconfig.patch
+
+* Fri Jan 13 2023 seth <getchoo at tuta dot io> - 7.0^20230113.3de681d-1
+- add cmark as a build dep
+
+* Tue Jan 03 2023 seth <getchoo at tuta dot io> - 7.0^20230102.4b12c85-1
+- add qlogging categories
+
+* Mon Dec 05 2022 seth <getchoo at tuta dot io> - 6.0^20221204.79d5bef-1
+- revise file to better follow fedora packaging guidelines and add java 8 as a
+  dependency
+
+* Thu Nov 10 2022 seth <getchoo at tuta dot io> - 5.1-0.1.20221110.e6d057f
+- add package to Amusements/Games
+
+* Sun Nov 06 2022 seth <getchoo at tuta dot io> - 5.0-0.1.20221105.9fb80a2
+- update installed files
+
+* Thu Oct 27 2022 seth <getchoo at tuta dot io> - 5.0-0.1.20221027.610b971
+- initial commit
@@ -0,0 +1,11 @@
+if filters.contains("nightly") {
+	rpm.global("commit", gh_commit("PrismLauncher/PrismLauncher"));
+	if rpm.changed() {
+		rpm.release();
+		let cmake = get("https://raw.githubusercontent.com/PrismLauncher/PrismLauncher/develop/CMakeLists.txt");
+		let maj = find("set\\(Launcher_VERSION_MAJOR\\s+(\\d+)\\)", cmake, 1);
+		let min = find("set\\(Launcher_VERSION_MINOR\\s+(\\d+)\\)", cmake, 1);
+		rpm.global("commit_date", date());
+		rpm.version(`${maj}.${min}^%{snapshot_info}`);
+	}
+}
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "prismlauncher-qt5.spec"
+	}
+}
@@ -0,0 +1,188 @@
+%global real_name prismlauncher
+%global nice_name PrismLauncher
+%bcond_with qt6
+
+# Change this variables if you want to use custom keys
+# Leave blank if you want to build Prism Launcher without MSA id or curseforge api key
+%define msa_id default
+%define curseforge_key default
+
+%if %{with qt6}
+%global qt_version 6
+%global min_qt_version 6
+%else
+%global qt_version 5
+%global min_qt_version 5.12
+%endif
+
+%global build_platform terra
+
+%if %{with qt6}
+Name:             prismlauncher
+%else
+Name:             prismlauncher-qt5
+%endif
+Version:          8.2
+Release:          2%?dist
+Summary:          Minecraft launcher with ability to manage multiple instances
+# see COPYING.md for more information
+# each file in the source also contains a SPDX-License-Identifier header that declares its license
+License:          GPL-3.0-only AND Apache-2.0 AND LGPL-3.0-only AND GPL-3.0-or-later AND GPL-2.0-or-later AND ISC AND OFL-1.1 AND LGPL-2.1-only AND MIT AND BSD-2-Clause-FreeBSD AND BSD-3-Clause AND LGPL-3.0-or-later
+Group:            Amusements/Games
+URL:              https://prismlauncher.org/
+Source0:          https://github.com/PrismLauncher/PrismLauncher/releases/download/%{version}/%{real_name}-%{version}.tar.gz
+
+BuildRequires:    cmake >= 3.15
+BuildRequires:    extra-cmake-modules
+BuildRequires:    gcc-c++
+BuildRequires:    java-17-openjdk-devel
+BuildRequires:    desktop-file-utils
+BuildRequires:    libappstream-glib
+BuildRequires:    cmake(ghc_filesystem)
+BuildRequires:    cmake(Qt%{qt_version}Concurrent) >= %{min_qt_version}
+BuildRequires:    cmake(Qt%{qt_version}Core) >= %{min_qt_version}
+BuildRequires:    cmake(Qt%{qt_version}Gui) >= %{min_qt_version}
+BuildRequires:    cmake(Qt%{qt_version}Network) >= %{min_qt_version}
+BuildRequires:    cmake(Qt%{qt_version}Test) >= %{min_qt_version}
+BuildRequires:    cmake(Qt%{qt_version}Widgets) >= %{min_qt_version}
+BuildRequires:    cmake(Qt%{qt_version}Xml) >= %{min_qt_version}
+
+%if %{with qt6}
+BuildRequires:    cmake(Qt6Core5Compat)
+%endif
+
+BuildRequires:    pkgconfig(libcmark)
+BuildRequires:    pkgconfig(scdoc)
+BuildRequires:    pkgconfig(zlib)
+
+Requires(post):   desktop-file-utils
+Requires(postun): desktop-file-utils
+
+Requires:         qt%{qt_version}-qtimageformats
+Requires:         qt%{qt_version}-qtsvg
+Requires:         javapackages-filesystem
+Recommends:       java-21-openjdk
+Recommends:       java-17-openjdk
+Suggests:         java-1.8.0-openjdk
+
+# xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
+Recommends:       xrandr
+# libflite needed for using narrator in minecraft
+Recommends:       flite
+
+# Prism supports enabling gamemode
+Suggests:         gamemode
+
+%if %{without qt6}
+Conflicts:        %{real_name}
+%endif
+
+%description
+A custom launcher for Minecraft that allows you to easily manage
+multiple installations of Minecraft at once (Fork of MultiMC)
+
+
+%prep
+%autosetup -n PrismLauncher-%{version}
+
+rm -rf libraries/{extra-cmake-modules,filesystem,zlib}
+
+# Do not set RPATH
+sed -i "s|\$ORIGIN/||" CMakeLists.txt
+
+
+%build
+%cmake \
+  -DLauncher_QT_VERSION_MAJOR="%{qt_version}" \
+  -DLauncher_BUILD_PLATFORM="%{build_platform}" \
+  %if "%{msa_id}" != "default"
+  -DLauncher_MSA_CLIENT_ID="%{msa_id}" \
+  %endif
+  %if "%{curseforge_key}" != "default"
+  -DLauncher_CURSEFORGE_API_KEY="%{curseforge_key}" \
+  %endif
+  -DBUILD_TESTING=OFF
+
+%cmake_build
+
+
+%install
+%cmake_install
+
+
+%check
+%ctest
+
+
+%files
+%doc README.md
+%license LICENSE COPYING.md
+%dir %{_datadir}/%{nice_name}
+%{_bindir}/prismlauncher
+%{_datadir}/%{nice_name}/NewLaunch.jar
+%{_datadir}/%{nice_name}/JavaCheck.jar
+%{_datadir}/%{nice_name}/qtlogging.ini
+%{_datadir}/%{nice_name}/NewLaunchLegacy.jar
+%{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop
+%{_datadir}/icons/hicolor/scalable/apps/org.prismlauncher.PrismLauncher.svg
+%{_datadir}/mime/packages/modrinth-mrpack-mime.xml
+%{_datadir}/qlogging-categories%{qt_version}/prismlauncher.categories
+%{_mandir}/man?/prismlauncher.*
+%{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml
+
+
+%changelog
+* Wed Apr 03 2024 seth <getchoo at tuta dot io> - 8.2-2
+- move JREs to weak deps, add java 21 for snapshots
+
+* Wed Jul 26 2023 seth <getchoo at tuta dot io> - 7.2-2
+- remove terra-fractureiser-detector from recommends, use proper build platform
+
+* Thu Jun 08 2023 seth <getchoo@tuta.io> - 6.3-3
+- specify jdk 17 + cleanup outdated patches/scriptlets
+
+* Mon Mar 20 2023 seth <getchoo at tuta dot io> - 6.3-2
+- recommend flite to support narrator in minecraft
+
+* Sat Feb 04 2023 seth <getchoo at tuta dot io> - 6.3-1
+- update to 6.3
+
+* Mon Dec 19 2022 seth <getchoo at tuta dot io> - 6.1-2
+- start using non-headless java deps
+
+* Mon Dec 12 2022 seth <getchoo at tuta dot io> - 6.0-1
+- update to 6.0
+
+* Mon Dec 05 2022 seth <getchoo at tuta dot io> - 5.2-3
+- revise file to better follow fedora packaging guidelines and add java 8 as a
+  dependency
+
+* Tue Nov 15 2022 seth <getchoo at tuta dot io> - 5.2-2
+- use newer version of toml++ to fix issues on aarch64
+
+* Tue Nov 15 2022 seth <getchoo at tuta dot io> - 5.2-1
+- update to 5.2
+
+* Thu Nov 10 2022 seth <getchoo at tuta dot io> - 5.1-2
+- add package to Amusements/Games
+
+* Tue Nov 01 2022 seth <getchoo at tuta dot io> - 5.1-1
+- update to 5.1
+
+* Wed Oct 19 2022 seth <getchoo at tuta dot io> - 5.0-3
+- add missing deps and build with qt6 by default
+
+* Wed Oct 19 2022 seth <getchoo at tuta dot io> - 5.0-2
+- add change-jars-path.patch to allow for package-specific jar path
+
+* Wed Oct 19 2022 seth <getchoo at tuta dot io> - 5.0-1
+- update to version 5.0
+
+* Tue Oct 18 2022 Cappy Ishihara <cappy@cappuchino.xyz> - 1.4.2.git981e9cf-0.2.20221018.981e9cf
+- Update provides and obsoletes
+
+* Tue Oct 18 2022 seth <getchoo at tuta dot io> - 1.4.2.git981e9cf-0.1.20221018.981e9cf
+- start using qt6
+
+* Tue Oct 18 2022 Cappy Ishihara <cappy@cappuchino.xyz> - 1.4.2-1
+- Repackaged as Prism Launcher
@@ -0,0 +1 @@
+rpm.version(gh("PrismLauncher/PrismLauncher"));
@@ -1,7 +1,7 @@
 %define debug_package %nil

 Name:			crystal
-Version:		1.13.1
+Version:		1.13.0
 Release:		1%?dist
 Summary:		The Crystal Programming Language
 License:		Apache-2.0
@@ -1,9 +1 @@
-let v = gh("crystal-lang/crystal");
-let url = `crystal-${v}-1-linux-x86_64-bundled.tar.gz`;
-
-if get(`https://github.com/crystal-lang/crystal/releases/expanded_assets/${v}`).contains(url) {
-  rpm.version(v);
-} else {
-  print(`crystal: ${v} (waiting for bundle)`);
-  terminate();
-}
+rpm.version(gh("crystal-lang/crystal"));
@@ -2,14 +2,14 @@

 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Name:           kotlin-native
-Version:        1.9.25
+Version:        2.0.0
 Release:        1%?dist
 Summary:        LLVM backend for the Kotlin compiler
 ExclusiveArch:  x86_64

 License:        ASL 2.0
 URL:            https://kotlinlang.org/docs/reference/native-overview.html
-Source0:        https://github.com/JetBrains/kotlin/releases/download/v%version/kotlin-native-linux-x86_64-%version.tar.gz
+Source0:        https://github.com/JetBrains/kotlin/releases/download/v%version/kotlin-native-prebuilt-linux-x86_64-%version.tar.gz

 BuildRequires:  tar
 BuildRequires:  sed
@@ -28,7 +28,7 @@ Kotlin compiler and native implementation of the Kotlin standard library.


 %prep
-tar -xf %{SOURCE0} && cd kotlin-native-linux-x86_64-%{version}
+tar -xf %{SOURCE0} && cd kotlin-native-prebuilt-linux-x86_64-%{version}
 sed -i "s|\(DIR *= *\).*|\1%{_bindir}|" bin/*
 sed -i "s|\(KONAN_HOME *= *\).*|\1%{_datadir}/%{name}|" bin/*

@@ -36,7 +36,7 @@ sed -i "s|\(KONAN_HOME *= *\).*|\1%{_datadir}/%{name}|" bin/*
 %build

 %install
-rm -rf %{buildroot} && mkdir -p %{buildroot}%{_bindir}/ && cd kotlin-native-linux-x86_64-%{version}
+rm -rf %{buildroot} && mkdir -p %{buildroot}%{_bindir}/ && cd kotlin-native-prebuilt-linux-x86_64-%{version}
 install -m 0755 bin/cinterop %{buildroot}%{_bindir}/
 install -m 0755 bin/generate-platform %{buildroot}%{_bindir}/
 install -m 0755 bin/jsinterop %{buildroot}%{_bindir}/
@@ -1,7 +1,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 Name:           kotlin
-Version:        1.9.25
+Version:        2.0.0
 Release:        1%?dist
 Summary:        Statically typed programming language

@@ -1,8 +1,8 @@
 %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10
-%global commit 97f54745459b8651b7a38c174b3a8135224ebd09
+%global commit 22ba5abd635a1b50c76acb0b80097a663cdf97c9
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global ver 2.1.9
-%global commit_date 20240720
+%global ver 2.1.1
+%global commit_date 20240712
 %global debug_package %nil

 Name:			nim-nightly
@@ -7,12 +7,12 @@ Release:		1%?dist
 Summary:		Imperative, multi-paradigm, compiled programming language
 License:		MIT and BSD
 URL:			https://nim-lang.org
+Source0:		https://nim-lang.org/download/nim-%{version}-linux_x64.tar.xz
 Source1:		nim.1
 Source2:		nimgrep.1
 Source3:		nimble.1
 Source4:		nimsuggest.1
-BuildRequires:	gcc mold git-core gcc-c++ nodejs openssl-devel pkgconfig(bash-completion) gc-devel pcre-devel
-BuildRequires:  redhat-rpm-config
+BuildRequires:	gcc mold git gcc-c++ nodejs openssl-devel pkgconfig(bash-completion) gc-devel pcre-devel
 Requires:		gcc


@@ -46,11 +46,7 @@ and its standard library.


 %prep
-rm -rf ./*
-# using git clone to include submodules
-git clone --recurse-submodules -j8 https://github.com/nim-lang/Nim -b v%version --depth 1 .
-# hack
-cp /usr/bin/mold /usr/bin/ld
+%autosetup -n nim-%{version}


 %build
@@ -61,18 +57,15 @@ export FCFLAGS="${FCFLAGS} -Ofast"

 export PATH="$(pwd):$(pwd)/bin:${PATH}"

-. ci/funs.sh
-nimBuildCsourcesIfNeeded CFLAGS="${CFLAGS} -Ic_code -w -O3 -fno-strict-aliasing -fPIE" LDFLAGS="-ldl -lm -lrt -pie"
-
-nim c --noNimblePath --skipUserCfg --skipParentCfg --hints:off -d:danger koch.nim
-koch boot -d:release -d:nimStrictMode --lib:lib
+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
-koch docs &
+mold -run koch docs &
 %endif
 (cd lib && nim c --app:lib -d:createNimRtl -d:release nimrtl.nim) &
-koch tools -t:-fPIE -l:-pie &
-nim c -d:danger -t:-fPIE -l:-pie nimsuggest/nimsuggest.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
@@ -82,24 +75,24 @@ sed -i '/<link.*fonts.googleapis.com/d' doc/html/*.html

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

-# --main:compiler/nim.nim
-bin/nim cc -d:nimCallDepthLimit=10000 -r tools/niminst/niminst --var:version=%ver --var:mingw=none scripts compiler/installer.ini
-
-sh ./install.sh %buildroot/usr/bin
-
-mkdir -p %buildroot/%_bindir %buildroot/%_datadir/bash-completion/completions %buildroot/usr/lib/nim %buildroot%_datadir
-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
-mv %buildroot%_bindir/nim %buildroot%_datadir/
-ln -s %_datadir/nim/bin/nim %buildroot%_bindir/nim
+mkdir -p %buildroot{%_bindir,%_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
+# completions
+for comp in tools/*.bash-completion; do
+	install -Dm644 $comp %bashcompdir/$(basename "${comp/.bash-completion}")
+done
+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 || true
-cp -a doc/html/*.html %buildroot/%_docdir/%name/html/ || true
-cp tools/dochack/dochack.js %buildroot/%_docdir/%name/ || true
+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

@@ -116,41 +109,32 @@ ln -s %_prefix/lib/nim %buildroot%_prefix/lib/nim/lib  # compiler needs lib from
 ln -s %_prefix/lib/nim/system.nim %_prefix/lib/system.nim  # nimsuggest bug
 rm -rf %buildroot/nim || true
 rm %buildroot%_bindir/*.bat || true
-rm -rf %buildroot%_bindir/empty.txt


 %files
 %license copying.txt dist/nimble/license.txt
 %doc doc/readme.txt
-%_sysconfdir/nim/
+/etc/nim/
 %_bindir/atlas
 %_bindir/nim_dbg
 %_bindir/nim-gdb
 %_bindir/testament
-%_bindir/nim
-%_bindir/nimble
-%_bindir/nim_csources_*
-%_mandir/man1/nim.1*
-%_mandir/man1/nimble.1*
 %_prefix/lib/nim/
 %_prefix/lib/libnimrtl.so
+%{_bindir}/nim{,ble}
+%{_mandir}/man1/nim{,ble}.1*
 %_includedir/cycle.h
 %_includedir/nimbase.h
-%_datadir/nim
-%bash_completions_dir/nim
-%bash_completions_dir/nimble

 %files tools
 %license copying.txt
-%_bindir/nimgrep
-%_bindir/nimsuggest
-%_bindir/nimpretty
-%_mandir/man1/nimgrep.1*
-%_mandir/man1/nimsuggest.1*
+%_prefix/lib/nim/
+%{_bindir}/nim{grep,suggest,pretty}
+%{_mandir}/man1/nim{grep,suggest}.1*

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

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

 Name:			python3-ruff
-Version:		0.5.3
+Version:		0.5.1
 Release:		1%?dist
 Summary:		An extremely fast Python linter, written in Rust
 License:		MIT
@@ -4,20 +4,19 @@ Release:		1%?dist
 Summary:		A new type of shell
 License:		MIT
 URL:			https://www.nushell.sh/
-BuildRequires:	anda-srpm-macros rust-packaging git-core
-BuildRequires:  openssl-devel-engine
+Source0:		https://github.com/nushell/nushell/archive/refs/tags/%version.tar.gz
+BuildRequires:	anda-srpm-macros rust-packaging openssl-devel
 Requires:		glibc openssl zlib

 %description
 %summary.

 %prep
-rm -rf ./*
-git clone https://github.com/nushell/nushell -b %version --depth 1 .
+%autosetup
 %cargo_prep_online

 %build
-%{cargo_build} --workspace
+%{cargo_build -f extra} --workspace

 %install
 mkdir -p %buildroot%_bindir
@@ -1,16 +1,16 @@
--- oxipng-9.1.2/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ oxipng-9.1.2/Cargo.toml	2024-07-13T07:08:09.478330+00:00
-@@ -150,7 +150,6 @@
+--- oxipng-9.0.0/Cargo.toml	1970-01-01T00:00:01+00:00
+++ oxipng-9.0.0/Cargo.toml	2023-10-30T06:36:01.294365+00:00
+@@ -116,7 +116,6 @@
 [features]
 binary = [
-     "dep:clap",
-    "dep:glob",
-     "dep:env_logger",
+     "clap",
+-    "glob",
+     "env_logger",
 ]
 default = [
-@@ -169,13 +168,10 @@
- sanity-checks = ["dep:image"]
- zopfli = ["dep:zopfli"]
+@@ -133,13 +132,10 @@
+ ]
+ sanity-checks = ["image"]
 
 -[target."cfg(windows)".dependencies.glob]
 -version = "0.3.1"
@@ -1,13 +1,11 @@
-# Generated by rust2rpm 26
+# Generated by rust2rpm 25
 %bcond_without check
-# don't mangle shebangs
-%global __brp_mangle_shebangs %{nil}

 %global crate oxipng

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

 License:        MIT
@@ -79,6 +77,42 @@ use the "binary" feature of the "%{crate}" crate.
 %files       -n %{name}+binary-devel
 %ghost %{crate_instdir}/Cargo.toml

+%package     -n %{name}+clap-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+clap-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "clap" feature of the "%{crate}" crate.
+
+%files       -n %{name}+clap-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+crossbeam-channel-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+crossbeam-channel-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "crossbeam-channel" feature of the "%{crate}" crate.
+
+%files       -n %{name}+crossbeam-channel-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+env_logger-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+env_logger-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "env_logger" feature of the "%{crate}" crate.
+
+%files       -n %{name}+env_logger-devel
+%ghost %{crate_instdir}/Cargo.toml
+
 %package     -n %{name}+filetime-devel
 Summary:        %{summary}
 BuildArch:      noarch
@@ -103,6 +137,18 @@ use the "freestanding" feature of the "%{crate}" crate.
 %files       -n %{name}+freestanding-devel
 %ghost %{crate_instdir}/Cargo.toml

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

+%package     -n %{name}+rayon-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+rayon-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "rayon" feature of the "%{crate}" crate.
+
+%files       -n %{name}+rayon-devel
+%ghost %{crate_instdir}/Cargo.toml
+
 %package     -n %{name}+sanity-checks-devel
 Summary:        %{summary}
 BuildArch:      noarch
@@ -1,12 +1,10 @@
-%global ver 1.8.12-10
-%global sanitized_ver %(echo %{ver} | sed -E 's/-/~/g')
 Summary:        The Application Framework for tauOS apps
 Name:           libhelium
-Version:        %{sanitized_ver}
+Version:        1.8.12
 Release:        1%?dist
 License:        GPL-3.0
 URL:            https://github.com/tau-OS/libhelium
-Source0:        https://github.com/tau-OS/libhelium/archive/refs/tags/%{ver}.tar.gz
+Source0:        https://github.com/tau-OS/libhelium/archive/refs/tags/%{version}.tar.gz

 BuildRequires:  sass
 BuildRequires:  meson
@@ -23,7 +21,6 @@ Requires: gtk4 >= 4.4
 Requires: glib2 >= 2.66.0
 Requires: libgee >= 0.20
 Requires: tau-helium >= 1.1.25
-Requires: tau-hydrogen

 %description
 The Application Framework for tauOS apps
@@ -37,7 +34,7 @@ This package contains the libraries and header files that are needed
 for writing applications with libhelium.

 %prep
-%autosetup -n libhelium-%{ver}
+%autosetup -n libhelium-%{version}

 %build
 %meson \
@@ -1 +1 @@
-rpm.global("ver",gh("tau-OS/libhelium"));
+rpm.version(gh("tau-OS/libhelium"));
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -euo pipefail
+
+DBUS_SERVICE="com.system76.Scheduler"
+DBUS_PATH="/com/system76/Scheduler"
+DBUS_INTERFACE="com.system76.Scheduler"
+DBUS_METHOD="SetForegroundProcess"
+
+while true; do 
+  read method call time sender _ dest serial path interface member
+  read type pid
+  [ "$member" = "member=$DBUS_METHOD" ] && qdbus --system $DBUS_SERVICE $DBUS_PATH $DBUS_INTERFACE.$DBUS_METHOD $pid
+done < <(dbus-monitor "destination=$DBUS_SERVICE,path=$DBUS_PATH,interface=$DBUS_INTERFACE,member=$DBUS_METHOD")
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "chromebook-wireplumber-config.spec"
+	}
+}
@@ -0,0 +1,36 @@
+%global commit 4f5a96a359e0917ace6ae3778618a46d5e88c45a
+%global commit_date 20240322
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global debug_package %{nil}
+%define __os_install_post %{nil}
+
+Name:           chromebook-wireplumber-config
+Version:        %commit_date.%shortcommit
+Release:        1%?dist
+
+License:        Apache-2.0
+Summary:        Chromebook wireplumber configs
+URL:            https://github.com/WeirdTreeThing/chromebook-linux-audio
+Source0:        https://github.com/WeirdTreeThing/chromebook-linux-audio/archive/%commit/chromebook-linux-audio-%commit.tar.gz
+
+Requires:       wireplumber
+
+%description
+WeirdTreeThing's wireplumber configs for chromebooks.
+
+%prep
+%autosetup -n chromebook-linux-audio-%commit
+
+%install
+mkdir -p %buildroot/etc/wireplumber/main.lua.d
+cp conf/avs/51-avs-dmic.lua %buildroot/etc/wireplumber/main.lua.d/
+cp conf/common/51-increase-headroom.lua %buildroot/etc/wireplumber/main.lua.d/
+
+%files
+%doc README.md
+%license LICENSE
+/etc/wireplumber/main.lua.d/*.lua
+
+%changelog
+* Thu Mar 28 2024 june-fish <terra@june.fish>
+- Initial package.
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`rpm.global("gamescope_tag", gh_tag("ValveSoftware/gamescope"));`
				`@@ -0,0 +1 @@`
				`rpm.version(gh("PrismLauncher/PrismLauncher"));`