bump(branch): zig-master

fix: u-root (#4455 ) (#5781 )
apply all patches until the one that replaces cpuid (cherry picked from commit 29570e7208) Co-authored-by: madomado <madonuko@outlook.com>
2026-05-31 09:01:55 +00:00 · 2025-07-06 04:51:09 +00:00 · 2025-07-06 12:35:00 +08:00 · 2025-07-06 04:21:24 +00:00 · 2025-07-06 03:40:36 +00:00 · 2025-07-06 02:15:14 +00:00
723 changed files with 19818 additions and 8097 deletions
@@ -2,7 +2,7 @@
  "repoOwner": "terrapkg",
  "repoName": "packages",
  "resetAuthor": true,
-  "targetBranchChoices": ["el10", "f40", "f41", "f42", "frawhide"],
+  "targetBranchChoices": ["el10", "f41", "f42", "frawhide"],
  "branchLabelMapping": {
    "^sync-(.+)$": "$1"
  }
@@ -69,7 +69,7 @@ jobs:
          dnf5 builddep -y ${dir}/*.spec

      - name: Build with Andaman
-        run: anda build ${{ matrix.pkg.pkg }} -c terra-${{ matrix.version }}-${{ matrix.pkg.arch }} ${{ !matrix.pkg.labels.mock == '1' && '-rrpmbuild' || '' }}
+        run: anda build ${{ matrix.pkg.pkg }} -D "vendor Terra" -c terra-${{ matrix.version }}-${{ matrix.pkg.arch }} ${{ !matrix.pkg.labels.mock == '1' && '-rrpmbuild' || '' }}

      - name: Generating artifact name
        id: art
@@ -46,15 +46,15 @@ jobs:
          echo "PATH=$PATH:/github/home/.cargo/bin" >> $GITHUB_ENV
          export PATH=$PATH:/github/home/.cargo/bin
          git config --global --add safe.directory "$GITHUB_WORKSPACE"
-          anda build -rrpmbuild anda/terra/mock-configs/pkg
+          anda build -D "vendor Terra" -rrpmbuild anda/terra/mock-configs/pkg
      - name: Install terra-mock-configs
        run: dnf5 install -y anda-build/rpm/rpms/terra-mock-configs*.rpm

-      - name: Build trra-release
-        run: anda build -rrpmbuild anda/terra/release/pkg
+      - name: Build terra-release
+        run: anda build -D "vendor Terra" -rrpmbuild anda/terra/release/pkg

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

@@ -61,7 +61,7 @@ jobs:
        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"

      - name: Build with Andaman
-        run: anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} anda/${{ matrix.pkg }}pkg
+        run: anda build -D "vendor Terra" -c terra-${{ matrix.version }}-${{ matrix.arch }} anda/${{ matrix.pkg }}pkg

      - name: Generating artifact name
        id: art
@@ -95,7 +95,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 "anda/${{matrix.pkg}}pkg" "${{matrix.version}}" "${{matrix.arch}}" "${{github.run_id}}" "${{secrets.MADOGUCHI_JWT}}" "$GITHUB_SHA"
      - 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 "anda/${{matrix.pkg}}pkg" "${{matrix.version}}" "${{matrix.arch}}" "${{github.run_id}}" "${{secrets.MADOGUCHI_JWT}}" "$GITHUB_SHA"
@@ -35,13 +35,13 @@ jobs:
          fi

      - name: Install Build Dependencies
-        if: ${{ !contains(matrix.pkg.labels, 'mock') }}
+        if: ${{ matrix.pkg.labels.mock != '1' }}
        run: |
          dir=$(dirname ${{ matrix.pkg.pkg }})
          dnf5 builddep -y ${dir}/*.spec

      - name: Build with Andaman
-        run: anda build ${{ matrix.pkg.pkg }} -c terra-${{ matrix.version }}-${{ matrix.pkg.arch }} ${{ contains(matrix.pkg.labels, 'mock') && '' || '-rrpmbuild' }}
+        run: anda build -D "vendor Terra" ${{ matrix.pkg.pkg }} -c terra-${{ matrix.version }}-${{ matrix.pkg.arch }} ${{ !matrix.pkg.labels.mock == '1' && '-rrpmbuild' || '' }}

      - name: Generating artifact name
        id: art
@@ -23,7 +23,7 @@ jobs:
          git config --global commit.gpgsign true

      - name: Backport Action
-        uses: sorenlouv/backport-github-action@v9.3.0
+        uses: sorenlouv/backport-github-action@v9.5.1
        with:
          github_token: ${{ secrets.RABONEKO_BACKPORT_GITHUB_TOKEN }}
          auto_backport_label_prefix: sync-
@@ -11,7 +11,6 @@ jobs:
      matrix:
        branch:
          - frawhide
-          - f40
          - f41
          - f42
          - el10
@@ -46,7 +45,7 @@ jobs:
            git config user.email "raboneko@fyralabs.com"
            git config gpg.format "ssh"
            git config user.signingkey "${{ runner.temp }}/signing_key"
-            msg="bump(branch): $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')"
+            msg="bump(branch): $(anda run andax/ci/update_commit_message.rhai)"
            git commit -S -a -m "$msg"
            git push -u origin --all
          fi
@@ -6,7 +6,6 @@ on:
      - frawhide
      - f42
      - f41
-      - f40
      - el10
    paths:
      - comps.xml
@@ -37,7 +37,7 @@ jobs:
            git config user.email "raboneko@fyralabs.com"
            git config gpg.format "ssh"
            git config user.signingkey "${{ runner.temp }}/signing_key"
-            msg="bump(nightly): $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')"
+            msg="bump(nightly): $(anda run andax/ci/update_commit_message.rhai)"
            git commit -S -a -m "$msg"
            git format-patch HEAD^
            copy_over () {
@@ -46,7 +46,6 @@ jobs:
              git add anda
              git commit -S -a -m "$msg"
            }
-            copy_over f40 || true
            copy_over f41 || true
            copy_over el10 || true
            git push -u origin --all
@@ -37,7 +37,7 @@ jobs:
            git config user.email "raboneko@fyralabs.com"
            git config gpg.format "ssh"
            git config user.signingkey "${{ runner.temp }}/signing_key"
-            msg="bump(weekly): $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')"
+            msg="bump(weekly): $(anda run andax/ci/update_commit_message.rhai)"
            git commit -S -a -m "$msg"
            git format-patch HEAD^
            copy_over () {
@@ -46,7 +46,6 @@ jobs:
              git add anda
              git commit -S -a -m "$msg"
            }
-            copy_over f40 || true
            copy_over f41 || true
            copy_over el10 || true
            git push -u origin --all
@@ -37,7 +37,7 @@ jobs:
            git config user.email "raboneko@fyralabs.com"
            git config gpg.format "ssh"
            git config user.signingkey "${{ runner.temp }}/signing_key"
-            msg="bump: $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')"
+            msg="bump: $(anda run andax/ci/update_commit_message.rhai)"
            git commit -S -a -m "$msg"
            git format-patch HEAD^
            copy_over () {
@@ -46,7 +46,6 @@ jobs:
              git add anda
              git commit -S -a -m "$msg"
            }
-            copy_over f40 || true
            copy_over f41 || true
            copy_over el10 || true
            git push -u origin --all
@@ -1,2 +1,4 @@
 anda-build/
 **/*.tar*
+**/*.crate
+**/*.zip
@@ -13,6 +13,8 @@ This monorepo contains the package manifests for all packages in Terra.

 ## Installation

+### Fedora
+
 ```bash
 sudo dnf install --nogpgcheck --repofrompath 'terra,https://repos.fyralabs.com/terra$releasever' terra-release
 ```
@@ -24,6 +26,24 @@ curl -fsSL https://github.com/terrapkg/subatomic-repos/raw/main/terra.repo | pke
 sudo rpm-ostree install terra-release
 ```

+Optionally, you can install `terra-release-extra` to use the Extras repository. This also installs the Nvidia, and Mesa streams but does not enable them.
+
+### Enterprise Linux (EL)
+
+Only EL10 is supported. Not all packages available in Terra are available in Terra EL at this time.
+
+Terra EL requires the EPEL repos, which may be installed with:
+
+```bash
+sudo dnf install 'https://dl.fedoraproject.org/pub/epel/epel-release-latest-$releasever.noarch.rpm'
+```
+
+And Terra EL itself can be installed with:
+
+```bash
+sudo dnf install --nogpgcheck --repofrompath 'terra,https://repos.fyralabs.com/terrael$releasever' terra-release
+```
+
 ## Documentation

 Our documentation can be found on our [Devdocs](https://developer.fyralabs.com/terra/).
@@ -1,9 +1,9 @@
-%global xurl https://files.pythonhosted.org/packages/68/9c/7685bd012e597332f8ce379a31b0d58dd4eae960da96ff43e9fcd978c93f/anki-25.02-cp39-abi3-manylinux_2_35_x86_64.whl
-%global aurl https://files.pythonhosted.org/packages/da/36/741cef7b7fce943d187784549fd8de8152986067d9226f384959c07770a7/anki-25.02-cp39-abi3-manylinux_2_35_aarch64.whl
-%global qurl https://files.pythonhosted.org/packages/2c/bc/763589b97aa5c91acf3d834beaa473c25ca7f335c7b40954fd0d5fd41ddc/aqt-25.02-py3-none-any.whl
+%global xurl https://files.pythonhosted.org/packages/f9/0d/a236895d92dfcf53be8e08e8421fb9d8bbf0f0c5d2ee9a89b699f59a2f50/anki-25.7.1-cp39-abi3-manylinux_2_36_x86_64.whl
+%global aurl https://files.pythonhosted.org/packages/83/72/5e451e1503b9ff7df60ca5d3857757bb6eb661504015c22cb8330a1ee26a/anki-25.7.1-cp39-abi3-manylinux_2_36_aarch64.whl
+%global qurl https://files.pythonhosted.org/packages/05/36/d381c10a0884b166ac3e465baeda4d116bf5f51ed1e6947831db56049173/aqt-25.7.1-py3-none-any.whl

 Name:			anki-bin
-Version:		25.02
+Version:		25.7.1
 Release:		1%?dist
 Summary:		Flashcard program for using space repetition learning (Installed with wheel)
 License:		AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
@@ -1,5 +1,5 @@
 Name:           anki-qt5
-Version:        25.02
+Version:        25.07.1
 Release:        1%?dist
 Summary:        Flashcard program for using space repetition learning
 License:        AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
@@ -1,5 +1,5 @@
 Name:           anki
-Version:        25.02
+Version:        25.07.1
 Release:        1%?dist
 Summary:        Flashcard program for using space repetition learning
 License:        AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
@@ -1,7 +1,7 @@
 %global __requires_exclude ^lib-.*.so            
 %global __provides_exclude ^lib-.*.so

-%global ver Audacity-3.7.3
+%global ver Audacity-3.7.4
 %global sanitized_ver %(echo %{ver} | sed 's/Audacity-//g')

 Name:    audacity-freeworld
@@ -8,8 +8,8 @@ for background device management, as well as a GUI to expertly customize your se
 %global __brp_mangle_shebangs %{nil}

 Name:           coolercontrol
-Version:        2.0.1
-Release:        2%?dist
+Version:        2.2.1
+Release:        1%?dist
 Summary:        Cooling device control for Linux
 License:        GPL-3.0-or-later
 URL:            https://gitlab.com/coolercontrol/coolercontrol
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-canary-openasar
-Version:        0.0.618
+Version:        0.0.712
 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.618
+Version:        0.0.712
 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.88
+Version:        0.0.100
 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.135
+Version:        0.0.151
 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.135
+Version:        0.0.151
 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.88
+Version:		0.0.100
 Release:		1%?dist
 Summary:		Free Voice and Text Chat for Gamers
 URL:			https://discord.com
@@ -1,22 +1,27 @@
-%global commit e117986715e1e9ef955009ad7f03ec110aa14940
-%global commit_date 20250303
+%global commit 8f3f9b8759eecca4768f4860cbf6dc878337fb82
+%global commit_date 20250615
 %global shortcommit %(c=%{commit}; echo ${c:0:7})

 Name:           envision-nightly
 Version:        %commit_date.%shortcommit
 Release:        1%?dist
 Summary:        UI for building, configuring and running Monado, the open source OpenXR runtime
-License:        AGPL-3.0-or-later
+SourceLicense:  AGPL-3.0-or-later
+License:        ((Apache-2.0 OR MIT) AND BSD-3-Clause) AND ((MIT OR Apache-2.0) AND Unicode-3.0) AND (0BSD OR MIT OR Apache-2.0) AND AGPL-3.0-or-later AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND Apache-2.0 AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND ISC AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND MIT AND Unicode-3.0 AND (Unlicense OR MIT) AND Zlib
 URL:            https://gitlab.com/gabmus/envision/
 Source0:        %url/-/archive/%commit/envision-%commit.tar.gz
-BuildRequires:  meson ninja-build cargo 
+BuildRequires:  anda-srpm-macros
+BuildRequires:  cargo
+BuildRequires:  cargo-rpm-macros
+BuildRequires:  meson
+BuildRequires:  ninja-build
 BuildRequires:  pkgconfig(glib-2.0) >= 2.66
 BuildRequires:  pkgconfig(gio-2.0) >= 2.66
 BuildRequires:  pkgconfig(gtk4) >= 4.10.0
 BuildRequires:  pkgconfig(vte-2.91-gtk4) >= 0.72.0
 BuildRequires:  pkgconfig(libadwaita-1)
 BuildRequires:  pkgconfig(libusb-1.0)
-BuildRequires:  openssl-devel-engine
+BuildRequires:  pkgconfig(openssl)
 BuildRequires:  openxr-devel
 BuildRequires:  libappstream-glib
 BuildRequires:  desktop-file-utils
@@ -30,17 +35,27 @@ Conflicts:      envision

 %prep
 %autosetup -n envision-%commit
+%cargo_prep_online

 %build
+# generate constants.rs from constants.rs.in
 %meson
+
+# skip subdir
+sed -E "/^subdir\('src'\)/d" -i meson.build
+
+%meson --reconfigure
 %meson_build

 %install
 %meson_install
+%cargo_install
+%{cargo_license_online} > LICENSE.dependencies

 %files
 %doc README.md
 %license LICENSE
+%license LICENSE.dependencies
 %_bindir/envision
 %_datadir/applications/org.gabmus.envision.Devel.desktop
 %_datadir/envision/
@@ -6,14 +6,15 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:			feishin
-Version:		0.12.3
+Version:		0.17.0
 Release:		1%?dist
 Summary:		A modern self-hosted music player
 License:		GPL-3.0
 URL:			https://github.com/jeffvli/feishin
 Source0:		%url/archive/refs/tags/v%version.tar.gz
 Requires:		fuse mpv
-BuildRequires:	nodejs20-npm jq libxcrypt-compat
+Packager:		madonuko <mado@fyralabs.com>
+BuildRequires:	jq libxcrypt-compat pnpm

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

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

 %define a linux
@@ -52,11 +49,11 @@ npm-20 run build
 %define a arm64
 %endif

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

 %install
 mkdir -p %buildroot%_datadir/{pixmaps,applications} %buildroot%_bindir
-mv release/build/*-unpacked %buildroot%_datadir/feishin
+mv dist/*-unpacked %buildroot%_datadir/feishin
 install -Dm644 assets/icons/icon.png %buildroot%_datadir/pixmaps/feishin.png
 ln -s %_datadir/feishin/feishin %buildroot%_bindir/feishin
 install -Dm644 feishin.desktop %buildroot%_datadir/applications/
@@ -0,0 +1,8 @@
+project pkg {
+    rpm {
+        spec = "flameshot-nightly.spec"
+    }
+    labels {
+        nightly = 1
+    }
+}
@@ -0,0 +1,109 @@
+#? https://github.com/flameshot-org/flameshot/blob/master/packaging/rpm/fedora/flameshot.spec
+
+%global ver 12.1.0
+%global commit 4edfb2ac1d71e7f75fcdcb850ff6bce5fb148a7b
+%global shortcommit %{sub %{commit} 1 7}
+#global commit_date 20250608
+%global commit_date 20250618
+%global devel_name QtColorWidgets
+
+Name:			flameshot.nightly
+Version:		%ver^%{commit_date}git.%shortcommit
+Release:		2%?dist
+License:		GPL-3.0-or-later AND ASL-2.0 AND GPL-2.0-only AND LGPL-3.0-only AND FAL-1.3
+Summary:		Powerful yet simple to use screenshot software
+URL:			https://flameshot.org
+Source0:		https://github.com/flameshot-org/flameshot/archive/%commit/flameshot-%commit.tar.gz
+Packager:  madonuko <mado@fyralabs.com>
+
+BuildRequires:	cmake >= 3.13.0
+BuildRequires:	gcc-c++ >= 7
+BuildRequires:	fdupes
+BuildRequires:	libappstream-glib
+BuildRequires:	ninja-build
+BuildRequires:	desktop-file-utils
+
+BuildRequires:	cmake(Qt5Core) >= 5.9.0
+BuildRequires:	cmake(KF5GuiAddons) >= 5.89.0
+BuildRequires:	cmake(Qt5DBus) >= 5.9.0
+BuildRequires:	cmake(Qt5Gui) >= 5.9.0
+BuildRequires:	cmake(Qt5LinguistTools) >= 5.9.0
+BuildRequires:	cmake(Qt5Network) >= 5.9.0
+BuildRequires:	cmake(Qt5Svg) >= 5.9.0
+BuildRequires:	cmake(Qt5Widgets) >= 5.9.0
+
+Requires:		hicolor-icon-theme
+Requires:		qt5-qtbase >= 5.9.0
+Requires:		qt5-qttools >= 5.9.0
+Requires:		qt5-qtsvg%{?_isa} >= 5.9.0
+
+%dnl Provides:		flameshot = %version-%release
+Conflicts:		flameshot
+
+Recommends:		xdg-desktop-portal%{?_isa}
+Recommends:		(xdg-desktop-portal-gnome%{?_isa} if gnome-shell%{?_isa})
+Recommends:		(xdg-desktop-portal-kde%{?_isa} if plasma-workspace-wayland%{?_isa})
+Recommends:		(xdg-desktop-portal-wlr%{?_isa} if wlroots%{?_isa})
+
+%description
+Powerful and simple to use screenshot software with built-in
+editor with advanced features.
+
+Features:
+
+ * Customizable appearance.
+ * Easy to use.
+ * In-app screenshot edition.
+ * DBus interface.
+ * Upload to Imgur
+
+
+%pkg_completion -Bfz flameshot
+
+%package devel
+Summary:      Flameshot development files
+Requires:     %{name} = %{version}
+
+%description devel
+Development files for Flameshot.
+
+%prep
+%autosetup -p1 -n flameshot-%commit
+
+%build
+%cmake -G Ninja \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DUSE_WAYLAND_CLIPBOARD:BOOL=ON \
+%cmake_build
+
+%install
+%cmake_install
+# https://fedoraproject.org/wiki/PackagingDrafts/find_lang
+%find_lang Internationalization --with-qt
+%fdupes %{buildroot}%{_datadir}/icons
+
+%check
+appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml
+desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
+
+%files -f Internationalization.lang
+%{_datadir}/flameshot/translations/Internationalization_grc.qm
+%doc README.md
+%license LICENSE
+%dir %{_datadir}/flameshot
+%dir %{_datadir}/flameshot/translations
+%{_bindir}/flameshot
+%{_libdir}/lib%{devel_name}.so.*
+%{_datadir}/applications/org.flameshot.Flameshot.desktop
+%{_metainfodir}/org.flameshot.Flameshot.metainfo.xml
+%{_datadir}/dbus-1/interfaces/org.flameshot.Flameshot.xml
+%{_datadir}/dbus-1/services/org.flameshot.Flameshot.service
+%{_datadir}/icons/hicolor/*/apps/*.png
+%{_datadir}/icons/hicolor/scalable/apps/*.svg
+%{_mandir}/man1/flameshot.1*
+
+%files devel
+%{_libdir}/lib%{devel_name}.so
+%{_libdir}/cmake/%{devel_name}/
+%{_libdir}/pkgconfig/%{devel_name}.pc
+%{_includedir}/%{devel_name}/
@@ -0,0 +1,8 @@
+terminate();
+rpm.global("commit", gh_commit("flameshot-org/flameshot"));
+if rpm.changed() {
+    let v = gh("flameshot-org/flameshot");
+    v.crop(1);
+    rpm.global("ver", v);
+    rpm.global("commit_date", date());
+}
@@ -0,0 +1,6 @@
+project pkg {
+	arches = ["x86_64"]
+	rpm {
+		spec = "flatpost.spec"
+	}
+}
@@ -0,0 +1,16 @@
+commit 86a77b2e3d69a09f75992e6795903ab56df1a900 (HEAD -> main, fork/main)
+Author: Adam Fidel <adam@fidel.id>
+Date:   Tue Apr 22 14:52:16 2025 -0500
+
+    feat: add MimeType to .desktop file
+
+diff --git a/data/usr/share/applications/com.flatpost.flatpostapp.desktop b/data/usr/share/applications/com.flatpost.flatpostapp.desktop
+index 73013fc..d1f321d 100644
+--- a/data/usr/share/applications/com.flatpost.flatpostapp.desktop
+++ b/data/usr/share/applications/com.flatpost.flatpostapp.desktop
+@@ -4,3 +4,4 @@ Exec=python3 /usr/bin/flatpost
+ Icon=com.flatpost.flatpostapp
+ Type=Application
+ Categories=Utility;
+MimeType=application/vnd.flatpak.ref;application/vnd.flatpak.repo;
+
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+  <mime-type type="application/vnd.flatpak.ref">
+    <glob pattern="*.flatpakref"/>
+    <comment>Flatpak Reference File</comment>
+  </mime-type>
+  <mime-type type="application/vnd.flatpak.repo">
+    <glob pattern="*.flatpakrepo"/>
+    <comment>Flatpak Repository File</comment>
+  </mime-type>
+</mime-info>
@@ -0,0 +1,77 @@
+Name:          flatpost
+Version:       1.0.6
+Release:       1%?dist
+License:       BSD-2-Clause
+Summary:       Desktop environment agnostic Flathub software center.
+
+URL:            https://github.com/gloriouseggroll/flatpost
+Source0:        %{url}/archive/refs/tags/%{version}.tar.gz
+Source1:        flatpost-mime.xml
+Patch0:         flatpost-desktop-mimetype.patch
+
+BuildArch:      noarch
+BuildRequires:  python3-devel
+BuildRequires:  make
+BuildRequires:  desktop-file-utils
+
+Provides:	nobara-updater
+
+# App Deps
+Requires: python
+Requires: python3
+Requires: python3-gobject
+Requires: python3-requests
+Requires: python3-pillow
+Requires: python3-svgwrite
+Requires: python3-fonttools
+Requires: python3-numpy
+
+Requires: flatpak
+Requires: glib2
+Requires: gtk3
+Requires: gtk4
+Requires: xdg-utils
+
+Requires(post):      shared-mime-info
+Requires(postun):    shared-mime-info
+Requires(posttrans): shared-mime-info
+
+%description
+Desktop environment agnostic Flathub software center. Allows for browsing,
+installation, removal, updating, and permission management of flatpak packages and repositories.
+
+%prep
+%autosetup -p1
+
+%build
+make all DESTDIR=%{buildroot}
+install -D -m644 %{SOURCE1} %{buildroot}/usr/share/mime/packages/flatpost.xml
+
+%check
+desktop-file-validate %{buildroot}%{_datadir}/applications/com.flatpost.flatpostapp.desktop
+
+%post
+xdg-icon-resource forceupdate --theme hicolor &>/dev/null
+update-mime-database usr/share/mime &>/dev/null
+update-desktop-database -q
+
+%postun
+xdg-icon-resource forceupdate --theme hicolor &>/dev/null
+update-mime-database usr/share/mime &>/dev/null
+update-desktop-database -q
+
+%posttrans
+xdg-icon-resource forceupdate --theme hicolor &>/dev/null
+update-mime-database usr/share/mime &>/dev/null
+update-desktop-database -q
+
+%files
+%{python3_sitelib}/flatpost/
+%{_bindir}/flatpost
+%{_datadir}/applications/com.flatpost.flatpostapp.desktop
+%{_datadir}/flatpost/collections_data.json
+%{_datadir}/icons/hicolor/1024x1024/apps/com.flatpost.flatpostapp.png
+%{_datadir}/icons/hicolor/64x64/apps/com.flatpost.flatpostapp.png
+%{_datadir}/mime/packages/flatpost.xml
+%license %{_datadir}/licenses/flatpost/LICENSE
+
@@ -0,0 +1,3 @@
+let v = gh_rawfile("GloriousEggroll/flatpost", "main", "VERSION.txt");
+v.trim();
+rpm.version(v);
@@ -0,0 +1,9 @@
+project pkg {
+	rpm {
+		spec = "goofcord-nightly.spec"
+	}
+        labels {
+                mock = 1
+                nightly = 1
+        } 
+} 
@@ -0,0 +1,101 @@
+%global commit 3f5eda113f33fead76a5a53e0b71c11b254d68fd
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commit_date 20250615
+%global ver 1.10.1
+%global base_name goofcord
+%global git_name GoofCord
+%global debug_package %{nil}
+# Exclude private libraries
+%global __provides_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*))$
+%ifnarch aarch64 armv7hl armv7l
+%global __requires_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*)|(.*\\aarch64*\\.so.*))$
+%elifarch aarch64 armv7hl armv7l
+%global __requires_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*)|(.*\\x86_64*\\.so.*)|(.*\\x86-64*\\.so.*))$
+%endif
+
+Name:          %{base_name}-nightly
+Version:       %{ver}^%{commit_date}.git.%{shortcommit}
+Release:       1%{?dist}
+License:       OSL-3.0
+Summary:       A privacy-minded Legcord fork.
+Group:         Applications/Internet
+URL:           https://github.com/Milkshiift/%{git_name}
+Source0:       %{url}/archive/%{commit}/%{git_name}-%{commit}.tar.gz
+BuildRequires: bun-bin
+BuildRequires: desktop-file-utils
+BuildRequires: gcc
+BuildRequires: gcc-c++
+BuildRequires: git
+BuildRequires: make
+BuildRequires: nodejs
+BuildRequires: nodejs-npm
+BuildRequires: python3
+%ifarch aarch64
+BuildRequires: zlib-ng-compat-devel
+%endif
+Packager:      Gilver E. <rockgrub@disroot.org>
+
+%description
+A highly configurable and privacy minded Discord client.
+
+%prep
+%autosetup -n %{git_name}-%{commit}
+
+%build
+%ifarch aarch64 armv7hl armv7l
+sed -i '/\"x64\",/d' electron-builder.ts
+%endif
+bun install
+bun run packageLinux --publish=never
+
+%install
+mkdir -p %{buildroot}%{_datadir}/%{git_name}
+%ifarch x86_64
+mv dist/linux-unpacked/* -t %{buildroot}%{_datadir}/%{git_name}
+%elifarch aarch64
+mv dist/linux-arm64-unpacked/* -t %{buildroot}%{_datadir}/%{git_name}
+%elifarch armv7hl armv7l
+mv dist/linux-armv7l-unpacked/* -t %{buildroot}%{_datadir}/%{git_name}
+%endif
+
+mkdir -p %{buildroot}%{_bindir}
+ln -sf %{_datadir}/%{git_name}/%{git_name} %{buildroot}%{_bindir}/%{git_name}
+install -Dm644 dist/.icon-set/icon_16x16.png %{buildroot}/%{_iconsdir}/hicolor/16x16/apps/%{git_name}.png
+install -Dm644 dist/.icon-set/icon_32.png %{buildroot}/%{_iconsdir}/hicolor/32x32/apps/%{git_name}.png
+install -Dm644 dist/.icon-set/icon_48x48.png %{buildroot}/%{_iconsdir}/hicolor/48x48/apps/%{git_name}.png
+install -Dm644 dist/.icon-set/icon_64.png %{buildroot}/%{_iconsdir}/hicolor/64x64/apps/%{git_name}.png
+install -Dm644 dist/.icon-set/icon_128.png %{buildroot}/%{_iconsdir}/hicolor/128x128/apps/%{git_name}.png
+install -Dm644 dist/.icon-set/icon_256.png %{buildroot}/%{_iconsdir}/hicolor/256x256/apps/%{git_name}.png
+install -Dm644 dist/.icon-set/icon_512.png %{buildroot}/%{_iconsdir}/hicolor/512x512/apps/%{git_name}.png
+install -Dm644 dist/.icon-set/icon_1024.png %{buildroot}/%{_iconsdir}/hicolor/1024x1024/apps/%{git_name}.png
+
+%ifarch x86_64
+dist/%{git_name}-*x86_64.AppImage --appimage-extract '*.desktop'
+%elifarch aarch64
+dist/%{git_name}-*arm64.AppImage --appimage-extract '*.desktop'
+%elifarch armv7hl armv7l
+dist/%{git_name}-*armv7l.AppImage --appimage-extract '*.desktop'
+%endif
+desktop-file-install --set-key=Exec --set-value="%{_datadir}/%{git_name}/%{git_name} --enable-features=UseOzonePlatform,WaylandWindowDecorations --ozone-platform-hint=auto %U" squashfs-root/%{git_name}.desktop
+
+%check
+desktop-file-validate %{buildroot}%{_datadir}/applications/%{git_name}.desktop
+
+%files
+%doc README.md
+%license LICENSE
+%{_bindir}/%{git_name}
+%{_datadir}/applications/%{git_name}.desktop
+%{_datadir}/%{git_name}/
+%{_iconsdir}/hicolor/16x16/apps/%{git_name}.png
+%{_iconsdir}/hicolor/32x32/apps/%{git_name}.png
+%{_iconsdir}/hicolor/48x48/apps/%{git_name}.png
+%{_iconsdir}/hicolor/64x64/apps/%{git_name}.png
+%{_iconsdir}/hicolor/128x128/apps/%{git_name}.png
+%{_iconsdir}/hicolor/256x256/apps/%{git_name}.png
+%{_iconsdir}/hicolor/512x512/apps/%{git_name}.png
+%{_iconsdir}/hicolor/1024x1024/apps/%{git_name}.png
+
+%changelog
+* Sat Jun 28 2025 Gilver E. <rockgrub@disroot.org> - 1.10.1^20250615.git.3f5eda1
+- Initial package
@@ -0,0 +1,8 @@
+rpm.global("commit", gh_commit("Milkshiift/GoofCord"));
+ if rpm.changed {
+   let v = gh_tag(""Milkshiift/GoofCord");
+   v.crop(1);
+   rpm.global("ver", v);
+   rpm.global("commit_date", date());
+   rpm.release();
+}
@@ -0,0 +1,8 @@
+project pkg {
+	rpm {
+		spec = "goofcord.spec"
+	}
+        labels {
+                mock = 1
+        } 
+} 
@@ -0,0 +1,95 @@
+%global git_name GoofCord
+%global debug_package %{nil}
+# Exclude private libraries
+%global __provides_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*))$
+%ifnarch aarch64 armv7hl armv7l
+%global __requires_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*)|(.*\\aarch64*\\.so.*))$
+%elifarch aarch64 armv7hl armv7l
+%global __requires_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*)|(.*\\x86_64*\\.so.*)|(.*\\x86-64*\\.so.*))$
+%endif
+
+Name:          goofcord
+Version:       1.10.1
+Release:       1%{?dist}
+License:       OSL-3.0
+Summary:       A privacy-minded Legcord fork.
+Group:         Applications/Internet
+URL:           https://github.com/Milkshiift/%{git_name}
+Source0:       %{url}/archive/refs/tags/v%{version}.tar.gz
+BuildRequires: bun-bin
+BuildRequires: desktop-file-utils
+BuildRequires: gcc
+BuildRequires: gcc-c++
+BuildRequires: make
+BuildRequires: nodejs
+BuildRequires: nodejs-npm
+BuildRequires: python3
+%ifarch aarch64
+BuildRequires: zlib-ng-compat-devel
+%endif
+Packager:      Gilver E. <rockgrub@disroot.org>
+
+%description
+A highly configurable and privacy minded Discord client.
+
+%prep
+%autosetup -n %{git_name}-%{version}
+
+%build
+%ifarch aarch64 armv7hl armv7l
+sed -i '/\"x64\",/d' electron-builder.ts
+%endif
+bun install
+bun run packageLinux
+
+%install
+mkdir -p %{buildroot}%{_datadir}/%{name}
+%ifarch x86_64
+mv dist/linux-unpacked/* -t %{buildroot}%{_datadir}/%{name}
+%elifarch aarch64
+mv dist/linux-arm64-unpacked/* -t %{buildroot}%{_datadir}/%{name}
+%elifarch armv7hl armv7l
+mv dist/linux-armv7l-unpacked/* -t %{buildroot}%{_datadir}/%{name}
+%endif
+
+mkdir -p %{buildroot}%{_bindir}
+ln -sf %{_datadir}/%{name}/%{name} %{buildroot}%{_bindir}/%{name}
+install -Dm644 dist/.icon-set/icon_16x16.png %{buildroot}/%{_iconsdir}/hicolor/16x16/apps/%{name}.png
+install -Dm644 dist/.icon-set/icon_32.png %{buildroot}/%{_iconsdir}/hicolor/32x32/apps/%{name}.png
+install -Dm644 dist/.icon-set/icon_48x48.png %{buildroot}/%{_iconsdir}/hicolor/48x48/apps/%{name}.png
+install -Dm644 dist/.icon-set/icon_64.png %{buildroot}/%{_iconsdir}/hicolor/64x64/apps/%{name}.png
+install -Dm644 dist/.icon-set/icon_128.png %{buildroot}/%{_iconsdir}/hicolor/128x128/apps/%{name}.png
+install -Dm644 dist/.icon-set/icon_256.png %{buildroot}/%{_iconsdir}/hicolor/256x256/apps/%{name}.png
+install -Dm644 dist/.icon-set/icon_512.png %{buildroot}/%{_iconsdir}/hicolor/512x512/apps/%{name}.png
+install -Dm644 dist/.icon-set/icon_1024.png %{buildroot}/%{_iconsdir}/hicolor/1024x1024/apps/%{name}.png
+
+%ifarch x86_64
+dist/%{git_name}-*x86_64.AppImage --appimage-extract '*.desktop'
+%elifarch aarch64
+dist/%{git_name}-*arm64.AppImage --appimage-extract '*.desktop'
+%elifarch armv7hl armv7l
+dist/%{git_name}-*armv7l.AppImage --appimage-extract '*.desktop'
+%endif
+desktop-file-install --set-key=Exec --set-value="%{_datadir}/%{name}/%{name} --enable-features=UseOzonePlatform,WaylandWindowDecorations --ozone-platform-hint=auto %U" squashfs-root/%{name}.desktop
+
+%check
+desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
+
+%files
+%doc README.md
+%license LICENSE
+%{_bindir}/%{name}
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/%{name}/
+%{_iconsdir}/hicolor/16x16/apps/%{name}.png
+%{_iconsdir}/hicolor/32x32/apps/%{name}.png
+%{_iconsdir}/hicolor/48x48/apps/%{name}.png
+%{_iconsdir}/hicolor/64x64/apps/%{name}.png
+%{_iconsdir}/hicolor/128x128/apps/%{name}.png
+%{_iconsdir}/hicolor/256x256/apps/%{name}.png
+%{_iconsdir}/hicolor/512x512/apps/%{name}.png
+%{_iconsdir}/hicolor/1024x1024/apps/%{name}.png
+
+%changelog
+* Sat Jun 28 2025 Gilver E. <rockgrub@disroot.org> - 1.10.1-1
+- Initial package
@@ -0,0 +1 @@
+rpm.version(gh_tag("Milkshiift/GoofCord"));
@@ -3,18 +3,19 @@
 %global gtk4_version        4.14.4
 %global libadwaita_version  1.5.1
 %global pure_protobuf_version 2.0.0
+%global raw_ver v1.81.0

 Name:           komikku
-Version:        1.73.0
+Version:        1.81.0
 %forgemeta
-Release:        2%?dist
+Release:        1%?dist
 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/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source0:        https://codeberg.org/valos/%{appname}/archive/%{raw_ver}.tar.gz#/%{name}-%{version}.tar.gz

 BuildRequires:  desktop-file-utils
 BuildRequires:  intltool
@@ -22,6 +23,7 @@ BuildRequires:  libappstream-glib
 BuildRequires:  meson >= 0.59.0
 BuildRequires:  python3-devel >= 3.8
 BuildRequires:  blueprint-compiler
+BuildRequires:  cmake

 BuildRequires:  pkgconfig(gobject-introspection-1.0) >= 1.35.9
 BuildRequires:  pkgconfig(gtk4) >= %{gtk4_version}
@@ -97,6 +99,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_bindir}/%{name}
 %{_datadir}/%{name}/
 %{_datadir}/applications/*.desktop
+%{_datadir}/dbus-1/services/%{uuid}.service
 %{_datadir}/glib-2.0/schemas/*.gschema.xml
 %{_datadir}/icons/hicolor/scalable/*/*.svg
 %{_datadir}/icons/hicolor/symbolic/*/*.svg
@@ -1,3 +1,4 @@
 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.global("raw_ver", latest_tag);
 rpm.version(new_version);
@@ -1,5 +0,0 @@
-project pkg {
-	rpm {
-		spec = "legcord-bin.spec"
-	}
-}
@@ -1,92 +0,0 @@
-%define debug_package %nil
-%global _build_id_links none
-
-%ifarch x86_64
-%global src Legcord-%version-linux-x64
-%elifarch aarch64
-%global src Legcord-%version-linux-arm64
-%elifarch armv7l
-%global src Legcord-%version-linux-armv7l
-%endif
-
-# Exclude private libraries
-%global __requires_exclude libffmpeg.so
-%global __provides_exclude_from %{_datadir}/(armcord|legcord)/.*\\.so
-
-Name:           legcord-bin
-Version:        1.1.1
-Release:        1%?dist
-License:        OSL-3.0
-Summary:        Custom lightweight Discord client designed to enhance your experience
-URL:            https://github.com/Legcord/Legcord
-Group:          Applications/Internet
-Source0:        %url/releases/download/v%version/%src.tar.gz
-Source1:        legcord.png
-Source2:        https://raw.githubusercontent.com/Legcord/Legcord/v%version/README.md
-Requires:       xdg-utils
-ExclusiveArch:  x86_64 aarch64 armv7l
-Conflicts:      legcord
-Conflicts:      legcord-nightly
-BuildRequires:  add-determinism
-Obsoletes:      armcord < 3.3.2-1
-
-%description
-Legcord is a custom client designed to enhance your Discord experience
-while keeping everything lightweight.
-
-%prep
-%autosetup -n %src
-
-cat <<EOF > .legcord.desktop
-[Desktop Entry]
-Name=Legcord
-Comment=%summary
-GenericName=Internet Messenger
-Type=Application
-Exec=%_bindir/legcord
-Icon=legcord
-Categories=Network;InstantMessaging;
-StartupWMClass=legcord
-Keywords=discord;armcord;legcord;vencord;shelter;electron;
-EOF
-
-%build
-
-%install
-mkdir -p %buildroot%_bindir %buildroot%_datadir/applications %buildroot%_datadir/pixmaps %buildroot%_datadir/legcord %buildroot%_docdir/%name
-cp -a * %buildroot%_datadir/legcord/
-ln -s %_datadir/legcord/legcord %buildroot%_bindir/legcord
-ln -s %_datadir/legcord %buildroot%_datadir/armcord
-chmod +x -R %buildroot%_datadir/legcord/*
-chmod 755 %buildroot%_datadir/legcord/legcord
-install -Dm644 .legcord.desktop %buildroot%_datadir/applications/LegCord.desktop
-install -Dm644 %SOURCE1 %buildroot%_datadir/pixmaps/legcord.png
-install -Dm644 %SOURCE2 %buildroot%_docdir/%name/
-
-# HACK: rpm bug for unability to replace existing files on system.
-%pre
-if [ -d %_datadir/armcord ] && [ ! -L %_datadir/armcord ]; then
-  echo "Found old %_datadir/armcord directory, removing…"
-  rm -rf %_datadir/armcord
-fi
-
-%files
-%doc README.md
-%_datadir/legcord
-%_datadir/armcord
-%_bindir/legcord
-%_datadir/applications/LegCord.desktop
-%_datadir/pixmaps/legcord.png
-
-%changelog
-* Mon Oct 21 2024 madonuko <mado@fyralabs.com> - 1.0.2-2
- Rename to LegCord.
-
-* Sat Jun 17 2023 madonuko <mado@fyralabs.com> - 3.2.0-2
- Remove libnotify dependency.
- Fix desktop entry.
- Set as noarch package because there are not binary files.
- Use /usr/share/ instead of /opt/
-
-* Sat May 6 2023 madonuko <mado@fyralabs.com> - 3.1.7-1
- Initial package
@@ -1 +0,0 @@
-rpm.version(gh("LegCord/LegCord"));
@@ -1,9 +1,9 @@
 project pkg {
-	arches = ["x86_64"]
 	rpm {
 		spec = "legcord-nightly.spec"
 	}
 	labels {
 		nightly = 1
+                mock = 1
 	}
-}
+}
@@ -1,13 +0,0 @@
-#!/bin/sh
-electron=/usr/bin/electron
-
-CONFIG=${XDG_CONFIG_HOME:-~/.config}
-FLAGS="$CONFIG/armcord-flags.conf"
-
-# Allow users to override command-line options
-if [ -f "$FLAGS" ]; then
-  USER_FLAGS="$(cat "$FLAGS")"
-fi
-
-# shellcheck disable=SC2086 # USER_FLAGS has to be unquoted
-"$electron" /usr/share/armcord/app.asar $USER_FLAGS "$@"
@@ -1,7 +1,14 @@
-%global commit d974d27fb6d424e9c50c95675fa56ae8d952b42b
-%global commit_date 20250317
+%global commit 0b1a005936552abd5aed144bdc0ca5a82f2fa682
+%global commit_date 20250622
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%define debug_package %nil
+%global debug_package %nil
+%global __strip /bin/true
+%global __provides_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*))$
+%ifnarch aarch64 
+%global __requires_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*)|(.*\\aarch64*\\.so.*))$
+%elifarch aarch64
+%global __requires_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*)|(.*\\x86_64*\\.so.*)|(.*\\x86-64*\\.so.*))$
+%endif

 Name:           legcord-nightly
 Version:        %commit_date.%shortcommit
@@ -10,67 +17,60 @@ License:        OSL-3.0
 Summary:        Custom lightweight Discord client designed to enhance your experience
 URL:            https://github.com/Legcord/Legcord
 Group:          Applications/Internet
-Source0:        %url/archive/%commit/Legcord-%commit.tar.gz
-Source1:        launch.sh
 Packager:       Owen <owen@fyralabs.com>
-Requires:       electron xdg-utils
-Provides:       armcord-nightly
+Requires:       xdg-utils
 Obsoletes:      armcord < 3.3.2-1
-Conflicts:      legcord-bin
 Conflicts:      legcord
-BuildArch:      noarch
-BuildRequires:  anda-srpm-macros pnpm
+BuildRequires:  anda-srpm-macros pnpm nodejs-npm git-core gcc gcc-c++ make desktop-file-utils zlib-ng-compat-devel

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

 %prep
-%autosetup -n Legcord-%commit
-
-cat <<EOF > legcord.desktop
-[Desktop Entry]
-Name=Legcord
-Comment=%summary
-GenericName=Internet Messenger
-Type=Application
-Exec=/usr/bin/legcord
-Icon=legcord
-Categories=Network;InstantMessaging;
-StartupWMClass=legcord
-Keywords=discord;armcord;legcord;vencord;shelter;electron;
-EOF
-
+%git_clone %{url}.git %{commit}

 %build
-pnpm install --no-frozen-lockfile
-pnpm run packageQuick
-
+pnpm install
+pnpm run build
+pnpm run package --linux AppImage tar.gz

 %install
-install -Dm644 dist/*-unpacked/resources/app.asar %buildroot/usr/share/legcord/app.asar
+mkdir -p %{buildroot}%{_datadir}/legcord
+%ifarch aarch64
+mv dist/linux-arm64-unpacked/* %{buildroot}%{_datadir}/legcord
+%else
+mv dist/linux-unpacked/* -t %{buildroot}%{_datadir}/legcord
+%endif

-install -Dm755 %SOURCE1 %buildroot/usr/bin/legcord
-install -Dm644 legcord.desktop %buildroot/usr/share/applications/LegCord.desktop
-install -Dm644 build/icon.png %buildroot/usr/share/pixmaps/legcord.png
+mkdir -p %{buildroot}%{_bindir}
+ln -sf %{_datadir}/legcord/legcord %{buildroot}%{_bindir}/legcord
+install -Dm644 dist/.icon-set/icon_16.png %{buildroot}%{_iconsdir}/hicolor/16x16/apps/legcord.png
+install -Dm644 dist/.icon-set/icon_32.png %{buildroot}%{_iconsdir}/hicolor/32x32/apps/legcord.png
+install -Dm644 dist/.icon-set/icon_48x48.png %{buildroot}%{_iconsdir}/hicolor/48x48/apps/legcord.png
+install -Dm644 dist/.icon-set/icon_64.png %{buildroot}%{_iconsdir}/hicolor/64x64/apps/legcord.png
+install -Dm644 dist/.icon-set/icon_128.png %{buildroot}%{_iconsdir}/hicolor/128x128/apps/legcord.png
+install -Dm644 dist/.icon-set/icon_256.png %{buildroot}%{_iconsdir}/hicolor/256x256/apps/legcord.png
+install -Dm644 dist/.icon-set/icon_512.png %{buildroot}%{_iconsdir}/hicolor/512x512/apps/legcord.png
+install -Dm644 dist/.icon-set/icon_1024.png %{buildroot}%{_iconsdir}/hicolor/1024x1024/apps/legcord.png

-ln -s %_datadir/legcord %buildroot%_datadir/armcord
-
-# HACK: rpm bug for unability to replace existing files on system.
-%pre
-if [ -d %_datadir/armcord ] && [ ! -L %_datadir/armcord ]; then
-  echo "Found old %_datadir/armcord directory, removing…"
-  rm -rf %_datadir/armcord
-fi
+dist/Legcord-*.AppImage --appimage-extract '*.desktop'
+desktop-file-install --set-key=Exec --set-value="%{_datadir}/legcord/legcord %U" squashfs-root/legcord.desktop

 %files
 %doc README.md
 %license license.txt
-/usr/bin/legcord
-/usr/share/applications/LegCord.desktop
-/usr/share/pixmaps/legcord.png
-/usr/share/legcord/app.asar
-/usr/share/armcord
+%{_bindir}/legcord
+%{_datadir}/applications/legcord.desktop
+%{_datadir}/legcord/
+%{_iconsdir}/hicolor/16x16/apps/legcord.png
+%{_iconsdir}/hicolor/32x32/apps/legcord.png
+%{_iconsdir}/hicolor/48x48/apps/legcord.png
+%{_iconsdir}/hicolor/64x64/apps/legcord.png
+%{_iconsdir}/hicolor/128x128/apps/legcord.png
+%{_iconsdir}/hicolor/256x256/apps/legcord.png
+%{_iconsdir}/hicolor/512x512/apps/legcord.png
+%{_iconsdir}/hicolor/1024x1024/apps/legcord.png

 %changelog
 * Fri Nov 22 2024 owen <owen@fyralabs.com> - 1.0.2-2
@@ -1,6 +1,8 @@
 project pkg {
-	arches = ["x86_64"]
 	rpm {
 		spec = "legcord.spec"
 	}
-}
+        labels {
+                mock =1
+        } 
+} 
@@ -1,13 +0,0 @@
-#!/bin/sh
-electron=/usr/bin/electron
-
-CONFIG=${XDG_CONFIG_HOME:-~/.config}
-FLAGS="$CONFIG/armcord-flags.conf"
-
-# Allow users to override command-line options
-if [ -f "$FLAGS" ]; then
-  USER_FLAGS="$(cat "$FLAGS")"
-fi
-
-# shellcheck disable=SC2086 # USER_FLAGS has to be unquoted
-"$electron" /usr/share/armcord/app.asar $USER_FLAGS "$@"
@@ -1,25 +1,26 @@
 %define debug_package %nil

 # Exclude private libraries
-%global __requires_exclude libffmpeg.so
-%global __provides_exclude_from %{_datadir}/(armcord|legcord)/.*\\.so
+%global __provides_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*))$
+%ifnarch aarch64 
+%global __requires_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*)|(.*\\aarch64*\\.so.*))$
+%elifarch aarch64
+%global __requires_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*)|(.*\\x86_64*\\.so.*)|(.*\\x86-64*\\.so.*))$
+%endif

 Name:           legcord
-Version:        1.1.1
-Release:        1%?dist
+Version:        1.1.5
+Release:        2%?dist
 License:        OSL-3.0
 Summary:        Custom lightweight Discord client designed to enhance your experience
 URL:            https://github.com/Legcord/Legcord
 Group:          Applications/Internet
-Source1:        launch.sh
 Packager:       madonuko <mado@fyralabs.com>
-Requires:       electron xdg-utils
-Provides:       armcord
+Requires:       xdg-utils
 Obsoletes:      armcord < 3.3.2-1
-Conflicts:      legcord-bin
+Obsoletes:      legcord-bin < 1.1.5-2
 Conflicts:      legcord-nightly
-BuildArch:      noarch
-BuildRequires:  anda-srpm-macros pnpm
+BuildRequires:  anda-srpm-macros pnpm nodejs-npm git-core gcc gcc-c++ make desktop-file-utils zlib-ng-compat-devel

 %description
 Legcord is a custom client designed to enhance your Discord experience
@@ -28,49 +29,47 @@ while keeping everything lightweight.
 %prep
 %git_clone %url v%version

-cat <<EOF > legcord.desktop
-[Desktop Entry]
-Name=Legcord
-Comment=%summary
-GenericName=Internet Messenger
-Type=Application
-Exec=/usr/bin/legcord
-Icon=legcord
-Categories=Network;InstantMessaging;
-StartupWMClass=legcord
-Keywords=discord;armcord;legcord;vencord;shelter;electron;
-EOF
-
-
 %build
-pnpm install --no-frozen-lockfile
-pnpm run packageQuick
-
+pnpm install
+pnpm run build
+pnpm run package --linux AppImage tar.gz

 %install
-install -Dm644 dist/*-unpacked/resources/app.asar %buildroot/usr/share/legcord/app.asar
+mkdir -p %{buildroot}%{_datadir}/legcord
+%ifarch aarch64
+mv dist/linux-arm64-unpacked/* %{buildroot}%{_datadir}/legcord
+%else
+mv dist/linux-unpacked/* -t %{buildroot}%{_datadir}/legcord
+%endif

-install -Dm755 %SOURCE1 %buildroot/usr/bin/legcord
-install -Dm644 legcord.desktop %buildroot/usr/share/applications/LegCord.desktop
-install -Dm644 build/icon.png %buildroot/usr/share/pixmaps/legcord.png
+mkdir -p %{buildroot}%{_bindir}
+ln -sf %{_datadir}/legcord/legcord %{buildroot}%{_bindir}/legcord
+install -Dm644 dist/.icon-set/icon_16.png %{buildroot}%{_iconsdir}/hicolor/16x16/apps/legcord.png
+install -Dm644 dist/.icon-set/icon_32.png %{buildroot}%{_iconsdir}/hicolor/32x32/apps/legcord.png
+install -Dm644 dist/.icon-set/icon_48x48.png %{buildroot}%{_iconsdir}/hicolor/48x48/apps/legcord.png
+install -Dm644 dist/.icon-set/icon_64.png %{buildroot}%{_iconsdir}/hicolor/64x64/apps/legcord.png
+install -Dm644 dist/.icon-set/icon_128.png %{buildroot}%{_iconsdir}/hicolor/128x128/apps/legcord.png
+install -Dm644 dist/.icon-set/icon_256.png %{buildroot}%{_iconsdir}/hicolor/256x256/apps/legcord.png
+install -Dm644 dist/.icon-set/icon_512.png %{buildroot}%{_iconsdir}/hicolor/512x512/apps/legcord.png
+install -Dm644 dist/.icon-set/icon_1024.png %{buildroot}%{_iconsdir}/hicolor/1024x1024/apps/legcord.png

-ln -s %_datadir/legcord %buildroot%_datadir/armcord
-
-# HACK: rpm bug for unability to replace existing files on system.
-%pre
-if [ -d %_datadir/armcord ] && [ ! -L %_datadir/armcord ]; then
-  echo "Found old %_datadir/armcord directory, removing…"
-  rm -rf %_datadir/armcord
-fi
+dist/Legcord-*.AppImage --appimage-extract '*.desktop'
+desktop-file-install --set-key=Exec --set-value="%{_datadir}/legcord/legcord %U" squashfs-root/legcord.desktop

 %files
 %doc README.md
 %license license.txt
-/usr/bin/legcord
-/usr/share/applications/LegCord.desktop
-/usr/share/pixmaps/legcord.png
-/usr/share/legcord/app.asar
-/usr/share/armcord
+%{_bindir}/legcord
+%{_datadir}/applications/legcord.desktop
+%{_datadir}/legcord/
+%{_iconsdir}/hicolor/16x16/apps/legcord.png
+%{_iconsdir}/hicolor/32x32/apps/legcord.png
+%{_iconsdir}/hicolor/48x48/apps/legcord.png
+%{_iconsdir}/hicolor/64x64/apps/legcord.png
+%{_iconsdir}/hicolor/128x128/apps/legcord.png
+%{_iconsdir}/hicolor/256x256/apps/legcord.png
+%{_iconsdir}/hicolor/512x512/apps/legcord.png
+%{_iconsdir}/hicolor/1024x1024/apps/legcord.png

 %changelog
 * Mon Oct 21 2024 madonuko <mado@fyralabs.com> - 1.0.2-2
@@ -0,0 +1,5 @@
+project pkg {
+    rpm {
+        spec = "mission-center.spec"
+    }
+}
@@ -0,0 +1,99 @@
+%global forgeurl0 https://gitlab.com/mission-center-devs/mission-center
+Version: 1.0.2
+%global tag0 v%{version}
+
+%global forgeurl1 https://gitlab.com/mission-center-devs/gng
+%global commit1 319d95d29cbc3c373ae61cff228e8440fbaadbbb
+
+
+%forgemeta -a
+
+Name:           mission-center
+Release:        1%?dist
+Summary:        Monitor your CPU, Memory, Disk, Network and GPU usage
+
+License:        GPL-3.0-or-later
+URL:            %{forgeurl0}
+Source0:         %{forgesource0}
+Source1:         %{forgesource1}
+Provides: bundled(mission-center-magpie)
+Provides: bundled(nvtop) = 3.2.0
+#mission centere uses a patched version of nvtop
+
+BuildRequires: meson >= 0.63
+BuildRequires: cargo
+BuildRequires: cmake
+BuildRequires: gcc
+BuildRequires:  gcc-c++
+BuildRequires: pkgconfig(protobuf)
+BuildRequires: pkgconfig(python3)
+BuildRequires: pkgconfig(libdrm)
+BuildRequires: pkgconfig(gbm)
+BuildRequires: pkgconfig(libudev)
+BuildRequires: pkgconfig(gtk4)
+BuildRequires: pkgconfig(egl)
+BuildRequires: libadwaita-devel
+BuildRequires: desktop-file-utils
+BuildRequires: blueprint-compiler
+BuildRequires: cargo-rpm-macros >= 24
+BuildRequires: gettext
+BuildRequires: desktop-file-utils
+BuildRequires: appstream-data
+BuildRequires: libappstream-glib
+Recommends: nethogs
+
+%description
+Monitor your CPU, Memory, Disk, Network and GPU usage
+
+
+%prep
+%forgesetup -z 0
+mkdir -p ./subprojects/magpie
+tar -x --strip-components=1  -f %{SOURCE1} -C ./subprojects/magpie
+pushd ./subprojects/magpie/
+%cargo_prep_online
+popd
+%cargo_prep_online
+%{cargo_license_summary_online}
+# %cargo_license_online > LICENSE.dependencies
+#builds is erroring
+
+%build
+%meson
+%meson_build
+
+
+%install
+%meson_install
+%find_lang missioncenter
+
+%check
+desktop-file-validate %{buildroot}/%{_datadir}/applications/io.missioncenter.MissionCenter.desktop
+appstream-util validate-relax  %{buildroot}/%{_datadir}/metainfo/io.missioncenter.MissionCenter.metainfo.xml
+%meson_test
+
+# https://gitlab.com/mission-center-devs/mission-center/-/wikis/Home/Nethogs
+%post
+if  command -v nethogs 2>&1 >/dev/null
+then
+     setcap "cap_net_admin,cap_net_raw,cap_dac_read_search,cap_sys_ptrace+pe" "$(which nethogs)"
+fi
+
+
+%files -f missioncenter.lang
+%doc README.md
+%license COPYING
+#builds is erroring
+# [%]license LICENSE.dependencies
+%{_datadir}/missioncenter/
+%{_datadir}/applications/io.missioncenter.MissionCenter.desktop
+%{_datadir}/metainfo/io.missioncenter.MissionCenter.metainfo.xml
+%{_datadir}/glib-2.0/schemas/io.missioncenter.MissionCenter.gschema.xml
+%{_datadir}/icons/hicolor/scalable/apps/io.missioncenter.MissionCenter.svg
+%{_datadir}/icons/hicolor/symbolic/apps/io.missioncenter.MissionCenter-symbolic.svg
+%{_bindir}/missioncenter-magpie
+%{_bindir}/missioncenter
+
+
+%changelog
+%autochangelog
@@ -0,0 +1,4 @@
+rpm.version(gitlab_tag("44426042"));
+if rpm.changed() {
+  rpm.global("commit1", gitlab_commit("66855638", "main"));
+}
@@ -1,7 +1,7 @@
-%global commit b31c3d80ab0040cb02a54ee878cb2d95f6ed74e0
+%global commit db7bc5949a7f6742131285f1383ff5a90d918a84
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20250324
-%global ver 0.39.0
+%global commit_date 20250706
+%global ver 0.40.0

 Name:           mpv-nightly
 Version:        %ver^%commit_date.%shortcommit
@@ -124,32 +124,7 @@ Requires: mpv-nightly-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 %description devel
 This package contains development header files and libraries for Mpv.

-%package bash-completion
-Summary: MPV Bash completion
-Requires: bash
-Requires: %{name}
-Supplements: (%{name} and bash)
-
-%description bash-completion
-Bash shell completion for MPV.
-
-%package fish-completion
-Summary: MPV Fish completion
-Requires: fish
-Requires: %{name}
-Supplements: (%{name} and fish)
-
-%description fish-completion
-Fish shell completion for MPV.
-
-%package zsh-completion
-Summary: MPV Zsh completion
-Requires: zsh
-Requires: %{name}
-Supplements: (%{name} and zsh)
-
-%description zsh-completion
-Zsh shell completion for MPV.
+%pkg_completion -Bfz mpv

 %prep
 %autosetup -p1 -n mpv-%commit
@@ -246,15 +221,3 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/mpv.desktop
 %{_includedir}/mpv/
 %{_libdir}/libmpv.so
 %{_libdir}/pkgconfig/mpv.pc
-
-%files bash-completion
-%{bash_completions_dir}/mpv
-
-%files fish-completion
-%{fish_completions_dir}/mpv.fish
-
-%files zsh-completion
-%{zsh_completions_dir}/_mpv
-
-%changelog
-%autochangelog
@@ -0,0 +1 @@
+v1.11.14
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "nekoray.spec"
+	}
+}
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Terminal=false
+Type=Application
+Name=nekoray
+Categories=Network;
+Comment=Qt based cross-platform GUI proxy configuration manager (backend: sing-box)
+Comment[zh_CN]=基于 Qt 的跨平台代理配置管理器 (后端 sing-box)
+Keywords=Internet;VPN;Proxy;sing-box;
+Exec=/bin/nekoray
+Icon=/usr/share/icons/nekoray.ico
@@ -0,0 +1,2 @@
+#!/bin/sh
+/lib64/nekoray/nekoray -appdata "${@}"
@@ -0,0 +1,93 @@
+%global gomodulesmode GO111MODULE=on
+Name: nekoray
+Version: 4.3.5
+Release: 1%?dist
+Summary: Qt based cross-platform GUI proxy configuration manager (backend: sing-box)
+URL: https://github.com/Mahdi-zarei/nekoray
+License: GPLv3
+
+Source0: https://github.com/Mahdi-zarei/nekoray/archive/refs/tags/%{version}.tar.gz#/nekoray-%{version}.tar.gz
+Packager: bunzuhbu <g89156436@gmail.com>
+Source1: vendor-%{version}.tar.gz
+%define fetch_vendor %{_rpmconfigdir}/rpmuncompress -xv %{SOURCE1}
+
+Source2: Sagernet.SingBox.Version.txt
+%define singbox_version $(cat %{SOURCE2})
+
+Source3: %{name}.desktop
+Source4: %{name}.sh
+
+BuildRequires: rpm_macro(cmake)
+BuildRequires: rpm_macro(cmake_build)
+BuildRequires: rpm_macro(cmake_install)
+BuildRequires: cmake
+BuildRequires: gcc-c++
+BuildRequires: pkgconfig(protobuf)
+BuildRequires: pkgconfig(libcurl)
+BuildRequires: cmake(yaml-cpp)
+BuildRequires: cmake(ZXing)
+BuildRequires: cmake(absl)
+BuildRequires: cmake(cpr)
+BuildRequires: cmake(Qt6)
+BuildRequires: cmake(Qt6Svg)
+BuildRequires: cmake(Qt6Linguist)
+BuildRequires: cmake(Qt6Charts)
+BuildRequires: patchelf
+BuildRequires: sed
+BuildRequires: golang
+BuildRequires: rpm_macro(gobuildflags)
+Requires: %{name}-core
+%define core nekobox_core
+
+%package core
+Summary: %{summary}
+
+%description
+%{summary}
+
+%description core
+%{summary}
+
+%prep
+%autosetup -p1 -n %{name}-%{version}
+sed -i 's~find_package(Protobuf CONFIG REQUIRED)~find_package(Protobuf REQUIRED)~' cmake/myproto.cmake
+sed -i 's~add_library(qhotkey 3rdparty/QHotkey/qhotkey.cpp)~add_library(qhotkey STATIC 3rdparty/QHotkey/qhotkey.cpp)~' cmake/QHotkey.cmake
+sed -i 's~ImageFormat::BGRA~ImageFormat::BGR~' 3rdparty/ZxingQtReader.hpp
+pushd core/server
+%{fetch_vendor}
+popd
+
+%build
+%cmake
+%cmake_build
+DEST=$PWD/%{__cmake_builddir}/%{core}
+pushd core/server
+go build %{gobuildflags} -o $DEST -trimpath -ldflags "-B 0x$(echo "%{name}-%{version}-%{release}-${SOURCE_DATE_EPOCH:-}" | sha1sum | cut -d ' ' -f1) -w -s -X 'github.com/sagernet/sing-box/constant.Version=%{singbox_version}'" -tags "with_clash_api,with_gvisor,with_quic,with_wireguard,with_utls,with_ech,with_dhcp"
+popd
+
+%install
+mkdir -p %{buildroot}%{_libdir}/%{name}
+mkdir -p %{buildroot}%{_bindir}
+mkdir -p %{buildroot}%{_datadir}/applications
+mkdir -p %{buildroot}%{_datadir}/icons
+
+cp %{SOURCE4} %{buildroot}%{_bindir}/%{name}
+cp %{SOURCE3} %{buildroot}%{_datadir}/applications/%{name}.desktop
+sed -i 's~/bin~%{_bindir}~g;s~/usr/share~%{_datadir}~g;s~nekoray~%{name}~g' %{buildroot}%{_datadir}/applications/%{name}.desktop
+sed -i 's~/bin~%{_bindir}~g;s~/lib64~%{_libdir}~g;s~nekoray~%{name}~g' %{buildroot}%{_bindir}/%{name}
+cp %{__cmake_builddir}/%{name} %{buildroot}%{_libdir}/%{name}/%{name}
+cp %{__cmake_builddir}/%{core} %{buildroot}%{_libdir}/%{name}/%{core}
+cp res/nekoray.ico %{buildroot}%{_datadir}/icons/%{name}.ico
+patchelf --remove-rpath %{buildroot}%{_libdir}/%{name}/%{name}
+patchelf --remove-rpath %{buildroot}%{_libdir}/%{name}/%{core}
+
+%files
+%attr(0755, -, -) %{_bindir}/%{name}
+%attr(0755, -, -) %{_libdir}/%{name}/%{name}
+%attr(0644, -, -) %{_datadir}/icons/%{name}.ico
+%attr(0644, -, -) %{_datadir}/applications/%{name}.desktop
+
+%files core
+%dir %{_libdir}/%{name}
+%attr(0755, -, -) %{_libdir}/%{name}/%{core}
+
@@ -0,0 +1,5 @@
+let sourcedir = "anda/apps/nekoray";
+
+sh(`dnf in -y golang rpmdevtools tar rpm-build coreutils`, #{});
+sh(`pushd ${sourcedir}; bash -x pre.sh; popd`, #{});
+
@@ -0,0 +1,9 @@
+export sourcedir="$PWD"
+rpmdev-spectool --all --get-files nekoray.spec
+version=$(rpmspec --query --queryformat "%{VERSION}\n" nekoray.spec | uniq)
+
+tar -xzf "nekoray-${version}.tar.gz"
+pushd "nekoray-${version}/core/server"
+ go mod vendor
+ tar -czf "${sourcedir}/vendor-${version}.tar.gz" vendor
+popd
@@ -0,0 +1,3 @@
+rpm.version(find(`([\d.]+)-\d+-\d+-\d+`, gh_rawfile("Mahdi-zarei/nekoray", "dev", "nekoray_version.txt"), 1));
+
+open_file("anda/apps/nekoray/Sagernet.SingBox.Version.txt", "w").write(gh("sagernet/sing-box"));
@@ -1,7 +1,7 @@
 %global __brp_mangle_shebangs %{nil}

 Name:           neohtop
-Version:        1.1.2
+Version:        1.2.0
 Release:        1%?dist
 Summary:        System monitoring on steroids
 License:        MIT
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "opensnitch.spec"
+	}
+}
@@ -0,0 +1,119 @@
+# Generated by go2rpm 1.16.0
+%bcond check 1
+%bcond bootstrap 0
+
+# https://github.com/evilsocket/opensnitch
+%global goipath         github.com/evilsocket/opensnitch
+Version:                1.7.0.0
+
+%gometa -f
+
+%global common_description %{expand:
+OpenSnitch is a GNU/Linux interactive application firewall inspired by Little
+Snitch.}
+
+%global golicenses      LICENSE ui/LICENSE\\\
+                        ui/opensnitch/res/themes/dark/icons/LICENSE
+%global godocs          README.md ebpf_prog/README ui/requirements.txt\\\
+                        ui/i18n/README.md example example example\\\
+                        utils/packaging/daemon/deb/debian/changelog\\\
+                        utils/packaging/ui/deb/debian/changelog
+
+Name:           opensnitch
+Release:        %autorelease
+Summary:        OpenSnitch is a GNU/Linux interactive application firewall inspired by Little Snitch
+
+License:        GPL-3.0-only AND LGPL-2.1-or-later
+URL:            %{gourl}
+Source:         %{gosource}
+BuildRequires:  gcc-c++
+BuildRequires:  python3-devel
+BuildRequires:  python-rpm-macros
+BuildRequires:  python3dist(pip)
+BuildRequires:  python3dist(setuptools) >= 61.0
+BuildRequires:  python3dist(wheel) >= 0.37.1
+BuildRequires:  python3dist(pyqt5)
+BuildRequires:  /usr/bin/lrelease-qt5
+BuildRequires:  protobuf-compiler
+BuildRequires:  pkgconfig(libnetfilter_queue)
+#BuildRequires:  protoc-gen-go
+#BuildRequires:  /usr/bin/protoc-gen-go-grpc
+
+%description %{common_description}
+
+%gopkg
+
+
+%prep
+%goprep -A
+%autopatch -p1
+
+export GOBIN=$(go env GOPATH | sed -E 's/:.+$//')/bin
+echo $GOBIN > %_builddir/gobin
+go install github.com/golang/protobuf/protoc-gen-go@latest
+go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.34.1
+go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0
+
+sed -i 's/@pip3 /@python3 -m pip /' ui/Makefile
+
+%build
+pushd ui
+%make_build deps
+popd
+
+export GOBIN=$(cat %_builddir/gobin)
+export PATH=$GOBIN:$PATH
+pushd proto
+%make_build
+popd
+
+pushd ui
+%make_build
+%pyproject_wheel
+popd
+
+%global gomodulesmode GO111MODULE=on
+pushd daemon
+%gobuild -o ../opensnitchd .
+popd
+
+
+%install
+%gopkginstall
+install -Dm755 opensnitchd -t %buildroot%_bindir
+
+pushd ui
+%if 0%{?fedora} <= 41
+%py3_install
+%else
+%pyproject_install
+%pyproject_save_files %name
+%endif
+popd
+
+rm -rf %buildroot%python3_sitelib/tests/
+cp -r %buildroot%python3_sitelib%_usr/ %buildroot%_usr/ --preserve=all --no-target-directory
+rm -rf %buildroot%python3_sitelib%_usr
+
+
+%if 0%{?fedora} <= 41
+%files
+%{python3_sitelib}/%name/
+%{python3_sitelib}/%name-%{version}-py%{python3_version}.egg-info/
+%else
+%files -f %{pyproject_files}
+%endif
+%license LICENSE
+%doc README.md
+%_bindir/opensnitch-ui
+%_bindir/opensnitchd
+%_datadir/applications/opensnitch_ui.desktop
+%_iconsdir/hicolor/48x48/apps/opensnitch-ui.png
+%_iconsdir/hicolor/64x64/apps/opensnitch-ui.png
+%_iconsdir/hicolor/scalable/apps/opensnitch-ui.svg
+%_datadir/kservices5/kcm_opensnitch.desktop
+%_metainfodir/io.github.evilsocket.opensnitch.appdata.xml
+
+/usr/share/icons/hicolor/scalable/apps/opensnitch-ui.svg
+
+%gopkgfiles
@@ -2,8 +2,8 @@
 %define debug_package %nil

 Name:           peazip
-Version:        10.3.0
-Release:        3%?dist
+Version:        10.5.0
+Release:        1%?dist
 Summary:        Free Zip / Unzip software and Rar file extractor. Cross-platform file and archive manager
 License:        LGPL-3.0-only
 URL:            https://peazip.github.io
@@ -0,0 +1,9 @@
+project pkg {
+    arches = ["x86_64"]
+    rpm {
+        spec = "protontricks.spec"
+    }
+    labels {
+        subrepo = "extras"
+    }
+}
@@ -0,0 +1,92 @@
+%bcond_with tests
+%global pypi_name protontricks
+
+Name:       terra-%{pypi_name}
+Version:    1.12.1
+Release:    1%{?dist}
+Summary:    Simple wrapper that does winetricks things for Proton enabled games
+BuildArch:  noarch
+
+License:    GPL-3.0-or-later
+URL:        https://github.com/Matoking/protontricks
+
+# GitHub tarball won't work for setuptools-scm
+Source0:    %{pypi_source}
+
+BuildRequires: desktop-file-utils
+BuildRequires: python3-devel
+BuildRequires: python3dist(pip)
+BuildRequires: python3dist(setuptools)
+BuildRequires: python3dist(setuptools-scm)
+# BuildRequires: python3dist(vdf) >= 3.4
+%if %{with tests}
+BuildRequires: python3dist(pytest-cov) >= 2.10
+BuildRequires: python3dist(pytest) >= 6.0
+%endif
+
+Requires:   (terra-winetricks or winetricks-git)
+Conflicts:  protontricks
+
+Recommends: yad
+
+Suggests:   zenity
+# https://github.com/Matoking/protontricks/blob/master/CHANGELOG.md#1120---2024-09-16
+Provides:   bundled(python3-vdf)
+
+
+%description
+A simple wrapper that does winetricks things for Proton enabled games,
+requires Winetricks.
+
+This is a fork of the original project created by sirmentio. The original
+repository is available at Sirmentio/protontricks.
+
+
+%prep
+%autosetup -n %{pypi_name}-%{version}
+
+
+%build
+%if 0%{?fedora} <= 41
+%py3_build
+%else
+%pyproject_wheel
+%endif
+
+
+%install
+%if 0%{?fedora} <= 41
+%py3_install
+%else
+%pyproject_install
+%endif
+
+# Remove `protontricks-desktop-install`, since we already install .desktop
+# files properly
+# https://bugzilla.redhat.com/show_bug.cgi?id=1991684
+rm %{buildroot}%{_bindir}/%{pypi_name}-desktop-install
+
+
+%if %{with tests}
+%check
+%{py3_test_envvars} %{python3} -m pytest -v
+desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
+%endif
+
+
+%files
+%license LICENSE
+%doc README.md CHANGELOG.md
+%{_bindir}/%{pypi_name}-launch
+%{_bindir}/%{pypi_name}
+%{_datadir}/applications/*.desktop
+%{python3_sitelib}/%{pypi_name}/
+%if 0%{?fedora} <= 41
+%{python3_sitelib}/%{pypi_name}-%{version}*.egg-info/
+%else
+%{python3_sitelib}/%{pypi_name}-%{version}*.dist-info/
+%endif
+
+
+%changelog
+%autochangelog
@@ -0,0 +1 @@
+rpm.version(pypi("protontricks"));
@@ -1,4 +1,4 @@
-%global ver 2025-03-24
+%global ver 2025-07-06
 %global goodver %(echo %ver | sed 's/-//g')
 %global __brp_mangle_shebangs %{nil}
 %bcond_without mold
@@ -31,7 +31,7 @@ Packager:       madonuko <mado@fyralabs.com>
 %doc README.md
 %license LICENSE.md
 %license LICENSE.dependencies
-%_bindir/ruffle_desktop
+%_bindir/ruffle
 %_datadir/applications/rs.ruffle.Ruffle.desktop
 %_iconsdir/hicolor/scalable/apps/rs.ruffle.Ruffle.svg
 %_metainfodir/rs.ruffle.Ruffle.metainfo.xml
@@ -39,18 +39,18 @@ Packager:       madonuko <mado@fyralabs.com>
 %prep
 %autosetup -n ruffle-nightly-%ver -p1
 %cargo_prep_online
-sed -iE 's@^Exec=ruffle %%u$@Exec=ruffle_desktop %%u@' desktop/packages/linux/rs.ruffle.Ruffle.desktop
-cat desktop/packages/linux/rs.ruffle.Ruffle.desktop

 %build
-%{cargo_license_online} > LICENSE.dependencies
+cd desktop
+%cargo_build

 %install
-cd desktop
-%cargo_install
-install -Dm644 packages/linux/rs.ruffle.Ruffle.svg %buildroot%_iconsdir/hicolor/scalable/apps/rs.ruffle.Ruffle.svg
-install -Dm644 packages/linux/rs.ruffle.Ruffle.desktop %buildroot%_datadir/applications/rs.ruffle.Ruffle.desktop
-install -Dm644 packages/linux/rs.ruffle.Ruffle.metainfo.xml %buildroot%_metainfodir/rs.ruffle.Ruffle.metainfo.xml
+install -Dm755 target/rpm/ruffle_desktop %buildroot%_bindir/ruffle
+install -Dm644 desktop/packages/linux/rs.ruffle.Ruffle.svg %buildroot%_iconsdir/hicolor/scalable/apps/rs.ruffle.Ruffle.svg
+install -Dm644 desktop/packages/linux/rs.ruffle.Ruffle.desktop %buildroot%_datadir/applications/rs.ruffle.Ruffle.desktop
+install -Dm644 desktop/packages/linux/rs.ruffle.Ruffle.metainfo.xml %buildroot%_metainfodir/rs.ruffle.Ruffle.metainfo.xml
+
+%{cargo_license_online} > LICENSE.dependencies

 %changelog
 * Mon Jul 29 2024 madonuko <mado@fyralabs.com>
@@ -2,8 +2,8 @@
 %global realname subtitleedit

 Name:           %realname.bin
-Version:        4.0.11
-Release:        1%?dist
+Version:        4.0.12
+Release:        2%?dist
 Summary:        An advanced subtitle editor and converter
 License:        GPL-3.0-only
 URL:            https://www.nikse.dk/SubtitleEdit
@@ -13,7 +13,7 @@ Packager:       madonuko <mado@fyralabs.com>
 Provides:       %realname = %evr
 Conflicts:      %realname
 BuildRequires:  unzip anda-srpm-macros
-Requires:       mono dejavu-fonts
+Requires:       dejavu-sans-mono-fonts mono-core

 %description
 %summary.
@@ -33,7 +33,7 @@ EOF

 cat<<EOF > subtitleedit
 #!/usr/bin/sh
-exec mono /opt/subtitleedit/SubtitleEdit.exe "$@"
+exec mono /usr/share/subtitleedit/SubtitleEdit.exe "$@"
 EOF


@@ -1,27 +0,0 @@
-From 44046bfbcb30a19c45416113a2a82a4d17a1a998 Mon Sep 17 00:00:00 2001
-From: Jan200101 <sentrycraft123@gmail.com>
-Date: Mon, 14 Aug 2023 14:06:45 +0200
-Subject: [PATCH 01/10] main: update GPUs comment for dbus property
-
-Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
---
- src/net.hadess.SwitcherooControl.xml | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/net.hadess.SwitcherooControl.xml b/src/net.hadess.SwitcherooControl.xml
-index e52bc1a..59a8896 100644
--- a/src/net.hadess.SwitcherooControl.xml
-+++ b/src/net.hadess.SwitcherooControl.xml
-@@ -38,7 +38,8 @@
-         will contain a user-facing name for the GPU, the "Environment" (as) key will
-         contain an array of even number of strings, each being an environment
-         variable to set to use the GPU, followed by its value, the "Default" (b) key
-        will tag the default (usually integrated) GPU.
-+        will tag the default GPU, the "Discrete" (b) key tags if the GPU is a
-+        dedicated component.
-     -->
-     <property name="GPUs" type="aa{sv}" access="read"/>
- 
-- 
-2.46.0
-
@@ -1,379 +0,0 @@
-From 4f31415cb61a50c2bcba1510a7511518417d0970 Mon Sep 17 00:00:00 2001
-From: Jan200101 <sentrycraft123@gmail.com>
-Date: Mon, 11 Sep 2023 15:21:46 +0200
-Subject: [PATCH 02/10] main: add Discrete key
-
-Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
---
- .gitlab-ci.yml                     |   1 +
- data/30-discrete-gpu.rules.in      |   3 +
- data/meson.build                   |   7 ++
- meson.build                        |   9 +++
- meson_options.txt                  |  24 +++++++
- src/discrete-detection/amdgpu.c    |  46 +++++++++++++
- src/discrete-detection/meson.build |  18 +++++
- src/discrete-detection/nouveau.c   | 105 +++++++++++++++++++++++++++++
- src/meson.build                    |   4 +-
- src/switcheroo-control.c           |  16 +++++
- 10 files changed, 232 insertions(+), 1 deletion(-)
- create mode 100644 data/30-discrete-gpu.rules.in
- create mode 100644 src/discrete-detection/amdgpu.c
- create mode 100644 src/discrete-detection/meson.build
- create mode 100644 src/discrete-detection/nouveau.c
-
-diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
-index a6aa3c7..a09fe20 100644
--- a/.gitlab-ci.yml
-+++ b/.gitlab-ci.yml
-@@ -3,6 +3,7 @@ image: fedora:rawhide
- variables:
-   DEPENDENCIES: glib2-devel
-                 libgudev-devel
-+                libdrm-devel
-                 gtk-doc
-                 gcc
-                 gcc-c++
-diff --git a/data/30-discrete-gpu.rules.in b/data/30-discrete-gpu.rules.in
-new file mode 100644
-index 0000000..a803ed4
--- /dev/null
-+++ b/data/30-discrete-gpu.rules.in
-@@ -0,0 +1,3 @@
-+DRIVERS=="amdgpu", SUBSYSTEM=="drm", PROGRAM="@libexecdir@/check-discrete-amdgpu $env{DEVNAME}", TAG+="switcheroo-discrete-gpu"
-+DRIVERS=="nouveau", SUBSYSTEM=="drm", PROGRAM="@libexecdir@/check-discrete-nouveau $env{DEVNAME}", TAG+="switcheroo-discrete-gpu"
-+DRIVERS=="nvidia", TAG+="switcheroo-discrete-gpu"
-diff --git a/data/meson.build b/data/meson.build
-index 85e5c93..38cf96c 100644
--- a/data/meson.build
-+++ b/data/meson.build
-@@ -17,3 +17,10 @@ install_data(
-   '30-pci-intel-gpu.hwdb',
-   install_dir: hwdb_dir,
- )
-+
-+configure_file(
-+  input: '30-discrete-gpu.rules.in',
-+  output: '30-discrete-gpu.rules',
-+  configuration: data_conf,
-+  install_dir: rules_dir,
-+)
-diff --git a/meson.build b/meson.build
-index b8f4bff..b3aaf0c 100644
--- a/meson.build
-+++ b/meson.build
-@@ -20,6 +20,9 @@ gnome = import('gnome')
- glib = dependency('glib-2.0', version: '>= 2.56.0')
- gio = dependency('gio-2.0', version: '>= 2.56.0')
- gudev = dependency('gudev-1.0', version: '>= 232')
-+libdrm = dependency('libdrm', version: '>= 2.4.97', required: get_option('libdrm'))
-+libdrm_nouveau = dependency('libdrm_nouveau', version: '>= 2.4.97', required: get_option('libdrm_nouveau'))
-+libdrm_amdgpu = dependency('libdrm_amdgpu', version: '>= 2.4.97', required: get_option('libdrm_amdgpu'))
- 
- systemd_systemunitdir = get_option('systemdsystemunitdir')
- if systemd_systemunitdir == ''
-@@ -32,6 +35,12 @@ if hwdb_dir == ''
-   hwdb_dir = udevdir / 'hwdb.d'
- endif
- 
-+rules_dir = get_option('rulesdir')
-+if rules_dir == ''
-+  udevdir = dependency('udev').get_pkgconfig_variable('udevdir')
-+  rules_dir = udevdir / 'rules.d'
-+endif
-+
- # Make like license available in the build root for docs
- configure_file(
-   input: 'COPYING',
-diff --git a/meson_options.txt b/meson_options.txt
-index c8d9619..b8d671a 100644
--- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -10,6 +10,12 @@ option('hwdbdir',
-   description: 'Directory for hwdb files',
- )
- 
-+option('rulesdir',
-+  type: 'string',
-+  value: '',
-+  description: 'Directory for ruke files',
-+)
-+
- option('gtk_doc',
-   type: 'boolean',
-   value: false,
-@@ -21,3 +27,21 @@ option('tests',
-   type: 'boolean',
-   value: false
- )
-+
-+option('libdrm',
-+  description: 'Whether libdrm should be used to probe GPUs',
-+  type: 'feature',
-+  value: 'auto'
-+)
-+
-+option('libdrm_nouveau',
-+  description: 'Whether libdrm_nouveau should be used to probe Nvidia GPUs',
-+  type: 'feature',
-+  value: 'auto'
-+)
-+
-+option('libdrm_amdgpu',
-+  description: 'Whether libdrm_amdgpu should be used to probe AMD GPUs',
-+  type: 'feature',
-+  value: 'auto'
-+)
-diff --git a/src/discrete-detection/amdgpu.c b/src/discrete-detection/amdgpu.c
-new file mode 100644
-index 0000000..2d9804f
--- /dev/null
-+++ b/src/discrete-detection/amdgpu.c
-@@ -0,0 +1,46 @@
-+
-+#include <fcntl.h>
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <gio/gio.h>
-+#include <gudev/gudev.h>
-+
-+#include <amdgpu.h>
-+#include <amdgpu_drm.h>
-+
-+typedef int handle;
-+G_DEFINE_AUTO_CLEANUP_FREE_FUNC(handle, close, -1)
-+G_DEFINE_AUTOPTR_CLEANUP_FUNC(amdgpu_device_handle, free);
-+
-+int main(int argc, char** argv)
-+{
-+	if (argc < 2)
-+	{
-+		puts ("check-discrete-amdgpu [DEVNAME]");
-+		return EXIT_FAILURE;
-+	}
-+
-+	const char *devname;
-+	g_auto(handle) fd = -1;
-+	g_autoptr(GUdevDevice) parent = NULL;
-+	struct drm_amdgpu_info_device device_info = {0};
-+	amdgpu_device_handle device = NULL;
-+	uint32_t drm_major, drm_minor;
-+
-+	devname = argv[1];
-+	fd = open (devname, O_RDWR);
-+	if (fd < 0)
-+		return EXIT_FAILURE;
-+
-+	if (amdgpu_device_initialize (fd, &drm_major, &drm_minor, &device))
-+		return EXIT_FAILURE;
-+
-+	if (amdgpu_query_info (device, AMDGPU_INFO_DEV_INFO, sizeof(device_info), &device_info))
-+		return EXIT_FAILURE;
-+
-+	/* AMDGPU_IDS_FLAGS_FUSION is set for all APUs */
-+	if (device_info.ids_flags & AMDGPU_IDS_FLAGS_FUSION)
-+		return EXIT_FAILURE;
-+
-+	return EXIT_SUCCESS;
-+}
-diff --git a/src/discrete-detection/meson.build b/src/discrete-detection/meson.build
-new file mode 100644
-index 0000000..3a6c03f
--- /dev/null
-+++ b/src/discrete-detection/meson.build
-@@ -0,0 +1,18 @@
-+
-+if libdrm_amdgpu.found()
-+  executable('check-discrete-amdgpu',
-+    files('amdgpu.c'),
-+    dependencies: deps,
-+    install: true,
-+    install_dir: libexecdir,
-+  )
-+endif
-+
-+if libdrm.found() and libdrm_nouveau.found()
-+  executable('check-discrete-nouveau',
-+    files('nouveau.c'),
-+    dependencies: deps,
-+    install: true,
-+    install_dir: libexecdir,
-+  )
-+endif
-diff --git a/src/discrete-detection/nouveau.c b/src/discrete-detection/nouveau.c
-new file mode 100644
-index 0000000..0a1f220
--- /dev/null
-+++ b/src/discrete-detection/nouveau.c
-@@ -0,0 +1,105 @@
-+
-+#include <fcntl.h>
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <gio/gio.h>
-+#include <gudev/gudev.h>
-+
-+#include <xf86drm.h>
-+#include <nouveau_drm.h>
-+#include <nouveau/nvif/ioctl.h>
-+#include <nvif/cl0080.h>
-+#include <nvif/class.h>
-+
-+typedef int handle;
-+G_DEFINE_AUTO_CLEANUP_FREE_FUNC(handle, close, -1)
-+
-+int main(int argc, char** argv)
-+{
-+	if (argc < 2)
-+	{
-+		puts ("check-discrete-nouveau [DEVNAME]");
-+		return EXIT_FAILURE;
-+	}
-+
-+	const char *devname;
-+	g_auto(handle) fd = -1;
-+
-+	devname = argv[1];
-+	fd = open (devname, O_RDWR);
-+	if (fd < 0)
-+		return EXIT_FAILURE;
-+
-+	g_autofree void *device = malloc(352);
-+
-+	/* Init device */
-+	{	
-+		struct {
-+			struct nvif_ioctl_v0 ioctl;
-+			struct nvif_ioctl_new_v0 new;
-+			struct nv_device_v0 dev;
-+		} init_args = {
-+		  .ioctl = {
-+			 .object = 0,
-+			 .owner = NVIF_IOCTL_V0_OWNER_ANY,
-+			 .route = 0x00,
-+			 .type = NVIF_IOCTL_V0_NEW,
-+			 .version = 0,
-+		  },
-+		  .new = {
-+			 .handle = 0,
-+			 .object = (uintptr_t)device,
-+			 .oclass = NV_DEVICE,
-+			 .route = NVIF_IOCTL_V0_ROUTE_NVIF,
-+			 .token = (uintptr_t)device,
-+			 .version = 0,
-+		  },
-+		  .dev = {
-+			 .device = ~0ULL,
-+		  },
-+	   };
-+
-+		if (drmCommandWrite (fd, DRM_NOUVEAU_NVIF, &init_args, sizeof(init_args)))
-+			return EXIT_FAILURE;
-+	}
-+
-+	/* Query device info */
-+	struct {
-+		struct nvif_ioctl_v0 ioctl;
-+		struct nvif_ioctl_mthd_v0 mthd;
-+		struct nv_device_info_v0 info;
-+	} args = {
-+		.ioctl = {
-+			.object = (uintptr_t)device,
-+			.owner = NVIF_IOCTL_V0_OWNER_ANY,
-+			.route = 0x00,
-+			.type = NVIF_IOCTL_V0_MTHD,
-+			.version = 0,
-+		},
-+		.mthd = {
-+			.method = NV_DEVICE_V0_INFO,
-+			.version = 0,
-+		},
-+		.info = {
-+			.version = 0,
-+		},
-+	};
-+
-+	if (drmCommandWriteRead (fd, DRM_NOUVEAU_NVIF, &args, sizeof(args)))
-+		return EXIT_FAILURE;
-+
-+
-+	switch (args.info.platform)
-+	{
-+		case NV_DEVICE_INFO_V0_IGP:
-+		case NV_DEVICE_INFO_V0_SOC:
-+			return EXIT_FAILURE;
-+
-+		case NV_DEVICE_INFO_V0_PCI:
-+		case NV_DEVICE_INFO_V0_AGP:
-+		case NV_DEVICE_INFO_V0_PCIE:
-+		default:
-+			return EXIT_SUCCESS;
-+	}
-+	return EXIT_FAILURE;
-+}
-diff --git a/src/meson.build b/src/meson.build
-index ab3a77d..da4267f 100644
--- a/src/meson.build
-+++ b/src/meson.build
-@@ -1,4 +1,4 @@
-deps = [glib, gio, gudev]
-+deps = [glib, gio, gudev, libdrm, libdrm_nouveau, libdrm_amdgpu]
- 
- sources = [
-   'info-cleanup.c',
-@@ -34,3 +34,5 @@ configure_file(
-   configuration: switcherooctl_conf,
-   install_dir: get_option('bindir')
- )
-+
-+subdir('discrete-detection')
-diff --git a/src/switcheroo-control.c b/src/switcheroo-control.c
-index abd8154..e407bfb 100644
--- a/src/switcheroo-control.c
-+++ b/src/switcheroo-control.c
-@@ -31,6 +31,7 @@ typedef struct {
- 	char *name;
- 	GPtrArray *env;
- 	gboolean is_default;
-+	gboolean is_discrete;
- } CardData;
- 
- typedef struct {
-@@ -94,6 +95,8 @@ build_gpus_variant (ControlData *data)
- 				       g_variant_new_strv ((const gchar * const *) card->env->pdata, card->env->len));
- 		g_variant_builder_add (&asv_builder, "{sv}", "Default",
- 				       g_variant_new_boolean (card->is_default));
-+		g_variant_builder_add (&asv_builder, "{sv}", "Discrete",
-+				       g_variant_new_boolean (card->is_discrete));
- 
- 		g_variant_builder_add (&builder, "a{sv}", &asv_builder);
- 	}
-@@ -312,6 +315,18 @@ get_card_is_default (GUdevDevice *d)
- 	return g_udev_device_get_sysfs_attr_as_boolean (parent, "boot_vga");
- }
- 
-+static gboolean
-+get_card_is_discrete (GUdevDevice *d)
-+{
-+	const char * const * tags;
-+	g_autoptr (GUdevDevice) platform_device = NULL;
-+
-+	tags = g_udev_device_get_tags (d);
-+	if (tags && g_strv_contains (tags, "switcheroo-discrete-gpu"))
-+		return TRUE;
-+	return FALSE;
-+}
-+
- static CardData *
- get_card_data (GUdevClient *client,
- 	       GUdevDevice *d)
-@@ -328,6 +343,7 @@ get_card_data (GUdevClient *client,
- 	data->name = get_card_name (d);
- 	data->env = env;
- 	data->is_default = get_card_is_default (d);
-+	data->is_discrete = get_card_is_discrete (d);
- 
- 	return data;
- }
-- 
-2.46.0
-
@@ -1,27 +0,0 @@
-From 1b115ed72e03ff1169cbfddd79ef10890baca133 Mon Sep 17 00:00:00 2001
-From: Jan200101 <sentrycraft123@gmail.com>
-Date: Tue, 12 Sep 2023 15:53:40 +0200
-Subject: [PATCH 03/10] tests: fix integration tests without UMockdev
- `gi.require_version` throws ValueError if the dependency cannot be found
-
-Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
---
- tests/integration-test.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/integration-test.py b/tests/integration-test.py
-index d8dea16..e3dd996 100755
--- a/tests/integration-test.py
-+++ b/tests/integration-test.py
-@@ -37,7 +37,7 @@ except ImportError as e:
- try:
-     gi.require_version('UMockdev', '1.0')
-     from gi.repository import UMockdev
-except ImportError:
-+except (ImportError, ValueError):
-     sys.stderr.write('Skipping tests, umockdev not available (https://github.com/martinpitt/umockdev)\n')
-     sys.exit(0)
- 
-- 
-2.46.0
-
@@ -1,278 +0,0 @@
-From d933e96bdb15679ae7653f929461982aa66973ba Mon Sep 17 00:00:00 2001
-From: Jan200101 <sentrycraft123@gmail.com>
-Date: Tue, 12 Sep 2023 15:58:16 +0200
-Subject: [PATCH 04/10] tests: add tests for discrete detection with mock libs
- Both tests have 4 different ways of testing: - Invalid Device - Unexpected
- Device - Non Discrete GPU (iGPU/APU) - Discrete GPU
-
-Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
---
- src/discrete-detection/meson.build            |  4 +-
- tests/discrete-detection/libdrm_amdgpu_mock.c | 57 +++++++++++++
- .../discrete-detection/libdrm_nouveau_mock.c  | 68 ++++++++++++++++
- tests/discrete-detection/meson.build          | 80 +++++++++++++++++++
- tests/meson.build                             |  2 +
- 5 files changed, 209 insertions(+), 2 deletions(-)
- create mode 100644 tests/discrete-detection/libdrm_amdgpu_mock.c
- create mode 100644 tests/discrete-detection/libdrm_nouveau_mock.c
- create mode 100644 tests/discrete-detection/meson.build
-
-diff --git a/src/discrete-detection/meson.build b/src/discrete-detection/meson.build
-index 3a6c03f..8eb8437 100644
--- a/src/discrete-detection/meson.build
-+++ b/src/discrete-detection/meson.build
-@@ -1,6 +1,6 @@
- 
- if libdrm_amdgpu.found()
-  executable('check-discrete-amdgpu',
-+  amdgpu_discrete = executable('check-discrete-amdgpu',
-     files('amdgpu.c'),
-     dependencies: deps,
-     install: true,
-@@ -9,7 +9,7 @@ if libdrm_amdgpu.found()
- endif
- 
- if libdrm.found() and libdrm_nouveau.found()
-  executable('check-discrete-nouveau',
-+  nouveau_discrete = executable('check-discrete-nouveau',
-     files('nouveau.c'),
-     dependencies: deps,
-     install: true,
-diff --git a/tests/discrete-detection/libdrm_amdgpu_mock.c b/tests/discrete-detection/libdrm_amdgpu_mock.c
-new file mode 100644
-index 0000000..20fa4aa
--- /dev/null
-+++ b/tests/discrete-detection/libdrm_amdgpu_mock.c
-@@ -0,0 +1,57 @@
-+#include <string.h>
-+#include <stdint.h>
-+#include <stdio.h>
-+
-+#include <amdgpu_drm.h>
-+
-+enum {
-+	OTHER_GPU,
-+	AMD_APU,
-+	AMD_GPU,
-+};
-+
-+/* Mock open(2) so we can test multiple devices configurations */
-+int open(const char *pathname, int flags)
-+{
-+	if (!strcmp(pathname, "OTHER_GPU"))
-+		return OTHER_GPU;
-+	if (!strcmp (pathname, "AMD_APU"))
-+		return AMD_APU;
-+	if (!strcmp (pathname, "AMD_GPU"))
-+		return AMD_GPU;
-+
-+	return -1;
-+}
-+
-+/* open64 may be used for large file support */
-+int open64(const char *pathname, int flags)
-+{
-+	return open (pathname, flags);
-+}
-+
-+int amdgpu_device_initialize(int fd, uint32_t *major_version, uint32_t *minor_version, int *device_handle)
-+{
-+	// Store the fd in the device handle for access in query_info
-+	*device_handle = fd;
-+
-+	if (fd != AMD_GPU && fd != AMD_APU)
-+		return 1;
-+
-+	return 0;
-+}
-+
-+int amdgpu_query_info(int device_handle, unsigned info_id, unsigned size, void *value)
-+{
-+	struct drm_amdgpu_info_device* device_info = value;
-+
-+	if (device_handle == AMD_GPU) {
-+		device_info->ids_flags = 0;
-+		return 0;
-+	}
-+	if (device_handle == AMD_APU) {
-+		device_info->ids_flags = AMDGPU_IDS_FLAGS_FUSION;
-+		return 0;
-+	}
-+
-+	return 1;
-+}
-diff --git a/tests/discrete-detection/libdrm_nouveau_mock.c b/tests/discrete-detection/libdrm_nouveau_mock.c
-new file mode 100644
-index 0000000..cdbfda8
--- /dev/null
-+++ b/tests/discrete-detection/libdrm_nouveau_mock.c
-@@ -0,0 +1,68 @@
-+#include <string.h>
-+#include <stdint.h>
-+#include <stdio.h>
-+
-+#include <xf86drm.h>
-+#include <nouveau_drm.h>
-+#include <nouveau/nvif/ioctl.h>
-+#include <nvif/cl0080.h>
-+#include <nvif/class.h>
-+
-+enum {
-+	OTHER_GPU,
-+	NVIDIA_IGPU,
-+	NVIDIA_GPU,
-+};
-+
-+/* Mock open(2) so we can test multiple devices configurations */
-+int open(const char *pathname, int flags)
-+{
-+	if (!strcmp(pathname, "OTHER_GPU"))
-+		return OTHER_GPU;
-+	if (!strcmp (pathname, "NVIDIA_IGPU"))
-+		return NVIDIA_IGPU;
-+	if (!strcmp (pathname, "NVIDIA_GPU"))
-+		return NVIDIA_GPU;
-+
-+	return -1;
-+}
-+
-+/* open64 may be used for large file support */
-+int open64(const char *pathname, int flags)
-+{
-+	return open (pathname, flags);
-+}
-+
-+int drmCommandWrite(int fd, unsigned long drmCommandIndex, void *data, unsigned long size)
-+{
-+	if (drmCommandIndex != DRM_NOUVEAU_NVIF)
-+		return 1;
-+
-+	if (fd != NVIDIA_GPU && fd != NVIDIA_IGPU)
-+		return 1;
-+
-+	return 0;
-+}
-+
-+int drmCommandWriteRead(int fd, unsigned long drmCommandIndex, void *data, unsigned long size)
-+{
-+	if (drmCommandIndex != DRM_NOUVEAU_NVIF)
-+		return 1;
-+
-+	struct {
-+		struct nvif_ioctl_v0 ioctl;
-+		struct nvif_ioctl_mthd_v0 mthd;
-+		struct nv_device_info_v0 info;
-+	} *args = data;
-+
-+	if (fd == NVIDIA_GPU) {
-+		args->info.platform = NV_DEVICE_INFO_V0_PCIE;
-+		return 0;
-+	}
-+	if (fd == NVIDIA_IGPU) {
-+		args->info.platform = NV_DEVICE_INFO_V0_IGP;
-+		return 0;	
-+	}
-+
-+	return 1;
-+}
-\ No newline at end of file
-diff --git a/tests/discrete-detection/meson.build b/tests/discrete-detection/meson.build
-new file mode 100644
-index 0000000..f01a014
--- /dev/null
-+++ b/tests/discrete-detection/meson.build
-@@ -0,0 +1,80 @@
-+
-+if libdrm_amdgpu.found()
-+    amdgpu_mock_lib = shared_library(
-+        'drm_amdgpu_mock',
-+        files('libdrm_amdgpu_mock.c'),
-+        dependencies: libdrm_amdgpu
-+    )
-+
-+    test(
-+        'test amdgpu detection with invalid device',
-+        amdgpu_discrete,
-+        args: ['NO_GPU'],
-+        env: environment({'LD_PRELOAD': amdgpu_mock_lib.full_path()}),
-+        should_fail: true
-+    )
-+
-+    test(
-+        'test amdgpu detection with non-AMD GPU',
-+        amdgpu_discrete,
-+        args: ['OTHER_GPU'],
-+        env: environment({'LD_PRELOAD': amdgpu_mock_lib.full_path()}),
-+        should_fail: true
-+    )
-+
-+    test(
-+        'test amdgpu detection with AMD APU',
-+        amdgpu_discrete,
-+        args: ['AMD_APU'],
-+        env: environment({'LD_PRELOAD': amdgpu_mock_lib.full_path()}),
-+        should_fail: true
-+    )
-+
-+    test(
-+        'test amdgpu detection with AMD GPU',
-+        amdgpu_discrete,
-+        args: ['AMD_GPU'],
-+        env: environment({'LD_PRELOAD': amdgpu_mock_lib.full_path()}),
-+        should_fail: false
-+    )
-+endif
-+
-+if libdrm.found() and libdrm_nouveau.found()
-+    nouveau_mock_lib = shared_library(
-+        'drm_nouveau_mock',
-+        files('libdrm_nouveau_mock.c'),
-+        dependencies: [libdrm, libdrm_nouveau]
-+    )
-+
-+    test(
-+        'test nouveau detection with invalid device',
-+        nouveau_discrete,
-+        args: ['NO_GPU'],
-+        env: environment({'LD_PRELOAD': nouveau_mock_lib.full_path()}),
-+        should_fail: true
-+    )
-+
-+    test(
-+        'test nouveau detection with non-Nvidia GPU',
-+        nouveau_discrete,
-+        args: ['OTHER_GPU'],
-+        env: environment({'LD_PRELOAD': nouveau_mock_lib.full_path()}),
-+        should_fail: true
-+    )
-+
-+    test(
-+        'test nouveau detection with Nvidia iGPU',
-+        nouveau_discrete,
-+        args: ['NVIDIA_IGPU'],
-+        env: environment({'LD_PRELOAD': nouveau_mock_lib.full_path()}),
-+        should_fail: true
-+    )
-+
-+    test(
-+        'test nouveau detection with Nvidia GPU',
-+        nouveau_discrete,
-+        args: ['NVIDIA_GPU'],
-+        env: environment({'LD_PRELOAD': nouveau_mock_lib.full_path()}),
-+        should_fail: false
-+    )
-+endif
-\ No newline at end of file
-diff --git a/tests/meson.build b/tests/meson.build
-index b0b7476..61ef00c 100644
--- a/tests/meson.build
-+++ b/tests/meson.build
-@@ -15,3 +15,5 @@ foreach ut: unit_tests
-          env: envs,
-         )
- endforeach
-+
-+subdir('discrete-detection')
-- 
-2.46.0
-
@@ -1,39 +0,0 @@
-From c102b643945dc076d881497dd2ca5865938f7053 Mon Sep 17 00:00:00 2001
-From: Jan200101 <sentrycraft123@gmail.com>
-Date: Tue, 12 Sep 2023 15:57:47 +0200
-Subject: [PATCH 05/10] main: remove leftover and fix typo
-
-Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
---
- meson_options.txt        | 2 +-
- src/switcheroo-control.c | 1 -
- 2 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/meson_options.txt b/meson_options.txt
-index b8d671a..c77fea8 100644
--- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -13,7 +13,7 @@ option('hwdbdir',
- option('rulesdir',
-   type: 'string',
-   value: '',
-  description: 'Directory for ruke files',
-+  description: 'Directory for rule files',
- )
- 
- option('gtk_doc',
-diff --git a/src/switcheroo-control.c b/src/switcheroo-control.c
-index e407bfb..0f6a548 100644
--- a/src/switcheroo-control.c
-+++ b/src/switcheroo-control.c
-@@ -319,7 +319,6 @@ static gboolean
- get_card_is_discrete (GUdevDevice *d)
- {
- 	const char * const * tags;
-	g_autoptr (GUdevDevice) platform_device = NULL;
- 
- 	tags = g_udev_device_get_tags (d);
- 	if (tags && g_strv_contains (tags, "switcheroo-discrete-gpu"))
-- 
-2.46.0
-
@@ -1,48 +0,0 @@
-From f764db4eb565c19ba14155791fbfced3fb5d34c8 Mon Sep 17 00:00:00 2001
-From: Jan200101 <sentrycraft123@gmail.com>
-Date: Tue, 12 Sep 2023 15:58:27 +0200
-Subject: [PATCH 06/10] main: move discrete dependencies out of main deps
-
-Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
---
- src/discrete-detection/meson.build | 5 +++--
- src/meson.build                    | 2 +-
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/discrete-detection/meson.build b/src/discrete-detection/meson.build
-index 8eb8437..353316f 100644
--- a/src/discrete-detection/meson.build
-+++ b/src/discrete-detection/meson.build
-@@ -1,8 +1,9 @@
-+discrete_deps = deps + [libdrm, libdrm_nouveau, libdrm_amdgpu]
- 
- if libdrm_amdgpu.found()
-   amdgpu_discrete = executable('check-discrete-amdgpu',
-     files('amdgpu.c'),
-    dependencies: deps,
-+    dependencies: discrete_deps,
-     install: true,
-     install_dir: libexecdir,
-   )
-@@ -11,7 +12,7 @@ endif
- if libdrm.found() and libdrm_nouveau.found()
-   nouveau_discrete = executable('check-discrete-nouveau',
-     files('nouveau.c'),
-    dependencies: deps,
-+    dependencies: discrete_deps,
-     install: true,
-     install_dir: libexecdir,
-   )
-diff --git a/src/meson.build b/src/meson.build
-index da4267f..22d69e7 100644
--- a/src/meson.build
-+++ b/src/meson.build
-@@ -1,4 +1,4 @@
-deps = [glib, gio, gudev, libdrm, libdrm_nouveau, libdrm_amdgpu]
-+deps = [glib, gio, gudev]
- 
- sources = [
-   'info-cleanup.c',
-- 
-2.46.0
-
@@ -1,137 +0,0 @@
-From d2ecc29469d5572fd171926c9d1dbb1b851c7b09 Mon Sep 17 00:00:00 2001
-From: Jan200101 <sentrycraft123@gmail.com>
-Date: Tue, 12 Sep 2023 17:12:00 +0200
-Subject: [PATCH 07/10] main: use glib for discrete command-line arguments
-
-Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
---
- src/discrete-detection/amdgpu.c  | 29 ++++++++++++++++++++---------
- src/discrete-detection/nouveau.c | 29 ++++++++++++++++++++---------
- 2 files changed, 40 insertions(+), 18 deletions(-)
-
-diff --git a/src/discrete-detection/amdgpu.c b/src/discrete-detection/amdgpu.c
-index 2d9804f..5a9a4ab 100644
--- a/src/discrete-detection/amdgpu.c
-+++ b/src/discrete-detection/amdgpu.c
-@@ -1,9 +1,10 @@
-
- #include <fcntl.h>
- #include <stdlib.h>
- #include <stdio.h>
-+#include <locale.h>
- #include <gio/gio.h>
- #include <gudev/gudev.h>
-+#include <glib.h>
- 
- #include <amdgpu.h>
- #include <amdgpu_drm.h>
-@@ -12,22 +13,32 @@ typedef int handle;
- G_DEFINE_AUTO_CLEANUP_FREE_FUNC(handle, close, -1)
- G_DEFINE_AUTOPTR_CLEANUP_FUNC(amdgpu_device_handle, free);
- 
-int main(int argc, char** argv)
-+int main (int argc, char** argv)
- {
-	if (argc < 2)
-	{
-		puts ("check-discrete-amdgpu [DEVNAME]");
-		return EXIT_FAILURE;
-	}
-
- 	const char *devname;
- 	g_auto(handle) fd = -1;
-	g_autoptr(GUdevDevice) parent = NULL;
- 	struct drm_amdgpu_info_device device_info = {0};
- 	amdgpu_device_handle device = NULL;
- 	uint32_t drm_major, drm_minor;
-+	g_autoptr(GOptionContext) option_context = NULL;
-+	g_autoptr(GError) error = NULL;
- 
-+	setlocale (LC_ALL, "");
-+	option_context = g_option_context_new ("");
-+
-+	if (!g_option_context_parse (option_context, &argc, &argv, &error)) {
-+		g_print ("Failed to parse arguments: %s\n", error->message);
-+		return EXIT_FAILURE;
-+	}
-+
-+	if (argc < 2)
-+	{
-+		g_print ("%s\n", g_option_context_get_help (option_context, TRUE, NULL));
-+		return EXIT_FAILURE;
-+	}
- 	devname = argv[1];
-+;
-+
- 	fd = open (devname, O_RDWR);
- 	if (fd < 0)
- 		return EXIT_FAILURE;
-diff --git a/src/discrete-detection/nouveau.c b/src/discrete-detection/nouveau.c
-index 0a1f220..1d61cbb 100644
--- a/src/discrete-detection/nouveau.c
-+++ b/src/discrete-detection/nouveau.c
-@@ -1,9 +1,10 @@
-
- #include <fcntl.h>
- #include <stdlib.h>
- #include <stdio.h>
-+#include <locale.h>
- #include <gio/gio.h>
- #include <gudev/gudev.h>
-+#include <glib.h>
- 
- #include <xf86drm.h>
- #include <nouveau_drm.h>
-@@ -14,23 +15,34 @@
- typedef int handle;
- G_DEFINE_AUTO_CLEANUP_FREE_FUNC(handle, close, -1)
- 
-int main(int argc, char** argv)
-+int main (int argc, char** argv)
- {
-+	const gchar *devname = NULL;
-+	g_auto(handle) fd = -1;
-+	g_autofree void *device = NULL;
-+	g_autoptr(GOptionContext) option_context = NULL;
-+	g_autoptr(GError) error = NULL;
-+
-+	setlocale (LC_ALL, "");
-+	option_context = g_option_context_new ("");
-+
-+	if (!g_option_context_parse (option_context, &argc, &argv, &error)) {
-+		g_print ("Failed to parse arguments: %s\n", error->message);
-+		return EXIT_FAILURE;
-+	}
-+
- 	if (argc < 2)
- 	{
-		puts ("check-discrete-nouveau [DEVNAME]");
-+		g_print ("%s\n", g_option_context_get_help (option_context, TRUE, NULL));
- 		return EXIT_FAILURE;
- 	}
-
-	const char *devname;
-	g_auto(handle) fd = -1;
-
- 	devname = argv[1];
-+
- 	fd = open (devname, O_RDWR);
- 	if (fd < 0)
- 		return EXIT_FAILURE;
- 
-	g_autofree void *device = malloc(352);
-+	device = malloc(352);
- 
- 	/* Init device */
- 	{	
-@@ -88,7 +100,6 @@ int main(int argc, char** argv)
- 	if (drmCommandWriteRead (fd, DRM_NOUVEAU_NVIF, &args, sizeof(args)))
- 		return EXIT_FAILURE;
- 
-
- 	switch (args.info.platform)
- 	{
- 		case NV_DEVICE_INFO_V0_IGP:
-- 
-2.46.0
-
@@ -1,25 +0,0 @@
-From 462b09f02de37dfd2965d23cc7c4137bcf45a4ae Mon Sep 17 00:00:00 2001
-From: Jan200101 <sentrycraft123@gmail.com>
-Date: Wed, 14 Feb 2024 20:25:42 +0100
-Subject: [PATCH 08/10] main: add udev rule for i915 checking a lot of systems
- has shown that the intel iGPU will always be available at `0000:00:02.0`.
- Using ID_PATH would have been cleaner, but I couldn't get it to work.
-
-Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
---
- data/30-discrete-gpu.rules.in | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/data/30-discrete-gpu.rules.in b/data/30-discrete-gpu.rules.in
-index a803ed4..f30f315 100644
--- a/data/30-discrete-gpu.rules.in
-+++ b/data/30-discrete-gpu.rules.in
-@@ -1,3 +1,4 @@
- DRIVERS=="amdgpu", SUBSYSTEM=="drm", PROGRAM="@libexecdir@/check-discrete-amdgpu $env{DEVNAME}", TAG+="switcheroo-discrete-gpu"
- DRIVERS=="nouveau", SUBSYSTEM=="drm", PROGRAM="@libexecdir@/check-discrete-nouveau $env{DEVNAME}", TAG+="switcheroo-discrete-gpu"
-DRIVERS=="nvidia", TAG+="switcheroo-discrete-gpu"
-+DRIVERS=="nvidia", SUBSYSTEM=="drm", TAG+="switcheroo-discrete-gpu"
-+DRIVERS=="i915", SUBSYSTEM=="drm", DEVPATH!="/devices/pci0000:00/0000:00:02.0/drm/*", TAG+="switcheroo-discrete-gpu"
-- 
-2.46.0
-
@@ -1,34 +0,0 @@
-From 55db3aeaeb962952881f73e94432f750cfb64fc8 Mon Sep 17 00:00:00 2001
-From: Jan200101 <sentrycraft123@gmail.com>
-Date: Thu, 15 Feb 2024 16:24:00 +0100
-Subject: [PATCH 09/10] main: use Discrete key in switcherooctl
-
-Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
---
- src/switcherooctl.in | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/switcherooctl.in b/src/switcherooctl.in
-index 96c21cc..c0e3f07 100755
--- a/src/switcherooctl.in
-+++ b/src/switcherooctl.in
-@@ -77,6 +77,7 @@ def print_gpu(gpu, index):
-     print('Device:', index)
-     print('  Name:       ', gpu['Name'])
-     print('  Default:    ', "yes" if gpu['Default'] else "no")
-+    print('  Discrete:   ', "yes" if gpu['Discrete'] else "no")
-     print('  Environment:', env_to_str(gpu['Environment']))
- 
- def _list():
-@@ -126,7 +127,7 @@ def get_discrete_gpu():
-         return None
- 
-     try:
-        gpu = next(gpu for gpu in gpus if not gpu['Default'])
-+        gpu = next(gpu for gpu in gpus if gpu['Discrete'])
-     except StopIteration:
-         return None
-     else:
-- 
-2.46.0
-
@@ -1,45 +0,0 @@
-From 4232c75fe41158bb5063d630d36b3ffd6a8a57ec Mon Sep 17 00:00:00 2001
-From: Jan200101 <sentrycraft123@gmail.com>
-Date: Fri, 6 Sep 2024 22:31:56 +0200
-Subject: [PATCH 10/10] main: use new GPU list on uevent the amount of GPUs may
- still be the same but underlying attributes may have changed On the ASUS TUF
- Dash F15 running Fedora 40 6.10.7-200.fc40.x86_64 the udev tags are not
- applied at the time switcheroo-control starts but at a later uevent they are
- correct. Memory gets allocated anyways to check if the GPU count has changed,
- so this shouldn't affect memory usage.
-
-Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
---
- src/switcheroo-control.c | 16 ++++++----------
- 1 file changed, 6 insertions(+), 10 deletions(-)
-
-diff --git a/src/switcheroo-control.c b/src/switcheroo-control.c
-index 0f6a548..01954c7 100644
--- a/src/switcheroo-control.c
-+++ b/src/switcheroo-control.c
-@@ -438,16 +438,12 @@ uevent_cb (GUdevClient *client,
- 
- 	cards = get_drm_cards (data);
- 	num_gpus = cards->len;
-	if (num_gpus != data->num_gpus) {
-		g_debug ("GPUs added or removed (old: %d new: %d)",
-			 data->num_gpus, num_gpus);
-		g_ptr_array_free (data->cards, TRUE);
-		data->cards = cards;
-		data->num_gpus = cards->len;
-		send_dbus_event (data);
-	} else {
-		g_ptr_array_free (cards, TRUE);
-	}
-+	g_debug ("GPUs updated (old: %d new: %d)",
-+		 data->num_gpus, num_gpus);
-+	g_ptr_array_free (data->cards, TRUE);
-+	data->cards = cards;
-+	data->num_gpus = cards->len;
-+	send_dbus_event (data);
- }
- 
- static void
-- 
-2.46.0
-
@@ -1,22 +1,16 @@
 Name:           switcheroo-control
 Version:        2.6
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        D-Bus service to check the availability of dual-GPU

 License:        GPLv3
 URL:            https://gitlab.freedesktop.org/hadess/switcheroo-control/
 # URL from https://gitlab.freedesktop.org/hadess/switcheroo-control/-/releases
 Source0:        https://gitlab.freedesktop.org/hadess/switcheroo-control/uploads/86ea54ac7ddb901b6bf6e915209151f8/switcheroo-control-2.6.tar.xz
-Patch:          0001-main-update-GPUs-comment-for-dbus-property.patch
-Patch:          0002-main-add-Discrete-key.patch
-Patch:          0003-tests-fix-integration-tests-without-UMockdev.patch
-Patch:          0004-tests-add-tests-for-discrete-detection-with-mock-lib.patch
-Patch:          0005-main-remove-leftover-and-fix-typo.patch
-Patch:          0006-main-move-discrete-dependencies-out-of-main-deps.patch
-Patch:          0007-main-use-glib-for-discrete-command-line-arguments.patch
-Patch:          0008-main-add-udev-rule-for-i915.patch
-Patch:          0009-main-use-Discrete-key-in-switcherooctl.patch
-Patch:					0010-main-use-new-GPU-list-on-uevent.patch
+# Adds proper discrete GPU detection to switcheroo-control
+# https://gitlab.freedesktop.org/hadess/switcheroo-control/-/merge_requests/69
+Patch:					discrete.patch
+

 BuildRequires:  gcc
 BuildRequires:  pkgconfig(gudev-1.0)
@@ -25,6 +19,7 @@ BuildRequires:  gtk-doc
 BuildRequires:  meson
 BuildRequires:  systemd
 BuildRequires:  libdrm-devel
+BuildRequires:  kernel-headers
 BuildRequires:  python3-dbusmock
 BuildRequires:  umockdev

@@ -78,6 +73,7 @@ fi
 %{_mandir}/man1/switcherooctl.1*
 %{_libexecdir}/check-discrete-amdgpu
 %{_libexecdir}/check-discrete-nouveau
+%{_libexecdir}/check-discrete-xe
 %{_udevrulesdir}/30-discrete-gpu.rules

 %files docs
@@ -86,14 +82,17 @@ fi
 %{_datadir}/gtk-doc/html/%{name}/

 %changelog
-* Fri Sep 06 2024 Jan200101 <sentrycraft123@gmail.com> - 2.6-8
+* Tue Apr 29 2025 Jan200101 <sentrycraft123@gmail.com> - 2.6-9
 - Update discrete patch

-* Thu Feb 15 2024 Jan Drögehoff <sentrycraft123@gmail.com> - 2.6-7
- Update discrete patch
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

-* Wed Feb 14 2024 Jan Drögehoff <sentrycraft123@gmail.com> - 2.6-6
- Add discrete patch
+* Mon Jul 29 2024 Miroslav Suchý <msuchy@redhat.com> - 2.6-7
+- convert license to SPDX
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

 * Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
@@ -6,7 +6,7 @@

 Name:		vencord-desktop
 Provides:   VencordDesktop = %{version}-%{release}
-Version:	1.5.5
+Version:	1.5.7
 Release:	1%?dist
 License:	GPL-3.0
 Summary:	Vesktop is a cross platform desktop app aiming to give you a snappier Discord experience with Vencord pre-installed
@@ -13,8 +13,8 @@
 %global __requires_exclude ^((libffmpeg[.]so.*)|(lib.*\\.so.*))$

 Name:			voicevox
-Version:		0.23.0
-Release:		2%?dist
+Version:		0.24.1
+Release:		1%?dist
 Summary:		Free Japanese text-to-speech editor
 License:		LGPL-3.0
 URL:			https://voicevox.hiroshiba.jp
@@ -0,0 +1,6 @@
+project pkg {
+  arches = ["x86_64"]
+  rpm {
+    spec = "vpkedit.spec"
+  }
+}
@@ -0,0 +1 @@
+rpm.version(gh("craftablescience/VPKEdit"));
@@ -0,0 +1,55 @@
+Name:           vpkedit
+Version:        4.4.2
+Release:        3%?dist
+Summary:        A CLI/GUI tool to create, read, and write several pack file formats
+License:        MIT
+URL:            https://github.com/craftablescience/VPKEdit
+Requires:       qt6-qtbase hicolor-icon-theme
+Suggests:       qt6-qtwayland
+Packager:       madonuko <mado@fyralabs.com>
+BuildRequires:  cmake git-core gcc gcc-c++ binutils
+BuildRequires:  cmake(Qt6)
+BuildRequires:  cmake(Qt6Svg)
+BuildRequires:  cmake(Qt6Linguist)
+BuildRequires:  cmake(Qt6Charts)
+BuildRequires:  cmake(Qt6LinguistTools)
+ExclusiveArch:  x86_64
+
+%description
+VPKEdit is an open source MIT-licensed tool that can extract from, preview the
+contents of and write to several pack file formats. It also supports creating
+new VPKs.
+
+
+%prep
+%git_clone %url v%version
+
+
+%build
+%cmake -DCMAKE_INSTALL_PREFIX=%_libdir/%name \
+   -DBUILD_SHARED_LIBS:BOOL=OFF              \
+   -DCMAKE_BUILD_TYPE=Release
+#   -DVPKEDIT_BUILD_LIBC=ON
+%cmake_build
+
+
+%install
+%cmake_install
+pushd %buildroot%_libdir/%name
+rm -rf {libQt*,*.md,LICENSE}
+popd
+ln -sf %_libdir/vpkedit/vpkedit %buildroot%_bindir/vpkedit
+ln -sf %_libdir/vpkedit/vpkeditcli %buildroot%_bindir/vpkeditcli
+sed -i 's@Exec=/opt/vpkedit/@Exec=@g' %buildroot%_datadir/applications/vpkedit.desktop
+
+
+%files
+%doc README.md CREDITS.md
+%license LICENSE
+%_bindir/vpkedit
+%_bindir/vpkeditcli
+%_libdir/%name/
+%_datadir/applications/vpkedit.desktop
+%_iconsdir/hicolor/128x128/mimetypes/application-x-vpkedit.png
+%_datadir/mime/packages/vpkedit.xml
+%_datadir/pixmaps/vpkedit.png
@@ -0,0 +1,10 @@
+project pkg {
+    arches = ["x86_64"]
+    rpm {
+        spec = "winetricks-git.spec"
+    }
+    labels {
+        subrepo = "extras"
+        nightly = 1
+    }
+}
@@ -0,0 +1,7 @@
+rpm.global("commit", gh_commit("Winetricks/winetricks"));
+if rpm.changed() {
+    rpm.release();
+    rpm.global("commit_date", date());
+    let v = gh("Winetricks/winetricks");
+    rpm.global("ver", v);
+}
@@ -0,0 +1,75 @@
+# Fedora sometimes sources the snapshots under stable versions and just bumps release
+# For user clarity I have separated these into different packages
+%global commit  50417b23b5d3e79c6c8fa4d1af69167dfa3de719
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global ver 20250102
+%global commit_date 20250621
+
+Name:           winetricks-git
+Version:        %{ver}^%{commit_date}git.%{shortcommit}
+Release:        1%?dist
+Summary:        Work around common problems in Wine; Winetricks Git builds
+License:        LGPL-2.1-or-later
+URL:            https://github.com/Winetricks/winetricks
+Source0:        %{url}/archive/%{commit}.tar.gz#/%{name}-%{commit}.tar.gz
+BuildRequires:  desktop-file-utils
+BuildRequires:  gcc
+BuildRequires:  make
+Requires:       cabextract
+Requires:       gzip
+Requires:       unzip
+Requires:       wget
+Requires:       which
+Requires:       hicolor-icon-theme
+Requires:       (kdialog or zenity)
+Requires:       (wine-stable or wine-staging or wine-dev or wine-common)
+Conflicts:      winetricks
+Conflicts:      terra-winetricks
+BuildArch:      noarch
+# need arch-specific wine, not available everywhere:
+# - adopted from wine.spec
+ExclusiveArch:  %{ix86} x86_64 %{arm} aarch64
+ExcludeArch:    ppc64 ppc64le
+
+%description
+Winetricks is an easy way to work around common problems in Wine.
+
+It has a menu of supported games/apps for which it can do all the
+workarounds automatically. It also lets you install missing DLLs
+or tweak various Wine settings individually.
+
+This version of Winetricks is built from the latest Git.
+
+It is also compatible with Terra WINE builds.
+
+%prep
+%setup -qn winetricks-%{commit}
+
+sed -i -e s:steam:: -e s:flash:: tests/*
+
+%build
+# Empty build section because RPM
+
+%install
+%make_install
+# some tarballs do not install appdata
+install -Dm0644 -t %{buildroot}%{_datadir}/metainfo src/io.github.winetricks.Winetricks.metainfo.xml
+
+%check
+desktop-file-validate %{buildroot}%{_datadir}/applications/winetricks.desktop
+
+
+%files
+%license COPYING
+%license debian/copyright
+%doc README.md
+%{_bindir}/winetricks
+%{_mandir}/man1/winetricks.1*
+%{_datadir}/applications/winetricks.desktop
+%{_datadir}/bash-completion/completions/winetricks
+%{_datadir}/icons/hicolor/scalable/apps/winetricks.svg
+%{_datadir}/metainfo/io.github.winetricks.Winetricks.metainfo.xml
+
+
+%changelog
+%autochangelog
@@ -0,0 +1,9 @@
+project pkg {
+    arches = ["x86_64"]
+    rpm {
+        spec = "winetricks.spec"
+    }
+    labels {
+        subrepo = "extras"
+    }
+}
@@ -0,0 +1 @@
+rpm.version(gh("Winetricks/winetricks"));
@@ -0,0 +1,68 @@
+# Fedora sometimes sources the snapshots under stable versions and just bumps release
+# For user clarity I have separated these into different packages
+
+Name:           terra-winetricks
+Version:        20250102
+Release:        1%{?dist}
+Summary:        Winetricks built to be compatible with Terra WINE builds
+License:        LGPL-2.1-or-later
+URL:            https://github.com/Winetricks/winetricks
+Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
+BuildRequires:  desktop-file-utils
+BuildRequires:  gcc
+BuildRequires:  make
+Requires:       cabextract
+Requires:       gzip
+Requires:       unzip
+Requires:       wget
+Requires:       which
+Requires:       hicolor-icon-theme
+Requires:       (kdialog or zenity)
+Requires:       (wine-stable or wine-staging or wine-dev)
+Conflicts:      winetricks
+Conflicts:      winetricks-git
+BuildArch:      noarch
+# need arch-specific wine, not available everywhere:
+# - adopted from wine.spec
+ExclusiveArch:  %{ix86} x86_64 %{arm} aarch64
+ExcludeArch:    ppc64 ppc64le
+
+%description
+Winetricks is an easy way to work around common problems in Wine.
+
+It has a menu of supported games/apps for which it can do all the
+workarounds automatically. It also lets you install missing DLLs
+or tweak various Wine settings individually.
+
+
+%prep
+%setup -q -n winetricks-%{version}
+
+sed -i -e s:steam:: -e s:flash:: tests/*
+
+%build
+# Empty build section because RPM
+
+%install
+%make_install
+# some tarballs do not install appdata
+install -Dm0644 -t %{buildroot}%{_datadir}/metainfo src/io.github.winetricks.Winetricks.metainfo.xml
+
+%check
+desktop-file-validate %{buildroot}%{_datadir}/applications/winetricks.desktop
+
+
+%files
+%license COPYING
+%license debian/copyright
+%doc README.md
+%{_bindir}/winetricks
+%{_mandir}/man1/winetricks.1*
+%{_datadir}/applications/winetricks.desktop
+%{_datadir}/bash-completion/completions/winetricks
+%{_datadir}/icons/hicolor/scalable/apps/winetricks.svg
+%{_datadir}/metainfo/io.github.winetricks.Winetricks.metainfo.xml
+
+
+%changelog
+%autochangelog
@@ -1,6 +1,6 @@
 Name:           WoeUSB-ng
 Version:        0.2.12
-Release:        1%?dist
+Release:        2%?dist
 Summary:        Simple tool that enable you to create your own usb stick with Windows installer
 License:        GPL-3.0-only
 Requires:       parted dosfstools ntfsprogs p7zip p7zip-plugins xdg-utils grub2-tools
@@ -8,28 +8,44 @@ URL:            https://github.com/WoeUSB/WoeUSB-ng
 Source:         https://github.com/WoeUSB/WoeUSB-ng/archive/refs/tags/v%version.tar.gz
 Patch0:         https://patch-diff.githubusercontent.com/raw/WoeUSB/WoeUSB-ng/pull/79.patch
 BuildArch:      noarch
-BuildRequires:  python3-devel python3-installer
+Requires:       python3-%{name} = %{evr}
+BuildRequires:  anda-srpm-macros python3-devel python3-installer pyproject-rpm-macros python3dist(pip) python3dist(setuptools) python3dist(termcolor) python3dist(wxpython) python3dist(wheel)

 %global _description %{expand:
 WoeUSB-ng is a simple tool that enable you to create your own usb stick windows installer from an iso image or a real DVD. This is a rewrite of original WoeUSB.}

 %description %_description

+%package -n     python3-%{name}
+Summary:        Python files for %{name}
+Requires:       %{name} = %{evr}
+BuildArch:      noarch
+
+%description -n python3-%{name}
+Python files needed for %{name}.
+
 %prep
 %autosetup -p1

-
+%if 0%{?fedora} > 41
 %generate_buildrequires
 %pyproject_buildrequires
-
+%endif

 %build
+%if 0%{?fedora} <= 41
+%py3_build
+%else
 %pyproject_wheel
-
+%endif

 %install
+%if 0%{?fedora} <= 41
+%py3_install
+%else
 %pyproject_install
 %pyproject_save_files WoeUSB
+%endif
 install -Dpm644 miscellaneous/WoeUSB-ng.desktop %buildroot%_datadir/applications/WoeUSB-ng.desktop
 install -Dpm644 miscellaneous/com.github.woeusb.woeusb-ng.policy %buildroot%_datadir/polkit-1/actions/com.github.woeusb.woeusb-ng.policy

@@ -37,14 +53,21 @@ install -Dpm644 miscellaneous/com.github.woeusb.woeusb-ng.policy %buildroot%_dat
 %check
 #pyproject_check_import

-
-%files -f %{pyproject_files}
+%files
 %_bindir/woeusb
 %_bindir/woeusbgui
 %_datadir/applications/WoeUSB-ng.desktop
 %_iconsdir/hicolor/scalable/apps/woeusb-logo.png
 %_datadir/polkit-1/actions/com.github.woeusb.woeusb-ng.policy

+%if 0%{?fedora} <= 41
+%files -n python3-%{name}
+%{python3_sitelib}/WoeUSB/
+%{python3_sitelib}/woeusb_ng-%{version}-py%{python3_version}.egg-info/
+%else
+%files -n python3-%{name} -f %{pyproject_files}
+%endif
+

 %changelog
 %autochangelog
@@ -1,4 +1,5 @@
 project pkg {
+        arches = ["x86_64"]
    rpm {
        spec = "WoeUSB-ng.spec"
    }
@@ -12,8 +12,8 @@
 %global vendor_pnpm 1

 Name:           youtube-music
-Version:        3.7.5
-Release:        4%?dist
+Version:        3.9.0
+Release:        1%?dist
 Summary:        YouTube Music Desktop App bundled with custom plugins (and built-in ad blocker / downloader)
 Source1:        youtube-music.desktop
 License:        MIT
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`rpm.version(gh_tag("Milkshiift/GoofCord"));`
				`@@ -0,0 +1 @@`
				`rpm.version(gh("craftablescience/VPKEdit"));`