fix: envision (#1499 )

Fedora pushed a breaking change splitting the openssl-devel package into also openssl-devel-engine Signed-off-by: madomado <madonuko@outlook.com> (cherry picked from commit fd1bc4f96b)
bump: preview stable
2026-05-31 09:01:55 +00:00 · 2024-07-12 04:07:48 +00:00 · 2024-07-12 03:31:35 +00:00 · 2024-07-12 10:15:21 +08:00 · 2024-07-12 01:16:53 +00:00 · 2024-07-11 21:39:10 +00:00
230 changed files with 2340 additions and 621 deletions
@@ -0,0 +1,9 @@
+{
+  "repoOwner": "terrapkg",
+  "repoName": "packages",
+  "resetAuthor": true,
+  "targetBranchChoices": ["f38", "f39", "f40", "frawhide"],
+  "branchLabelMapping": {
+    "^sync-(.+)$": "$1"
+  }
+}
@@ -29,7 +29,7 @@ jobs:
      - name: Set workspace as safe
        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0
      - name: Generate build matrix
@@ -42,25 +42,18 @@ jobs:
        pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }}
        version: ["39"]
      fail-fast: false
-    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
+    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || matrix.pkg.labels['large'] && 'x86-64-lg' || 'ubuntu-latest' }}
    container:
      image: ghcr.io/terrapkg/builder:f${{ matrix.version}}
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0
      - name: Set up git repository
        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"

-      - name: Cache buildroot
-        id: br-cache
-        uses: actions/cache@v3
-        with:
-          path: /var/cache
-          key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}
-
      - name: Include custom build template instead of package default
        run: |
          cp -v anda/terra/mock-configs/terra.tpl /etc/mock/templates/terra.tpl
@@ -75,9 +68,10 @@ jobs:
          x=${NAME//\//@}
          echo "name=$x" >> $GITHUB_OUTPUT

-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
        with:
          name: ${{ steps.art.outputs.name }}
+          compression-level: 0 # The RPMs are already compressed :p
          path: |
            anda-build/rpm/rpms/*
            anda-build/rpm/srpm/*
@@ -21,7 +21,7 @@ jobs:
      - name: Install Anda
        run: cargo install anda

-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
        with:
          ref: f${{ matrix.version }}
          fetch-depth: 1
@@ -5,16 +5,41 @@ on:
      packages:
        description: "Packages to Build"
        required: true
+      custom_builder:
+        description: "Custom Builder"
+        required: false
+        default: ""
+      architecture:
+        description: "Architecture"
+        required: false
+        default: all
+        type: string
+    
+

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

  build:
    needs: parse
@@ -22,15 +47,15 @@ jobs:
      matrix:
        pkg: ${{ fromJson(needs.parse.outputs.pkgs) }}
        version: ["39"]
-        arch: ["x86_64", "aarch64"]
+        arch: ${{ fromJson(needs.parse.outputs.arch) }}
      fail-fast: false
-    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
+    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || needs.parse.outputs.builder && needs.parse.outputs.builder || 'ubuntu-latest' }}
    container:
      image: ghcr.io/terrapkg/builder:f${{ matrix.version }}
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0
      - name: Set up git repository
@@ -38,7 +63,7 @@ jobs:

      - name: Cache buildroot
        id: br-cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
        with:
          path: /var/cache
          key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.arch }}-${{ matrix.pkg }}
@@ -53,9 +78,10 @@ jobs:
          x=${NAME//\//@}
          echo "name=$x" >> $GITHUB_OUTPUT

-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
        with:
          name: ${{ steps.art.outputs.name }}
+          compression-level: 0 # The RPMs are already compressed :p
          path: |
            anda-build/rpm/rpms/*
            anda-build/rpm/srpm/*
@@ -19,7 +19,7 @@ jobs:
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0
      - name: Set up git repository
@@ -27,7 +27,7 @@ jobs:

      - name: Cache buildroot
        id: br-cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
        with:
          path: /var/cache
          key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}-${{ matrix.pkg.pkg }}
@@ -42,9 +42,10 @@ jobs:
          x=${NAME//\//@}
          echo "name=$x" >> $GITHUB_OUTPUT

-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
        with:
          name: ${{ steps.art.outputs.name }}
+          compression-level: 0 # The RPMs are already compressed :p
          path: |
            anda-build/rpm/rpms/*
            anda-build/rpm/srpm/*
@@ -17,6 +17,6 @@ jobs:
      image: ghcr.io/terrapkg/builder:f39
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
      - name: Lint spec files
        run: rpmlint $(find anda -type f -name "*.spec" -type f)
@@ -0,0 +1,37 @@
+name: Automatic backport/sync action
+
+on:
+  pull_request_target:
+    types: ["labeled", "closed"]
+
+jobs:
+  backport:
+    name: Backport/sync PR
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.merged
+    steps:
+      - name: Install SSH signing key
+        run: |
+          mkdir -p ${{ runner.temp }}
+          echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key
+          chmod 0700 ${{ runner.temp }}/signing_key
+
+      - name: Setup Raboneko Signing
+        run: |
+          git config --global gpg.format "ssh"
+          git config --global user.signingkey "${{ runner.temp }}/signing_key"
+          git config --global commit.gpgsign true
+
+      - name: Backport Action
+        uses: sorenlouv/backport-github-action@v9.3.0
+        with:
+          github_token: ${{ secrets.RABONEKO_BACKPORT_GITHUB_TOKEN }}
+          auto_backport_label_prefix: sync-
+
+      - name: Info log
+        if: ${{ success() }}
+        run: cat ~/.backport/backport.info.log
+
+      - name: Debug log
+        if: ${{ failure() }}
+        run: cat ~/.backport/backport.debug.log
@@ -16,7 +16,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0
          ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
@@ -16,7 +16,7 @@ jobs:
    container:
      image: ghcr.io/terrapkg/builder:f39
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
      - name: Push to subatomic
        run: |
          branch=${{ github.ref_name }}
@@ -12,7 +12,7 @@ jobs:
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0
          ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
@@ -12,7 +12,7 @@ jobs:
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0
          ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
@@ -1,6 +1,6 @@
 Name:			anki-bin
-Version:		23.12.1
-Release:		1%{?dist}
+Version:		24.06.3
+Release:		1%?dist
 Summary:		Flashcard program for using space repetition learning (Installed with wheel)
 License:		AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
 URL:			https://apps.ankiweb.net/
@@ -1,6 +1,6 @@
 Name:           anki-qt5
-Version:        23.12.1
-Release:        1%{?dist}
+Version:        24.06.3
+Release:        1%?dist
 Summary:        Flashcard program for using space repetition learning
 License:        AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
 URL:            https://apps.ankiweb.net/
@@ -22,7 +22,7 @@ Anki is based on a theory called spaced repetition.
 %prep
 git clone https://github.com/ankitects/anki .
 git checkout %version
-%patch1 -p1
+%patch 1 -p1

 # See https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=anki-qt5

@@ -1,6 +1,6 @@
 Name:           anki
-Version:        23.12.1
-Release:        1%{?dist}
+Version:        24.06.3
+Release:        1%?dist
 Summary:        Flashcard program for using space repetition learning
 License:        AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
 URL:            https://apps.ankiweb.net/
@@ -20,8 +20,10 @@ phrases in a foreign language) as easily, quickly and efficiently as possible.
 Anki is based on a theory called spaced repetition.

 %prep
+rm -rf *
 git clone https://github.com/ankitects/anki .
 git checkout %{version}
+%patch 0 -p1

 # See https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=anki

@@ -14,8 +14,8 @@
 %global __provides_exclude_from %{_datadir}/armcord/.*\\.so

 Name:			armcord-bin
-Version:		3.2.6
-Release:		1%{?dist}
+Version:		3.2.7
+Release:		1%?dist
 License:		OSL-3.0
 Summary:		Custom lightweight Discord client designed to enhance your experience
 URL:			https://github.com/ArmCord/ArmCord
@@ -26,6 +26,7 @@ Source2:		https://raw.githubusercontent.com/ArmCord/ArmCord/v%version/README.md
 Requires:		electron xdg-utils
 ExclusiveArch:	x86_64 aarch64 armv7l
 Conflicts:		armcord
+BuildRequires:	add-determinism

 %description
 ArmCord is a custom client designed to enhance your Discord experience
@@ -1,15 +1,15 @@
 %define debug_package %nil

 Name:		armcord
-Version:	3.2.6
-Release:	1%{?dist}
+Version:	3.2.7
+Release:	1%?dist
 License:	OSL-3.0
 Summary:	Custom lightweight Discord client designed to enhance your experience
 URL:		https://github.com/ArmCord/ArmCord
 Group:		Applications/Internet
 Source1:	launch.sh
 Requires:	electron xdg-utils
-BuildRequires:	nodejs-npm git
+BuildRequires:	nodejs-npm git add-determinism
 Conflicts:	armcord-bin
 BuildArch:	noarch

@@ -18,6 +18,7 @@ ArmCord is a custom client designed to enhance your Discord experience
 while keeping everything lightweight.

 %prep
+rm -rf *
 git clone %url .
 git checkout v%version

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

 Name:           discord-canary-openasar
-Version:        0.0.326
+Version:        0.0.452
 Release:        1%?dist
 Summary:        A snappier Discord rewrite with features like further customization and theming
 License:        MIT AND https://discord.com/terms
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-canary
-Version:        0.0.326
+Version:        0.0.452
 Release:        1%?dist
 Summary:        Free Voice and Text Chat for Gamers
 URL:            discord.com
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-openasar
-Version:        0.0.47
+Version:        0.0.59
 Release:        1%?dist
 Summary:        A snappier Discord rewrite with features like further customization and theming
 License:        MIT AND https://discord.com/terms
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-ptb-openasar
-Version:        0.0.76
+Version:        0.0.94
 Release:        1%?dist
 Summary:        A snappier Discord rewrite with features like further customization and theming
 License:        MIT AND https://discord.com/terms
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-ptb
-Version:        0.0.76
+Version:        0.0.94
 Release:        1%?dist
 Summary:        Free Voice and Text Chat for Gamers.
 URL:            https://discord.com
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:			discord
-Version:		0.0.47
+Version:		0.0.59
 Release:		1%?dist
 Summary:		Free Voice and Text Chat for Gamers
 URL:			https://discord.com
@@ -0,0 +1,5 @@
+project pkg {
+    rpm {
+        spec = "envision.spec"
+    }
+}
@@ -0,0 +1,46 @@
+%global commit 6cf5e40b96d1cbd99a3cfcef1f03899356e79448
+%global commit_date 20240703
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+
+Name:           envision
+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
+URL:            https://gitlab.com/gabmus/envision/
+Source0:        %url/-/archive/%commit/envision-%commit.tar.gz
+BuildRequires:  meson ninja-build cargo 
+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:  libappstream-glib
+BuildRequires:  desktop-file-utils
+BuildRequires:  glib2-devel
+Recommends:     android-tools
+
+%description
+%summary.
+
+%prep
+%autosetup -n envision-%commit
+
+%build
+%meson
+%meson_build
+
+%install
+%meson_install
+
+%files
+%doc README.md
+%license LICENSE
+%_bindir/envision
+%_datadir/applications/org.gabmus.envision.desktop
+%_datadir/envision/
+%_iconsdir/hicolor/scalable/apps/org.gabmus.envision.svg
+%_iconsdir/hicolor/symbolic/apps/org.gabmus.envision-symbolic.svg
+%_metainfodir/org.gabmus.envision.appdata.xml
@@ -0,0 +1,5 @@
+rpm.global("commit", gitlab_commit("gitlab.com", "46446166", "main"));
+if rpm.changed() {
+	rpm.global("commit_date", date());
+	rpm.release();
+}
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:			feishin
-Version:		0.6.1
+Version:		0.7.1
 Release:		1%?dist
 Summary:		A modern self-hosted music player
 License:		GPL-3.0
@@ -1,7 +1,7 @@
-%global commit 2af3a6e294e829191dfa0c41396ecd6384d405d9
+%global commit f470b63a04767ada809ae7d0c69c8f9ac4c80628
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240327
-%global ver v0.37.0
+%global commit_date 20240712
+%global ver v0.38.0

 Name:           mpv-nightly
 Version:        %ver^%commit_date.%shortcommit
@@ -0,0 +1,6 @@
+project pkg {
+    arches = ["x86_64"]
+    rpm {
+        spec = "mugshot.spec"
+    }
+}
@@ -0,0 +1,62 @@
+%global app org.bluesabre.Mugshot
+%global _description %{expand:
+Mugshot is a lightweight user configuration utility for Linux designed for simplicity and ease of
+use. Quickly update your personal profile and sync your updates across applications.}
+
+
+Name:           python-mugshot
+Version:        0.4.3
+Release:        1%?dist
+Summary:        User Management Utility for Linux
+License:        GPL-3.0
+URL:            https://github.com/bluesabre/mugshot
+Source0:        %url/archive/refs/tags/mugshot-%version.tar.gz
+BuildArch:      noarch
+BuildRequires:  python3-devel
+BuildRequires:  python3-pip
+BuildRequires:  python3-distutils-extra
+BuildRequires:  python3-wheel
+BuildRequires:  python3-setuptools
+BuildRequires:  glib2
+BuildRequires:  desktop-file-utils
+BuildRequires:  libappstream-glib
+
+%description %_description
+
+%package -n mugshot
+Requires:       util-linux-user
+Requires:       python3-cairo
+Requires:       python3-pexpect
+Requires:       python3-gobject
+Summary:        User Management Utility for Linux
+
+%description -n mugshot %_description
+
+%prep
+%autosetup -n mugshot-mugshot-%version
+
+%build
+%pyproject_wheel
+
+%install
+%pyproject_install
+%pyproject_save_files -L 'mugshot*'
+install -Dm644 data/glib-2.0/schemas/%{lower:%app}.gschema.xml %buildroot%_datadir/glib-2.0/schemas/
+
+%find_lang mugshot
+
+%check
+#pyproject_check_import
+desktop-file-validate %buildroot%_datadir/applications/%app.desktop
+appstream-util validate-relax --nonet %buildroot%_metainfodir/mugshot.appdata.xml
+
+%files -n mugshot -f %{pyproject_files} -f mugshot.lang
+%doc README.md NEWS
+%license COPYING
+%_bindir/mugshot
+%_datadir/glib-2.0/schemas/%{lower:%app}.gschema.xml
+%_datadir/applications/%app.desktop
+%_datadir/mugshot/
+%_metainfodir/mugshot.appdata.xml
+%_mandir/man1/mugshot.1.gz
+%_iconsdir/hicolor/*/apps/mugshot.svg
@@ -0,0 +1,3 @@
+let v = gh("bluesabre/mugshot");
+v.crop(8);
+rpm.version(v);
@@ -13,8 +13,8 @@
 %global crate sccache

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

 License:        Apache-2.0
@@ -0,0 +1,5 @@
+project pkg {
+  rpm {
+    spec = "tuxclocker.spec"
+  }
+}
@@ -0,0 +1,42 @@
+Name:           tuxclocker
+Version:        1.5.1
+Release:        1%?dist
+Summary:        Qt overclocking tool for GNU/Linux 
+License:        GPL-3.0
+URL:            https://github.com/Lurkki14/tuxclocker
+# boost qt5-qtbase qt5-qtcharts
+Requires:       hicolor-icon-theme
+BuildRequires:  git-core meson hwdata qt5-qttools gettext anda-srpm-macros
+BuildRequires:  boost-devel qt5-qtbase-devel qt5-qtcharts-devel libdrm-devel libXNVCtrl-devel openssl-devel
+Recommends:     xorg-x11-drv-nvidia libdrm libXNVCtrl hwdata
+
+%description
+TuxClocker is a hardware controlling and monitoring program.
+TuxClocker consists of a DBus daemon and a Qt GUI that uses the daemon.
+
+%prep
+git clone --recursive %url .
+git checkout %version
+
+%build
+%meson
+%meson_build
+
+%install
+%meson_install
+
+%files
+%doc README.md
+%license LICENSE
+%_bindir/tuxclocker-qt
+%_bindir/tuxclockerd
+%_libdir/libtuxclocker.so
+%_libdir/tuxclocker/
+%_datadir/applications/tuxclocker.desktop
+%_datadir/dbus-1/system-services/org.tuxclocker.service
+%_datadir/dbus-1/system.d/org.tuxclocker.conf
+%_datadir/locale/*/LC_MESSAGES/tuxclocker.mo
+%_iconsdir/hicolor/scalable/apps/tuxclocker-logo.svg
+
+%changelog
+%autochangelog
@@ -0,0 +1 @@
+rpm.version(gh("Lurkki14/tuxclocker"));
@@ -6,7 +6,7 @@

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

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

 Name:           compiz9
@@ -3,8 +3,8 @@

 Name:           elementary-calculator
 Summary:        Calculator app designed for elementary
-Version:        2.0.3
-Release:        1%{?dist}
+Version:        8.0.0
+Release:        1%?dist
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/%{srcname}
@@ -3,8 +3,8 @@

 Name:           elementary-capnet-assist
 Summary:        Captive Portal Assistant for elementary
-Version:        2.4.4
-Release:        2%{?dist}
+Version:        8.0.0
+Release:        1%?dist
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/capnet-assist
@@ -21,10 +21,13 @@ BuildRequires:  pkgconfig(gcr-ui-3)
 BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gobject-2.0)
-BuildRequires:  pkgconfig(granite)
+BuildRequires:  pkgconfig(granite-7)
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(libhandy-1) >= 1.0.0
 BuildRequires:  pkgconfig(webkit2gtk-4.1)
+BuildRequires:  pkgconfig(gcr-4)
+BuildRequires:  pkgconfig(libadwaita-1)
+BuildRequires:  pkgconfig(webkitgtk-6.0)
 BuildRequires:  fdupes

 Requires:       NetworkManager
@@ -3,8 +3,8 @@

 Name:           elementary-icon-theme
 Summary:        Icons from the Elementary Project
-Version:        7.3.1
-Release:        2%{?dist}
+Version:        8.0.0
+Release:        1%?dist
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/icons
@@ -5,16 +5,13 @@

 Name:           elementary-photos
 Summary:        Photo manager and viewer from elementary
-Version:        2.8.0
-Release:        2%?dist
+Version:        8.0.0
+Release:        1%?dist
 License:        LGPL-2.0-or-later

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

-# RIP the publishing plugins (sorry for the "wide" patch, having issues with just the relevant commits)
-Patch0:         https://github.com/elementary/photos/compare/7261606a05d1f41116aba5c86b62d1f739419ed1..09e55943b266bc2861b913251cb834169d81743e.patch
-
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
@@ -22,6 +19,7 @@ BuildRequires:  meson >= 0.46.0
 BuildRequires:  vala
 BuildRequires:  fdupes
 BuildRequires:  git-core
+BuildRequires:  cmake

 BuildRequires:  pkgconfig(gee-0.8) >= 0.8.5
 BuildRequires:  pkgconfig(geocode-glib-2.0)
@@ -43,6 +41,8 @@ BuildRequires:  pkgconfig(libhandy-1)
 BuildRequires:  pkgconfig(libraw) >= 0.13.2
 BuildRequires:  pkgconfig(libwebp) >= 0.4.4
 BuildRequires:  pkgconfig(sqlite3) >= 3.5.9
+BuildRequires:  pkgconfig(libportal)
+BuildRequires:  pkgconfig(libportal-gtk3)

 Requires:       hicolor-icon-theme

@@ -53,7 +53,6 @@ Foundation.

 %prep
 %autosetup -n %{srcname}-%{version} -N
-git apply %PATCH0 # The .patch file has Git binary patches, so we need to apply it manually with Git


 %build
@@ -75,10 +74,10 @@ desktop-file-validate \
    %{buildroot}/%{_datadir}/applications/%{appname}.desktop

 desktop-file-validate \
-    %{buildroot}/%{_datadir}/applications/%{appname}-viewer.desktop
+    %{buildroot}/%{_datadir}/applications/%{appname}.viewer.desktop

 appstream-util validate-relax --nonet \
-    %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
+    %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml


 %files -f %{appname}.lang
@@ -92,11 +91,11 @@ appstream-util validate-relax --nonet \
 %{_libexecdir}/%{appname}/

 %{_datadir}/applications/%{appname}.desktop
-%{_datadir}/applications/%{appname}-viewer.desktop
+%{_datadir}/applications/%{appname}.viewer.desktop
 %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
 %{_datadir}/icons/hicolor/*/apps/%{appname}.svg
-%{_datadir}/icons/hicolor/*/apps/%{appname}-viewer.svg
-%{_datadir}/metainfo/%{appname}.appdata.xml
+%{_datadir}/icons/hicolor/*/apps/%{appname}.viewer.svg
+%{_datadir}/metainfo/%{appname}.metainfo.xml


 %changelog
@@ -3,8 +3,8 @@

 Name:           elementary-shortcut-overlay
 Summary:        Native, OS-wide shortcut overlay
-Version:        2.0.1
-Release:        %autorelease
+Version:        8.0.0
+Release:        1%?dist
 License:        GPL-3.0

 URL:            https://github.com/elementary/shortcut-overlay
@@ -49,7 +49,7 @@ desktop-file-validate \
    %{buildroot}/%{_datadir}/applications/%{appname}.desktop

 appstream-util validate-relax --nonet \
-    %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
+    %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml


 %files -f %{appname}.lang
@@ -59,7 +59,7 @@ appstream-util validate-relax --nonet \
 %{_bindir}/%{appname}

 %{_datadir}/applications/%{appname}.desktop
-%{_datadir}/metainfo/%{appname}.appdata.xml
+%{_datadir}/metainfo/%{appname}.metainfo.xml


 %changelog
@@ -3,8 +3,8 @@
 
 Name:           elementary-sideload
 Summary:        Sideload flatpaks on Pantheon
-Version:        6.2.1
-Release:        1%{?dist}
+Version:        6.2.2
+Release:        1%?dist
 License:        GPL-3.0-or-later
 
 URL:            https://github.com/elementary/sideload
@@ -3,8 +3,8 @@

 Name:           elementary-theme
 Summary:        Elementary GTK+ Stylesheet
-Version:        7.3.0
-Release:        1%{?dist}
+Version:        8.0.0
+Release:        1%?dist
 License:        GPL-3.0

 URL:            https://github.com/elementary/stylesheet
@@ -3,8 +3,9 @@
 Name:           gala
 Summary:        Gala window manager
 Version:        7.1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPL-3.0-or-later
+Epoch:          1

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

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

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

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

 %description    devel
 Gala is Pantheon's Window Manager, part of the elementary project.
@@ -5,8 +5,8 @@ apps built for elementary.}

 Name:           granite-7
 Summary:        Elementary companion library for GTK+ and GLib
-Version:        7.4.0
-Release:        1%{?dist}
+Version:        7.5.0
+Release:        1%?dist
 License:        LGPL-3.0-or-later

 URL:            https://github.com/elementary/granite
@@ -82,6 +82,7 @@ desktop-file-validate \

 %{_datadir}/metainfo/granite-7.metainfo.xml
 %{_datadir}/icons/hicolor/*/apps/io.elementary.granite-7.svg
+%{_datadir}/themes/Granite/


 %files devel
@@ -3,8 +3,8 @@

 Name:           pantheon-agent-polkit
 Summary:        Pantheon Polkit Agent
-Version:        1.0.5
-Release:        1%{?dist}
+Version:        8.0.0
+Release:        1%?dist
 License:        LGPL-2.0-or-later

 URL:            https://github.com/elementary/%{name}
@@ -18,10 +18,12 @@ BuildRequires:  vala >= 0.34.1
 BuildRequires:  fdupes

 BuildRequires:  pkgconfig(glib-2.0) >= 2.32.0
-BuildRequires:  pkgconfig(granite) >= 6.0.0
-BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(polkit-agent-1)
 BuildRequires:  pkgconfig(polkit-gobject-1)
+BuildRequires:  pkgconfig(libadwaita-1)
+BuildRequires:  pkgconfig(gobject-2.0)
+BuildRequires:  pkgconfig(granite-7)
+BuildRequires:  pkgconfig(gtk4)

 %description
 An agent for Polkit authorization designed for Pantheon.
@@ -50,7 +52,7 @@ desktop-file-validate \
    %{buildroot}/%{_datadir}/applications/%{appname}.desktop

 appstream-util validate-relax --nonet \
-    %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
+    %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml


 %files -f %{appname}.lang
@@ -62,7 +64,7 @@ appstream-util validate-relax --nonet \
 %{_libexecdir}/policykit-1-pantheon/

 %{_datadir}/applications/%{appname}.desktop
-%{_datadir}/metainfo/%{appname}.appdata.xml
+%{_datadir}/metainfo/%{appname}.metainfo.xml


 %changelog
@@ -1,5 +0,0 @@
-project pkg {
-	rpm {
-		spec = "pantheon-tweaks.spec"
-	}
-}
@@ -1,37 +0,0 @@
-Name:			pantheon-tweaks
-Version:		1.1.2
-Release:		1%{?dist}
-Summary:		A system settings panel for the Pantheon desktop environment
-License:		GPL-3.0
-URL:			https://github.com/pantheon-tweaks/pantheon-tweaks
-Source0:		%{url}/archive/refs/tags/%{version}.tar.gz
-BuildRequires:	vala switchboard-devel pkgconfig(gee-0.8) pkgconfig(glib-2.0)
-BuildRequires:	granite-devel >= 6.0.0 pkgconfig(gtk+-3.0) meson vala
-Requires:		gtk3 granite
-
-%description
-A system settings panel for the Pantheon Desktop that
-lets you easily and safely customise your desktop's appearance.
-
-%prep
-%autosetup
-
-%build
-%meson
-%meson_build
-
-%install
-%meson_install
-
-%files
-%doc README.md
-%license COPYING
-/usr/lib64/switchboard/personal/libpantheon-tweaks.so
-%{_datadir}/icons/hicolor/32x32/categories/preferences-desktop-tweaks.svg
-%{_datadir}/locale/*/LC_MESSAGES/pantheon-tweaks-plug.mo
-%{_datadir}/metainfo/pantheon-tweaks.metainfo.xml
-
-
-%changelog
-* Tue Jan 17 2023 windowsboy111 <windowsboy111@fyralabs.com> - 1.0.4-1
- Initial package
@@ -1 +0,0 @@
-rpm.version(gh("pantheon-tweaks/pantheon-tweaks"));
@@ -2,16 +2,20 @@

 %global plug_type personal
 %global plug_name pantheon-tweaks
+%global app io.github.pantheon_tweaks.pantheon-tweaks

 Name:           switchboard-plug-tweaks
 Summary:        Switchboard Tweaks Plug
-Version:        1.1.2
-Release:        1%{?dist}
+Version:        2.0.2
+Release:        2%?dist
 License:        GPL-3.0-or-later

 URL:            https://github.com/pantheon-tweaks/pantheon-tweaks
 Source0:        %{url}/archive/%{version}/%{plug_name}-%{version}.tar.gz

+Provides:       pantheon-tweaks = %version-%release
+Obsoletes:      pantheon-tweaks < 2.0.2-2
+
 BuildRequires:  gcc
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
@@ -22,7 +26,7 @@ BuildRequires:  pkgconfig(gee-0.8)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(granite) >= 6.0.0
 BuildRequires:  pkgconfig(gtk+-3.0)
-BuildRequires:  pkgconfig(switchboard-2.0)
+BuildRequires:  pkgconfig(switchboard-3)

 Requires:       switchboard%{?_isa}

@@ -63,28 +67,22 @@ de trabalho.
 %install
 %meson_install

-%find_lang %{plug_name}-plug
+%find_lang %{plug_name}

 # remove the specified stock icon from metainfo (invalid in libappstream-glib)
-sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{plug_name}.metainfo.xml
+sed -i '/icon type="stock"/d' %buildroot%_metainfodir/%app.metainfo.xml

 %check
-appstream-util validate-relax --nonet \
-    %{buildroot}/%{_datadir}/metainfo/%{plug_name}.metainfo.xml
+appstream-util validate-relax --nonet %buildroot%_metainfodir/%app.metainfo.xml


-%files -f %{plug_name}-plug.lang
+%files -f %{plug_name}.lang
 %license COPYING
 %doc README.md
 %doc AUTHORS
 %doc CONTRIBUTORS

-%{_libdir}/switchboard/%{plug_type}/lib%{plug_name}.so
-
-%{_datadir}/metainfo/%{plug_name}.metainfo.xml
-%{_datadir}/icons/hicolor/*/categories/preferences-*.svg
-
-
-%changelog
-* Sat Oct 15 2022 windowsboy111 <windowsboy111@fyralabs.com>
- Repackaged for Terra
+%_bindir/pantheon-tweaks
+%_datadir/applications/%app.desktop
+%_iconsdir/hicolor/*/apps/%app.svg
+%_metainfodir/io.github.pantheon_tweaks.pantheon-tweaks.metainfo.xml
@@ -4,11 +4,11 @@

 %global plug_type hardware
 %global plug_name wacom
-%global plug_rdnn io.elementary.switchboard.wacom
+%global plug_rdnn io.elementary.settings.wacom

 Name:           switchboard-plug-wacom
 Summary:        Switchboard Wacom Plug
-Version:        1.0.1
+Version:        8.0.0
 Release:        1%?dist
 License:        GPL-3.0-or-later

@@ -25,7 +25,7 @@ BuildRequires:  pkgconfig(libwacom)
 BuildRequires:  pkgconfig(gudev-1.0)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xi)
-BuildRequires:  switchboard-devel
+BuildRequires:  pkgconfig(switchboard-3)

 Requires:       switchboard%{?_isa}
 Supplements:    switchboard%{?_isa}
@@ -45,22 +45,18 @@ Supplements:    switchboard%{?_isa}
 %install
 %meson_install

-%find_lang %{plug_name}-plug
+%find_lang %{plug_rdnn}


 %check
 appstream-util validate-relax --nonet \
-    %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
+    %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml


-%files -f %{plug_name}-plug.lang
+%files -f %{plug_rdnn}.lang
 %doc README.md
 %license COPYING

-%{_libdir}/switchboard/%{plug_type}/lib%{plug_name}.so
+%{_libdir}/switchboard-3/%{plug_type}/lib%{plug_name}.so

-%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
-
-%changelog
-* Tue Jun 13 2023 windowsboy111 <windowsboy111@fyralabs.com> - 1.0.1-1
- Initial package.
+%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml
@@ -1,10 +1,10 @@
 %global srcname switchboard
-%global appname io.elementary.switchboard
+%global appname io.elementary.settings

 Name:           switchboard
 Summary:        Modular Desktop Settings Hub
-Version:        6.0.2
-Release:        1%{?dist}
+Version:        8.0.0
+Release:        1%?dist
 License:        LGPL-2.0-or-later

 URL:            https://github.com/elementary/%{name}
@@ -16,12 +16,10 @@ BuildRequires:  libappstream-glib
 BuildRequires:  meson
 BuildRequires:  vala

-BuildRequires:  pkgconfig(gee-0.8)
-BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(granite) >= 5.4.0
-BuildRequires:  pkgconfig(gtk+-3.0)
-BuildRequires:  pkgconfig(libhandy-1) >= 0.83.0
-BuildRequires:  fdupes
+BuildRequires:  pkgconfig(granite-7)
+BuildRequires:  pkgconfig(gtk4)
+BuildRequires:  pkgconfig(libadwaita-1)
+BuildRequires:  fdupes sassc

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

@@ -92,7 +90,7 @@ appstream-util validate-relax --nonet \

 %{_datadir}/applications/%{appname}.desktop
 %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
-%{_datadir}/icons/hicolor/*/apps/%{appname}.svg
+%{_iconsdir}/hicolor/*/apps/%{appname}.svg
 %{_datadir}/metainfo/%{appname}.appdata.xml

 %files libs
@@ -102,19 +100,14 @@ appstream-util validate-relax --nonet \
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/*

-%{_libdir}/lib%{name}-2.0.so.0
-%{_libdir}/lib%{name}-2.0.so.2.0
+%{_libdir}/lib%{name}-3.so.0
+%{_libdir}/lib%{name}-3.so.2.0

 %files devel
-%{_includedir}/%{name}-2.0/
+%{_includedir}/%{name}-3/

-%{_libdir}/lib%{name}-2.0.so
-%{_libdir}/pkgconfig/%{name}-2.0.pc
+%{_libdir}/lib%{name}-3.so
+%{_libdir}/pkgconfig/%{name}-3.pc

-%{_datadir}/vala/vapi/%{name}-2.0.deps
-%{_datadir}/vala/vapi/%{name}-2.0.vapi
-
-
-%changelog
-* Sat Oct 15 2022 windowsboy111 <windowsboy111@fyralabs.com> - 6.0.2-1
- Repackaged for Terra
+%{_datadir}/vala/vapi/%{name}-3.deps
+%{_datadir}/vala/vapi/%{name}-3.vapi
@@ -9,6 +9,7 @@ Summary:        Stylish top panel
 Version:        3.0.5
 Release:        1%{?dist}
 License:        GPL-2.0-or-later
+Epoch:          1

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

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

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

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

 %description    libs %{common_description}

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

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

 %description    devel %{common_description}

@@ -1,9 +1,9 @@
 # from Fedora upstream
 %global extension   pop-shell
 %global uuid        %{extension}@system76.com
-%global commit      5fa3a500152b5131afbcbb4cfcd4a0db2fd0f063
+%global commit      9418d0a9af7c9b30b61ac3eeb5ca432a3ad3e651
 %global shortcommit %{lua:print(macros.commit:sub(1,7))}
-%global commit_date 20240327
+%global commit_date 20240401
 %global ver         1.2.0

 Name:           terra-gnome-shell-extension-%{extension}
@@ -1,5 +1,5 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-app-launch
-%global commit 0011f74e9377fcde3166374b05301444131ac0e5
+%global commit af441bdb31bb76b207119a8c91eef3fa93c0c078
 %forgemeta

 Name:           lomiri-app-launch
@@ -1,5 +1,5 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings
-%global commit bac3baa2876c61fe2963ad5e861f574d4b9c4402
+%global commit aacd2e4704112468b44332e8c8b1f7445651b8da
 %forgemeta

 Name:       lomiri-system-settings
@@ -1,4 +1,5 @@
 rpm.version(gitlab_tag("19057685"));
 if rpm.changed() {
-	rpm.global("commit", gitlab_commit("19057685"));
+	rpm.global("commit", gitlab_commit("19057685", "main"));
+	rpm.release();
 }
@@ -1,4 +1,4 @@
-%global rn 3
+%global rn 4

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

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

 Name:		unity-shell
 Version:	7.7.0
@@ -1,7 +1,7 @@
 Name:       ayatana-indicator-datetime
 Summary:    A GTK implementation of the StatusNotifierItem Specification
-Version:    24.2.0
-Release:    1%{?dist}
+Version:    24.5.0
+Release:    1%?dist
 License:    GPL-3.0
 URL:        https://github.com/AyatanaIndicators/ayatana-indicator-datetime
 Source0:    %{url}/archive/refs/tags/%{version}.tar.gz
@@ -1,7 +1,7 @@
 Name:       ayatana-indicator-messages
 Summary:    Ayatana Indicator Messages Applet
-Version:    23.10.0
-Release:    %autorelease
+Version:    24.5.0
+Release:    1%?dist
 License:    GPLv3
 URL:        https://github.com/AyatanaIndicators/ayatana-indicator-messages
 Source0:    %{url}/archive/refs/tags/%{version}.tar.gz
@@ -1,7 +1,7 @@
 Name:       ayatana-indicator-notifications
 Summary:    Ayatana Indicator Notifications Applet
-Version:    23.10.0
-Release:    1%{?dist}
+Version:    23.10.1
+Release:    1%?dist
 License:    GPL-3.0
 URL:        https://github.com/AyatanaIndicators/ayatana-indicator-notifications
 Source0:    %{url}/archive/refs/tags/%{version}.tar.gz
@@ -1,6 +1,6 @@
 Name:       ayatana-indicator-session
 Summary:    Ayatana Indicator Session Applet
-Version:    24.2.0
+Version:    24.5.0
 Release:    1%?dist
 License:    GPL-3.0
 URL:        https://github.com/AyatanaIndicators/ayatana-indicator-session
@@ -1,7 +1,7 @@
 Name:       ayatana-indicator-sound
 Summary:    Ayatana Indicator Sound Applet
-Version:    23.10.3
-Release:    1%{?dist}
+Version:    24.5.0
+Release:    1%?dist
 License:    GPLv3
 URL:        https://github.com/AyatanaIndicators/ayatana-indicator-sound
 Source0:    %{url}/archive/refs/tags/%{version}.tar.gz
@@ -0,0 +1,6 @@
+project pkg {
+  arches = ["x86_64"]
+  rpm {
+    spec = "asar.spec"
+  }
+}
@@ -0,0 +1,41 @@
+%define debug_package %nil
+%define __strip /bin/true
+%global _build_id_links none
+
+# Exclude private libraries
+%global __requires_exclude libffmpeg.so
+%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
+
+Name:           asar
+Version:        3.2.10
+Release:        1%?dist
+Summary:        Simple extensive tar-like archive format with indexing
+License:        MIT
+URL:            https://github.com/electron/asar
+Source0:        %url/archive/refs/tags/v%version.tar.gz
+Requires:       nodejs
+BuildRequires:  nodejs-npm
+BuildArch:      noarch
+
+%description
+Asar is a simple extensive archive format, it works like `tar` that concatenates all files
+together without compression, while having random access support.
+
+%prep
+%autosetup
+
+%build
+
+%install
+mkdir -p %buildroot%_bindir
+PATH="$PATH:%buildroot%_bindir"
+npm install -g --prefix %buildroot%_prefix %SOURCE0
+
+%files
+%doc README.md
+%license LICENSE.md
+%_bindir/asar
+%_prefix/lib/node_modules/@electron/asar/
+
+%changelog
+%autochangelog
@@ -0,0 +1 @@
+rpm.version(gh("electron/asar"));
@@ -0,0 +1,6 @@
+project pkg {
+    arches = ["x86_64"]
+    rpm {
+        spec = "codium-marketplace.spec"
+    }
+}
@@ -0,0 +1,47 @@
+# ref: https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=vscodium-marketplace
+
+Name:       codium-marketplace
+Version:    1.65.0
+Release:    1%?dist
+Summary:    Enable vscode marketplace in vscodium
+License:    MIT
+BuildArch:  noarch
+URL:        https://marketplace.visualstudio.com/vscode
+Requires:   codium sed
+
+%description
+This package replaces the default marketplace (https://open-vsx.org/)
+to the official one used by vscode.
+
+%install
+touch dummy
+install -Dm644 dummy %buildroot/tmp/terra-codium-marketplace-dummy-file
+
+%posttrans
+if [ $1 -gt 1 ]; then  # update/install
+  sed -i -e 's/^[[:blank:]]*"serviceUrl":.*/    "serviceUrl": "https:\/\/marketplace.visualstudio.com\/_apis\/public\/gallery",/' \
+    -e '/^[[:blank:]]*"cacheUrl/d' \
+    -e '/^[[:blank:]]*"serviceUrl/a\    "cacheUrl": "https:\/\/vscode.blob.core.windows.net\/gallery\/index",' \
+    -e 's/^[[:blank:]]*"itemUrl":.*/    "itemUrl": "https:\/\/marketplace.visualstudio.com\/items"/' \
+    -e '/^[[:blank:]]*"linkProtectionTrustedDomains/d' \
+    /usr/share/codium/resources/app/product.json || true
+fi
+
+%preun
+sed -i -e 's/^[[:blank:]]*"serviceUrl":.*/    "serviceUrl": "https:\/\/open-vsx.org\/vscode\/gallery",/' \
+  -e '/^[[:blank:]]*"cacheUrl/d' \
+  -e 's/^[[:blank:]]*"itemUrl":.*/    "itemUrl": "https:\/\/open-vsx.org\/vscode\/item"/' \
+  -e '/^[[:blank:]]*"linkProtectionTrustedDomains/d' \
+  -e '/^[[:blank:]]*"documentationUrl/i\  "linkProtectionTrustedDomains": ["https://open-vsx.org"],' \
+  /usr/share/codium/resources/app/product.json || true
+
+%triggerin -- codium
+sed -i -e 's/^[[:blank:]]*"serviceUrl":.*/    "serviceUrl": "https:\/\/marketplace.visualstudio.com\/_apis\/public\/gallery",/' \
+  -e '/^[[:blank:]]*"cacheUrl/d' \
+  -e '/^[[:blank:]]*"serviceUrl/a\    "cacheUrl": "https:\/\/vscode.blob.core.windows.net\/gallery\/index",' \
+  -e 's/^[[:blank:]]*"itemUrl":.*/    "itemUrl": "https:\/\/marketplace.visualstudio.com\/items"/' \
+  -e '/^[[:blank:]]*"linkProtectionTrustedDomains/d' \
+  /usr/share/codium/resources/app/product.json || true
+
+%files
+/tmp/terra-codium-marketplace-dummy-file
@@ -12,7 +12,7 @@
 %endif

 Name:			codium
-Version:		1.87.2.24072
+Version:		1.91.1.24193
 Release:		1%?dist
 Summary:		Code editing. Redefined.
 License:		MIT
@@ -28,6 +28,8 @@ VSCodium is a new choice of tool that combines the simplicity of a code editor
 with what developers need for the core edit-build-debug cycle.

 %prep
+mkdir stuff
+cd stuff
 tar xf %SOURCE0

 cat <<EOF > vscodium-bin-uri-handler.desktop
@@ -70,6 +72,7 @@ EOF
 %build

 %install
+cd stuff
 mkdir -p %buildroot%_datadir/doc/%name/ %buildroot%_datadir/licenses/%name
 install -Dm644 %SOURCE1 %buildroot%_docdir/%name/
 install -Dm644 %SOURCE2 %buildroot%_datadir/licenses/%name/
@@ -1,5 +1,5 @@
 Name:			flutter
-Version:		3.19.4
+Version:		3.22.2
 Release:		1%?dist
 Summary:		SDK for crafting beautiful, fast user experiences from a single codebase
 License:		BSD-3-Clause
@@ -1,13 +1,14 @@
 %define debug_package %nil

 Name:		neovide
-Version:	0.12.2
-Release:	1%{?dist}
+Version:	0.13.1
+Release:	1%?dist
 Summary:	No Nonsense Neovim Client in Rust
 License:	MIT
 URL:		https://neovide.dev/
 Source0:	https://github.com/neovide/neovide/archive/refs/tags/%version.tar.gz
-Requires:	neovim fontconfig freetype libglvnd
+Requires:	fontconfig freetype libglvnd
+Requires:	neovim > 0.9.5
 BuildRequires:	anda-srpm-macros cargo-rpm-macros >= 24 cmake gtk3 python3 SDL2
 BuildRequires:	fontconfig-devel freetype-devel libX11-xcb libX11-devel libstdc++-static libstdc++-devel
 ExclusiveArch:	x86_64
@@ -1,6 +1,6 @@
 Name:		terra-rgbds
-Version:	0.7.0
-Release:	1%{?dist}
+Version:	0.8.0
+Release:	1%?dist
 Summary:	A development package for the Game Boy, including an assembler

 # See LICENSE for details
@@ -0,0 +1,9 @@
+project pkg {
+  rpm {
+    spec = "zed-nightly.spec"
+  }
+  labels {
+    nightly = 1
+    large = 1
+  }
+}
@@ -0,0 +1,9 @@
+if filters.contains("nightly") {
+  rpm.global("commit", gh_commit("zed-industries/zed"));
+  if rpm.changed() {
+    let v = find("\nversion = \"([.\\d]+)\"\n", gh_rawfile("zed-industries/zed", "main", "crates/zed/Cargo.toml"), 1);
+    rpm.global("ver", v);
+    rpm.global("commit_date", date());
+    rpm.release();
+  }
+}
@@ -0,0 +1,97 @@
+%global commit 0129d4e2506d5ec5e50ef0968382770b9abec390
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commit_date 20240619
+%global ver 0.142.0
+
+%bcond_without check
+
+# Exclude input files from mangling
+%global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$
+
+%global crate zed
+%global app_id dev.zed.Zed-Nightly
+
+Name:           zed-nightly
+Version:        %ver^%commit_date.%shortcommit
+Release:        1%?dist
+Summary:        Zed is a high-performance, multiplayer code editor
+
+License:        MIT
+URL:            https://zed.dev/
+Source0:        https://github.com/zed-industries/zed/archive/%{commit}.zip
+
+Conflicts:      zed
+Provides:       zed
+
+BuildRequires:  cargo-rpm-macros >= 24
+BuildRequires:  anda-srpm-macros
+BuildRequires:  gcc
+BuildRequires:  g++
+BuildRequires:  clang
+BuildRequires:  mold
+BuildRequires:  alsa-lib-devel
+BuildRequires:  fontconfig-devel
+BuildRequires:  wayland-devel
+BuildRequires:  libxkbcommon-x11-devel
+BuildRequires:  openssl-devel
+BuildRequires:  libzstd-devel
+BuildRequires:  perl-FindBin
+BuildRequires:  perl-IPC-Cmd
+BuildRequires:  perl-File-Compare
+BuildRequires:  perl-File-Copy
+BuildRequires:  perl-lib
+BuildRequires:  vulkan-loader
+
+%description
+Code at the speed of thought - Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
+
+%prep
+%autosetup -n %{crate}-%{commit} -p1
+%cargo_prep_online
+
+export DO_STARTUP_NOTIFY="true"
+export APP_ID="%app_id"
+export APP_ICON="%app_id"
+export APP_NAME="Zed Nightly"
+export APP_CLI="zed"
+export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed Nightly from Terra."
+export ZED_RELEASE_CHANNEL=nightly
+export BRANDING_LIGHT="#e9aa6a"
+export BRANDING_DARK="#1a5fb4"
+
+echo "StartupWMClass=$APP_ID" >> crates/zed/resources/zed.desktop.in
+envsubst < "crates/zed/resources/zed.desktop.in" > $APP_ID.desktop # from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=zed-git#n52
+
+envsubst < "crates/zed/resources/flatpak/zed.metainfo.xml.in" > $APP_ID.metainfo.xml
+
+%build
+export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed Nightly from Terra."
+echo "nightly" > crates/zed/RELEASE_CHANNEL
+
+%cargo_build -- --package zed --package cli
+script/generate-licenses
+
+%install
+install -Dm755 target/rpm/zed %{buildroot}%{_libexecdir}/zed-editor
+install -Dm755 target/rpm/cli %{buildroot}%{_bindir}/zed
+
+install -Dm644 %app_id.desktop %{buildroot}%{_datadir}/applications/%app_id.desktop
+install -Dm644 crates/zed/resources/app-icon-nightly.png %{buildroot}%{_datadir}/pixmaps/%app_id.png
+
+install -Dm644 %app_id.metainfo.xml %{buildroot}%{_metainfodir}/%app_id.metainfo.xml
+
+%if %{with check}
+%check
+%cargo_test
+%endif
+
+%files
+%{_libexecdir}/zed-editor
+%{_bindir}/zed
+%{_datadir}/applications/%app_id.desktop
+%{_datadir}/pixmaps/%app_id.png
+%{_metainfodir}/%app_id.metainfo.xml
+%license assets/licenses.md
+
+%changelog
+%autochangelog
@@ -0,0 +1,8 @@
+project pkg {
+  rpm {
+    spec = "zed-preview.spec"
+  }
+  labels {
+    large = 1
+  }
+}
@@ -0,0 +1,14 @@
+let releases = "https://api.github.com/repos/zed-industries/zed/releases".get().json_arr();
+for release in releases {
+  if !release.prerelease {
+    continue;
+  }
+  let tag = release.tag_name;
+  tag.pop(4); // remove the "-pre" suffix
+  tag.crop(1); // remove "v"
+  rpm.global("ver", tag);
+  break;
+  if rpm.changed() {
+    rpm.release();
+  }
+}
@@ -0,0 +1,91 @@
+%bcond_without check
+%global debug_package %{nil}
+%global ver 0.144.2
+
+%global crate zed
+%global app_id dev.zed.Zed-Preview
+
+Name:           zed-preview
+Version:        %ver
+Release:        pre1%?dist
+Summary:        Zed is a high-performance, multiplayer code editor
+
+License:        MIT
+URL:            https://zed.dev/
+Source0:        https://github.com/zed-industries/zed/archive/refs/tags/v%{ver}-pre.tar.gz
+
+Conflicts:      zed
+Provides:       zed
+
+BuildRequires:  cargo-rpm-macros >= 24
+BuildRequires:  anda-srpm-macros
+BuildRequires:  gcc
+BuildRequires:  g++
+BuildRequires:  clang
+BuildRequires:  mold
+BuildRequires:  alsa-lib-devel
+BuildRequires:  fontconfig-devel
+BuildRequires:  wayland-devel
+BuildRequires:  libxkbcommon-x11-devel
+BuildRequires:  openssl-devel
+BuildRequires:  libzstd-devel
+BuildRequires:  perl-FindBin
+BuildRequires:  perl-IPC-Cmd
+BuildRequires:  perl-File-Compare
+BuildRequires:  perl-File-Copy
+BuildRequires:  perl-lib
+BuildRequires:  vulkan-loader
+
+%description
+Code at the speed of thought - Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
+
+%prep
+%autosetup -n %{crate}-%{ver}-pre -p1
+%cargo_prep_online
+
+export DO_STARTUP_NOTIFY="true"
+export APP_ID="%app_id"
+export APP_ICON="%app_id"
+export APP_NAME="Zed Preview"
+export APP_CLI="zed"
+export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed Preview from Terra."
+export ZED_RELEASE_CHANNEL=preview
+export BRANDING_LIGHT="#99c1f1"
+export BRANDING_DARK="#1a5fb4"
+
+echo "StartupWMClass=$APP_ID" >> crates/zed/resources/zed.desktop.in
+envsubst < "crates/zed/resources/zed.desktop.in" > $APP_ID.desktop # from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=zed-git#n52
+
+envsubst < "crates/zed/resources/flatpak/zed.metainfo.xml.in" > $APP_ID.metainfo.xml
+
+%build
+export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed Preview from Terra."
+echo "preview" > crates/zed/RELEASE_CHANNEL
+
+%cargo_build -- --package zed --package cli
+script/generate-licenses
+
+%install
+install -Dm755 target/rpm/zed %{buildroot}%{_libexecdir}/zed-editor
+install -Dm755 target/rpm/cli %{buildroot}%{_bindir}/zed
+
+install -Dm644 %app_id.desktop %{buildroot}%{_datadir}/applications/%app_id.desktop
+install -Dm644 crates/zed/resources/app-icon-preview.png %{buildroot}%{_datadir}/pixmaps/%app_id.png
+
+install -Dm644 %app_id.metainfo.xml %{buildroot}%{_metainfodir}/%app_id.metainfo.xml
+
+%if %{with check}
+%check
+%cargo_test
+%endif
+
+%files
+%{_libexecdir}/zed-editor
+%{_bindir}/zed
+%{_datadir}/applications/%app_id.desktop
+%{_datadir}/pixmaps/%app_id.png
+%{_metainfodir}/%app_id.metainfo.xml
+%license assets/licenses.md
+
+%changelog
+%autochangelog
@@ -0,0 +1,8 @@
+project pkg {
+  rpm {
+    spec = "zed.spec"
+  }
+  labels {
+    large = 1
+  }
+}
@@ -0,0 +1 @@
+rpm.version(gh("zed-industries/zed"));
@@ -0,0 +1,93 @@
+%bcond_without check
+
+# Exclude input files from mangling
+%global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$
+
+%global crate zed
+%global app_id dev.zed.Zed
+
+Name:           zed
+Version:        0.143.7
+Release:        1%?dist
+Summary:        Zed is a high-performance, multiplayer code editor
+
+License:        MIT
+URL:            https://zed.dev/
+Source0:        https://github.com/zed-industries/zed/archive/refs/tags/v%{version}.tar.gz
+
+Conflicts:      zed
+Provides:       zed
+
+BuildRequires:  cargo-rpm-macros >= 24
+BuildRequires:  anda-srpm-macros
+BuildRequires:  gcc
+BuildRequires:  g++
+BuildRequires:  clang
+BuildRequires:  mold
+BuildRequires:  alsa-lib-devel
+BuildRequires:  fontconfig-devel
+BuildRequires:  wayland-devel
+BuildRequires:  libxkbcommon-x11-devel
+BuildRequires:  openssl-devel
+BuildRequires:  libzstd-devel
+BuildRequires:  perl-FindBin
+BuildRequires:  perl-IPC-Cmd
+BuildRequires:  perl-File-Compare
+BuildRequires:  perl-File-Copy
+BuildRequires:  perl-lib
+BuildRequires:  vulkan-loader
+BuildRequires:  libcurl-devel
+
+%description
+Code at the speed of thought - Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
+
+%prep
+%autosetup -n %{crate}-%{version} -p1
+%cargo_prep_online
+
+export DO_STARTUP_NOTIFY="true"
+export APP_ID="%app_id"
+export APP_ICON="%app_id"
+export APP_NAME="Zed Editor"
+export APP_CLI="zed"
+export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed from Terra."
+export ZED_RELEASE_CHANNEL=stable
+export BRANDING_LIGHT="#e9aa6a"
+export BRANDING_DARK="#1a5fb4"
+
+echo "StartupWMClass=$APP_ID" >> crates/zed/resources/zed.desktop.in
+envsubst < "crates/zed/resources/zed.desktop.in" > $APP_ID.desktop # from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=zed-git#n52
+
+envsubst < "crates/zed/resources/flatpak/zed.metainfo.xml.in" > $APP_ID.metainfo.xml
+
+%build
+export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed from Terra."
+echo "stable" > crates/zed/RELEASE_CHANNEL
+
+%cargo_build -- --package zed --package cli
+script/generate-licenses
+
+%install
+install -Dm755 target/rpm/zed %{buildroot}%{_libexecdir}/zed-editor
+install -Dm755 target/rpm/cli %{buildroot}%{_bindir}/zed
+
+install -Dm644 %app_id.desktop %{buildroot}%{_datadir}/applications/%app_id.desktop
+install -Dm644 crates/zed/resources/app-icon.png %{buildroot}%{_datadir}/pixmaps/%app_id.png
+
+install -Dm644 %app_id.metainfo.xml %{buildroot}%{_metainfodir}/%app_id.metainfo.xml
+
+%if %{with check}
+%check
+%cargo_test
+%endif
+
+%files
+%{_libexecdir}/zed-editor
+%{_bindir}/zed
+%{_datadir}/applications/%app_id.desktop
+%{_datadir}/pixmaps/%app_id.png
+%{_metainfodir}/%app_id.metainfo.xml
+%license assets/licenses.md
+
+%changelog
+%autochangelog
@@ -7,7 +7,7 @@

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

 %gometa

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

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

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

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

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

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

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

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


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


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

 %build

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

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

 %changelog
-* Sun Jun 18 2023 windowsboy111 <windowsboy111@fyralabs.com> - 6.20-2
- Fix install dir.
-
-* Tue Nov 22 2022 windowsboy111 <windowsboy111@fyralabs.com> - 6.20-1
- Initial package
+%autochangelog
@@ -1,9 +1,9 @@
-%define osuresver 2024.321.0
+%define osuresver 2024.705.0
 %global debug_package %{nil}
 %define __strip /bin/true

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

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

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

 %bcond_without qt6
@@ -40,8 +38,6 @@ Group:            Amusements/Games
 URL:              https://prismlauncher.org/
 Source0:          https://github.com/PrismLauncher/PrismLauncher/archive/%{commit}/%{real_name}-%{shortcommit}.tar.gz
 Source1:          https://github.com/PrismLauncher/libnbtplusplus/archive/%{libnbtplusplus_commit}/libnbtplusplus-%{libnbtplusplus_commit}.tar.gz
-Source2:          https://github.com/stachenov/quazip/archive/%{quazip_commit}/quazip-%{quazip_commit}.tar.gz
-Source3:          https://github.com/marzer/tomlplusplus/archive/%{tomlplusplus_commit}/tomlplusplus-%{tomlplusplus_commit}.tar.gz
 Patch0:           0001-find-cmark-with-pkgconfig.patch

 BuildRequires:    cmake >= 3.15
@@ -50,6 +46,7 @@ BuildRequires:    gcc-c++
 BuildRequires:    java-17-openjdk-devel
 BuildRequires:    desktop-file-utils
 BuildRequires:    libappstream-glib
+BuildRequires:    tomlplusplus-devel
 BuildRequires:    cmake(ghc_filesystem)
 BuildRequires:    cmake(Qt%{qt_version}Concurrent) >= %{min_qt_version}
 BuildRequires:    cmake(Qt%{qt_version}Core) >= %{min_qt_version}
@@ -58,9 +55,13 @@ BuildRequires:    cmake(Qt%{qt_version}Network) >= %{min_qt_version}
 BuildRequires:    cmake(Qt%{qt_version}Test) >= %{min_qt_version}
 BuildRequires:    cmake(Qt%{qt_version}Widgets) >= %{min_qt_version}
 BuildRequires:    cmake(Qt%{qt_version}Xml) >= %{min_qt_version}
+BuildRequires:    cmake(Qt%{qt_version}NetworkAuth) >= %{min_qt_version}

 %if %{with qt6}
 BuildRequires:    cmake(Qt6Core5Compat)
+BuildRequires:    quazip-qt6-devel
+%else
+BuildRequires:    quazip-qt5-devel
 %endif

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

 # xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
 Recommends:       xrandr
@@ -102,13 +104,9 @@ multiple installations of Minecraft at once (Fork of MultiMC)
 %autosetup -p1 -n PrismLauncher-%{commit}

 tar -xzf %{SOURCE1} -C libraries
-tar -xvf %{SOURCE2} -C libraries
-tar -xvf %{SOURCE3} -C libraries

-rmdir libraries/{extra-cmake-modules,filesystem,libnbtplusplus,quazip,tomlplusplus,zlib}/
+rmdir libraries/{extra-cmake-modules,filesystem,libnbtplusplus,zlib}/
 mv -f libraries/libnbtplusplus-%{libnbtplusplus_commit} libraries/libnbtplusplus
-mv -f libraries/quazip-%{quazip_commit} libraries/quazip
-mv -f libraries/tomlplusplus-%{tomlplusplus_commit} libraries/tomlplusplus

 # Do not set RPATH
 sed -i "s|\$ORIGIN/||" CMakeLists.txt
@@ -155,6 +153,9 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt


 %changelog
+* Wed Jun 19 2024 Trung Lê <8 at tle dot id dot au> - 9.0^20240619.8014283-1
+- use system quazip-qt and tomlplusplus
+
 * Wed Jul 26 2023 seth <getchoo at tuta dot io> - 8.0^20230726.4f00012-1
 - remove terra-fractureiser-detector from recommends, use proper build platform,
  and add patches for epel/older fedora versions
@@ -1,13 +1,13 @@
 %global real_name prismlauncher
 %global nice_name PrismLauncher

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

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

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

 # xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
 Recommends:       xrandr
@@ -23,7 +23,7 @@ Name:             prismlauncher
 Name:             prismlauncher-qt5
 %endif
 Version:          8.2
-Release:          1%?dist
+Release:          2%?dist
 Summary:          Minecraft launcher with ability to manage multiple instances
 # see COPYING.md for more information
 # each file in the source also contains a SPDX-License-Identifier header that declares its license
@@ -61,8 +61,9 @@ Requires(postun): desktop-file-utils
 Requires:         qt%{qt_version}-qtimageformats
 Requires:         qt%{qt_version}-qtsvg
 Requires:         javapackages-filesystem
-Requires:         java-17-openjdk
-Requires:         java-1.8.0-openjdk
+Recommends:       java-21-openjdk
+Recommends:       java-17-openjdk
+Suggests:         java-1.8.0-openjdk

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


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

@@ -22,8 +22,8 @@ Name:             prismlauncher
 %else
 Name:             prismlauncher-qt5
 %endif
-Version:          8.2
-Release:          1%?dist
+Version:          8.4
+Release:          2%?dist
 Summary:          Minecraft launcher with ability to manage multiple instances
 # see COPYING.md for more information
 # each file in the source also contains a SPDX-License-Identifier header that declares its license
@@ -46,11 +46,16 @@ BuildRequires:    cmake(Qt%{qt_version}Network) >= %{min_qt_version}
 BuildRequires:    cmake(Qt%{qt_version}Test) >= %{min_qt_version}
 BuildRequires:    cmake(Qt%{qt_version}Widgets) >= %{min_qt_version}
 BuildRequires:    cmake(Qt%{qt_version}Xml) >= %{min_qt_version}
+BuildRequires:    tomlplusplus-devel

 %if %{with qt6}
 BuildRequires:    cmake(Qt6Core5Compat)
+BuildRequires:    quazip-qt6-devel
+%else
+BuildRequires:    quazip-qt5-devel
 %endif

+
 BuildRequires:    pkgconfig(libcmark)
 BuildRequires:    pkgconfig(scdoc)
 BuildRequires:    pkgconfig(zlib)
@@ -61,8 +66,9 @@ Requires(postun): desktop-file-utils
 Requires:         qt%{qt_version}-qtimageformats
 Requires:         qt%{qt_version}-qtsvg
 Requires:         javapackages-filesystem
-Requires:         java-17-openjdk
-Requires:         java-1.8.0-openjdk
+Recommends:       java-21-openjdk
+Recommends:       java-17-openjdk
+Suggests:         java-1.8.0-openjdk

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


 %changelog
+* Sun Jun 23 2024 Trung Lê <8@tle.id.au> - 8.2-2
+- update to 8.4. Add quazip-qt deps
+
+* Wed Apr 03 2024 seth <getchoo at tuta dot io> - 8.2-2
+- move JREs to weak deps, add java 21 for snapshots
+
 * Wed Jul 26 2023 seth <getchoo at tuta dot io> - 7.2-2
 - remove terra-fractureiser-detector from recommends, use proper build platform

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

 Name:			crystal
-Version:		1.11.2
-Release:		1%{?dist}
+Version:		1.13.0
+Release:		1%?dist
 Summary:		The Crystal Programming Language
 License:		Apache-2.0
 URL:			https://crystal-lang.org/
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`rpm.version(gh("pantheon-tweaks/pantheon-tweaks"));`