add: golang-github-zrepl (#2112 )

(cherry picked from commit 89d6601cb5)
bump: electron
2026-05-31 09:01:55 +00:00 · 2024-09-20 06:51:32 +00:00 · 2024-09-20 05:59:16 +00:00 · 2024-09-20 03:41:04 +00:00 · 2024-09-20 01:25:59 +00:00 · 2024-09-20 01:16:03 +00:00
290 changed files with 4456 additions and 3497 deletions
@@ -2,7 +2,7 @@
  "repoOwner": "terrapkg",
  "repoName": "packages",
  "resetAuthor": true,
-  "targetBranchChoices": ["f39", "f40", "frawhide"],
+  "targetBranchChoices": ["f38", "f39", "f40", "frawhide"],
  "branchLabelMapping": {
    "^sync-(.+)$": "$1"
  }
@@ -1,4 +1,4 @@
-ARG VARIANT="rawhide"
+ARG VARIANT="38"
 FROM fedora:${VARIANT}

 RUN useradd -m vscode
@@ -2,7 +2,7 @@
  "name": "Fedora",
  "build": {
    "dockerfile": "Dockerfile",
-    "args": { "VARIANT": "rawhide" }
+    "args": { "VARIANT": "38" }
  },
  "remoteUser": "vscode",
  "runArgs": [
@@ -6,13 +6,13 @@ on:
    paths:
      - anda/**
    branches:
-      - frawhide
+      - f39
  pull_request:
    branches:
-      - frawhide
+      - f39
  merge_group:
    branches:
-      - frawhide
+      - f39
  workflow_dispatch:
  workflow_call:

@@ -23,7 +23,7 @@ jobs:
    outputs:
      build_matrix: ${{ steps.generate_build_matrix.outputs.build_matrix }}
    container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:f39
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Set workspace as safe
@@ -40,7 +40,7 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }}
-        version: ["rawhide"]
+        version: ["39"]
      fail-fast: false
    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || matrix.pkg.labels['large'] && 'x86-64-lg' || 'ubuntu-latest' }}
    container:
@@ -7,7 +7,7 @@ jobs:
  bootstrap:
    strategy:
      matrix:
-        version: ["rawhide"]
+        version: ["39"]
        arch: ["x86_64", "aarch64"]
      fail-fast: true
    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
@@ -44,7 +44,7 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(needs.parse.outputs.pkgs) }}
-        version: ["rawhide"]
+        version: ["39"]
        arch: ${{ fromJson(needs.parse.outputs.arch) }}
      fail-fast: false
    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || needs.parse.outputs.builder && needs.parse.outputs.builder || 'ubuntu-latest' }}
@@ -11,7 +11,7 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(inputs.packages) }}
-        version: ["rawhide"]
+        version: ["39"]
      fail-fast: false
    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
    container:
@@ -3,18 +3,18 @@ name: Lint
 on:
  push:
    branches:
-      - frawhide
+      - f39
  pull_request:
    branches:
-      - frawhide
+      - f39
  merge_group:
    branches:
-      - frawhide
+      - f39
 jobs:
  lint:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:f39
    steps:
      - name: Checkout repository
        uses: actions/checkout@v4
@@ -0,0 +1,38 @@
+name: Sync PR to other branches
+on:
+  pull_request:
+    types:
+      - closed
+    branches:
+      - f38
+
+jobs:
+  sync:
+    strategy:
+      matrix:
+        branch: ["f37"]
+      fail-fast: false
+    if: github.event.pull_request.merged == true && !contains(github.event.pull_request.labels.*.name, 'nosync')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
+          ref: ${{ matrix.branch }}
+      - name: Install SSH key and Setup Git
+        run: |
+          mkdir -p ${{ runner.temp }}
+          echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key
+          chmod 0700 ${{ runner.temp }}/signing_key
+          git config --global --add safe.directory "$GITHUB_WORKSPACE"
+          git config user.name "Raboneko"
+          git config user.email "raboneko@fyralabs.com"
+          git config gpg.format "ssh"
+          git config user.signingkey "${{ runner.temp }}/signing_key"
+      - name: Apply patches and Push
+        run: |
+          curl https://github.com/terrapkg/packages/pull/${{ github.event.pull_request.number }}.patch > pr.patch
+          git am -S --keep-cr --signoff < pr.patch
+          git push -u origin --all
@@ -3,9 +3,9 @@ name: Push comps updates
 on:
  push:
    branches:
-      - frawhide
-      - f40
      - f39
+      - f38
+      - f37
    paths:
      - comps.xml
  workflow_dispatch:
@@ -14,7 +14,7 @@ jobs:
  update-comps:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:f39
    steps:
      - uses: actions/checkout@v4
      - name: Push to subatomic
@@ -8,7 +8,7 @@ jobs:
  autoupdate:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:f39
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
@@ -17,12 +17,11 @@ jobs:
          fetch-depth: 0
          ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}

-      - name: Install SSH signing key & Set up git repository
+      - name: Install SSH signing key
        run: |
          mkdir -p ${{ runner.temp }}
          echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key
          chmod 0700 ${{ runner.temp }}/signing_key
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"

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

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

-      - name: Install SSH signing key & Set up git repository
+      - name: Install SSH signing key
        run: |
          mkdir -p ${{ runner.temp }}
          echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key
          chmod 0700 ${{ runner.temp }}/signing_key
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"

      - name: Run Update
-        run: anda update -vv --excludes nightly=1
+        run: anda update -vv
        env:
          GITHUB_TOKEN: ${{ secrets.AUTOUPDATE_GH_TOKEN }}
          RUST_BACKTRACE: full

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

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

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

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

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

@@ -2,11 +2,11 @@
 %global _build_id_links none

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

 # Exclude private libraries
@@ -14,7 +14,7 @@
 %global __provides_exclude_from %{_datadir}/armcord/.*\\.so

 Name:			armcord-bin
-Version:		3.2.7
+Version:		3.3.1
 Release:		1%?dist
 License:		OSL-3.0
 Summary:		Custom lightweight Discord client designed to enhance your experience
@@ -26,7 +26,6 @@ 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,16 @@
 %define debug_package %nil

 Name:		armcord
-Version:	3.2.7
+Version:	3.3.1
 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
+Packager:	madonuko <mado@fyralabs.com>
 Requires:	electron xdg-utils
-BuildRequires:	nodejs-npm git add-determinism
+BuildRequires:	git-core add-determinism pnpm
 Conflicts:	armcord-bin
 BuildArch:	noarch

@@ -37,8 +38,8 @@ EOF


 %build
-npx pnpm@7 install --no-frozen-lockfile
-npm run packageQuick
+pnpm install --no-frozen-lockfile
+pnpm run packageQuick


 %install
@@ -50,13 +51,16 @@ install -Dm644 build/icon.png %buildroot/usr/share/pixmaps/armcord.png

 %files
 %doc README.md
-%license LICENSE
+%license license.txt
 /usr/bin/armcord
 /usr/share/applications/ArmCord.desktop
 /usr/share/pixmaps/armcord.png
 /usr/share/armcord/app.asar

 %changelog
+* Mon Aug 26 2024 madonuko <mado@fyralabs.com> - 3.3.0-1
+- Update to license.txt
+
 * Sat Jun 17 2023 windowsboy111 <windowsboy111@fyralabs.com> - 3.2.0-2
 - Remove libnotify dependency.
 - Fix desktop entry.
@@ -64,4 +68,3 @@ install -Dm644 build/icon.png %buildroot/usr/share/pixmaps/armcord.png

 * Sat May 6 2023 windowsboy111 <windowsboy111@fyralabs.com> - 3.1.7-1
 - Initial package
-
@@ -0,0 +1,8 @@
+project pkg {
+    rpm {
+        spec = "coolercontrol.spec"
+    }
+    labels {
+        large = 1
+    }
+}
@@ -0,0 +1,159 @@
+%bcond_without mold
+%global _desc %{expand:
+CoolerControl is a feature-rich cooling device control application for Linux. It has a system daemon
+for background device management, as well as a GUI to expertly customize your settings.
+}
+%global rdnn org.coolercontrol.CoolerControl
+# Don't mangle shebangs
+%global __brp_mangle_shebangs %{nil}
+
+Name:           coolercontrol
+Version:        1.4.0
+Release:        1%?dist
+Summary:        Cooling device control for Linux
+License:        GPL-3.0-or-later
+URL:            https://gitlab.com/coolercontrol/coolercontrol
+Source0:		%url/-/archive/%version/coolercontrol-%version.tar.gz
+Packager:       madonuko <mado@fyralabs.com>
+Provides:       coolercontrol-ui
+Provides:       coolercontrol-gui
+Requires:       hicolor-icon-theme
+Requires:       webkit2gtk4.1
+Requires:       libappindicator-gtk3
+Requires:       coolercontrold
+BuildRequires:  git-core make nodejs-npm libdrm-devel curl wget file mold
+BuildRequires:  systemd-rpm-macros anda-srpm-macros cargo >= 1.75.0 cargo-rpm-macros
+BuildRequires:  autoconf automake binutils bison flex gcc gcc-c++ gdb libtool pkgconf strace
+BuildRequires:  pkgconfig(webkit2gtk-4.1) pkgconfig(openssl) pkgconfig(librsvg-2.0)
+BuildRequires:  libappindicator-gtk3-devel
+BuildRequires:  python3-devel python3-wheel python3-liquidctl python3-setproctitle python3-fastapi python3-uvicorn python3-pip
+BuildRequires:  libappstream-glib
+BuildRequires:  desktop-file-utils
+%description %_desc
+
+%package liqctld
+Summary:        CoolerControl daemon for interacting with liquidctl devices on a system level
+Requires:       coolercontrold
+%description liqctld %_desc
+coolercontrol-liqctld is a CoolerControl daemon for interacting with liquidctl devices on a system level, and is
+installed as the coolercontrol-liqctld application. Its main purpose is to wrap the underlying
+liquidctl library providing an API interface that the main coolercontrol daemon interacts with.
+It also enables parallel device communication and access to specific device properties.
+
+%package -n coolercontrold
+Summary:        Monitor and control your cooling devices.
+Requires:       coolercontrol-liqctld
+%description -n coolercontrold %_desc
+coolercontrold is the main daemon containing the core logic for interfacing with devices, and installed as
+"coolercontrold". It is meant to run in the background as a system daemon. It handles all device
+communication and data management, additionally connecting to the liqctld daemon for liquidctl
+supported devices. It has an API that services client programs like the coolercontrol-gui.
+
+
+%prep
+%autosetup
+
+pushd coolercontrold
+%cargo_prep_online &
+popd
+
+pushd coolercontrol-ui
+npm ci --prefer-offline &
+pushd src-tauri
+%cargo_prep_online &
+popd
+popd
+
+wait
+
+
+%build
+pushd coolercontrold
+%{cargo_license_online} > LICENSE.dependencies &
+%cargo_build -- &
+popd
+
+pushd coolercontrol-liqctld
+%pyproject_wheel
+popd
+
+pushd coolercontrol-ui
+npm run build &
+pushd src-tauri
+%{cargo_license_online} > LICENSE.dependencies &
+wait
+%cargo_build -f custom-protocol
+popd
+popd
+
+
+%install
+pushd coolercontrol-liqctld
+#define _pyproject_wheeldir .
+%pyproject_install
+%pyproject_save_files coolercontrol_liqctld
+popd
+
+pushd coolercontrold
+install -Dpm755 target/rpm/coolercontrold %buildroot%_bindir/coolercontrold
+install -Dpm644 LICENSE.dependencies %buildroot%_datadir/licenses/coolercontrold/LICENSE.dependencies
+popd
+
+pushd coolercontrol-ui/src-tauri
+install -Dpm755 target/rpm/coolercontrol %buildroot%_bindir/coolercontrol
+install -Dpm644 LICENSE.dependencies %buildroot%_datadir/licenses/%name/LICENSE.dependencies
+popd
+
+install -Dpm644 packaging/systemd/coolercontrol-liqctld.service %buildroot%_unitdir/coolercontrol-liqctld.service
+desktop-file-install --dir=%buildroot%_datadir/applications packaging/metadata/%rdnn.desktop
+install -Dpm644 packaging/metadata/%rdnn.svg %buildroot%_iconsdir/hicolor/scalable/apps/%rdnn.svg
+install -Dpm644 packaging/metadata/%rdnn.png %buildroot%_iconsdir/hicolor/256x256/apps/%rdnn.svg
+for f in packaging/systemd/*.service; do
+  install -Dpm644 $f %buildroot%_unitdir/$(basename $f)
+done
+install -Dpm644 packaging/metadata/%rdnn.metainfo.xml %buildroot%_metainfodir/%rdnn.metainfo.xml
+
+
+%check
+appstream-util validate-relax --nonet %buildroot%_metainfodir/%rdnn.metainfo.xml
+%pyproject_check_import
+
+
+%post -n coolercontrold
+%systemd_post coolercontrold.service
+
+%preun -n coolercontrold
+%systemd_preun coolercontrold.service
+
+%postun -n coolercontrold
+%systemd_postun_with_restart coolercontrold.service
+
+# coolercontrold.service automatically uses the liqctld service, so there are
+# no scriptlets for liqctld.
+
+
+%files
+%doc README.md
+%license LICENSE
+%license LICENSE.dependencies
+%_bindir/coolercontrol
+%_datadir/applications/%rdnn.desktop
+%_datadir/metainfo/%rdnn.metainfo.xml
+%_iconsdir/hicolor/*/apps/%rdnn.svg
+
+%files -n coolercontrold
+%doc coolercontrold/README.md
+%license LICENSE
+%license LICENSE.dependencies
+%_bindir/coolercontrold
+%_unitdir/coolercontrold.service
+
+%files liqctld -f %pyproject_files
+%doc coolercontrol-liqctld/README.md
+%license LICENSE
+%_bindir/coolercontrol-liqctld
+%_unitdir/coolercontrol-liqctld.service
+
+%changelog
+* Thu Aug 15 2024 madonuko <mado@fyralabs.com> - 1.4.0-1
+- Initial package
@@ -0,0 +1 @@
+rpm.version(gitlab("30707566"));
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-canary-openasar
-Version:        0.0.464
+Version:        0.0.491
 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.464
+Version:        0.0.491
 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.62
+Version:        0.0.68
 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.97
+Version:        0.0.106
 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.97
+Version:        0.0.106
 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.62
+Version:		0.0.68
 Release:		1%?dist
 Summary:		Free Voice and Text Chat for Gamers
 URL:			https://discord.com
@@ -1,5 +1,5 @@
-%global commit 5eb42335e0ccbf3558b1d285348d7c02906c931d
-%global commit_date 20240801
+%global commit 7a02447abc7d51f56e8abf90200fdd442247b442
+%global commit_date 20240920
 %global shortcommit %(c=%{commit}; echo ${c:0:7})

 Name:           envision
@@ -16,11 +16,12 @@ 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:  openssl-devel
 BuildRequires:  openxr-devel
 BuildRequires:  libappstream-glib
 BuildRequires:  desktop-file-utils
 BuildRequires:  glib2-devel
+BuildRequires:  git-core
 Recommends:     android-tools

 %description
@@ -40,8 +41,8 @@ Recommends:     android-tools
 %doc README.md
 %license LICENSE
 %_bindir/envision
-%_datadir/applications/org.gabmus.envision.desktop
+%_datadir/applications/org.gabmus.envision.Devel.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
+%_iconsdir/hicolor/scalable/apps/org.gabmus.envision.Devel.svg
+%_iconsdir/hicolor/symbolic/apps/org.gabmus.envision.Devel-symbolic.svg
+%_metainfodir/org.gabmus.envision.Devel.appdata.xml
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:			feishin
-Version:		0.7.3
+Version:		0.9.0
 Release:		1%?dist
 Summary:		A modern self-hosted music player
 License:		GPL-3.0
@@ -5,9 +5,9 @@
 %global pure_protobuf_version 2.0.0

 Name:           komikku
-Version:        1.51.1
+Version:        1.59.0
 %forgemeta
-Release:        %autorelease
+Release:        1%?dist
 Summary:        A manga reader for GNOME

 BuildArch:      noarch
@@ -1,6 +1,6 @@
-%global commit dcb4b491b2077be370cf5295ff4021d1e6182817
+%global commit e3eeaec8136bf153c1d38124bca22a631b53cf66
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240801
+%global commit_date 20240920
 %global ver 0.38.0

 Name:           mpv-nightly
@@ -1,4 +1,4 @@
-%global ver 2024-08-01
+%global ver 2024-09-20
 %global goodver %(echo %ver | sed 's/-//g')
 %global __brp_mangle_shebangs %{nil}
 %bcond_without mold
@@ -59,7 +59,7 @@ EOF
 %install
 cd desktop
 %cargo_install
-install -Dm644 assets/logo.svg %buildroot%_iconsdir/hicolor/scalable/apps/ruffle_desktop.svg
+install -Dm644 assets/icon.svg %buildroot%_iconsdir/hicolor/scalable/apps/ruffle_desktop.svg
 install -Dm644 ../ruffle_desktop.desktop %buildroot%_datadir/applications/ruffle_desktop.desktop

 %changelog
@@ -1,19 +1,27 @@
 %define debug_package %nil
 %global _build_id_links none

+# do not strip binaries
+%define __strip /bin/true
+
+# do not perform compression in cpio
+%define _source_payload w0.ufdio
+%define _binary_payload w0.gzdio
+
 # Exclude private libraries
 %global __requires_exclude libffmpeg.so
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:			voicevox
-Version:		0.19.2
-Release:		4%?dist
+Version:		0.20.0
+Release:		1%?dist
 Summary:		Free Japanese text-to-speech editor
 License:		LGPL-3.0
 URL:			https://voicevox.hiroshiba.jp
 Source0:        https://github.com/VOICEVOX/voicevox/releases/download/%version/VOICEVOX.AppImage.7z.001
 Source1:        https://github.com/VOICEVOX/voicevox/releases/download/%version/VOICEVOX.AppImage.7z.002
 Source2:        https://github.com/VOICEVOX/voicevox/releases/download/%version/VOICEVOX.AppImage.7z.003
+Packager:       madonuko <mado@fyralabs.com>
 BuildRequires:  p7zip-plugins
 ExclusiveArch:  x86_64

@@ -28,7 +36,7 @@ Summary: Documentation files for voicevox (Japanese)

 %prep
 cat<<EOF > voicevox.sh
-#!/bin/sh
+#!/usr/bin/sh
 /usr/share/voicevox/VOICEVOX.AppImage
 EOF
 7z x %SOURCE0
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "youtube-music.spec"
+	}
+}
@@ -0,0 +1 @@
+rpm.version(gh("th-ch/youtube-music"));
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=YouTube Music
+Exec=/usr/bin/youtube-music --no-sandbox %U
+TryExec=/usr/bin/youtube-music
+Icon=youtube-music
+Terminal=false
+Type=Application
+StartupWMClass=YouTube Music
+Comment=YouTube Music Desktop App - including custom plugins
+Categories=AudioVideo;
@@ -0,0 +1,91 @@
+%define debug_package %nil
+
+
+# macro shorthand for calling pnpm
+%global pnpm npx pnpm@%{pnpm_version}
+
+Name:           youtube-music
+Version:        3.5.3
+Release:        1%?dist
+Summary:        YouTube Music Desktop App bundled with custom plugins (and built-in ad blocker / downloader)
+Source1:        youtube-music.desktop
+License:        MIT
+URL:            https://github.com/th-ch/youtube-music
+Packager:       Cappy Ishihara <cappy@fyralabs.com>
+
+# For some unknown reason, PNPM is not working with Node.js 22 on Aarch64 devices.
+# todo: investigate why
+#ExclusiveArch: x86_64
+
+BuildRequires:  git-core gcc make
+# Required for usocket native module built with node-gyp
+BuildRequires:  python3 gcc-c++
+
+%description
+YouTube Music Desktop App bundled with custom plugins (and built-in ad blocker / downloader)
+
+
+%prep
+rm -rf ./*
+git clone --recursive %{url} .
+git checkout v%{version}
+
+
+
+%build
+# Vendor PNPM directly instead of installing from packages, because we need to somehow force PNPM to use Node.js 20
+# We are not using Fedora's PNPM because we need to use `pnpm env`, which PNPM does not support when not vendored directly from upstream
+curl -fsSL https://get.pnpm.io/install.sh | sh -
+source /builddir/.bashrc
+pnpm env use --global 20
+pnpm install
+pnpm build
+pnpm electron-builder --linux --dir
+
+
+
+%install
+
+# Install assets
+install -d -m 0755 %{buildroot}%{_datadir}/icons/hicolor/1024x1024/apps
+install -d -m 0755 %{buildroot}%{_datadir}/icons/hicolor/scalable/apps
+
+# Copy icon files
+ls -laR pack
+%ifarch aarch64
+pushd pack/linux-arm64-unpacked/resources/app.asar.unpacked/assets
+%else
+pushd pack/linux-unpacked/resources/app.asar.unpacked/assets
+%endif
+install -m 0644 youtube-music.png %{buildroot}%{_datadir}/icons/hicolor/1024x1024/apps/youtube-music.png
+install -m 0644 youtube-music.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/youtube-music.svg
+install -m 0644 youtube-music-tray-paused.png %{buildroot}%{_datadir}/icons/hicolor/1024x1024/apps/youtube-music-tray-paused.png
+install -m 0644 youtube-music-tray.png %{buildroot}%{_datadir}/icons/hicolor/1024x1024/apps/youtube-music-tray.png
+popd
+
+# Actually install the app
+
+install -d -m 0755 %{buildroot}%{_datadir}/youtube-music
+# Delete unpacked asar files before copying
+rm -rfv pack/linux*-unpacked/resources/app.asar.unpacked
+cp -rv pack/linux*-unpacked/* %{buildroot}%{_datadir}/youtube-music
+install -d -m 0755 %{buildroot}%{_bindir}
+ln -svf %{_datadir}/youtube-music/youtube-music %{buildroot}%{_bindir}/youtube-music
+
+# Install desktop file
+install -D -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/applications/youtube-music.desktop
+
+%files
+%license license
+%doc README.md
+%doc docs
+%{_bindir}/youtube-music
+%{_datadir}/youtube-music
+%{_datadir}/icons/hicolor/*/apps/youtube-music*
+%{_datadir}/applications/youtube-music.desktop
+
+
+
+%changelog
+* Sat Aug 03 2024 Cappy Ishihara <cappy@cappuchino.xyz>
+- Initial Release
@@ -2,8 +2,8 @@

 Name:           elementary-appcenter
 Summary:        Software Center from elementary
-Version:        8.0.0
-Release:        1%?dist
+Version:        7.4.0
+Release:        1%{?dist}
 License:        GPL-3.0

 Provides:       appcenter = %{version}-%{release}
@@ -12,8 +12,6 @@ Obsoletes:      appcenter < 7.2.1-2
 URL:            https://github.com/elementary/appcenter
 Source0:        %url/archive/%{version}/appcenter-%{version}.tar.gz

-Patch0:         pr2099.patch
-
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
@@ -1,311 +0,0 @@
-commit fce55d9373bfb82953191b32e276a2129ffcb8c1
-Author: Marius Meisenzahl <meisenzahl@users.noreply.github.com>
-Date:   Wed Feb 7 00:14:43 2024 +0100
-
-    Add support for AppStream 1.0 (#2099)
-
-diff --git a/src/Core/FlatpakBackend.vala b/src/Core/FlatpakBackend.vala
-index 98931505..10f2baab 100644
--- a/src/Core/FlatpakBackend.vala
-+++ b/src/Core/FlatpakBackend.vala
-@@ -400,8 +400,13 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
- 
-         var category_array = new GLib.GenericArray<AppStream.Category> ();
-         category_array.add (category);
-+#if HAS_APPSTREAM_1_0
-+        AppStream.utils_sort_components_into_categories (user_appstream_pool.get_components ().as_array (), category_array, false);
-+        AppStream.utils_sort_components_into_categories (system_appstream_pool.get_components ().as_array (), category_array, false);
-+#else
-         AppStream.utils_sort_components_into_categories (user_appstream_pool.get_components (), category_array, false);
-         AppStream.utils_sort_components_into_categories (system_appstream_pool.get_components (), category_array, false);
-+#endif
-         components = category.get_components ();
- 
-         var apps = new Gee.TreeSet<AppCenterCore.Package> ();
-@@ -417,13 +422,21 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
-         var apps = new Gee.TreeSet<AppCenterCore.Package> ();
-         var comps = user_appstream_pool.search (query);
-         if (category == null) {
-+#if HAS_APPSTREAM_1_0
-+            comps.as_array ().foreach ((comp) => {
-+#else
-             comps.foreach ((comp) => {
-+#endif
-                 var packages = get_packages_for_component_id (comp.get_id ());
-                 apps.add_all (packages);
-             });
-         } else {
-             var cat_packages = get_applications_for_category (category);
-+#if HAS_APPSTREAM_1_0
-+            comps.as_array ().foreach ((comp) => {
-+#else
-             comps.foreach ((comp) => {
-+#endif
-                 var packages = get_packages_for_component_id (comp.get_id ());
-                 foreach (var package in packages) {
-                     if (package in cat_packages) {
-@@ -435,13 +448,21 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
- 
-         comps = system_appstream_pool.search (query);
-         if (category == null) {
-+#if HAS_APPSTREAM_1_0
-+            comps.as_array ().foreach ((comp) => {
-+#else
-             comps.foreach ((comp) => {
-+#endif
-                 var packages = get_packages_for_component_id (comp.get_id ());
-                 apps.add_all (packages);
-             });
-         } else {
-             var cat_packages = get_applications_for_category (category);
-+#if HAS_APPSTREAM_1_0
-+            comps.as_array ().foreach ((comp) => {
-+#else
-             comps.foreach ((comp) => {
-+#endif
-                 var packages = get_packages_for_component_id (comp.get_id ());
-                 foreach (var package in packages) {
-                     if (package in cat_packages) {
-@@ -510,7 +531,11 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
-                 continue;
-             }
- 
-+#if HAS_APPSTREAM_1_0
-+            if (package.component.get_developer ().get_name () == author) {
-+#else
-             if (package.component.developer_name == author) {
-+#endif
-                 package_ids.add (package.component.id);
- 
-                 AppCenterCore.Package? user_package = null;
-@@ -1095,7 +1120,11 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
-             warning ("Errors found in flatpak appdata, some components may be incomplete/missing: %s", e.message);
-         } finally {
-             var comp_validator = ComponentValidator.get_default ();
-+#if HAS_APPSTREAM_1_0
-+            user_appstream_pool.get_components ().as_array ().foreach ((comp) => {
-+#else
-             user_appstream_pool.get_components ().foreach ((comp) => {
-+#endif
-                 if (!comp_validator.validate (comp)) {
-                     return;
-                 }
-@@ -1133,7 +1162,11 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
-             warning ("Errors found in flatpak appdata, some components may be incomplete/missing: %s", e.message);
-         } finally {
-             var comp_validator = ComponentValidator.get_default ();
-+#if HAS_APPSTREAM_1_0
-+            system_appstream_pool.get_components ().as_array ().foreach ((comp) => {
-+#else
-             system_appstream_pool.get_components ().foreach ((comp) => {
-+#endif
-                 if (!comp_validator.validate (comp)) {
-                     return;
-                 }
-diff --git a/src/Core/Package.vala b/src/Core/Package.vala
-index 0f9a90c4..ed141292 100644
--- a/src/Core/Package.vala
-+++ b/src/Core/Package.vala
-@@ -306,7 +306,11 @@ public class AppCenterCore.Package : Object {
-                 return _author;
-             }
- 
-+#if HAS_APPSTREAM_1_0
-+            _author = component.get_developer ().get_name ();
-+#else
-             _author = component.developer_name;
-+#endif
- 
-             if (_author == null) {
-                 var project_group = component.project_group;
-@@ -677,7 +681,11 @@ public class AppCenterCore.Package : Object {
-             }
- 
-             try {
-+#if HAS_APPSTREAM_1_0
-+                description = AppStream.markup_convert (description, TEXT);
-+#else
-                 description = AppStream.markup_convert_simple (description);
-+#endif
-             } catch (Error e) {
-                 warning ("Failed to convert description to markup: %s", e.message);
-             }
-@@ -919,7 +927,11 @@ public class AppCenterCore.Package : Object {
-     }
- 
-     public AppStream.Release? get_newest_release () {
-+#if HAS_APPSTREAM_1_0
-+        var releases = component.get_releases_plain ().get_entries ();
-+#else
-         var releases = component.get_releases ();
-+#endif
-         releases.sort_with_data ((a, b) => {
-             if (a.get_version () == null || b.get_version () == null) {
-                 if (a.get_version () != null) {
-diff --git a/src/Core/PackageKitBackend.vala b/src/Core/PackageKitBackend.vala
-index 09da4074..a108831e 100644
--- a/src/Core/PackageKitBackend.vala
-+++ b/src/Core/PackageKitBackend.vala
-@@ -275,7 +275,11 @@ public class AppCenterCore.PackageKitBackend : Backend, Object {
-         } finally {
-             var new_package_list = new Gee.HashMap<string, Package> ();
-             var comp_validator = ComponentValidator.get_default ();
-+#if HAS_APPSTREAM_1_0
-+            appstream_pool.get_components ().as_array ().foreach ((comp) => {
-+#else
-             appstream_pool.get_components ().foreach ((comp) => {
-+#endif
-                 if (!comp_validator.validate (comp)) {
-                     return;
-                 }
-@@ -317,7 +321,12 @@ public class AppCenterCore.PackageKitBackend : Backend, Object {
-             component.set_id (id);
-             component.set_origin (Package.APPCENTER_PACKAGE_ORIGIN);
- 
-#if HAS_APPSTREAM_0_15
-+#if HAS_APPSTREAM_1_0
-+            var components = new AppStream.ComponentBox (AppStream.ComponentBoxFlags.NONE);
-+            components.add (component);
-+
-+            appstream_pool.add_components (components);
-+#elif HAS_APPSTREAM_0_15
-             var components = new GenericArray<AppStream.Component> ();
-             components.add (component);
- 
-@@ -430,7 +439,11 @@ public class AppCenterCore.PackageKitBackend : Backend, Object {
-                 break;
-             }
- 
-+#if HAS_APPSTREAM_1_0
-+            if (package.component.get_developer ().get_name () == author) {
-+#else
-             if (package.component.developer_name == author) {
-+#endif
-                 packages.add (package);
-             }
-         }
-@@ -447,7 +460,11 @@ public class AppCenterCore.PackageKitBackend : Backend, Object {
- 
-         var category_array = new GLib.GenericArray<AppStream.Category> ();
-         category_array.add (category);
-+#if HAS_APPSTREAM_1_0
-+        AppStream.utils_sort_components_into_categories (appstream_pool.get_components ().as_array (), category_array, true);
-+#else
-         AppStream.utils_sort_components_into_categories (appstream_pool.get_components (), category_array, true);
-+#endif
-         components = category.get_components ();
- 
-         var apps = new Gee.TreeSet<AppCenterCore.Package> ();
-@@ -465,7 +482,11 @@ public class AppCenterCore.PackageKitBackend : Backend, Object {
-         var apps = new Gee.TreeSet<AppCenterCore.Package> ();
-         var comps = appstream_pool.search (query);
-         if (category == null) {
-+#if HAS_APPSTREAM_1_0
-+            comps.as_array ().foreach ((comp) => {
-+#else
-             comps.foreach ((comp) => {
-+#endif
-                 var package = get_package_for_component_id (comp.get_id ());
-                 if (package != null) {
-                     apps.add (package);
-@@ -473,7 +494,11 @@ public class AppCenterCore.PackageKitBackend : Backend, Object {
-             });
-         } else {
-             var cat_packages = get_applications_for_category (category);
-+#if HAS_APPSTREAM_1_0
-+            comps.as_array ().foreach ((comp) => {
-+#else
-             comps.foreach ((comp) => {
-+#endif
-                 var package = get_package_for_component_id (comp.get_id ());
-                 if (package != null && package in cat_packages) {
-                     apps.add (package);
-diff --git a/src/Views/AppInfoView.vala b/src/Views/AppInfoView.vala
-index 5a3a361a..bef37f0e 100644
--- a/src/Views/AppInfoView.vala
-+++ b/src/Views/AppInfoView.vala
-@@ -310,8 +310,16 @@ public class AppCenter.Views.AppInfoView : AppCenter.AbstractAppContainer {
-                 oars_flowbox.add (uncurated);
-             }
- #endif
-+
-+#if HAS_APPSTREAM_1_0
-+            var active_locale = "en-US";
-+            if (package_component.get_context () != null) {
-+                active_locale = package_component.get_context ().get_locale () ?? "en-US";
-+            }
-+#else
-             var active_locale = package_component.get_active_locale ();
-            if (active_locale != "en_US") {
-+#endif
-+            if (active_locale != "en_US" && active_locale != "en-US") {
-                 var percent_translated = package_component.get_language (
-                     // Expects language without locale
-                     active_locale.split ("_")[0]
-@@ -492,7 +500,11 @@ public class AppCenter.Views.AppInfoView : AppCenter.AbstractAppContainer {
-             }
-         }
- 
-+#if HAS_APPSTREAM_1_0
-+        screenshots = package_component.get_screenshots_all ();
-+#else
-         screenshots = package_component.get_screenshots ();
-+#endif
- 
-         if (screenshots.length > 0) {
-             screenshot_carousel = new Hdy.Carousel () {
-@@ -1030,7 +1042,11 @@ public class AppCenter.Views.AppInfoView : AppCenter.AbstractAppContainer {
-             get_app_download_size.begin ();
- 
-             Idle.add (() => {
-+#if HAS_APPSTREAM_1_0
-+                var releases = package.component.get_releases_plain ().get_entries ();
-+#else
-                 var releases = package.component.get_releases ();
-+#endif
- 
-                 foreach (unowned var release in releases) {
-                     if (release.get_version () == null) {
-@@ -1049,7 +1065,11 @@ public class AppCenter.Views.AppInfoView : AppCenter.AbstractAppContainer {
- 
-                         release_carousel.add (release_row);
- 
-+#if HAS_APPSTREAM_1_0
-+                        if (package.installed && AppStream.vercmp_simple (release.get_version (), package.get_version ()) <= 0) {
-+#else
-                         if (package.installed && AppStream.utils_compare_versions (release.get_version (), package.get_version ()) <= 0) {
-+#endif
-                             break;
-                         }
-                     }
-diff --git a/src/Widgets/ReleaseRow.vala b/src/Widgets/ReleaseRow.vala
-index 3b487914..36fcbc76 100644
--- a/src/Widgets/ReleaseRow.vala
-+++ b/src/Widgets/ReleaseRow.vala
-@@ -116,7 +116,11 @@ public class AppCenter.Widgets.ReleaseRow : Gtk.Box {
-     private string format_release_description (string? description ) {
-         if (description != null) {
-             try {
-+#if HAS_APPSTREAM_1_0
-+                var markup = AppStream.markup_convert (description, TEXT);
-+#else
-                 var markup = AppStream.markup_convert_simple (description);
-+#endif
- 
-                 if (markup.strip () != "") {
-                     return markup;
-diff --git a/src/meson.build b/src/meson.build
-index d3d558ef..df69a0bf 100644
--- a/src/meson.build
-+++ b/src/meson.build
-@@ -78,6 +78,10 @@ if appstream.version().version_compare('>=0.16')
-     args += '--define=HAS_APPSTREAM_0_16'
- endif
- 
-+if appstream.version().version_compare('>=1.0')
-+    args += '--define=HAS_APPSTREAM_1_0'
-+endif
-+
- if get_option('packagekit_backend')
-     appcenter_files += files(
-         'Core/PackageKitBackend.vala',
@@ -3,8 +3,8 @@

 Name:           elementary-camera
 Summary:        Camera app designed for elementary
-Version:        8.0.0
-Release:        1%?dist
+Version:        6.2.2
+Release:        2%{?dist}
 License:        GPL-3.0

 URL:            https://github.com/elementary/camera
@@ -5,8 +5,8 @@

 Name:           elementary-files
 Summary:        File manager from elementary
-Version:        6.5.3
-Release:        1%{?dist}
+Version:        7.0.0
+Release:        1%?dist
 License:        GPL-3.0

 URL:            https://github.com/elementary/%{srcname}
@@ -42,6 +42,8 @@ BuildRequires:  pkgconfig(pango) >= 1.1.2
 BuildRequires:  pkgconfig(plank) >= 0.10.9
 BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(systemd) >= 206
+BuildRequires:  pkgconfig(libportal)
+BuildRequires:  pkgconfig(libportal-gtk3)

 Requires:       contractor
 Requires:       file-roller
@@ -76,6 +78,7 @@ This package contains the development headers.


 %build
+CFLAGS="$CFLAGS -Wno-implicit-function-declaration"
 %meson -Dwith-zeitgeist=disabled
 %meson_build

@@ -85,11 +88,6 @@ This package contains the development headers.

 %find_lang %{appname}

-%fdupes %buildroot%_datadir/icons/hicolor/
-
-# remove unused pixmaps
-rm -r %{buildroot}/%{_datadir}/pixmaps
-
 # install file-roller contracts
 mkdir -p %{buildroot}/%{_datadir}/contractor
 cp -pav %{SOURCE1} %{buildroot}/%{_datadir}/contractor/
@@ -120,7 +118,7 @@ appstream-util validate-relax --nonet \
 %{_bindir}/%{appname}-pkexec

 %{_libdir}/%{appname}/
-%{_libdir}/libpantheon-files-core.so.6*
+%{_libdir}/libpantheon-files-core.so.*

 %{_datadir}/applications/%{appname}.desktop
 %{_datadir}/contractor/*.contract
@@ -11,7 +11,7 @@ URL:            https://github.com/elementary/greeter
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 Source1:        40-%{appname}.conf

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

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

 Provides:       pantheon-greeter = %{version}-%{release}
@@ -3,8 +3,8 @@

 Name:           elementary-onboarding
 Summary:        Onboarding app for new users
-Version:        7.2.0
-Release:        2%{?dist}
+Version:        8.0.0
+Release:        1%?dist
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/onboarding
@@ -3,7 +3,7 @@
 %global iface   io.elementary.SettingsDaemon.AccountsService

 Name:           elementary-settings-daemon
-Version:        8.0.0
+Version:        8.1.0
 Release:        1%?dist
 Summary:        Settings Daemon and Portal for Pantheon
 License:        GPL-3.0-or-later
@@ -3,7 +3,7 @@

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

@@ -3,7 +3,7 @@

 Name:           elementary-videos
 Summary:        Video player and library app from elementary
-Version:        8.0.0
+Version:        8.0.1
 Release:        1%?dist
 License:        GPL-3.0-or-later

@@ -2,8 +2,8 @@

 Name:           gala
 Summary:        Gala window manager
-Version:        7.1.3
-Release:        2%{?dist}
+Version:        8.0.0
+Release:        1%?dist
 License:        GPL-3.0-or-later
 Epoch:          1

@@ -12,7 +12,6 @@ Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz

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

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

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

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


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

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

 %{_bindir}/gala
 %{_bindir}/gala-daemon
@@ -8,8 +8,8 @@

 Name:           switchboard-plug-bluetooth
 Summary:        Switchboard Bluetooth plug
-Version:        2.3.6
-Release:        1%{?dist}
+Version:        8.0.0
+Release:        1%?dist
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/switchboard-plug-bluetooth
@@ -8,8 +8,8 @@

 Name:           switchboard-plug-display
 Summary:        Switchboard Display plug
-Version:        7.0.0
-Release:        1%{?dist}
+Version:        8.0.0
+Release:        1%?dist
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/switchboard-plug-display
@@ -8,7 +8,7 @@

 Name:           switchboard-plug-mouse-touchpad
 Summary:        Switchboard Mouse and Touchpad plug
-Version:        8.0.0
+Version:        8.0.1
 Release:        1%?dist
 License:        GPL-3.0-or-later

@@ -8,8 +8,8 @@

 Name:           switchboard-plug-pantheon-shell
 Summary:        Switchboard Pantheon Shell plug
-Version:        8.0.0
-Release:        1%?dist
+Version:        6.5.0
+Release:        1%{?dist}
 License:        GPL-3.0

 URL:            https://github.com/elementary/switchboard-plug-pantheon-shell
@@ -5,8 +5,8 @@

 Name:           wingpanel-applications-menu
 Summary:        Lightweight and stylish app launcher
-Version:        2.11.1
-Release:        2%?dist
+Version:        8.0.0
+Release:        1%?dist
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/applications-menu
@@ -5,8 +5,8 @@

 Name:           wingpanel-indicator-bluetooth
 Summary:        Bluetooth Indicator for wingpanel
-Version:        7.0.1
-Release:        1%{?dist}
+Version:        8.0.0
+Release:        1%?dist
 License:        LGPL-2.0-or-later

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

 Name:           wingpanel-indicator-datetime
 Summary:        Datetime Indicator for wingpanel
-Version:        2.4.1
-Release:        1%{?dist}
+Version:        2.4.2
+Release:        1%?dist
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/wingpanel-indicator-datetime
@@ -5,8 +5,8 @@

 Name:           wingpanel-indicator-keyboard
 Summary:        Keyboard Indicator for wingpanel
-Version:        2.4.1
-Release:        2%{?dist}
+Version:        2.4.2
+Release:        1%?dist
 License:        LGPL-2.0-or-later

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

 Name:           wingpanel-indicator-network
 Summary:        Network Indicator for wingpanel
-Version:        7.1.0
-Release:        1%{?dist}
+Version:        7.1.1
+Release:        1%?dist
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/wingpanel-indicator-network
@@ -5,8 +5,8 @@

 Name:           wingpanel-indicator-nightlight
 Summary:        Night Light Indicator for wingpanel
-Version:        2.1.2
-Release:        1%{?dist}
+Version:        2.1.3
+Release:        1%?dist
 License:        GPL-2.0-or-later

 URL:            https://github.com/elementary/wingpanel-indicator-nightlight
@@ -5,8 +5,8 @@

 Name:           wingpanel-indicator-notifications
 Summary:        Notifications Indicator for wingpanel
-Version:        7.1.0
-Release:        1%{?dist}
+Version:        7.1.1
+Release:        1%?dist
 License:        LGPL-2.0-or-later

 URL:            https://github.com/elementary/wingpanel-indicator-notifications
@@ -5,8 +5,8 @@

 Name:           wingpanel-indicator-power
 Summary:        Power indicator for wingpanel
-Version:        6.2.1
-Release:        1%{?dist}
+Version:        8.0.0
+Release:        1%?dist
 License:        GPL-2.0-or-later

 URL:            https://github.com/elementary/wingpanel-indicator-power
@@ -5,8 +5,8 @@

 Name:           wingpanel-indicator-sound
 Summary:        Sound Indicator for wingpanel
-Version:        7.0.0
-Release:        1%{?dist}
+Version:        8.0.0
+Release:        1%?dist
 License:        GPL-3.0

 URL:            https://github.com/elementary/%{name}
@@ -6,14 +6,14 @@ launcher.}

 Name:           wingpanel
 Summary:        Stylish top panel
-Version:        3.0.5
-Release:        1%{?dist}
+Version:        8.0.0
+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
-Patch0:         https://github.com/elementary/wingpanel/compare/23a3eb7c2448b4f35398116df7d01b075361ef1f..5d22d436b45decfb2a50d9a7c27f2c961f1dd39f.patch
+Patch0:         https://github.com/elementary/wingpanel/commit/d6009d9f0d5c7479172093447ccceccba86ff1f3.patch

 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -29,9 +29,9 @@ BuildRequires:  pkgconfig(gee-0.8)
 BuildRequires:  pkgconfig(glib-2.0) >= 2.32
 BuildRequires:  pkgconfig(granite) >= 5.4.0
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.10
-BuildRequires:  pkgconfig(mutter-clutter-14)
-BuildRequires:  pkgconfig(mutter-cogl-14)
-BuildRequires:  pkgconfig(mutter-cogl-pango-14)
+BuildRequires:  pkgconfig(mutter-clutter-13)
+BuildRequires:  pkgconfig(mutter-cogl-13)
+BuildRequires:  pkgconfig(mutter-cogl-pango-13)

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

@@ -11,15 +11,16 @@ URL:            https://github.com/fthx/appmenu-is-back
 BuildArch:      noarch

 Source0:        https://github.com/fthx/appmenu-is-back/archive/refs/tags/v%{version}.tar.gz
+Patch0:         https://github.com/fthx/appmenu-is-back/compare/v2..703a31acf900eb7bcab3462baeefa815ec7f13ab.patch

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

 %description
 This extension brings back the app menu in the top panel, for GNOME 45 and later.

 %prep
-%autosetup -n appmenu-is-back-%{version}
+%autosetup -n appmenu-is-back-%{version} -p1

 %install
 install -Dm644 metadata.json %{buildroot}%{_datadir}/gnome-shell/extensions/%{uuid}/metadata.json
@@ -1,9 +1,9 @@
 # from Fedora upstream
 %global extension   pop-shell
 %global uuid        %{extension}@system76.com
-%global commit      cfa0c55e84b7ce339e5ce83832f76fee17e99d51
+%global commit      9418d0a9af7c9b30b61ac3eeb5ca432a3ad3e651
 %global shortcommit %{lua:print(macros.commit:sub(1,7))}
-%global commit_date 20240404
+%global commit_date 20240401
 %global ver         1.2.0

 Name:           terra-gnome-shell-extension-%{extension}
@@ -1,6 +1,6 @@
 %global forgeurl https://github.com/KDE/latte-dock/

-%global commit 31a6135fd9942a492fefecc69339b0802ecdce3b
+%global commit b4b16f61f1d69c994701f149e54335c40b9b201d
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global commit_date %(date '+%Y%m%d')
 %global snapshot_info %{commit_date}.%{shortcommit}
@@ -1,5 +1,5 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-app-launch
-%global commit af441bdb31bb76b207119a8c91eef3fa93c0c078
+%global commit a057a37b56b96efddc7f42577407a3a08a0575cf
 %forgemeta

 Name:           lomiri-app-launch
@@ -4,7 +4,7 @@

 Name:       lomiri-download-manager
 Version:    0.1.3
-Release:    1%?dist
+Release:    1%{?dist}
 Summary:    Upload Download Manager for Lomiri
 License:    LGPLv3
 URL:        https://gitlab.com/ubports/development/core/lomiri-download-manager
@@ -1,5 +1,5 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings
-%global commit 0f9ce94e628a245cb3a7e97a7a169cb94e04c9ea
+%global commit 63010d4edadb3116b6ce9a86d050a1d62b25cb60
 %forgemeta

 Name:       lomiri-system-settings
@@ -10,7 +10,6 @@ License:    GPLv3
 URL:        https://gitlab.com/ubports/development/core/lomiri-system-settings
 Source0:    %{url}/-/archive/%commit/lomiri-system-settings-%commit.tar.gz
 Patch0:     https://sources.debian.org/data/main/l/lomiri-system-settings/1.0.1-2/debian/patches/1001_use-maliit-keyboard-for-language-plugin.patch
-Patch1:     https://sources.debian.org/data/main/l/lomiri-system-settings/1.0.1-2/debian/patches/2001_disable-current-language-switching.patch

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

 Name:           lomiri-ui-toolkit
@@ -4,7 +4,7 @@

 Name:           lomiri-url-dispatcher
 Version:        0.1.3
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        A small library for handling URLs over dbus

 License:        LGPL-3.0
@@ -1,8 +1,8 @@
-%global rn 4
+%global rn 1

 Name:           unity-greeter
-Version:        23.10.1
-Release:        %autorelease
+Version:        24.10.1
+Release:        1%?dist
 Summary:        Unity Greeter for Lightdm

 License:        GPL-3.0
@@ -1,4 +1,4 @@
-%define _ubuntu_rel 1ubuntu4
+%define _ubuntu_rel 8ubuntu1

 Name:    unity-session
 Summary: Lightdm profile for Unity 7
@@ -1,142 +0,0 @@
-From 4d44531c8f624f5b479c3ff23e8fecc67eb848ab Mon Sep 17 00:00:00 2001
-From: Jeremy Linton <jeremy.linton@arm.com>
-Date: Fri, 22 Oct 2021 14:51:54 -0500
-Subject: [PATCH] Delay for logind, and fallback to seat0
-
-There is systemd/logind race with when restarting
-sddm that causes logind1 not to be available. Previously
-this meant the seat0 was immediately created regardless
-of the state of CanGraphical.
-
-Fixing this, though we still want seat0 to be started
-if none of the seats appear to be graphical. Presumably
-there are some graphics on the machine, otherwise
-why run sddm? Wait a bit, and create seat0 anyway. If
-this fails the output from Xorg should tell us why. This
-is generally a better strategy than what happens a good
-amount of time now, where sddm is started and silent about
-why the screen is blank.
-
-References:
-* https://bugzilla.redhat.com/2011991
-* https://bugzilla.redhat.com/2016310
-
-Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
---
- src/daemon/LogindDBusTypes.cpp | 31 +++++++++++++++++++++----------
- src/daemon/SeatManager.cpp     | 22 ++++++++++++++++++++++
- src/daemon/SeatManager.h       |  1 +
- 3 files changed, 44 insertions(+), 10 deletions(-)
-
-diff --git a/src/daemon/LogindDBusTypes.cpp b/src/daemon/LogindDBusTypes.cpp
-index 011bb7f..6255c69 100644
--- a/src/daemon/LogindDBusTypes.cpp
-+++ b/src/daemon/LogindDBusTypes.cpp
-@@ -8,6 +8,8 @@
- 
- #include <QDebug>
- 
-+#include <unistd.h>
-+
- class LogindPathInternal {
- public:
-     LogindPathInternal();
-@@ -46,17 +48,26 @@ LogindPathInternal::LogindPathInternal()
-     qRegisterMetaType<UserInfoList>("UserInfoList");
-     qDBusRegisterMetaType<UserInfoList>();
- 
-    if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.login1"))) {
-        qDebug() << "Logind interface found";
-        available = true;
-        serviceName = QStringLiteral("org.freedesktop.login1");
-        managerPath = QStringLiteral("/org/freedesktop/login1");
-        managerIfaceName = QStringLiteral("org.freedesktop.login1.Manager");
-        seatIfaceName = QStringLiteral("org.freedesktop.login1.Seat");
-        sessionIfaceName = QStringLiteral("org.freedesktop.login1.Session");
-        userIfaceName = QStringLiteral("org.freedesktop.login1.User");
-        return;
-+#ifdef HAVE_SYSTEMD
-+    // systemd-logind should be running, although because it takes a few moments to restart after
-+    // systemctl isolate calls, it may not yet be running. Wait a few seconds for it, while blocking everything else.
-+    int logind_wait_seconds = 50;
-+    while (logind_wait_seconds--) {
-+        if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.login1"))) {
-+            qDebug() << "Logind interface found";
-+            available = true;
-+            serviceName = QStringLiteral("org.freedesktop.login1");
-+            managerPath = QStringLiteral("/org/freedesktop/login1");
-+            managerIfaceName = QStringLiteral("org.freedesktop.login1.Manager");
-+            seatIfaceName = QStringLiteral("org.freedesktop.login1.Seat");
-+            sessionIfaceName = QStringLiteral("org.freedesktop.login1.Session");
-+            userIfaceName = QStringLiteral("org.freedesktop.login1.User");
-+            return;
-+        }
-+	qDebug() << "Sleeping for systemd-logind";
-+	usleep(100000);
-     }
-+#endif
- 
-     if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.ConsoleKit"))) {
-         qDebug() << "Console kit interface found";
-diff --git a/src/daemon/SeatManager.cpp b/src/daemon/SeatManager.cpp
-index bd207e6..39d8b85 100644
--- a/src/daemon/SeatManager.cpp
-+++ b/src/daemon/SeatManager.cpp
-@@ -26,6 +26,9 @@
- #include <QDBusMessage>
- #include <QDBusPendingReply>
- #include <QDBusContext>
-+#include <QDebug>
-+#include <QFileInfo>
-+#include <QTimer>
- 
- #include "LogindDBusTypes.h"
- 
-@@ -115,6 +118,8 @@ namespace SDDM {
- 
-         QDBusConnection::systemBus().connect(Logind::serviceName(), Logind::managerPath(), Logind::managerIfaceName(), QStringLiteral("SeatNew"), this, SLOT(logindSeatAdded(QString,QDBusObjectPath)));
-         QDBusConnection::systemBus().connect(Logind::serviceName(), Logind::managerPath(), Logind::managerIfaceName(), QStringLiteral("SeatRemoved"), this, SLOT(logindSeatRemoved(QString,QDBusObjectPath)));
-+
-+	QTimer::singleShot(5000, this, &SeatManager::checkSeat);
-     }
- 
-     void SeatManager::createSeat(const QString &name) {
-@@ -152,6 +157,23 @@ namespace SDDM {
-         m_seats.value(name)->createDisplay(Display::defaultDisplayServerType());
-     }
- 
-+    // this is a bit hacky, but linux DRM drivers
-+    // won't initially be available so there is a race
-+    // between determing if a efifb/etc graphical object
-+    // is the only graphics on the machine, or a DRM driver
-+    // will take over the display. So we will hang out for a few
-+    // seconds and if none of the seats are declared cangraphical
-+    // its possible the only graphics on the machine don't have
-+    // a drm driver.
-+    void SeatManager::checkSeat(void) {
-+        if (m_seats.isEmpty()) {
-+	     //if (QFileInfo::exists(QStringLiteral("/dev/fb0"))) {
-+                 qWarning() << "No graphical seats found, attempt to start one on the main console anyway...";
-+                 createSeat(QStringLiteral("seat0"));
-+	     //}
-+        }
-+    }
-+
-     void SDDM::SeatManager::logindSeatAdded(const QString& name, const QDBusObjectPath& objectPath)
-     {
-         auto logindSeat = new LogindSeat(name, objectPath);
-diff --git a/src/daemon/SeatManager.h b/src/daemon/SeatManager.h
-index b2f9796..aa43047 100644
--- a/src/daemon/SeatManager.h
-+++ b/src/daemon/SeatManager.h
-@@ -49,6 +49,7 @@ namespace SDDM {
-     private:
-         QHash<QString, Seat *> m_seats; //these will exist only for graphical seats
-         QHash<QString, LogindSeat*> m_systemSeats; //these will exist for all seats
-+        void checkSeat(void);
-     };
- }
- 
-- 
-2.39.2
-
@@ -1,2 +0,0 @@
-This scripts dir contains only samples, but are generally not used directly.
-In practice, sddm runtime uses items under /etc/sddm by default
@@ -1,5 +0,0 @@
-project pkg {
-  rpm {
-    spec = "terra-sddm.spec"
-  }
-}
@@ -1,11 +0,0 @@
-diff -up sddm-0.18.0/services/sddm.service.in.env sddm-0.18.0/services/sddm.service.in
--- sddm-0.18.0/services/sddm.service.in.env	2018-07-18 05:31:40.000000000 -0500
-+++ sddm-0.18.0/services/sddm.service.in	2019-03-14 08:23:22.095498405 -0500
-@@ -7,6 +7,7 @@ After=systemd-user-sessions.service gett
- [Service]
- ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/sddm
- Restart=always
-+EnvironmentFile=-/etc/sysconfig/sddm
- 
- [Install]
- Alias=display-manager.service
@@ -1,53 +0,0 @@
-diff --git a/src/common/Configuration.h b/src/common/Configuration.h
-index 54bcace..9b8fa22 100644
--- a/src/common/Configuration.h
-+++ b/src/common/Configuration.h
-@@ -37,9 +37,8 @@ namespace SDDM {
-         enum NumState { NUM_NONE, NUM_SET_ON, NUM_SET_OFF };
- 
-         //  Name                   Type         Default value                                   Description
-        // TODO: Change default to x11-user in a future release
-        Entry(DisplayServer,       QString,     _S("x11"),                                      _S("Which display server should be used.\n"
-                                                                                                   "Valid values are: x11, x11-user, wayland. Wayland support is experimental"));
-+        Entry(DisplayServer,       QString,     _S("wayland"),                                  _S("Which display server should be used.\n"
-+                                                                                                   "Valid values are: x11, x11-user, wayland."));
-         Entry(HaltCommand,         QString,     _S(HALT_COMMAND),                               _S("Halt command"));
-         Entry(RebootCommand,       QString,     _S(REBOOT_COMMAND),                             _S("Reboot command"));
-         Entry(Numlock,             NumState,    NUM_NONE,                                       _S("Initial NumLock state. Can be on, off or none.\n"
-@@ -51,7 +50,7 @@ namespace SDDM {
-         //  Name   Entries (but it's a regular class again)
-         Section(Theme,
-             Entry(ThemeDir,            QString,     _S(DATA_INSTALL_DIR "/themes"),             _S("Theme directory path"));
-            Entry(Current,             QString,     _S(""),                                     _S("Current theme name"));
-+            Entry(Current,             QString,     _S("01-breeze-fedora"),                     _S("Current theme name"));
-             Entry(FacesDir,            QString,     _S(DATA_INSTALL_DIR "/faces"),              _S("Global directory for user avatars\n"
-                                                                                                    "The files should be named <username>.face.icon"));
-             Entry(CursorTheme,         QString,     QString(),                                  _S("Cursor theme used in the greeter"));
-@@ -71,9 +70,9 @@ namespace SDDM {
-             Entry(SessionDir,          QStringList, {_S("/usr/local/share/xsessions"),
-                                                      _S("/usr/share/xsessions")},               _S("Comma-separated list of directories containing available X sessions"));
-             Entry(SessionCommand,      QString,     _S(SESSION_COMMAND),                        _S("Path to a script to execute when starting the desktop session"));
-            Entry(SessionLogFile,      QString,     _S(".local/share/sddm/xorg-session.log"),   _S("Path to the user session log file"));
-            Entry(DisplayCommand,      QString,     _S(DATA_INSTALL_DIR "/scripts/Xsetup"),     _S("Path to a script to execute when starting the display server"));
-            Entry(DisplayStopCommand,  QString,     _S(DATA_INSTALL_DIR "/scripts/Xstop"),      _S("Path to a script to execute when stopping the display server"));
-+            Entry(SessionLogFile,      QString,     _S(".cache/xsession-errors"),               _S("Path to the user session log file"));
-+            Entry(DisplayCommand,      QString,     _S(SYS_CONFIG_DIR "/sddm/Xsetup"),          _S("Path to a script to execute when starting the display server"));
-+            Entry(DisplayStopCommand,  QString,     _S(SYS_CONFIG_DIR "/sddm/Xstop"),           _S("Path to a script to execute when stopping the display server"));
-             Entry(EnableHiDPI,         bool,        true,                                      _S("Enable Qt's automatic high-DPI scaling"));
-         );
- 
-@@ -82,12 +81,12 @@ namespace SDDM {
-             Entry(SessionDir,          QStringList, {_S("/usr/local/share/wayland-sessions"),
-                                                      _S("/usr/share/wayland-sessions")},        _S("Comma-separated list of directories containing available Wayland sessions"));
-             Entry(SessionCommand,      QString,     _S(WAYLAND_SESSION_COMMAND),                _S("Path to a script to execute when starting the desktop session"));
-            Entry(SessionLogFile,      QString,     _S(".local/share/sddm/wayland-session.log"),_S("Path to the user session log file"));
-+            Entry(SessionLogFile,      QString,     _S(".cache/wayland-errors"),                _S("Path to the user session log file"));
-             Entry(EnableHiDPI,         bool,        true,                                       _S("Enable Qt's automatic high-DPI scaling"));
-         );
- 
-         Section(Users,
-            Entry(DefaultPath,         QString,     _S("/usr/local/bin:/usr/bin:/bin"),         _S("Default $PATH for logged in users"));
-+            Entry(DefaultPath,         QString,     _S("/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin"), _S("Default $PATH for logged in users"));
-             Entry(MinimumUid,          int,         UID_MIN,                                    _S("Minimum user id for displayed users"));
-             Entry(MaximumUid,          int,         UID_MAX,                                    _S("Maximum user id for displayed users"));
-             Entry(HideUsers,           QStringList, QStringList(),                              _S("Comma-separated list of users that should not be listed"));
@@ -1,67 +0,0 @@
-From 52175648f4e1b415f93b24a3ef970983024659f2 Mon Sep 17 00:00:00 2001
-From: Neal Gompa <neal@gompa.dev>
-Date: Wed, 28 Feb 2024 16:47:16 -0500
-Subject: [PATCH] Default to Qt6 and always use versioned greeters
-
-Distributors can handle creating an unversioned name if necessary.
---
- src/common/ThemeMetadata.cpp | 4 ++--
- src/daemon/Greeter.cpp       | 3 +--
- src/greeter/CMakeLists.txt   | 9 +--------
- 3 files changed, 4 insertions(+), 12 deletions(-)
-
-diff --git a/src/common/ThemeMetadata.cpp b/src/common/ThemeMetadata.cpp
-index 2cb3762..003056a 100644
--- a/src/common/ThemeMetadata.cpp
-+++ b/src/common/ThemeMetadata.cpp
-@@ -28,7 +28,7 @@ namespace SDDM {
-         QString mainScript { QStringLiteral("Main.qml") };
-         QString configFile;
-         QString translationsDirectory { QStringLiteral(".") };
-        int qtVersion = 5;
-+        int qtVersion = 6;
-     };
- 
-     ThemeMetadata::ThemeMetadata(const QString &path, QObject *parent) : QObject(parent), d(new ThemeMetadataPrivate()) {
-@@ -61,6 +61,6 @@ namespace SDDM {
-         d->mainScript = settings.value(QStringLiteral("SddmGreeterTheme/MainScript"), QStringLiteral("Main.qml")).toString();
-         d->configFile = settings.value(QStringLiteral("SddmGreeterTheme/ConfigFile"), QStringLiteral("theme.conf")).toString();
-         d->translationsDirectory = settings.value(QStringLiteral("SddmGreeterTheme/TranslationsDirectory"), QStringLiteral(".")).toString();
-        d->qtVersion = settings.value(QStringLiteral("SddmGreeterTheme/QtVersion"), 5).toInt();
-+        d->qtVersion = settings.value(QStringLiteral("SddmGreeterTheme/QtVersion"), 6).toInt();
-     }
- }
-diff --git a/src/daemon/Greeter.cpp b/src/daemon/Greeter.cpp
-index 07fccde..5a956b6 100644
--- a/src/daemon/Greeter.cpp
-+++ b/src/daemon/Greeter.cpp
-@@ -82,8 +82,7 @@ namespace SDDM {
- 
-     QString Greeter::greeterPathForQt(int qtVersion)
-     {
-        const QString suffix = qtVersion == 5 ? QString() : QStringLiteral("-qt%1").arg(qtVersion);
-        return QStringLiteral(BIN_INSTALL_DIR "/sddm-greeter%1").arg(suffix);
-+        return QStringLiteral(BIN_INSTALL_DIR "/sddm-greeter-qt%1").arg(qtVersion);
-     }
- 
-     bool Greeter::start() {
-diff --git a/src/greeter/CMakeLists.txt b/src/greeter/CMakeLists.txt
-index 72769e4..524368d 100644
--- a/src/greeter/CMakeLists.txt
-+++ b/src/greeter/CMakeLists.txt
-@@ -1,11 +1,4 @@
-if(QT_MAJOR_VERSION EQUAL "5")
-    # Keep the unversioned name for Qt5. When upgrading SDDM, the old daemon
-    # might still be running and only know about "sddm-greeter". Keeping the
-    # previous name around also helps users calling it directly.
-    set(GREETER_TARGET sddm-greeter)
-else()
-    set(GREETER_TARGET sddm-greeter-qt${QT_MAJOR_VERSION})
-endif()
-+set(GREETER_TARGET sddm-greeter-qt${QT_MAJOR_VERSION})
- 
- message(STATUS "Building greeter for Qt ${QT_MAJOR_VERSION} as ${GREETER_TARGET}")
- 
-- 
-2.43.0
-
@@ -1,20 +0,0 @@
- #%PAM-1.0
-auth       required    pam_env.so
-auth       required    pam_permit.so
-auth       include     postlogin
-
-account    required    pam_nologin.so
-account    include     system-auth
-
-password   include     system-auth
-
-session    required    pam_selinux.so close
-session    required    pam_loginuid.so
-session    required    pam_selinux.so open
-session    optional    pam_keyinit.so force revoke
-session    required    pam_namespace.so
-session    include     system-auth
-session    optional    pam_gnome_keyring.so auto_start
-session    optional    pam_kwallet5.so auto_start
-session    optional    pam_kwallet.so auto_start
-session    include     postlogin
@@ -1,17 +0,0 @@
-#%PAM-1.0
-
-# Load environment from /etc/environment and ~/.pam_environment
-auth		required pam_env.so
-
-# Always let the greeter start without authentication
-auth		required pam_permit.so
-
-# No action required for account management
-account		required pam_permit.so
-
-# Can't change password
-password	required pam_deny.so
-
-# Setup session
-session		required pam_unix.so
-session		optional pam_systemd.so
@@ -1,12 +0,0 @@
-diff --git a/services/sddm-tmpfiles.conf.in b/services/sddm-tmpfiles.conf.in
-index fb45553..6acfb6c 100644
--- a/services/sddm-tmpfiles.conf.in
-+++ b/services/sddm-tmpfiles.conf.in
-@@ -1,5 +1,7 @@
- # Home dir of the sddm user, also contains state.conf
- d	${STATE_DIR}	0750	sddm	sddm
-+# Workaround for https://pagure.io/fedora-kde/SIG/issue/87
-+Z	${STATE_DIR}	-	sddm	sddm
- # This contains X11 auth files passed to Xorg and the greeter
- d	${RUNTIME_DIR}	0711	root	root
- # Sockets for IPC
@@ -1,2 +0,0 @@
-#Type Name ID GECOS                  Home directory Shell
-u     sddm -  "SDDM Greeter Account" /var/lib/sddm   -
@@ -1,2 +0,0 @@
-[General]
-DisplayServer=x11
@@ -1,122 +0,0 @@
-[Autologin]
-# Whether sddm should automatically log back into sessions when they exit
-#Relogin=false
-
-# Name of session file for autologin session
-#Session=
-
-# Username for autologin session
-#User=
-
-
-[General]
-# Enable Qt's automatic high-DPI scaling
-#EnableHiDPI=false
-
-# Halt command
-#HaltCommand=/usr/bin/systemctl poweroff
-
-# Initial NumLock state. Can be on, off or none.
-# If property is set to none, numlock won't be changed
-# NOTE: Currently ignored if autologin is enabled.
-#Numlock=none
-
-# Reboot command
-#RebootCommand=/usr/bin/systemctl reboot
-
-# Control x11/wayland startup
-# DisplayServer=wayland
-
-[Theme]
-# Current theme name
-#Current=01-breeze-fedora
-
-# Cursor theme used in the greeter
-#CursorTheme=
-
-# Number of users to use as threshold
-# above which avatars are disabled
-# unless explicitly enabled with EnableAvatars
-#DisableAvatarsThreshold=7
-
-# Enable display of custom user avatars
-#EnableAvatars=true
-
-# Global directory for user avatars
-# The files should be named <username>.face.icon
-#FacesDir=/usr/share/sddm/faces
-
-# Theme directory path
-#ThemeDir=/usr/share/sddm/themes
-
-
-[Users]
-# Default $PATH for logged in users
-#DefaultPath=/usr/local/bin:/usr/bin:/bin
-
-# Comma-separated list of shells.
-# Users with these shells as their default won't be listed
-#HideShells=
-
-# Comma-separated list of users that should not be listed
-#HideUsers=
-
-# Maximum user id for displayed users
-#MaximumUid=60000
-
-# Minimum user id for displayed users
-#MinimumUid=1000
-
-# Remember the session of the last successfully logged in user
-#RememberLastSession=true
-
-# Remember the last successfully logged in user
-#RememberLastUser=true
-
-
-[Wayland]
-# Path to a script to execute when starting the desktop session
-#SessionCommand=/etc/sddm/wayland-session
-
-# Directory containing available Wayland sessions
-#SessionDir=/usr/share/wayland-sessions
-
-# Path to the user session log file
-#SessionLogFile=.cache/wayland-errors
-
-
-[X11]
-# Path to a script to execute when starting the display server
-#DisplayCommand=/etc/sddm/Xsetup
-
-# Path to a script to execute when stopping the display server
-#DisplayStopCommand=/etc/sddm/Xstop
-
-# The lowest virtual terminal number that will be used.
-#MinimumVT=1
-
-# Arguments passed to the X server invocation
-#ServerArguments=-nolisten tcp
-
-# Path to X server binary
-#ServerPath=/usr/bin/X
-
-# Path to a script to execute when starting the desktop session
-#SessionCommand=/etc/X11/xinit/Xsession
-
-# Directory containing available X sessions
-#SessionDir=/usr/share/xsessions
-
-# Path to the user session log file
-#SessionLogFile=.cache/xsession-errors
-
-# Path to the Xauthority file
-#UserAuthFile=.Xauthority
-
-# Path to xauth binary
-#XauthPath=/usr/bin/xauth
-
-# Path to Xephyr binary
-#XephyrPath=/usr/bin/Xephyr
-
-
@@ -1,23 +0,0 @@
-auth     [success=done ignore=ignore default=bad] pam_selinux_permit.so
-auth        substack      password-auth
-auth        optional      pam_gnome_keyring.so
-auth        optional      pam_kwallet5.so
-auth        optional      pam_kwallet.so
-auth        include       postlogin
-
-account     required      pam_nologin.so
-account     include       password-auth
-
-password    include       password-auth
-
-session     required      pam_selinux.so close
-session     required      pam_loginuid.so
-session    optional    pam_ck_connector.so
-session     required      pam_selinux.so open
-session     optional      pam_keyinit.so force revoke
-session     required      pam_namespace.so
-session     include       password-auth
-session     optional      pam_gnome_keyring.so auto_start
-session     optional      pam_kwallet5.so auto_start
-session     optional      pam_kwallet.so auto_start
-session     include       postlogin
@@ -1,5 +0,0 @@
-# workaround https://bugzilla.redhat.com/1686675
-# see also https://bugreports.qt.io/browse/QTBUG-58508
-QML_DISABLE_DISK_CACHE=1
-# enable qDebug messages for debug build
-# QT_LOGGING_RULES="*.debug=true"
@@ -1,293 +0,0 @@
-# Disable X11 for RHEL 10+
-%bcond x11 %[%{undefined rhel} || 0%{?rhel} < 10]
-
-Name:           terra-sddm
-Version:        0.21.0
-Release:        5%{?dist}
-License:        GPL-2.0-or-later
-Summary:        QML based desktop and login manager
-Provides:       sddm = %version-%release
-
-URL:            https://github.com/sddm/sddm
-Source0:        %{url}/archive/v%{version}/sddm-%{version}.tar.gz
-
-## upstream patches
-# Port all themes to Qt 6
-# Submitted: https://github.com/sddm/sddm/pull/1876
-Patch1:         sddm-PR1876.patch
-
-## upstreamable patches
-# Fix race with logind restart, and start seat0 if !CanGraphical on timer
-# https://bugzilla.redhat.com/show_bug.cgi?id=2011991
-# https://bugzilla.redhat.com/show_bug.cgi?id=2016310
-# Submmited: https://github.com/sddm/sddm/pull/1494
-Patch11:        0001-Delay-for-logind-and-fallback-to-seat0.patch
-
-## downstream patches
-Patch101:       sddm-0.20.0-fedora_config.patch
-
-# sddm.service: +EnvironmentFile=-/etc/sysconfig/sddm
-Patch103:       sddm-0.18.0-environment_file.patch
-
-# Workaround for https://pagure.io/fedora-kde/SIG/issue/87
-Patch104:       sddm-rpmostree-tmpfiles-hack.patch
-
-# Workaround lack of Qt 5 greeter build
-Patch105:       sddm-0.21.0-qt6greeter.patch
-
-# https://github.com/sddm/sddm/pull/1779
-Patch106:       https://github.com/sddm/sddm/pull/1779.patch
-
-# Shamelessly stolen from gdm
-Source10:       sddm.pam
-# Shamelessly stolen from gdm
-Source11:       sddm-autologin.pam
-# Previously included in sddm sources
-Source12:       sddm-greeter.pam
-# sample sddm.conf generated with sddm --example-config, and entries commented-out
-Source13:       sddm.conf
-# README.scripts
-Source14:       README.scripts
-# sysconfig snippet
-Source15:       sddm.sysconfig
-# sddm x11 override config
-Source16:       sddm-x11.conf
-# sysusers config file. note these are shipped in the upstream tarball
-# but we cannot use the files from the tarball for %pre scriptlet
-# generation, so we duplicate them as source files for that purpose;
-# this is an ugly hack that should be removed if it becomes possible.
-# see https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/TFDMAU7KLMSQTKPJELHSM6PFVXIZ56GK/
-Source17:       sddm-systemd-sysusers.conf
-
-
-Provides: service(graphical-login) = sddm
-
-BuildRequires:  cmake >= 2.8.8
-BuildRequires:  extra-cmake-modules
-BuildRequires:  pam-devel
-BuildRequires:  pkgconfig(libsystemd)
-BuildRequires:  pkgconfig(systemd)
-BuildRequires:  pkgconfig(xcb)
-BuildRequires:  pkgconfig(xcb-xkb)
-# sometimes python-docutils, sometimes python2-docutils, sometimes python3-docutils.
-# use path then for sanity
-BuildRequires:  /usr/bin/rst2man
-BuildRequires:  cmake(Qt6Core)
-BuildRequires:  cmake(Qt6DBus)
-BuildRequires:  cmake(Qt6Gui)
-BuildRequires:  cmake(Qt6Qml)
-BuildRequires:  cmake(Qt6Quick)
-BuildRequires:  cmake(Qt6LinguistTools)
-BuildRequires:  cmake(Qt6Test)
-BuildRequires:  cmake(Qt6QuickTest)
-# verify presence to pull defaults from /etc/login.defs
-BuildRequires:  shadow-utils
-BuildRequires:  systemd
-BuildRequires:  systemd-rpm-macros
-
-Obsoletes: kde-settings-sddm < 20-5
-
-%if 0%{?fedora}
-# for /usr/share/backgrounds/default.png
-BuildRequires: desktop-backgrounds-compat
-BuildRequires: GraphicsMagick
-Requires: desktop-backgrounds-compat
-# for /usr/share/pixmaps/system-logo-white.png
-Requires: system-logos
-%endif
-Requires: systemd
-%if %{with x11}
-Requires: xorg-x11-xinit
-%endif
-%{?systemd_requires}
-
-Requires(pre): shadow-utils
-
-# Virtual dependency for sddm greeter setup
-Requires: sddm-greeter-displayserver
-Suggests: sddm-wayland-generic
-
-%description
-SDDM is a modern graphical display manager aiming to be fast, simple and
-beautiful. It uses modern technologies like QtQuick, which in turn gives the
-designer the ability to create smooth, animated user interfaces.
-
-%package wayland-generic
-Summary: Generic Wayland SDDM greeter configuration
-Provides: sddm-greeter-displayserver
-Conflicts: sddm-greeter-displayserver
-Requires: weston
-Requires: %{name} = %{version}-%{release}
-BuildArch: noarch
-
-%description wayland-generic
-This package contains configuration and dependencies for SDDM
-to use Weston for the greeter display server.
-
-This is the generic default Wayland configuration provided
-by SDDM.
-
-%if %{with x11}
-%package x11
-Summary: X11 SDDM greeter configuration
-Provides: sddm-greeter-displayserver
-Conflicts: sddm-greeter-displayserver
-# This will eventually go away...
-Provides: deprecated()
-Requires: xorg-x11-server-Xorg
-Requires: %{name} = %{version}-%{release}
-Recommends: qt6-qtvirtualkeyboard
-BuildArch: noarch
-
-%description x11
-This package contains configuration and dependencies for SDDM
-to use X11 for the greeter display server.
-%endif
-
-%package themes
-Summary: SDDM Themes
-# for upgrade path
-Obsoletes: sddm < 0.2.0-0.12
-Requires: %{name} = %{version}-%{release}
-BuildArch: noarch
-%description themes
-A collection of sddm themes, including: elarun, maldives, maya
-
-
-%prep
-%autosetup -p1 %{?commitdate:-n sddm-%{commit}} -n sddm-%version
-
-%if 0%{?fedora}
-#FIXME/TODO: use version on filesystem instead of using a bundled copy
-cp -v /usr/share/backgrounds/default.png  \
-      src/greeter/theme/background.png
-ls -sh src/greeter/theme/background.png
-gm mogrify -resize 1920x1200 src/greeter/theme/background.png
-ls -sh src/greeter/theme/background.png
-%endif
-
-
-%build
-%cmake \
-  -DBUILD_WITH_QT6:BOOL=ON \
-  -DBUILD_MAN_PAGES:BOOL=ON \
-  -DCMAKE_BUILD_TYPE:STRING="Release" \
-  -DENABLE_JOURNALD:BOOL=ON \
-  -DSESSION_COMMAND:PATH=/etc/X11/xinit/Xsession \
-  -DWAYLAND_SESSION_COMMAND:PATH=/etc/sddm/wayland-session
-
-%cmake_build
-
-
-%install
-%cmake_install
-
-mkdir -p %{buildroot}%{_sysconfdir}/sddm.conf.d
-mkdir -p %{buildroot}%{_prefix}/lib/sddm/sddm.conf.d
-install -Dpm 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/sddm
-install -Dpm 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/pam.d/sddm-autologin
-install -Dpm 644 %{SOURCE12} %{buildroot}%{_sysconfdir}/pam.d/sddm-greeter
-install -Dpm 644 %{SOURCE13} %{buildroot}%{_sysconfdir}/sddm.conf
-install -Dpm 644 %{SOURCE14} %{buildroot}%{_datadir}/sddm/scripts/README.scripts
-install -Dpm 644 %{SOURCE15} %{buildroot}%{_sysconfdir}/sysconfig/sddm
-%if %{with x11}
-install -Dpm 644 %{SOURCE16} %{buildroot}%{_prefix}/lib/sddm/sddm.conf.d/x11.conf
-%endif
-mkdir -p %{buildroot}/run/sddm
-mkdir -p %{buildroot}%{_localstatedir}/lib/sddm
-mkdir -p %{buildroot}%{_sysconfdir}/sddm/
-cp -a %{buildroot}%{_datadir}/sddm/scripts/* \
-      %{buildroot}%{_sysconfdir}/sddm/
-# we're using /etc/X11/xinit/Xsession (by default) instead
-rm -fv %{buildroot}%{_sysconfdir}/sddm/Xsession
-
-# De-conflict the dbus file
-mv %{buildroot}%{_datadir}/dbus-1/system.d/org.freedesktop.DisplayManager.conf \
-   %{buildroot}%{_datadir}/dbus-1/system.d/org.freedesktop.DisplayManager-sddm.conf
-
-%if 0%{?fedora} && 0%{?fedora} < 43
-# Provide unversioned greeter until F40 is EOL
-ln -sr %{buildroot}%{_bindir}/sddm-greeter-qt6 %{buildroot}%{_bindir}/sddm-greeter
-%endif
-
-
-%pre
-%sysusers_create_compat %{SOURCE17}
-
-%post
-%systemd_post sddm.service
-# handle incompatible configuration changes
-(grep \
-   -e '^Current=fedora$' \
-   -e '^\[XDisplay\]$' \
-   -e '^\[WaylandDisplay\]$' \
-   %{_sysconfdir}/sddm.conf > /dev/null && \
- sed -i.rpmsave \
-   -e 's|^Current=fedora$|#Current=01-breeze-fedora|' \
-   -e 's|^\[XDisplay\]$|\[X11\]|' \
-   -e 's|^\[WaylandDisplay\]$|\[Wayland\]|' \
-   %{_sysconfdir}/sddm.conf
-) ||:
-
-
-%preun
-%systemd_preun sddm.service
-
-
-%postun
-%systemd_postun sddm.service
-
-
-%files
-%license LICENSE
-%doc README.md CONTRIBUTORS
-%dir %{_sysconfdir}/sddm/
-%dir %{_sysconfdir}/sddm.conf.d
-%dir %{_prefix}/lib/sddm/sddm.conf.d
-%config(noreplace)   %{_sysconfdir}/sddm/*
-%config(noreplace)   %{_sysconfdir}/sddm.conf
-%config(noreplace) %{_sysconfdir}/sysconfig/sddm
-%config(noreplace) %{_sysconfdir}/pam.d/sddm*
-%{_datadir}/dbus-1/system.d/org.freedesktop.DisplayManager-sddm.conf
-%{_bindir}/sddm
-%{_bindir}/sddm-greeter*
-%{_libexecdir}/sddm-helper
-%{_libexecdir}/sddm-helper-start-wayland
-%{_libexecdir}/sddm-helper-start-x11user
-%{_tmpfilesdir}/sddm.conf
-%{_sysusersdir}/sddm.conf
-%attr(0711, root, sddm) %dir /run/sddm
-%attr(1770, sddm, sddm) %dir %{_localstatedir}/lib/sddm
-%{_unitdir}/sddm.service
-%{_qt6_archdatadir}/qml/SddmComponents/
-%dir %{_datadir}/sddm
-%{_datadir}/sddm/faces/
-%{_datadir}/sddm/flags/
-%{_datadir}/sddm/scripts/
-%dir %{_datadir}/sddm/themes/
-# %%lang'ify? they're small, probably not worth it -- rex
-%{_datadir}/sddm/translations*/
-%{_mandir}/man1/sddm.1*
-%{_mandir}/man1/sddm-greeter.1*
-%{_mandir}/man5/sddm.conf.5*
-%{_mandir}/man5/sddm-state.conf.5*
-
-
-%files wayland-generic
-# No files since default configuration
-
-
-%if %{with x11}
-%files x11
-%{_prefix}/lib/sddm/sddm.conf.d/x11.conf
-%endif
-
-
-%files themes
-%{_datadir}/sddm/themes/elarun/
-%{_datadir}/sddm/themes/maldives/
-%{_datadir}/sddm/themes/maya/
-
-
-%changelog
-%autochangelog
@@ -1 +0,0 @@
-rpm.version(gh("sddm/sddm"));
@@ -7,7 +7,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           asar
-Version:        3.2.10
+Version:        3.2.13
 Release:        1%?dist
 Summary:        Simple extensive tar-like archive format with indexing
 License:        MIT
@@ -1,5 +1,5 @@
 Name:			terra-blueprint-compiler
-Version:		0.12.0
+Version:		0.14.0
 Release:		1%?dist
 License:		LGPL-3.0-or-later
 Summary:		Markup language for GTK user interfaces
@@ -12,7 +12,7 @@
 %endif

 Name:			codium
-Version:		1.91.1.24193
+Version:		1.93.1.24256
 Release:		1%?dist
 Summary:		Code editing. Redefined.
 License:		MIT
@@ -52,7 +52,7 @@ cat <<EOF > vscodium-bin.desktop
 Name=VSCodium
 Comment=Code Editing. Redefined.
 GenericName=Text Editor
-Exec=/usr/bin/codium --no-sandbox --unity-launch %F
+Exec=/usr/bin/codium --no-sandbox %F
 Icon=vscodium
 Type=Application
 StartupNotify=false
@@ -1,6 +1,6 @@
-%global commit 3400554f57b770760cb4cb58f15963399d13848e
+%global commit ee7fb21cee40fe84875a886748b0057aaf96677a
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240801
+%global commit_date 20240920

 Name:           flow-control-nightly
 Version:        %commit_date.%shortcommit
@@ -1,5 +1,5 @@
 Name:			flutter
-Version:		3.22.3
+Version:		3.24.3
 Release:		1%?dist
 Summary:		SDK for crafting beautiful, fast user experiences from a single codebase
 License:		BSD-3-Clause
@@ -0,0 +1,25 @@
+From 518d106d6d54bc65d37116e3c5bc940b5c93fb0e Mon Sep 17 00:00:00 2001
+From: Philipp Trulson <der-eismann@users.noreply.github.com>
+Date: Tue, 13 Aug 2024 10:22:14 +0200
+Subject: [PATCH] Change path in systemd service to use package binary
+
+---
+ utils/systemd/kvrocks.service | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/utils/systemd/kvrocks.service b/utils/systemd/kvrocks.service
+index c0180b7c..17482b7a 100644
+--- a/utils/systemd/kvrocks.service
+++ b/utils/systemd/kvrocks.service
+@@ -6,7 +6,7 @@ After=network-online.target
+ 
+ [Service]
+ Type=notify
+-ExecStart=/usr/local/bin/kvrocks -c /etc/kvrocks/kvrocks.conf
+ExecStart=/usr/bin/kvrocks -c /etc/kvrocks/kvrocks.conf
+ Restart=on-failure
+ ExecStop=/bin/kill -s TERM $MAINPID
+ RestartSec=10s
+-- 
+2.45.2
+
@@ -1,10 +1,11 @@
 Name:           kvrocks
 Version:        2.9.0
-Release:        1%?dist
+Release:        2%?dist
 Summary:        Distributed key value NoSQL database that uses RocksDB
 License:        Apache-2.0
 URL:            https://kvrocks.apache.org/
 Source0:        https://github.com/apache/kvrocks/archive/refs/tags/v%version.tar.gz
+Patch0:         0001-Change-path-in-systemd-service-to-use-package-binary.patch
 Requires:       openssl
 BuildRequires:  autoconf
 BuildRequires:  cmake
@@ -19,7 +20,7 @@ Apache Kvrocks is a distributed key value NoSQL database that uses RocksDB as st
 engine and is compatible with Redis protocol.

 %prep
-%autosetup
+%autosetup -p1

 %build
 unset LDFLAGS
@@ -1,7 +1,7 @@
 %global _desc Tracy is a real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications.

 Name:			tracy
-Version:		0.11.0
+Version:		0.11.1
 Release:		1%?dist
 Summary:		A real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications.
 License:		BSD-3-Clause
@@ -27,7 +27,7 @@ This package contains the development files for the tracy package.
 %meson
 %meson_build

-for project in capture csvexport import-chrome import-fuchsia update profiler
+for project in capture csvexport import update profiler
 do
    pushd $project
    %cmake -DDOWNLOAD_CAPSTONE=0
@@ -41,8 +41,8 @@ done
 # NOTE: the subprojects don't have install targets so we do it manually
 install -Dm755 capture/%__cmake_builddir/tracy-capture %buildroot%_bindir/tracy-capture
 install -Dm755 csvexport/%__cmake_builddir/tracy-csvexport %buildroot%_bindir/tracy-csvexport
-install -Dm755 import-chrome/%__cmake_builddir/tracy-import-chrome %buildroot%_bindir/tracy-import-chrome
-install -Dm755 import-fuchsia/%__cmake_builddir/tracy-import-fuchsia %buildroot%_bindir/tracy-import-fuchsia
+install -Dm755 import/%__cmake_builddir/tracy-import-chrome %buildroot%_bindir/tracy-import-chrome
+install -Dm755 import/%__cmake_builddir/tracy-import-fuchsia %buildroot%_bindir/tracy-import-fuchsia
 install -Dm755 update/%__cmake_builddir/tracy-update %buildroot%_bindir/tracy-update
 install -Dm755 profiler/%__cmake_builddir/tracy-profiler %buildroot%_bindir/tracy

@@ -1,7 +1,7 @@
-%global commit 33d06c4d9603b37885e7ddcc82fa06f4dcd83943
+%global commit 15b4130fa551e38841b69f135218ef75cfb010db
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240801
-%global ver 0.148.0
+%global commit_date 20240920
+%global ver 0.155.0

 %bcond_with check

@@ -35,7 +35,7 @@ BuildRequires:  alsa-lib-devel
 BuildRequires:  fontconfig-devel
 BuildRequires:  wayland-devel
 BuildRequires:  libxkbcommon-x11-devel
-BuildRequires:  openssl-devel-engine
+BuildRequires:  openssl-devel
 BuildRequires:  libzstd-devel
 BuildRequires:  perl-FindBin
 BuildRequires:  perl-IPC-Cmd
@@ -79,6 +79,8 @@ script/generate-licenses
 install -Dm755 target/rpm/zed %{buildroot}%{_libexecdir}/zed-editor
 install -Dm755 target/rpm/cli %{buildroot}%{_bindir}/zed

+%__cargo clean
+
 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

@@ -1,7 +1,6 @@
 let releases = "https://api.github.com/repos/zed-industries/zed/releases".get().json_arr();
 for release in releases {
  let tag = release.tag_name;
-  tag.pop(4); // remove the "-pre" suffix
  tag.crop(1); // remove "v"
  rpm.global("ver", tag);
  break;
@@ -1,6 +1,6 @@
 %bcond_with check

-%global ver 0.147.0
+%global ver 0.154.0-pre
 # Exclude input files from mangling
 %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$
 # Use Mold as the linker
@@ -10,13 +10,13 @@
 %global app_id dev.zed.Zed-Preview

 Name:           zed-preview
-Version:        %ver
+Version:        %(echo %ver | sed 's/-/~/')
 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
+Source0:        https://github.com/zed-industries/zed/archive/refs/tags/v%{ver}.tar.gz

 Conflicts:      zed
 Provides:       zed
@@ -31,7 +31,7 @@ BuildRequires:  alsa-lib-devel
 BuildRequires:  fontconfig-devel
 BuildRequires:  wayland-devel
 BuildRequires:  libxkbcommon-x11-devel
-BuildRequires:  openssl-devel-engine
+BuildRequires:  openssl-devel
 BuildRequires:  libzstd-devel
 BuildRequires:  perl-FindBin
 BuildRequires:  perl-IPC-Cmd
@@ -44,7 +44,7 @@ BuildRequires:  vulkan-loader
 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
+%autosetup -n %{crate}-%{ver} -p1
 %cargo_prep_online

 export DO_STARTUP_NOTIFY="true"
@@ -75,6 +75,8 @@ script/generate-licenses
 install -Dm755 target/rpm/zed %{buildroot}%{_libexecdir}/zed-editor
 install -Dm755 target/rpm/cli %{buildroot}%{_bindir}/zed

+%__cargo clean
+
 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

@@ -9,7 +9,7 @@
 %global app_id dev.zed.Zed

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

@@ -30,7 +30,7 @@ BuildRequires:  alsa-lib-devel
 BuildRequires:  fontconfig-devel
 BuildRequires:  wayland-devel
 BuildRequires:  libxkbcommon-x11-devel
-BuildRequires:  openssl-devel-engine
+BuildRequires:  openssl-devel
 BuildRequires:  libzstd-devel
 BuildRequires:  perl-FindBin
 BuildRequires:  perl-IPC-Cmd
@@ -75,6 +75,8 @@ script/generate-licenses
 install -Dm755 target/rpm/zed %{buildroot}%{_libexecdir}/zed-editor
 install -Dm755 target/rpm/cli %{buildroot}%{_bindir}/zed

+%__cargo clean
+
 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

@@ -7,7 +7,7 @@

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

 %gometa

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

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

--- a/Show More
+++ b/Show More