Merge branch 'f40' into mado/rebuild/libappimageupdate

* chore(rebuild): zsync2

Signed-off-by: madomado <madonuko@outlook.com>

* bump: zsync2

* bump commit to head

* disable -Wincompatible-pointer-types

Signed-off-by: madomado <madonuko@outlook.com>

---------

Signed-off-by: madomado <madonuko@outlook.com>

.backportrc.json

@@ -2,7 +2,7 @@
   "repoOwner": "terrapkg",
   "repoName": "packages",
   "resetAuthor": true,
-  "targetBranchChoices": ["f39", "f40", "frawhide"],
+  "targetBranchChoices": ["f38", "f39", "f40", "frawhide"],
   "branchLabelMapping": {
     "^sync-(.+)$": "$1"
   }

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-ARG VARIANT="rawhide"
+ARG VARIANT="38"
 FROM fedora:${VARIANT}
 
 RUN useradd -m vscode

.devcontainer/devcontainer.json

@@ -2,7 +2,7 @@
   "name": "Fedora",
   "build": {
     "dockerfile": "Dockerfile",
-    "args": { "VARIANT": "rawhide" }
+    "args": { "VARIANT": "38" }
   },
   "remoteUser": "vscode",
   "runArgs": [

.github/workflows/autobuild.yml

@@ -6,13 +6,13 @@ on:
     paths:
       - anda/**
     branches:
-      - frawhide
+      - f40
   pull_request:
     branches:
-      - frawhide
+      - f40
   merge_group:
     branches:
-      - frawhide
+      - f40
   workflow_dispatch:
   workflow_call:
 
@@ -23,13 +23,13 @@ jobs:
     outputs:
       build_matrix: ${{ steps.generate_build_matrix.outputs.build_matrix }}
     container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:f40
       options: --cap-add=SYS_ADMIN --privileged
     steps:
       - name: Set workspace as safe
         run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Generate build matrix
@@ -40,15 +40,15 @@ jobs:
     strategy:
       matrix:
         pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }}
-        version: ["rawhide"]
+        version: ["40"]
       fail-fast: false
-    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || matrix.pkg.labels['large'] && 'x86-64-lg' || 'ubuntu-latest' }}
+    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
     container:
       image: ghcr.io/terrapkg/builder:f${{ matrix.version}}
       options: --cap-add=SYS_ADMIN --privileged
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Set up git repository
@@ -68,10 +68,9 @@ jobs:
           x=${NAME//\//@}
           echo "name=$x" >> $GITHUB_OUTPUT
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
         with:
           name: ${{ steps.art.outputs.name }}
-          compression-level: 0 # The RPMs are already compressed :p
           path: |
             anda-build/rpm/rpms/*
             anda-build/rpm/srpm/*

.github/workflows/bootstrap.yml

@@ -7,7 +7,7 @@ jobs:
   bootstrap:
     strategy:
       matrix:
-        version: ["rawhide"]
+        version: ["40"]
         arch: ["x86_64", "aarch64"]
       fail-fast: true
     runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
@@ -21,7 +21,7 @@ jobs:
       - name: Install Anda
         run: cargo install anda
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           ref: f${{ matrix.version }}
           fetch-depth: 1

.github/workflows/build.yml

@@ -5,57 +5,32 @@ on:
       packages:
         description: "Packages to Build"
         required: true
-      custom_builder:
-        description: "Custom Builder"
-        required: false
-        default: ""
-      architecture:
-        description: "Architecture"
-        required: false
-        default: all
-        type: string
-    
-
 
 jobs:
   parse:
     outputs:
       pkgs: ${{ steps.parsing.outputs.pkgs }}
-      builder: ${{ inputs.custom_builder }}
-      arch: ${{ steps.parsing.outputs.arch }}
     runs-on: "ubuntu-latest"
     steps:
       - name: Parse Input
         id: parsing
-        run: |
-            echo "${{ inputs.packages }}" | sed 's/ /\n/g' | sed 's/$/\//g' | jq -R . | jq -s . | jq -c . | sed 's/^/pkgs=/' >> $GITHUB_OUTPUT
-            echo "builder=${{ inputs.custom_builder }}" >> $GITHUB_OUTPUT
-            arch="${{ inputs.architecture }}"
-            # Convert to json array using jq
-            # if arch is not all, convert to array
-            if [ "$arch" != "all" ]; then
-              # jq, array with single element as string
-               arch=$(echo $arch | sed 's/,/\n/g')
-               echo "arch=$(echo $arch | jq -Rs 'split("\n")' | jq 'map(select(length > 0))' | jq -c .)" >> $GITHUB_OUTPUT
-            else
-               echo "arch=$(echo '["aarch64", "x86_64"]' | jq -c .)" >> $GITHUB_OUTPUT
-            fi
+        run: echo "${{ inputs.packages }}" | sed 's/ /\n/g' | sed 's/$/\//g' | jq -R . | jq -s . | jq -c . | sed 's/^/pkgs=/' >> $GITHUB_OUTPUT
 
   build:
     needs: parse
     strategy:
       matrix:
         pkg: ${{ fromJson(needs.parse.outputs.pkgs) }}
-        version: ["rawhide"]
-        arch: ${{ fromJson(needs.parse.outputs.arch) }}
+        version: ["40"]
+        arch: ["x86_64", "aarch64"]
       fail-fast: false
-    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || needs.parse.outputs.builder && needs.parse.outputs.builder || 'ubuntu-latest' }}
+    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
     container:
       image: ghcr.io/terrapkg/builder:f${{ matrix.version }}
       options: --cap-add=SYS_ADMIN --privileged
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Set up git repository
@@ -63,7 +38,7 @@ jobs:
 
       - name: Cache buildroot
         id: br-cache
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         with:
           path: /var/cache
           key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.arch }}-${{ matrix.pkg }}
@@ -78,10 +53,9 @@ jobs:
           x=${NAME//\//@}
           echo "name=$x" >> $GITHUB_OUTPUT
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
         with:
           name: ${{ steps.art.outputs.name }}
-          compression-level: 0 # The RPMs are already compressed :p
           path: |
             anda-build/rpm/rpms/*
             anda-build/rpm/srpm/*

.github/workflows/json-build.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         pkg: ${{ fromJson(inputs.packages) }}
-        version: ["rawhide"]
+        version: ["40"]
       fail-fast: false
     runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
     container:
@@ -19,7 +19,7 @@ jobs:
       options: --cap-add=SYS_ADMIN --privileged
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Set up git repository
@@ -27,7 +27,7 @@ jobs:
 
       - name: Cache buildroot
         id: br-cache
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         with:
           path: /var/cache
           key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}-${{ matrix.pkg.pkg }}
@@ -42,10 +42,9 @@ jobs:
           x=${NAME//\//@}
           echo "name=$x" >> $GITHUB_OUTPUT
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
         with:
           name: ${{ steps.art.outputs.name }}
-          compression-level: 0 # The RPMs are already compressed :p
           path: |
             anda-build/rpm/rpms/*
             anda-build/rpm/srpm/*

.github/workflows/lint.yml

@@ -3,20 +3,20 @@ name: Lint
 on:
   push:
     branches:
-      - frawhide
+      - f40
   pull_request:
     branches:
-      - frawhide
+      - f40
   merge_group:
     branches:
-      - frawhide
+      - f40
 jobs:
   lint:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:f40
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
       - name: Lint spec files
         run: rpmlint $(find anda -type f -name "*.spec" -type f)

.github/workflows/sync.yml.bak

@@ -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@v3
+        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

.github/workflows/update-comps.yml

@@ -3,9 +3,10 @@ name: Push comps updates
 on:
   push:
     branches:
-      - frawhide
       - f40
       - f39
+      - f38
+      - f37
     paths:
       - comps.xml
   workflow_dispatch:
@@ -14,9 +15,9 @@ jobs:
   update-comps:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:f40
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Push to subatomic
         run: |
           branch=${{ github.ref_name }}

.github/workflows/update-nightly.yml

@@ -8,21 +8,20 @@ jobs:
   autoupdate:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:f40
       options: --cap-add=SYS_ADMIN --privileged
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
           ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
 
-      - name: Install SSH signing key & Set up git repository
+      - name: Install SSH signing key
         run: |
           mkdir -p ${{ runner.temp }}
           echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key
           chmod 0700 ${{ runner.temp }}/signing_key
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"
 
       - name: Run Nightly Update
         run: anda update -vv --filters nightly=1
@@ -31,6 +30,7 @@ jobs:
 
       - name: Save
         run: |
+          git config --global --add safe.directory "*"
           if [[ `git status --porcelain` ]]; then
             git config user.name "Raboneko"
             git config user.email "raboneko@fyralabs.com"
@@ -46,7 +46,8 @@ jobs:
               git add *
               git commit -S -a -m "$msg"
             }
-            copy_over f39 || true
-            copy_over f40 || true
+            copy_over f37 || true
+            copy_over f38 || true
+            copy_over frawhide || true
             git push -u origin --all
           fi

.github/workflows/update.yml

@@ -8,21 +8,20 @@ jobs:
   autoupdate:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:f40
       options: --cap-add=SYS_ADMIN --privileged
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
           ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
 
-      - name: Install SSH signing key & Set up git repository
+      - name: Install SSH signing key
         run: |
           mkdir -p ${{ runner.temp }}
           echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key
           chmod 0700 ${{ runner.temp }}/signing_key
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"
 
       - name: Run Update
         run: anda update -vv
@@ -32,6 +31,7 @@ jobs:
 
       - name: Save
         run: |
+          git config --global --add safe.directory "*"
           if [[ `git status --porcelain` ]]; then
             git config user.name "Raboneko"
             git config user.email "raboneko@fyralabs.com"
@@ -48,6 +48,8 @@ jobs:
               git commit -S -a -m "$msg"
             }
             copy_over f39 || true
-            copy_over f40 || true
+            copy_over f37 || true
+            copy_over f38 || true
+            copy_over frawhide || true
             git push -u origin --all
           fi

CONTRIBUTING.md

@@ -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)

README.md

@@ -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.
 

anda/apps/anki-bin/anki-bin.spec

@@ -1,5 +1,5 @@
 Name:			anki-bin
-Version:		24.06.3
+Version:		24.04.1
 Release:		1%?dist
 Summary:		Flashcard program for using space repetition learning (Installed with wheel)
 License:		AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5

anda/apps/anki-qt5/anki-qt5.spec

@@ -1,5 +1,5 @@
 Name:           anki-qt5
-Version:        24.06.3
+Version:        24.04.1
 Release:        1%?dist
 Summary:        Flashcard program for using space repetition learning
 License:        AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
@@ -22,7 +22,7 @@ Anki is based on a theory called spaced repetition.
 %prep
 git clone https://github.com/ankitects/anki .
 git checkout %version
-%patch 1 -p1
+%patch1 -p1
 
 # See https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=anki-qt5
 

anda/apps/anki/anki.spec

@@ -1,5 +1,5 @@
 Name:           anki
-Version:        24.06.3
+Version:        24.04.1
 Release:        1%?dist
 Summary:        Flashcard program for using space repetition learning
 License:        AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
@@ -20,10 +20,8 @@ phrases in a foreign language) as easily, quickly and efficiently as possible.
 Anki is based on a theory called spaced repetition.
 
 %prep
-rm -rf *
 git clone https://github.com/ankitects/anki .
 git checkout %{version}
-%patch 0 -p1
 
 # See https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=anki
 

anda/apps/armcord-bin/armcord-bin.spec

@@ -14,8 +14,8 @@
 %global __provides_exclude_from %{_datadir}/armcord/.*\\.so
 
 Name:			armcord-bin
-Version:		3.2.7
-Release:		1%?dist
+Version:		3.2.6
+Release:		1%{?dist}
 License:		OSL-3.0
 Summary:		Custom lightweight Discord client designed to enhance your experience
 URL:			https://github.com/ArmCord/ArmCord
@@ -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

anda/apps/armcord/armcord.spec

@@ -1,15 +1,15 @@
 %define debug_package %nil
 
 Name:		armcord
-Version:	3.2.7
-Release:	1%?dist
+Version:	3.2.6
+Release:	1%{?dist}
 License:	OSL-3.0
 Summary:	Custom lightweight Discord client designed to enhance your experience
 URL:		https://github.com/ArmCord/ArmCord
 Group:		Applications/Internet
 Source1:	launch.sh
 Requires:	electron xdg-utils
-BuildRequires:	nodejs-npm git add-determinism
+BuildRequires:	nodejs-npm git
 Conflicts:	armcord-bin
 BuildArch:	noarch
 
@@ -18,7 +18,6 @@ ArmCord is a custom client designed to enhance your Discord experience
 while keeping everything lightweight.
 
 %prep
-rm -rf *
 git clone %url .
 git checkout v%version
 

anda/apps/discord-canary-openasar/discord-canary-openasar.spec

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

anda/apps/discord-canary/discord-canary.spec

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

anda/apps/discord-openasar/discord-openasar.spec

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

anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec

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

anda/apps/discord-ptb/discord-ptb.spec

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

anda/apps/discord/discord.spec

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

anda/apps/envision/anda.hcl

@@ -1,5 +0,0 @@
-project pkg {
-    rpm {
-        spec = "envision.spec"
-    }
-}

anda/apps/envision/envision.spec

@@ -1,46 +0,0 @@
-%global commit 6cf5e40b96d1cbd99a3cfcef1f03899356e79448
-%global commit_date 20240703
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-
-Name:           envision
-Version:        %commit_date.%shortcommit
-Release:        1%?dist
-Summary:        UI for building, configuring and running Monado, the open source OpenXR runtime
-License:        AGPL-3.0-or-later
-URL:            https://gitlab.com/gabmus/envision/
-Source0:        %url/-/archive/%commit/envision-%commit.tar.gz
-BuildRequires:  meson ninja-build cargo 
-BuildRequires:  pkgconfig(glib-2.0) >= 2.66
-BuildRequires:  pkgconfig(gio-2.0) >= 2.66
-BuildRequires:  pkgconfig(gtk4) >= 4.10.0
-BuildRequires:  pkgconfig(vte-2.91-gtk4) >= 0.72.0
-BuildRequires:  pkgconfig(libadwaita-1)
-BuildRequires:  pkgconfig(libusb-1.0)
-BuildRequires:  openssl-devel
-BuildRequires:  libappstream-glib
-BuildRequires:  desktop-file-utils
-BuildRequires:  glib2-devel
-Recommends:     android-tools
-
-%description
-%summary.
-
-%prep
-%autosetup -n envision-%commit
-
-%build
-%meson
-%meson_build
-
-%install
-%meson_install
-
-%files
-%doc README.md
-%license LICENSE
-%_bindir/envision
-%_datadir/applications/org.gabmus.envision.desktop
-%_datadir/envision/
-%_iconsdir/hicolor/scalable/apps/org.gabmus.envision.svg
-%_iconsdir/hicolor/symbolic/apps/org.gabmus.envision-symbolic.svg
-%_metainfodir/org.gabmus.envision.appdata.xml

anda/apps/envision/update.rhai

@@ -1,5 +0,0 @@
-rpm.global("commit", gitlab_commit("gitlab.com", "46446166", "main"));
-if rpm.changed() {
-	rpm.global("commit_date", date());
-	rpm.release();
-}

anda/apps/feishin/feishin.spec

@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
 
 Name:			feishin
-Version:		0.7.1
+Version:		0.7.0
 Release:		1%?dist
 Summary:		A modern self-hosted music player
 License:		GPL-3.0

anda/apps/mpv/mpv-nightly.spec

@@ -1,6 +1,6 @@
-%global commit 14571f0f7793fe60ca14a25fc45adbe1e5b6a1e8
+%global commit 943a50b300a081bb223325295040846fe435a861
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240711
+%global commit_date 20240504
 %global ver v0.38.0
 
 Name:           mpv-nightly

anda/apps/mugshot/anda.hcl

@@ -1,6 +0,0 @@
-project pkg {
-    arches = ["x86_64"]
-    rpm {
-        spec = "mugshot.spec"
-    }
-}

anda/apps/mugshot/mugshot.spec

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

anda/apps/mugshot/update.rhai

@@ -1,3 +0,0 @@
-let v = gh("bluesabre/mugshot");
-v.crop(8);
-rpm.version(v);

anda/apps/sccache/rust-sccache.spec

@@ -13,7 +13,7 @@
 %global crate sccache
 
 Name:           rust-sccache
-Version:        0.8.1
+Version:        0.8.0
 Release:        1%?dist
 Summary:        Ccache-like tool
 

anda/apps/tuxclocker/anda.hcl

@@ -1,5 +0,0 @@
-project pkg {
-  rpm {
-    spec = "tuxclocker.spec"
-  }
-}

anda/apps/tuxclocker/tuxclocker.spec

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

anda/apps/tuxclocker/update.rhai

@@ -1 +0,0 @@
-rpm.version(gh("Lurkki14/tuxclocker"));

anda/apps/vencord-desktop/vencord-desktop.spec

@@ -6,7 +6,7 @@
 
 Name:		vencord-desktop
 Provides:   VencordDesktop = %{version}-%{release}
-Version:	1.5.3
+Version:	1.5.2
 Release:	1%?dist
 License:	GPL-3.0
 Summary:	Vesktop is a cross platform desktop app aiming to give you a snappier Discord experience with Vencord pre-installed

anda/apps/voicevox/voicevox.spec

@@ -1,6 +1,6 @@
 %global nodev 20.12.2
 %global npmv 10.5.0
-%global ver 0.19.2
+%global ver 0.19.1
 %define debug_package %nil
 %global _build_id_links none
 

anda/desktops/elementary/elementary-calculator/elementary-calculator.spec

@@ -3,8 +3,8 @@
 
 Name:           elementary-calculator
 Summary:        Calculator app designed for elementary
-Version:        8.0.0
-Release:        1%?dist
+Version:        2.0.3
+Release:        1%{?dist}
 License:        GPL-3.0-or-later
 
 URL:            https://github.com/elementary/%{srcname}

anda/desktops/elementary/elementary-capnet-assist/elementary-capnet-assist.spec

@@ -3,8 +3,8 @@
 
 Name:           elementary-capnet-assist
 Summary:        Captive Portal Assistant for elementary
-Version:        8.0.0
-Release:        1%?dist
+Version:        2.4.4
+Release:        2%{?dist}
 License:        GPL-3.0-or-later
 
 URL:            https://github.com/elementary/capnet-assist
@@ -21,13 +21,10 @@ BuildRequires:  pkgconfig(gcr-ui-3)
 BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gobject-2.0)
-BuildRequires:  pkgconfig(granite-7)
+BuildRequires:  pkgconfig(granite)
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(libhandy-1) >= 1.0.0
 BuildRequires:  pkgconfig(webkit2gtk-4.1)
-BuildRequires:  pkgconfig(gcr-4)
-BuildRequires:  pkgconfig(libadwaita-1)
-BuildRequires:  pkgconfig(webkitgtk-6.0)
 BuildRequires:  fdupes
 
 Requires:       NetworkManager

anda/desktops/elementary/elementary-icon-theme/elementary-icon-theme.spec

@@ -3,8 +3,8 @@
 
 Name:           elementary-icon-theme
 Summary:        Icons from the Elementary Project
-Version:        8.0.0
-Release:        1%?dist
+Version:        7.3.1
+Release:        2%{?dist}
 License:        GPL-3.0-or-later
 
 URL:            https://github.com/elementary/icons

anda/desktops/elementary/elementary-photos/elementary-photos.spec

@@ -5,13 +5,16 @@
 
 Name:           elementary-photos
 Summary:        Photo manager and viewer from elementary
-Version:        8.0.0
-Release:        1%?dist
+Version:        2.8.0
+Release:        2%?dist
 License:        LGPL-2.0-or-later
 
 URL:            https://github.com/elementary/photos
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
+# RIP the publishing plugins (sorry for the "wide" patch, having issues with just the relevant commits)
+Patch0:         https://github.com/elementary/photos/compare/7261606a05d1f41116aba5c86b62d1f739419ed1..09e55943b266bc2861b913251cb834169d81743e.patch
+
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
@@ -19,7 +22,6 @@ BuildRequires:  meson >= 0.46.0
 BuildRequires:  vala
 BuildRequires:  fdupes
 BuildRequires:  git-core
-BuildRequires:  cmake
 
 BuildRequires:  pkgconfig(gee-0.8) >= 0.8.5
 BuildRequires:  pkgconfig(geocode-glib-2.0)
@@ -41,8 +43,6 @@ BuildRequires:  pkgconfig(libhandy-1)
 BuildRequires:  pkgconfig(libraw) >= 0.13.2
 BuildRequires:  pkgconfig(libwebp) >= 0.4.4
 BuildRequires:  pkgconfig(sqlite3) >= 3.5.9
-BuildRequires:  pkgconfig(libportal)
-BuildRequires:  pkgconfig(libportal-gtk3)
 
 Requires:       hicolor-icon-theme
 
@@ -53,6 +53,7 @@ Foundation.
 
 %prep
 %autosetup -n %{srcname}-%{version} -N
+git apply %PATCH0 # The .patch file has Git binary patches, so we need to apply it manually with Git
 
 
 %build
@@ -74,10 +75,10 @@ desktop-file-validate \
     %{buildroot}/%{_datadir}/applications/%{appname}.desktop
 
 desktop-file-validate \
-    %{buildroot}/%{_datadir}/applications/%{appname}.viewer.desktop
+    %{buildroot}/%{_datadir}/applications/%{appname}-viewer.desktop
 
 appstream-util validate-relax --nonet \
-    %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml
+    %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
 %files -f %{appname}.lang
@@ -91,11 +92,11 @@ appstream-util validate-relax --nonet \
 %{_libexecdir}/%{appname}/
 
 %{_datadir}/applications/%{appname}.desktop
-%{_datadir}/applications/%{appname}.viewer.desktop
+%{_datadir}/applications/%{appname}-viewer.desktop
 %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
 %{_datadir}/icons/hicolor/*/apps/%{appname}.svg
-%{_datadir}/icons/hicolor/*/apps/%{appname}.viewer.svg
-%{_datadir}/metainfo/%{appname}.metainfo.xml
+%{_datadir}/icons/hicolor/*/apps/%{appname}-viewer.svg
+%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
 %changelog

anda/desktops/elementary/elementary-shortcut-overlay/elementary-shortcut-overlay.spec

@@ -3,8 +3,8 @@
 
 Name:           elementary-shortcut-overlay
 Summary:        Native, OS-wide shortcut overlay
-Version:        8.0.0
-Release:        1%?dist
+Version:        2.0.1
+Release:        %autorelease
 License:        GPL-3.0
 
 URL:            https://github.com/elementary/shortcut-overlay
@@ -49,7 +49,7 @@ desktop-file-validate \
     %{buildroot}/%{_datadir}/applications/%{appname}.desktop
 
 appstream-util validate-relax --nonet \
-    %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml
+    %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
 %files -f %{appname}.lang
@@ -59,7 +59,7 @@ appstream-util validate-relax --nonet \
 %{_bindir}/%{appname}
 
 %{_datadir}/applications/%{appname}.desktop
-%{_datadir}/metainfo/%{appname}.metainfo.xml
+%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
 %changelog

anda/desktops/elementary/elementary-sideload/elementary-sideload.spec

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

anda/desktops/elementary/pantheon-agent-polkit/pantheon-agent-polkit.spec

@@ -3,8 +3,8 @@
 
 Name:           pantheon-agent-polkit
 Summary:        Pantheon Polkit Agent
-Version:        8.0.0
-Release:        1%?dist
+Version:        1.0.5
+Release:        1%{?dist}
 License:        LGPL-2.0-or-later
 
 URL:            https://github.com/elementary/%{name}
@@ -18,12 +18,10 @@ BuildRequires:  vala >= 0.34.1
 BuildRequires:  fdupes
 
 BuildRequires:  pkgconfig(glib-2.0) >= 2.32.0
+BuildRequires:  pkgconfig(granite) >= 6.0.0
+BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(polkit-agent-1)
 BuildRequires:  pkgconfig(polkit-gobject-1)
-BuildRequires:  pkgconfig(libadwaita-1)
-BuildRequires:  pkgconfig(gobject-2.0)
-BuildRequires:  pkgconfig(granite-7)
-BuildRequires:  pkgconfig(gtk4)
 
 %description
 An agent for Polkit authorization designed for Pantheon.
@@ -52,7 +50,7 @@ desktop-file-validate \
     %{buildroot}/%{_datadir}/applications/%{appname}.desktop
 
 appstream-util validate-relax --nonet \
-    %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml
+    %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
 %files -f %{appname}.lang
@@ -64,7 +62,7 @@ appstream-util validate-relax --nonet \
 %{_libexecdir}/policykit-1-pantheon/
 
 %{_datadir}/applications/%{appname}.desktop
-%{_datadir}/metainfo/%{appname}.metainfo.xml
+%{_datadir}/metainfo/%{appname}.appdata.xml
 
 
 %changelog

anda/desktops/elementary/pantheon-tweaks/anda.hcl

@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "pantheon-tweaks.spec"
+	}
+}

anda/desktops/elementary/pantheon-tweaks/pantheon-tweaks.spec

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

anda/desktops/elementary/pantheon-tweaks/update.rhai

@@ -0,0 +1 @@
+rpm.version(gh("pantheon-tweaks/pantheon-tweaks"));

anda/desktops/elementary/switchboard-plug-tweaks/switchboard-plug-tweaks.spec

@@ -2,20 +2,16 @@
 
 %global plug_type personal
 %global plug_name pantheon-tweaks
-%global app io.github.pantheon_tweaks.pantheon-tweaks
 
 Name:           switchboard-plug-tweaks
 Summary:        Switchboard Tweaks Plug
-Version:        2.0.2
-Release:        2%?dist
+Version:        1.1.2
+Release:        1%{?dist}
 License:        GPL-3.0-or-later
 
 URL:            https://github.com/pantheon-tweaks/pantheon-tweaks
 Source0:        %{url}/archive/%{version}/%{plug_name}-%{version}.tar.gz
 
-Provides:       pantheon-tweaks = %version-%release
-Obsoletes:      pantheon-tweaks < 2.0.2-2
-
 BuildRequires:  gcc
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
@@ -26,7 +22,7 @@ BuildRequires:  pkgconfig(gee-0.8)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(granite) >= 6.0.0
 BuildRequires:  pkgconfig(gtk+-3.0)
-BuildRequires:  pkgconfig(switchboard-3)
+BuildRequires:  pkgconfig(switchboard-2.0)
 
 Requires:       switchboard%{?_isa}
 
@@ -67,22 +63,28 @@ de trabalho.
 %install
 %meson_install
 
-%find_lang %{plug_name}
+%find_lang %{plug_name}-plug
 
 # remove the specified stock icon from metainfo (invalid in libappstream-glib)
-sed -i '/icon type="stock"/d' %buildroot%_metainfodir/%app.metainfo.xml
+sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{plug_name}.metainfo.xml
 
 %check
-appstream-util validate-relax --nonet %buildroot%_metainfodir/%app.metainfo.xml
+appstream-util validate-relax --nonet \
+    %{buildroot}/%{_datadir}/metainfo/%{plug_name}.metainfo.xml
 
 
-%files -f %{plug_name}.lang
+%files -f %{plug_name}-plug.lang
 %license COPYING
 %doc README.md
 %doc AUTHORS
 %doc CONTRIBUTORS
 
-%_bindir/pantheon-tweaks
-%_datadir/applications/%app.desktop
-%_iconsdir/hicolor/*/apps/%app.svg
-%_metainfodir/io.github.pantheon_tweaks.pantheon-tweaks.metainfo.xml
+%{_libdir}/switchboard/%{plug_type}/lib%{plug_name}.so
+
+%{_datadir}/metainfo/%{plug_name}.metainfo.xml
+%{_datadir}/icons/hicolor/*/categories/preferences-*.svg
+
+
+%changelog
+* Sat Oct 15 2022 windowsboy111 <windowsboy111@fyralabs.com>
+- Repackaged for Terra

anda/desktops/elementary/switchboard-plug-wacom/switchboard-plug-wacom.spec

@@ -4,11 +4,11 @@
 
 %global plug_type hardware
 %global plug_name wacom
-%global plug_rdnn io.elementary.settings.wacom
+%global plug_rdnn io.elementary.switchboard.wacom
 
 Name:           switchboard-plug-wacom
 Summary:        Switchboard Wacom Plug
-Version:        8.0.0
+Version:        1.0.1
 Release:        1%?dist
 License:        GPL-3.0-or-later
 
@@ -25,7 +25,7 @@ BuildRequires:  pkgconfig(libwacom)
 BuildRequires:  pkgconfig(gudev-1.0)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xi)
-BuildRequires:  pkgconfig(switchboard-3)
+BuildRequires:  switchboard-devel
 
 Requires:       switchboard%{?_isa}
 Supplements:    switchboard%{?_isa}
@@ -45,18 +45,22 @@ Supplements:    switchboard%{?_isa}
 %install
 %meson_install
 
-%find_lang %{plug_rdnn}
+%find_lang %{plug_name}-plug
 
 
 %check
 appstream-util validate-relax --nonet \
-    %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml
+    %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
 
 
-%files -f %{plug_rdnn}.lang
+%files -f %{plug_name}-plug.lang
 %doc README.md
 %license COPYING
 
-%{_libdir}/switchboard-3/%{plug_type}/lib%{plug_name}.so
+%{_libdir}/switchboard/%{plug_type}/lib%{plug_name}.so
 
-%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml
+%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
+
+%changelog
+* Tue Jun 13 2023 windowsboy111 <windowsboy111@fyralabs.com> - 1.0.1-1
+- Initial package.

anda/desktops/elementary/switchboard/switchboard.spec

@@ -1,10 +1,10 @@
 %global srcname switchboard
-%global appname io.elementary.settings
+%global appname io.elementary.switchboard
 
 Name:           switchboard
 Summary:        Modular Desktop Settings Hub
-Version:        8.0.0
-Release:        1%?dist
+Version:        6.0.2
+Release:        1%{?dist}
 License:        LGPL-2.0-or-later
 
 URL:            https://github.com/elementary/%{name}
@@ -16,10 +16,12 @@ BuildRequires:  libappstream-glib
 BuildRequires:  meson
 BuildRequires:  vala
 
-BuildRequires:  pkgconfig(granite-7)
-BuildRequires:  pkgconfig(gtk4)
-BuildRequires:  pkgconfig(libadwaita-1)
-BuildRequires:  fdupes sassc
+BuildRequires:  pkgconfig(gee-0.8)
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(granite) >= 5.4.0
+BuildRequires:  pkgconfig(gtk+-3.0)
+BuildRequires:  pkgconfig(libhandy-1) >= 0.83.0
+BuildRequires:  fdupes
 
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 
@@ -90,7 +92,7 @@ appstream-util validate-relax --nonet \
 
 %{_datadir}/applications/%{appname}.desktop
 %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
-%{_iconsdir}/hicolor/*/apps/%{appname}.svg
+%{_datadir}/icons/hicolor/*/apps/%{appname}.svg
 %{_datadir}/metainfo/%{appname}.appdata.xml
 
 %files libs
@@ -100,14 +102,19 @@ appstream-util validate-relax --nonet \
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/*
 
-%{_libdir}/lib%{name}-3.so.0
-%{_libdir}/lib%{name}-3.so.2.0
+%{_libdir}/lib%{name}-2.0.so.0
+%{_libdir}/lib%{name}-2.0.so.2.0
 
 %files devel
-%{_includedir}/%{name}-3/
+%{_includedir}/%{name}-2.0/
 
-%{_libdir}/lib%{name}-3.so
-%{_libdir}/pkgconfig/%{name}-3.pc
+%{_libdir}/lib%{name}-2.0.so
+%{_libdir}/pkgconfig/%{name}-2.0.pc
 
-%{_datadir}/vala/vapi/%{name}-3.deps
-%{_datadir}/vala/vapi/%{name}-3.vapi
+%{_datadir}/vala/vapi/%{name}-2.0.deps
+%{_datadir}/vala/vapi/%{name}-2.0.vapi
+
+
+%changelog
+* Sat Oct 15 2022 windowsboy111 <windowsboy111@fyralabs.com> - 6.0.2-1
+- Repackaged for Terra

anda/desktops/elementary/wingpanel/wingpanel.spec

@@ -13,7 +13,7 @@ Epoch:          1
 
 URL:            https://github.com/elementary/wingpanel
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
-Patch0:         https://github.com/elementary/wingpanel/compare/23a3eb7c2448b4f35398116df7d01b075361ef1f..5d22d436b45decfb2a50d9a7c27f2c961f1dd39f.patch
+Patch0:         https://github.com/elementary/wingpanel/compare/3.0.5..5d22d436b45decfb2a50d9a7c27f2c961f1dd39f.patch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -23,7 +23,7 @@ BuildRequires:  vala >= 0.24.0
 
 BuildRequires:  mesa-libEGL-devel
 
-BuildRequires:  pkgconfig(gala)
+BuildRequires:  pkgconfig(gala) >= 7.1.3-2
 BuildRequires:  pkgconfig(gdk-x11-3.0)
 BuildRequires:  pkgconfig(gee-0.8)
 BuildRequires:  pkgconfig(glib-2.0) >= 2.32

anda/desktops/gnome/gnome-shell-extension-appmenu-is-back/gnome-shell-extension-appmenu-is-back.spec

@@ -3,7 +3,7 @@
 
 Name:           gnome-shell-extension-%{extension}
 Version:        2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNOME Shell extension to bring back the app menu
 License:        GPL-3.0-only
 URL:            https://github.com/fthx/appmenu-is-back
@@ -11,8 +11,9 @@ URL:            https://github.com/fthx/appmenu-is-back
 BuildArch:      noarch
 
 Source0:        https://github.com/fthx/appmenu-is-back/archive/refs/tags/v%{version}.tar.gz
+Patch0:         https://github.com/fthx/appmenu-is-back/commit/c251ff36d226dac679eb745638e3df236d3e1a20.patch
 
-Requires:       (gnome-shell >= 45~ with gnome-shell < 46~)
+Requires:       (gnome-shell >= 46~ with gnome-shell < 47~)
 Recommends:     gnome-extensions-app
 
 %description
@@ -30,5 +31,8 @@ install -Dm644 extension.js %{buildroot}%{_datadir}/gnome-shell/extensions/%{uui
 %{_datadir}/gnome-shell/extensions/%{uuid}
 
 %changelog
+* Mon Apr 1 2024 Lleyton Gray <lleyton@fyralabs.com> - 2-2
+- Patch for GNOME 46 compatibility
+
 * Thu Nov 16 2023 Lleyton Gray <lleyton@fyralabs.com> - 2-1
 - Initial Release

anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec

@@ -1,6 +1,6 @@
 %global forgeurl https://github.com/KDE/latte-dock/
 
-%global commit 4f1c08054b1f975176375f615cf9d2470f7ec7ed
+%global commit 8328f9a6863b4bae48adfdbc29b32b4c571c6530
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global commit_date %(date '+%Y%m%d')
 %global snapshot_info %{commit_date}.%{shortcommit}

anda/desktops/lomiri-unity/lomiri-app-launch/lomiri-app-launch.spec

@@ -1,5 +1,5 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-app-launch
-%global commit af441bdb31bb76b207119a8c91eef3fa93c0c078
+%global commit 99fa99c6e8af868f64dbfdb973eebeb2ca3ad14a
 %forgemeta
 
 Name:           lomiri-app-launch

anda/desktops/lomiri-unity/lomiri-download-manager/lomiri-download-manager.spec

@@ -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

anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec

@@ -1,16 +1,15 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings
-%global commit 73c2249ea78d2ca080ed907a9d60c18ce42db25f
+%global commit 30d9df926b6837b139990a622d39171ea42c9017
 %forgemeta
 
 Name:       lomiri-system-settings
-Version:    1.1.0
-Release:    1%?dist
+Version:    1.0.2
+Release:    1%{?dist}
 Summary:    The system settings application for Lomiri
 License:    GPLv3
 URL:        https://gitlab.com/ubports/development/core/lomiri-system-settings
 Source0:    %{url}/-/archive/%commit/lomiri-system-settings-%commit.tar.gz
 Patch0:     https://sources.debian.org/data/main/l/lomiri-system-settings/1.0.1-2/debian/patches/1001_use-maliit-keyboard-for-language-plugin.patch
-Patch1:     https://sources.debian.org/data/main/l/lomiri-system-settings/1.0.1-2/debian/patches/2001_disable-current-language-switching.patch
 
 BuildRequires: cmake
 BuildRequires: gcc-c++

anda/desktops/lomiri-unity/lomiri-ui-toolkit/lomiri-ui-toolkit.spec

@@ -1,10 +1,10 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-ui-toolkit
-%global commit 8f490672f9853278b0aec6435a68d56b9eaf8207
+%global commit 454d980c352f3cea725458ff8a3d04ae686d2a96
 %forgemeta
 
 Name:           lomiri-ui-toolkit
-Version:        1.3.5100
-Release:        1%?dist
+Version:        1.3.5012
+Release:        1%{?dist}
 Summary:        QML components to ease the creation of beautiful applications in QML for Lomiri
 
 License:        LGPL-3.0

anda/desktops/lomiri-unity/lomiri-ui-toolkit/update.rhai

@@ -1,5 +1,4 @@
 rpm.version(gitlab_tag("19057685"));
 if rpm.changed() {
-	rpm.global("commit", gitlab_commit("19057685", "main"));
-	rpm.release();
+	rpm.global("commit", gitlab_commit("19057685"));
 }

anda/desktops/lomiri-unity/lomiri-url-dispatcher/lomiri-url-dispatcher.spec

@@ -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

anda/desktops/lomiri-unity/lomiri/lomiri.spec

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

anda/desktops/mate/indicators/datetime/ayatana-indicator-datetime.spec

@@ -1,7 +1,7 @@
 Name:       ayatana-indicator-datetime
 Summary:    A GTK implementation of the StatusNotifierItem Specification
-Version:    24.5.0
-Release:    1%?dist
+Version:    24.2.0
+Release:    1%{?dist}
 License:    GPL-3.0
 URL:        https://github.com/AyatanaIndicators/ayatana-indicator-datetime
 Source0:    %{url}/archive/refs/tags/%{version}.tar.gz

anda/desktops/mate/indicators/messages/ayatana-indicator-messages.spec

@@ -1,7 +1,7 @@
 Name:       ayatana-indicator-messages
 Summary:    Ayatana Indicator Messages Applet
-Version:    24.5.0
-Release:    1%?dist
+Version:    23.10.0
+Release:    %autorelease
 License:    GPLv3
 URL:        https://github.com/AyatanaIndicators/ayatana-indicator-messages
 Source0:    %{url}/archive/refs/tags/%{version}.tar.gz

anda/desktops/mate/indicators/session/ayatana-indicator-session.spec

@@ -1,6 +1,6 @@
 Name:       ayatana-indicator-session
 Summary:    Ayatana Indicator Session Applet
-Version:    24.5.0
+Version:    24.2.0
 Release:    1%?dist
 License:    GPL-3.0
 URL:        https://github.com/AyatanaIndicators/ayatana-indicator-session

anda/desktops/mate/indicators/sound/ayatana-indicator-sound.spec

@@ -1,6 +1,6 @@
 Name:       ayatana-indicator-sound
 Summary:    Ayatana Indicator Sound Applet
-Version:    24.5.0
+Version:    24.4.0
 Release:    1%?dist
 License:    GPLv3
 URL:        https://github.com/AyatanaIndicators/ayatana-indicator-sound

anda/devs/asar/anda.hcl

@@ -1,6 +0,0 @@
-project pkg {
-  arches = ["x86_64"]
-  rpm {
-    spec = "asar.spec"
-  }
-}

anda/devs/asar/asar.spec

@@ -1,41 +0,0 @@
-%define debug_package %nil
-%define __strip /bin/true
-%global _build_id_links none
-
-# Exclude private libraries
-%global __requires_exclude libffmpeg.so
-%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
-
-Name:           asar
-Version:        3.2.10
-Release:        1%?dist
-Summary:        Simple extensive tar-like archive format with indexing
-License:        MIT
-URL:            https://github.com/electron/asar
-Source0:        %url/archive/refs/tags/v%version.tar.gz
-Requires:       nodejs
-BuildRequires:  nodejs-npm
-BuildArch:      noarch
-
-%description
-Asar is a simple extensive archive format, it works like `tar` that concatenates all files
-together without compression, while having random access support.
-
-%prep
-%autosetup
-
-%build
-
-%install
-mkdir -p %buildroot%_bindir
-PATH="$PATH:%buildroot%_bindir"
-npm install -g --prefix %buildroot%_prefix %SOURCE0
-
-%files
-%doc README.md
-%license LICENSE.md
-%_bindir/asar
-%_prefix/lib/node_modules/@electron/asar/
-
-%changelog
-%autochangelog

anda/devs/asar/update.rhai

@@ -1 +0,0 @@
-rpm.version(gh("electron/asar"));

anda/devs/codium-marketplace/anda.hcl

@@ -1,6 +0,0 @@
-project pkg {
-    arches = ["x86_64"]
-    rpm {
-        spec = "codium-marketplace.spec"
-    }
-}

anda/devs/codium-marketplace/codium-marketplace.spec

@@ -1,47 +0,0 @@
-# ref: https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=vscodium-marketplace
-
-Name:       codium-marketplace
-Version:    1.65.0
-Release:    1%?dist
-Summary:    Enable vscode marketplace in vscodium
-License:    MIT
-BuildArch:  noarch
-URL:        https://marketplace.visualstudio.com/vscode
-Requires:   codium sed
-
-%description
-This package replaces the default marketplace (https://open-vsx.org/)
-to the official one used by vscode.
-
-%install
-touch dummy
-install -Dm644 dummy %buildroot/tmp/terra-codium-marketplace-dummy-file
-
-%posttrans
-if [ $1 -gt 1 ]; then  # update/install
-  sed -i -e 's/^[[:blank:]]*"serviceUrl":.*/    "serviceUrl": "https:\/\/marketplace.visualstudio.com\/_apis\/public\/gallery",/' \
-    -e '/^[[:blank:]]*"cacheUrl/d' \
-    -e '/^[[:blank:]]*"serviceUrl/a\    "cacheUrl": "https:\/\/vscode.blob.core.windows.net\/gallery\/index",' \
-    -e 's/^[[:blank:]]*"itemUrl":.*/    "itemUrl": "https:\/\/marketplace.visualstudio.com\/items"/' \
-    -e '/^[[:blank:]]*"linkProtectionTrustedDomains/d' \
-    /usr/share/codium/resources/app/product.json || true
-fi
-
-%preun
-sed -i -e 's/^[[:blank:]]*"serviceUrl":.*/    "serviceUrl": "https:\/\/open-vsx.org\/vscode\/gallery",/' \
-  -e '/^[[:blank:]]*"cacheUrl/d' \
-  -e 's/^[[:blank:]]*"itemUrl":.*/    "itemUrl": "https:\/\/open-vsx.org\/vscode\/item"/' \
-  -e '/^[[:blank:]]*"linkProtectionTrustedDomains/d' \
-  -e '/^[[:blank:]]*"documentationUrl/i\  "linkProtectionTrustedDomains": ["https://open-vsx.org"],' \
-  /usr/share/codium/resources/app/product.json || true
-
-%triggerin -- codium
-sed -i -e 's/^[[:blank:]]*"serviceUrl":.*/    "serviceUrl": "https:\/\/marketplace.visualstudio.com\/_apis\/public\/gallery",/' \
-  -e '/^[[:blank:]]*"cacheUrl/d' \
-  -e '/^[[:blank:]]*"serviceUrl/a\    "cacheUrl": "https:\/\/vscode.blob.core.windows.net\/gallery\/index",' \
-  -e 's/^[[:blank:]]*"itemUrl":.*/    "itemUrl": "https:\/\/marketplace.visualstudio.com\/items"/' \
-  -e '/^[[:blank:]]*"linkProtectionTrustedDomains/d' \
-  /usr/share/codium/resources/app/product.json || true
-
-%files
-/tmp/terra-codium-marketplace-dummy-file

anda/devs/codium/codium.spec

@@ -12,7 +12,7 @@
 %endif
 
 Name:			codium
-Version:		1.91.0.24190
+Version:		1.89.0.24127
 Release:		1%?dist
 Summary:		Code editing. Redefined.
 License:		MIT
@@ -28,8 +28,6 @@ VSCodium is a new choice of tool that combines the simplicity of a code editor
 with what developers need for the core edit-build-debug cycle.
 
 %prep
-mkdir stuff
-cd stuff
 tar xf %SOURCE0
 
 cat <<EOF > vscodium-bin-uri-handler.desktop
@@ -72,7 +70,6 @@ EOF
 %build
 
 %install
-cd stuff
 mkdir -p %buildroot%_datadir/doc/%name/ %buildroot%_datadir/licenses/%name
 install -Dm644 %SOURCE1 %buildroot%_docdir/%name/
 install -Dm644 %SOURCE2 %buildroot%_datadir/licenses/%name/

anda/devs/flutter/flutter.spec

@@ -1,5 +1,5 @@
 Name:			flutter
-Version:		3.22.2
+Version:		3.19.6
 Release:		1%?dist
 Summary:		SDK for crafting beautiful, fast user experiences from a single codebase
 License:		BSD-3-Clause

anda/devs/neovide/neovide.spec

@@ -1,14 +1,13 @@
 %define debug_package %nil
 
 Name:		neovide
-Version:	0.13.1
-Release:	1%?dist
+Version:	0.12.2
+Release:	1%{?dist}
 Summary:	No Nonsense Neovim Client in Rust
 License:	MIT
 URL:		https://neovide.dev/
 Source0:	https://github.com/neovide/neovide/archive/refs/tags/%version.tar.gz
-Requires:	fontconfig freetype libglvnd
-Requires:	neovim > 0.9.5
+Requires:	neovim fontconfig freetype libglvnd
 BuildRequires:	anda-srpm-macros cargo-rpm-macros >= 24 cmake gtk3 python3 SDL2
 BuildRequires:	fontconfig-devel freetype-devel libX11-xcb libX11-devel libstdc++-static libstdc++-devel
 ExclusiveArch:	x86_64

anda/devs/rgbds/terra-rgbds.spec

@@ -1,6 +1,6 @@
 Name:		terra-rgbds
-Version:	0.8.0
-Release:	1%?dist
+Version:	0.7.0
+Release:	1%{?dist}
 Summary:	A development package for the Game Boy, including an assembler
 
 # See LICENSE for details

anda/devs/zed/nightly/anda.hcl

@@ -1,9 +0,0 @@
-project pkg {
-  rpm {
-    spec = "zed-nightly.spec"
-  }
-  labels {
-    nightly = 1
-    large = 1
-  }
-}

anda/devs/zed/nightly/update.rhai

@@ -1,9 +0,0 @@
-if filters.contains("nightly") {
-  rpm.global("commit", gh_commit("zed-industries/zed"));
-  if rpm.changed() {
-    let v = find("\nversion = \"([.\\d]+)\"\n", gh_rawfile("zed-industries/zed", "main", "crates/zed/Cargo.toml"), 1);
-    rpm.global("ver", v);
-    rpm.global("commit_date", date());
-    rpm.release();
-  }
-}

anda/devs/zed/nightly/zed-nightly.spec

@@ -1,97 +0,0 @@
-%global commit 0129d4e2506d5ec5e50ef0968382770b9abec390
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240619
-%global ver 0.142.0
-
-%bcond_without check
-
-# Exclude input files from mangling
-%global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$
-
-%global crate zed
-%global app_id dev.zed.Zed-Nightly
-
-Name:           zed-nightly
-Version:        %ver^%commit_date.%shortcommit
-Release:        1%?dist
-Summary:        Zed is a high-performance, multiplayer code editor
-
-License:        MIT
-URL:            https://zed.dev/
-Source0:        https://github.com/zed-industries/zed/archive/%{commit}.zip
-
-Conflicts:      zed
-Provides:       zed
-
-BuildRequires:  cargo-rpm-macros >= 24
-BuildRequires:  anda-srpm-macros
-BuildRequires:  gcc
-BuildRequires:  g++
-BuildRequires:  clang
-BuildRequires:  mold
-BuildRequires:  alsa-lib-devel
-BuildRequires:  fontconfig-devel
-BuildRequires:  wayland-devel
-BuildRequires:  libxkbcommon-x11-devel
-BuildRequires:  openssl-devel
-BuildRequires:  libzstd-devel
-BuildRequires:  perl-FindBin
-BuildRequires:  perl-IPC-Cmd
-BuildRequires:  perl-File-Compare
-BuildRequires:  perl-File-Copy
-BuildRequires:  perl-lib
-BuildRequires:  vulkan-loader
-
-%description
-Code at the speed of thought - Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
-
-%prep
-%autosetup -n %{crate}-%{commit} -p1
-%cargo_prep_online
-
-export DO_STARTUP_NOTIFY="true"
-export APP_ID="%app_id"
-export APP_ICON="%app_id"
-export APP_NAME="Zed Nightly"
-export APP_CLI="zed"
-export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed Nightly from Terra."
-export ZED_RELEASE_CHANNEL=nightly
-export BRANDING_LIGHT="#e9aa6a"
-export BRANDING_DARK="#1a5fb4"
-
-echo "StartupWMClass=$APP_ID" >> crates/zed/resources/zed.desktop.in
-envsubst < "crates/zed/resources/zed.desktop.in" > $APP_ID.desktop # from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=zed-git#n52
-
-envsubst < "crates/zed/resources/flatpak/zed.metainfo.xml.in" > $APP_ID.metainfo.xml
-
-%build
-export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed Nightly from Terra."
-echo "nightly" > crates/zed/RELEASE_CHANNEL
-
-%cargo_build -- --package zed --package cli
-script/generate-licenses
-
-%install
-install -Dm755 target/rpm/zed %{buildroot}%{_libexecdir}/zed-editor
-install -Dm755 target/rpm/cli %{buildroot}%{_bindir}/zed
-
-install -Dm644 %app_id.desktop %{buildroot}%{_datadir}/applications/%app_id.desktop
-install -Dm644 crates/zed/resources/app-icon-nightly.png %{buildroot}%{_datadir}/pixmaps/%app_id.png
-
-install -Dm644 %app_id.metainfo.xml %{buildroot}%{_metainfodir}/%app_id.metainfo.xml
-
-%if %{with check}
-%check
-%cargo_test
-%endif
-
-%files
-%{_libexecdir}/zed-editor
-%{_bindir}/zed
-%{_datadir}/applications/%app_id.desktop
-%{_datadir}/pixmaps/%app_id.png
-%{_metainfodir}/%app_id.metainfo.xml
-%license assets/licenses.md
-
-%changelog
-%autochangelog

anda/devs/zed/preview/anda.hcl

@@ -1,8 +0,0 @@
-project pkg {
-  rpm {
-    spec = "zed-preview.spec"
-  }
-  labels {
-    large = 1
-  }
-}

anda/devs/zed/preview/update.rhai

@@ -1,14 +0,0 @@
-let releases = "https://api.github.com/repos/zed-industries/zed/releases".get().json_arr();
-for release in releases {
-  if !release.prerelease {
-    continue;
-  }
-  let tag = release.tag_name;
-  tag.pop(4); // remove the "-pre" suffix
-  tag.crop(1); // remove "v"
-  rpm.global("ver", tag);
-  break;
-  if rpm.changed() {
-    rpm.release();
-  }
-}

anda/devs/zed/preview/zed-preview.spec

@@ -1,91 +0,0 @@
-%bcond_without check
-%global debug_package %{nil}
-%global ver 0.144.0
-
-%global crate zed
-%global app_id dev.zed.Zed-Preview
-
-Name:           zed-preview
-Version:        %ver
-Release:        pre1%?dist
-Summary:        Zed is a high-performance, multiplayer code editor
-
-License:        MIT
-URL:            https://zed.dev/
-Source0:        https://github.com/zed-industries/zed/archive/refs/tags/v%{ver}-pre.tar.gz
-
-Conflicts:      zed
-Provides:       zed
-
-BuildRequires:  cargo-rpm-macros >= 24
-BuildRequires:  anda-srpm-macros
-BuildRequires:  gcc
-BuildRequires:  g++
-BuildRequires:  clang
-BuildRequires:  mold
-BuildRequires:  alsa-lib-devel
-BuildRequires:  fontconfig-devel
-BuildRequires:  wayland-devel
-BuildRequires:  libxkbcommon-x11-devel
-BuildRequires:  openssl-devel
-BuildRequires:  libzstd-devel
-BuildRequires:  perl-FindBin
-BuildRequires:  perl-IPC-Cmd
-BuildRequires:  perl-File-Compare
-BuildRequires:  perl-File-Copy
-BuildRequires:  perl-lib
-BuildRequires:  vulkan-loader
-
-%description
-Code at the speed of thought - Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
-
-%prep
-%autosetup -n %{crate}-%{ver}-pre -p1
-%cargo_prep_online
-
-export DO_STARTUP_NOTIFY="true"
-export APP_ID="%app_id"
-export APP_ICON="%app_id"
-export APP_NAME="Zed Preview"
-export APP_CLI="zed"
-export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed Preview from Terra."
-export ZED_RELEASE_CHANNEL=preview
-export BRANDING_LIGHT="#99c1f1"
-export BRANDING_DARK="#1a5fb4"
-
-echo "StartupWMClass=$APP_ID" >> crates/zed/resources/zed.desktop.in
-envsubst < "crates/zed/resources/zed.desktop.in" > $APP_ID.desktop # from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=zed-git#n52
-
-envsubst < "crates/zed/resources/flatpak/zed.metainfo.xml.in" > $APP_ID.metainfo.xml
-
-%build
-export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed Preview from Terra."
-echo "preview" > crates/zed/RELEASE_CHANNEL
-
-%cargo_build -- --package zed --package cli
-script/generate-licenses
-
-%install
-install -Dm755 target/rpm/zed %{buildroot}%{_libexecdir}/zed-editor
-install -Dm755 target/rpm/cli %{buildroot}%{_bindir}/zed
-
-install -Dm644 %app_id.desktop %{buildroot}%{_datadir}/applications/%app_id.desktop
-install -Dm644 crates/zed/resources/app-icon-preview.png %{buildroot}%{_datadir}/pixmaps/%app_id.png
-
-install -Dm644 %app_id.metainfo.xml %{buildroot}%{_metainfodir}/%app_id.metainfo.xml
-
-%if %{with check}
-%check
-%cargo_test
-%endif
-
-%files
-%{_libexecdir}/zed-editor
-%{_bindir}/zed
-%{_datadir}/applications/%app_id.desktop
-%{_datadir}/pixmaps/%app_id.png
-%{_metainfodir}/%app_id.metainfo.xml
-%license assets/licenses.md
-
-%changelog
-%autochangelog

anda/devs/zed/stable/anda.hcl

@@ -1,8 +0,0 @@
-project pkg {
-  rpm {
-    spec = "zed.spec"
-  }
-  labels {
-    large = 1
-  }
-}

anda/devs/zed/stable/update.rhai

@@ -1 +0,0 @@
-rpm.version(gh("zed-industries/zed"));

anda/devs/zed/stable/zed.spec

@@ -1,93 +0,0 @@
-%bcond_without check
-
-# Exclude input files from mangling
-%global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$
-
-%global crate zed
-%global app_id dev.zed.Zed
-
-Name:           zed
-Version:        0.143.6
-Release:        1%?dist
-Summary:        Zed is a high-performance, multiplayer code editor
-
-License:        MIT
-URL:            https://zed.dev/
-Source0:        https://github.com/zed-industries/zed/archive/refs/tags/v%{version}.tar.gz
-
-Conflicts:      zed
-Provides:       zed
-
-BuildRequires:  cargo-rpm-macros >= 24
-BuildRequires:  anda-srpm-macros
-BuildRequires:  gcc
-BuildRequires:  g++
-BuildRequires:  clang
-BuildRequires:  mold
-BuildRequires:  alsa-lib-devel
-BuildRequires:  fontconfig-devel
-BuildRequires:  wayland-devel
-BuildRequires:  libxkbcommon-x11-devel
-BuildRequires:  openssl-devel
-BuildRequires:  libzstd-devel
-BuildRequires:  perl-FindBin
-BuildRequires:  perl-IPC-Cmd
-BuildRequires:  perl-File-Compare
-BuildRequires:  perl-File-Copy
-BuildRequires:  perl-lib
-BuildRequires:  vulkan-loader
-BuildRequires:  libcurl-devel
-
-%description
-Code at the speed of thought - Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
-
-%prep
-%autosetup -n %{crate}-%{version} -p1
-%cargo_prep_online
-
-export DO_STARTUP_NOTIFY="true"
-export APP_ID="%app_id"
-export APP_ICON="%app_id"
-export APP_NAME="Zed Editor"
-export APP_CLI="zed"
-export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed from Terra."
-export ZED_RELEASE_CHANNEL=stable
-export BRANDING_LIGHT="#e9aa6a"
-export BRANDING_DARK="#1a5fb4"
-
-echo "StartupWMClass=$APP_ID" >> crates/zed/resources/zed.desktop.in
-envsubst < "crates/zed/resources/zed.desktop.in" > $APP_ID.desktop # from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=zed-git#n52
-
-envsubst < "crates/zed/resources/flatpak/zed.metainfo.xml.in" > $APP_ID.metainfo.xml
-
-%build
-export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed from Terra."
-echo "stable" > crates/zed/RELEASE_CHANNEL
-
-%cargo_build -- --package zed --package cli
-script/generate-licenses
-
-%install
-install -Dm755 target/rpm/zed %{buildroot}%{_libexecdir}/zed-editor
-install -Dm755 target/rpm/cli %{buildroot}%{_bindir}/zed
-
-install -Dm644 %app_id.desktop %{buildroot}%{_datadir}/applications/%app_id.desktop
-install -Dm644 crates/zed/resources/app-icon.png %{buildroot}%{_datadir}/pixmaps/%app_id.png
-
-install -Dm644 %app_id.metainfo.xml %{buildroot}%{_metainfodir}/%app_id.metainfo.xml
-
-%if %{with check}
-%check
-%cargo_test
-%endif
-
-%files
-%{_libexecdir}/zed-editor
-%{_bindir}/zed
-%{_datadir}/applications/%app_id.desktop
-%{_datadir}/pixmaps/%app_id.png
-%{_metainfodir}/%app_id.metainfo.xml
-%license assets/licenses.md
-
-%changelog
-%autochangelog

anda/docker/containerd/containerd.spec

@@ -7,7 +7,7 @@
 
 # https://github.com/containerd/containerd
 %global goipath         github.com/containerd/containerd
-Version:                1.7.19
+Version:                1.7.16
 
 %gometa
 

anda/docker/moby-buildx/moby-buildx.spec

@@ -1,7 +1,7 @@
 %define debug_package %nil
 
 Name:           moby-buildx
-Version:        0.15.1
+Version:        0.14.0
 Release:        1%?dist
 Summary:        Docker CLI plugin for extended build capabilities with BuildKit
 

anda/docker/moby-compose/moby-compose.spec

@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 
 Name:           moby-compose
-Version:        2.28.1
+Version:        2.27.0
 Release:        1%?dist
 Summary:        Define and run multi-container applications with Docker
 

anda/fonts/iosevka-fusion/anda.hcl

@@ -1,6 +1,6 @@
 project pkg {
 	arches = ["x86_64"]
 	rpm {
-		spec = "google-black-cursor-theme.spec"
+		spec = "iosevka-fusion-fonts.spec"
 	}
 }

anda/fonts/iosevka-fusion/iosevka-fusion-fonts.spec

@@ -0,0 +1,142 @@
+%global         source_name Iosevka
+%global         debug_package %{nil}
+
+Name:           iosevka-fusion-fonts
+Version:        29.2.0
+Release:        1%?dist
+Summary:        A custom font based on iosevka
+
+License:        OFL-1.1
+URL:            https://github.com/be5invis/Iosevka
+Source0:        %{url}/archive/v%{version}.tar.gz
+Source1:        iosevka-fusion.toml
+
+BuildArch:      noarch
+
+BuildRequires:  clang
+BuildRequires:  nodejs-npm
+BuildRequires:  ttfautohint
+
+%description
+Based on Iosevka font, https://github.com/be5invis/Iosevka,
+this font mixes elements from various fonts tailored to my personal taste.
+
+%prep
+%autosetup -n %{source_name}-%{version}
+%__cp %SOURCE1 %{_builddir}/%{source_name}-%{version}/private-build-plans.toml
+
+%build
+npm install
+npm run build -- ttf::iosevka-fusion
+
+%install
+%__mkdir -p %{buildroot}%{_datadir}/fonts/%{name}
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-bold.ttf             \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-Bold.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-bolditalic.ttf       \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-BoldItalic.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-book.ttf             \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-Book.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-bookitalic.ttf       \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-BookItalic.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-extrabold.ttf        \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-ExtraBold.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-extrabolditalic.ttf  \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-ExtraBoldItalic.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-extralight.ttf       \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-ExtraLight.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-extralightitalic.ttf \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-ExtraLightItalic.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-heavy.ttf            \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-Heavy.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-heavyitalic.ttf      \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-HeavyItalic.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-italic.ttf           \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-Italic.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-light.ttf            \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-Light.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-lightitalic.ttf      \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-LightItalic.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-medium.ttf           \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-Medium.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-mediumitalic.ttf     \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-MediumItalic.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-regular.ttf          \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-Regular.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-semibold.ttf         \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-SemiBold.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-semibolditalic.ttf   \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-SemiBoldItalic.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-thin.ttf             \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-Thin.ttf
+
+%__install -m 0644                                                     \
+           dist/iosevka-fusion/ttf/iosevka-fusion-thinitalic.ttf       \
+           -T                                                          \
+           %{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-ThinItalic.ttf
+
+%files
+%license LICENSE.md
+%doc README.md
+%{_datadir}/fonts/*
+
+%changelog
+* Wed Dec 28 2022 windowsboy111 <windowsboy111@fyralabs.com> - 16.8.4
+- Initial package

anda/fonts/iosevka-fusion/iosevka-fusion.toml

@@ -0,0 +1,190 @@
+[buildPlans.iosevka-fusion]
+family      = "Iosevka Fusion"
+spacing     = "fixed"
+serifs      = "sans"
+
+[buildPlans.iosevka-fusion.variants.design]
+cv01 = 1    # A cap straight
+cv02 = 1    # B cap straight
+cv03 = 1    # C cap serifless
+cv04 = 1    # D cap serifless
+cv05 = 1    # E cap serifless
+cv06 = 1    # F cap serifless
+cv07 = 6    # G cap toothless rounded serifless hooked
+cv08 = 1    # H cap serifless
+cv09 = 1    # I cap long serifs
+cv10 = 2    # J cap serified
+cv11 = 2    # K cap curly
+cv12 = 1    # L cap serifless
+cv13 = 1    # M cap short middle leg
+cv14 = 1    # N cap symmetric
+cv15 = 1    # P cap straight
+cv16 = 4    # Q cap crossing tail
+cv17 = 1    # R cap straight
+cv18 = 1    # S cap serifless
+cv19 = 1    # T cap serifless
+cv20 = 3    # U cap serifless
+cv21 = 1    # V cap straight
+cv22 = 1    # W straight
+cv23 = 1    # X cap straight
+cv24 = 1    # Y cap straight
+cv25 = 1    # Z cap straight
+cv28 = 1    # c serifless
+cv33 = 1    # h straight
+cv34 = 10   # i serified flat tailed
+cv35 = 6    # j flat hook serified
+cv37 = 10   # l serified flat tailed
+cv42 = 9    # r compact
+cv43 = 1    # s serifless
+cv44 = 2    # t flat hook
+cv49 = 6    # y cursive flat terminal hook
+cv53 = 1    # Λ, Δ lambda and delta cap straight
+cv54 = 2    # α alpha straight tailed
+cv55 = 1    # δ delta rounded top
+cv56 = 1    # Γ gamma cap straight
+cv57 = 6    # ι iota serified flat tailed
+cv58 = 2    # λ lambda top tailed
+cv59 = 1    # μ me tailless
+cv60 = 2    # ξ xe flat top
+cv77 = 13   # 0 oval dashed forward slash
+cv80 = 2    # 3 arched
+cv82 = 2    # 5 open contour
+cv84 = 1    # 7 straight
+cv85 = 3    # 8 two asymmetric circles
+cv89 = 2    # ~ tilde low
+cv90 = 3    # * asterisk five-pointed low
+cv91 = 1    # _ underscore right below baseline
+cv92 = 1    # ^ uptick high
+cv93 = 1    # ( parentheses normal slope
+cv94 = 2    # { braces curly
+cv95 = 1    # # column straight
+cv97 = 4    # @ three-fold, tall height
+cv98 = 2    # $ dollar strike through
+VXSF = 2    # ¢ cent strike through
+cv99 = 1    # % percent dots
+VXSA = 1    # | bar natural slope
+VXSB = 1    # ' single quote straight
+VXSC = 1    # ` grave/backtick straight
+VXSD = 1    # ? smooth
+cv88 = 2    # .:; square punctuation marks
+cv87 = 2    # ijäöü square diacretics
+
+[buildPlans.iosevka-fusion.variants.upright]
+cv26 = 3    # a double storey rounded
+cv27 = 2    # b rounded
+cv29 = 2    # d rounded
+cv30 = 1    # e straight
+cv31 = 16   # f serifless bottom flat top crossbar at x height
+cv32 = 9    # g single storey flat hook earless cornered top
+cv36 = 1    # k straight
+cv38 = 5    # m earless normal middle leg
+cv39 = 3    # n earless straight
+cv40 = 2    # p earless
+cv41 = 2    # q earless
+cv45 = 2    # u rounded
+cv46 = 1    # v straight
+cv47 = 1    # w straight
+cv48 = 1    # x straight
+cv50 = 1    # z straight
+cv78 = 3    # 1 serified with base
+cv79 = 1    # 2 straight
+cv81 = 3    # 4 semi-open contour
+cv83 = 3    # 6 straight
+cv86 = 3    # 9 straight
+cv96 = 2    # & et open top (ampersand)
+
+[buildPlans.iosevka-fusion.variants.italic]
+cv26 = 1    # a double storey straight
+cv27 = 1    # b straight
+cv29 = 1    # d straight
+cv30 = 2    # e curly
+cv31 = 18   # f flat hook tailed crossbar at x height
+cv32 = 7    # g single storey flat hook
+cv36 = 2    # k curly
+cv38 = 1    # m straight normal middle leg
+cv39 = 1    # n straight
+cv40 = 1    # p straight
+cv41 = 1    # q straight
+cv45 = 1    # u straight
+cv46 = 2    # v curly
+cv47 = 2    # w curly short middle top
+cv48 = 2    # x curly
+cv50 = 4    # z curly
+cv78 = 2    # 1 serified no base
+cv79 = 2    # 2 curly
+cv81 = 1    # 4 closed contour crossing
+cv83 = 1    # 6 closed contour
+cv86 = 1    # 9 closed contour
+cv96 = 4    # & et open top toothed (ampersand)
+
+[buildPlans.iosevka-fusion.weights.thin]
+shape = 100
+menu  = 100
+css   = 100
+
+[buildPlans.iosevka-fusion.weights.extralight]
+shape = 200
+menu  = 200
+css   = 200
+
+[buildPlans.iosevka-fusion.weights.light]
+shape = 300
+menu  = 300
+css   = 300
+
+[buildPlans.iosevka-fusion.weights.regular]
+shape = 400
+menu  = 400
+css   = 400
+
+[buildPlans.iosevka-fusion.weights.book]
+shape = 450
+menu  = 450
+css   = 450
+
+[buildPlans.iosevka-fusion.weights.medium]
+shape = 500
+menu  = 500
+css   = 500
+
+[buildPlans.iosevka-fusion.weights.semibold]
+shape = 600
+menu  = 600
+css   = 600
+
+[buildPlans.iosevka-fusion.weights.bold]
+shape = 700
+menu  = 700
+css   = 700
+
+[buildPlans.iosevka-fusion.weights.extrabold]
+shape = 800
+menu  = 800
+css   = 800
+
+[buildPlans.iosevka-fusion.weights.heavy]
+shape = 900
+menu  = 900
+css   = 900
+
+[buildPlans.iosevka-fusion.slopes.upright]
+angle = 0
+shape = "upright"
+menu  = "upright"
+css   = "normal"
+
+[buildPlans.iosevka-fusion.slopes.italic]
+angle = 9.4
+shape = "italic"
+menu  = "italic"
+css   = "italic"
+
+[buildPlans.iosevka-fusion.widths.normal]
+shape = 600
+menu  = 5
+css   = "normal"
+
+[buildPlans.iosevka-fusion.metric-override]
+leading = 1350
+sb = 60
+xHeight = 530

anda/fonts/iosevka-fusion/update.rhai

@@ -0,0 +1 @@
+rpm.version(gh("be5invis/Iosevka"));

anda/fonts/sarasa-gothic/sarasa-gothic-fonts.spec

@@ -1,5 +1,5 @@
 Name:		sarasa-gothic-fonts
-Version:	1.0.15
+Version:	1.0.11
 Release:	1%?dist
 URL:		https://github.com/be5invis/Sarasa-Gothic
 Source0:	%url/releases/download/v%version/Sarasa-TTC-%version.7z

anda/games/osu-lazer/osu-lazer.spec

@@ -1,9 +1,9 @@
-%define osuresver 2024.705.0
+%define osuresver 2024.410.0
 %global debug_package %{nil}
 %define __strip /bin/true
 
 Name:			osu-lazer
-Version:		2024.625.2
+Version:		2024.412.1
 Release:		1%?dist
 Summary:		The future of osu! and the beginning of an open era! Commonly known by the codename osu!lazer. Pew pew.
 ExclusiveArch:	x86_64

anda/games/prismlauncher-nightly/prismlauncher-nightly.spec

@@ -1,11 +1,13 @@
 %global real_name prismlauncher
 %global nice_name PrismLauncher
 
-%global commit 5f345cedea44ec0037e684436d1bcd94e1ae5b95
+%global commit bfac12604e9cd0884987ca89f34a455cf16c543c
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f
+%global quazip_commit 6117161af08e366c37499895b00ef62f93adc345
+%global tomlplusplus_commit 7eb2ffcc09f8e9890dc0b77ff8ab00fc53b1f2b8
 
-%global commit_date 20240710
+%global commit_date 20240501
 %global snapshot_info %{commit_date}.%{shortcommit}
 
 %bcond_without qt6
@@ -38,6 +40,8 @@ Group:            Amusements/Games
 URL:              https://prismlauncher.org/
 Source0:          https://github.com/PrismLauncher/PrismLauncher/archive/%{commit}/%{real_name}-%{shortcommit}.tar.gz
 Source1:          https://github.com/PrismLauncher/libnbtplusplus/archive/%{libnbtplusplus_commit}/libnbtplusplus-%{libnbtplusplus_commit}.tar.gz
+Source2:          https://github.com/stachenov/quazip/archive/%{quazip_commit}/quazip-%{quazip_commit}.tar.gz
+Source3:          https://github.com/marzer/tomlplusplus/archive/%{tomlplusplus_commit}/tomlplusplus-%{tomlplusplus_commit}.tar.gz
 Patch0:           0001-find-cmark-with-pkgconfig.patch
 
 BuildRequires:    cmake >= 3.15
@@ -46,7 +50,6 @@ BuildRequires:    gcc-c++
 BuildRequires:    java-17-openjdk-devel
 BuildRequires:    desktop-file-utils
 BuildRequires:    libappstream-glib
-BuildRequires:    tomlplusplus-devel
 BuildRequires:    cmake(ghc_filesystem)
 BuildRequires:    cmake(Qt%{qt_version}Concurrent) >= %{min_qt_version}
 BuildRequires:    cmake(Qt%{qt_version}Core) >= %{min_qt_version}
@@ -55,13 +58,9 @@ BuildRequires:    cmake(Qt%{qt_version}Network) >= %{min_qt_version}
 BuildRequires:    cmake(Qt%{qt_version}Test) >= %{min_qt_version}
 BuildRequires:    cmake(Qt%{qt_version}Widgets) >= %{min_qt_version}
 BuildRequires:    cmake(Qt%{qt_version}Xml) >= %{min_qt_version}
-BuildRequires:    cmake(Qt%{qt_version}NetworkAuth) >= %{min_qt_version}
 
 %if %{with qt6}
 BuildRequires:    cmake(Qt6Core5Compat)
-BuildRequires:    quazip-qt6-devel
-%else
-BuildRequires:    quazip-qt5-devel
 %endif
 
 BuildRequires:    pkgconfig(libcmark)
@@ -104,9 +103,13 @@ multiple installations of Minecraft at once (Fork of MultiMC)
 %autosetup -p1 -n PrismLauncher-%{commit}
 
 tar -xzf %{SOURCE1} -C libraries
+tar -xvf %{SOURCE2} -C libraries
+tar -xvf %{SOURCE3} -C libraries
 
-rmdir libraries/{extra-cmake-modules,filesystem,libnbtplusplus,zlib}/
+rmdir libraries/{extra-cmake-modules,filesystem,libnbtplusplus,quazip,tomlplusplus,zlib}/
 mv -f libraries/libnbtplusplus-%{libnbtplusplus_commit} libraries/libnbtplusplus
+mv -f libraries/quazip-%{quazip_commit} libraries/quazip
+mv -f libraries/tomlplusplus-%{tomlplusplus_commit} libraries/tomlplusplus
 
 # Do not set RPATH
 sed -i "s|\$ORIGIN/||" CMakeLists.txt
@@ -153,9 +156,6 @@ sed -i "s|\$ORIGIN/||" CMakeLists.txt
 
 
 %changelog
-* Wed Jun 19 2024 Trung Lê <8 at tle dot id dot au> - 9.0^20240619.8014283-1
-- use system quazip-qt and tomlplusplus
-
 * Wed Jul 26 2023 seth <getchoo at tuta dot io> - 8.0^20230726.4f00012-1
 - remove terra-fractureiser-detector from recommends, use proper build platform,
   and add patches for epel/older fedora versions

anda/games/prismlauncher-qt5-nightly/0001-find-cmark-with-pkgconfig.patch

@@ -0,0 +1,79 @@
+From 5a38fc2c9a329e88c8337af541dfeccaeff1fefb Mon Sep 17 00:00:00 2001
+From: seth <getchoo@tuta.io>
+Date: Sun, 15 Jan 2023 14:47:49 -0500
+Subject: [PATCH] find cmark with pkgconfig
+
+Signed-off-by: seth <getchoo@tuta.io>
+---
+ cmake/Findcmark.cmake | 59 +++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 59 insertions(+)
+ create mode 100755 cmake/Findcmark.cmake
+
+diff --git a/cmake/Findcmark.cmake b/cmake/Findcmark.cmake
+new file mode 100755
+index 00000000..9858e5df
+--- /dev/null
++++ b/cmake/Findcmark.cmake
+@@ -0,0 +1,59 @@
++# SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
++# SPDX-License-Identifier: GPL-3.0-only
++
++#
++# CMake module to search for the cmark library
++#
++
++# first try to find cmark-config.cmake
++# path to a file not in the search path can be set with 'cmake -Dcmark_DIR=some/path/'
++find_package(cmark CONFIG QUIET)
++if(cmark_FOUND AND TARGET cmark::cmark)
++  # found it!
++  return()
++endif()
++
++find_package(PkgConfig QUIET)
++if(PKG_CONFIG_FOUND)
++  pkg_check_modules(PC_CMARK QUIET cmark)
++endif()
++
++if(NOT CMARK_INCLUDE_DIR)
++  find_path(CMARK_INCLUDE_DIR
++            NAMES cmark.h
++            PATHS
++            ${PC_CMARK_INCLUDEDIR}
++            ${PC_CMARK_INCLUDE_DIRS}
++            /usr/include
++            /usr/local/include)
++endif()
++
++if(NOT CMARK_LIBRARY)
++  find_library(CMARK_LIBRARY
++               NAMES cmark
++               HINTS
++               ${PC_CMARK_LIBDIR}
++               ${PC_CMARK_LIBRARY_DIRS}
++               /usr/lib
++               /usr/local/lib)
++endif()
++
++if(NOT TARGET cmark::cmark)
++  add_library(cmark::cmark UNKNOWN IMPORTED)
++  set_target_properties(cmark::cmark
++                        PROPERTIES INTERFACE_INCLUDE_DIRECTORIES
++                                   ${CMARK_INCLUDE_DIR})
++  set_property(TARGET cmark::cmark APPEND
++               PROPERTY IMPORTED_LOCATION ${CMARK_LIBRARY})
++endif()
++
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(cmark
++                                  DEFAULT_MSG
++                                  CMARK_INCLUDE_DIR
++                                  CMARK_LIBRARY)
++
++mark_as_advanced(CMARK_LIBRARY CMARK_INCLUDE_DIR)
++
++set(CMARK_LIBRARIES ${CMARK_LIBRARY})
++set(CMARK_INCLUDE_DIRS ${CMARK_INCLUDE_DIR})
+-- 
+2.39.0
+

anda/games/prismlauncher-qt5-nightly/anda.hcl

@@ -0,0 +1,8 @@
+project pkg {
+	rpm {
+		spec = "prismlauncher-qt5-nightly.spec"
+	}
+	labels {
+		nightly = "1"
+	}
+}

anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec

@@ -0,0 +1,198 @@
+%global real_name prismlauncher
+%global nice_name PrismLauncher
+
+%global commit 2012b2c243dcfad8860847c0d85f184b6dd24504
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f
+%global quazip_commit 6117161af08e366c37499895b00ef62f93adc345
+%global tomlplusplus_commit 7eb2ffcc09f8e9890dc0b77ff8ab00fc53b1f2b8
+
+%global commit_date 20240329
+%global snapshot_info %{commit_date}.%{shortcommit}
+
+%bcond_with qt6
+
+# Change this variables if you want to use custom keys
+# Leave blank if you want to build Prism Launcher without MSA id or curseforge api key
+%define msa_id default
+%define curseforge_key default
+
+%if %{with qt6}
+%global qt_version 6
+%global min_qt_version 6
+%else
+%global qt_version 5
+%global min_qt_version 5.12
+%endif
+
+%global build_platform terra
+
+%if %{with qt6}
+Name:             prismlauncher-nightly
+%else
+Name:             prismlauncher-qt5-nightly
+%endif
+Version:          9.0^%{snapshot_info}
+Release:          1%?dist
+Summary:          Minecraft launcher with ability to manage multiple instances
+License:          GPL-3.0-only AND Apache-2.0 AND LGPL-3.0-only AND GPL-3.0-or-later AND GPL-2.0-or-later AND ISC AND OFL-1.1 AND LGPL-2.1-only AND MIT AND BSD-2-Clause-FreeBSD AND BSD-3-Clause AND LGPL-3.0-or-later
+Group:            Amusements/Games
+URL:              https://prismlauncher.org/
+Source0:          https://github.com/PrismLauncher/PrismLauncher/archive/%{commit}/%{real_name}-%{shortcommit}.tar.gz
+Source1:          https://github.com/PrismLauncher/libnbtplusplus/archive/%{libnbtplusplus_commit}/libnbtplusplus-%{libnbtplusplus_commit}.tar.gz
+Source2:          https://github.com/stachenov/quazip/archive/%{quazip_commit}/quazip-%{quazip_commit}.tar.gz
+Source3:          https://github.com/marzer/tomlplusplus/archive/%{tomlplusplus_commit}/tomlplusplus-%{tomlplusplus_commit}.tar.gz
+Patch0:           0001-find-cmark-with-pkgconfig.patch
+
+BuildRequires:    cmake >= 3.15
+BuildRequires:    extra-cmake-modules
+BuildRequires:    gcc-c++
+BuildRequires:    java-17-openjdk-devel
+BuildRequires:    desktop-file-utils
+BuildRequires:    libappstream-glib
+BuildRequires:    cmake(ghc_filesystem)
+BuildRequires:    cmake(Qt%{qt_version}Concurrent) >= %{min_qt_version}
+BuildRequires:    cmake(Qt%{qt_version}Core) >= %{min_qt_version}
+BuildRequires:    cmake(Qt%{qt_version}Gui) >= %{min_qt_version}
+BuildRequires:    cmake(Qt%{qt_version}Network) >= %{min_qt_version}
+BuildRequires:    cmake(Qt%{qt_version}Test) >= %{min_qt_version}
+BuildRequires:    cmake(Qt%{qt_version}Widgets) >= %{min_qt_version}
+BuildRequires:    cmake(Qt%{qt_version}Xml) >= %{min_qt_version}
+
+%if %{with qt6}
+BuildRequires:    cmake(Qt6Core5Compat)
+%endif
+
+BuildRequires:    pkgconfig(libcmark)
+%if 0%{fedora} < 38
+BuildRequires:    cmark
+%endif
+BuildRequires:    pkgconfig(scdoc)
+BuildRequires:    pkgconfig(zlib)
+
+Requires(post):   desktop-file-utils
+Requires(postun): desktop-file-utils
+
+Requires:         qt%{qt_version}-qtimageformats
+Requires:         qt%{qt_version}-qtsvg
+Requires:         javapackages-filesystem
+Recommends:       java-21-openjdk
+Recommends:       java-17-openjdk
+Suggests:         java-1.8.0-openjdk
+
+# xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
+Recommends:       xrandr
+# libflite needed for using narrator in minecraft
+Recommends:       flite
+# Prism supports enabling gamemode
+Suggests:         gamemode
+
+Conflicts:        %{real_name}
+Conflicts:        %{real_name}-qt5
+%if %{without qt6}
+Conflicts:        %{real_name}-nightly
+%endif
+
+
+%description
+A custom launcher for Minecraft that allows you to easily manage
+multiple installations of Minecraft at once (Fork of MultiMC)
+
+
+%prep
+%autosetup -p1 -n PrismLauncher-%{commit}
+
+tar -xzf %{SOURCE1} -C libraries
+tar -xvf %{SOURCE2} -C libraries
+tar -xvf %{SOURCE3} -C libraries
+
+rmdir libraries/{extra-cmake-modules,filesystem,libnbtplusplus,quazip,tomlplusplus,zlib}/
+mv -f libraries/libnbtplusplus-%{libnbtplusplus_commit} libraries/libnbtplusplus
+mv -f libraries/quazip-%{quazip_commit} libraries/quazip
+mv -f libraries/tomlplusplus-%{tomlplusplus_commit} libraries/tomlplusplus
+
+# Do not set RPATH
+sed -i "s|\$ORIGIN/||" CMakeLists.txt
+
+
+%build
+%cmake \
+  -DLauncher_QT_VERSION_MAJOR="%{qt_version}" \
+  -DLauncher_BUILD_PLATFORM="%{build_platform}" \
+  %if "%{msa_id}" != "default"
+  -DLauncher_MSA_CLIENT_ID="%{msa_id}" \
+  %endif
+  %if "%{curseforge_key}" != "default"
+  -DLauncher_CURSEFORGE_API_KEY="%{curseforge_key}" \
+  %endif
+  -DBUILD_TESTING=OFF
+
+%cmake_build
+
+
+%install
+%cmake_install
+
+
+%check
+%ctest
+
+
+%files
+%doc README.md
+%license LICENSE COPYING.md
+%dir %{_datadir}/%{nice_name}
+%{_bindir}/%{real_name}
+%{_datadir}/%{nice_name}/NewLaunch.jar
+%{_datadir}/%{nice_name}/JavaCheck.jar
+%{_datadir}/%{nice_name}/qtlogging.ini
+%{_datadir}/%{nice_name}/NewLaunchLegacy.jar
+%{_datadir}/applications/org.prismlauncher.PrismLauncher.desktop
+%{_metainfodir}/org.prismlauncher.PrismLauncher.metainfo.xml
+%{_datadir}/icons/hicolor/scalable/apps/org.prismlauncher.PrismLauncher.svg
+%{_datadir}/mime/packages/modrinth-mrpack-mime.xml
+%{_datadir}/qlogging-categories%{qt_version}/prismlauncher.categories
+%{_mandir}/man?/prismlauncher.*
+
+
+%changelog
+* Wed Jul 26 2023 seth <getchoo at tuta dot io> - 8.0^20230726.4f00012-1
+- remove terra-fractureiser-detector from recommends, use proper build platform,
+  and add patches for epel/older fedora versions
+
+* Sun Jul 23 2023 seth <getchoo at tuta dot io> - 8.0^20230722.273d75f-1
+- update submodules, version, & use autorelease
+
+* Wed Jun 07 2023 seth <getchoo at tuta dot io> - 7.0^20230603.954d4d7-1
+- specify jdk 17 + cleanup outdated patches/scriptlets
+
+* Sun May 14 2023 seth <getchoo at tuta dot io> - 7.0^20230513.c5aff7c-1
+- add qtlogging.ini to files list
+
+* Mon Mar 20 2023 seth <getchoo at tuta dot io> - 7.0^20230319.6dcf34a-1
+- recommend flite to support narrator in minecraft
+
+* Fri Feb 03 2023 seth <getchoo at tuta dot io> - 7.0^20230203.58d9ced-1
+- disable tests and explicitly require cmark
+
+* Sun Jan 15 2023 seth <getchoo at tuta dot io> - 7.0^20230115.f1247d2-1
+- add 0001-find-cmark-with-pkgconfig.patch
+
+* Fri Jan 13 2023 seth <getchoo at tuta dot io> - 7.0^20230113.3de681d-1
+- add cmark as a build dep
+
+* Tue Jan 03 2023 seth <getchoo at tuta dot io> - 7.0^20230102.4b12c85-1
+- add qlogging categories
+
+* Mon Dec 05 2022 seth <getchoo at tuta dot io> - 6.0^20221204.79d5bef-1
+- revise file to better follow fedora packaging guidelines and add java 8 as a
+  dependency
+
+* Thu Nov 10 2022 seth <getchoo at tuta dot io> - 5.1-0.1.20221110.e6d057f
+- add package to Amusements/Games
+
+* Sun Nov 06 2022 seth <getchoo at tuta dot io> - 5.0-0.1.20221105.9fb80a2
+- update installed files
+
+* Thu Oct 27 2022 seth <getchoo at tuta dot io> - 5.0-0.1.20221027.610b971
+- initial commit