Merge branch 'f39' into mado/w39/spacedrive

terrapkg · Jun 27, 2024 · 6d54f13 · 6d54f13
2 parents c2d50ff + e1a4779
commit 6d54f13
Show file tree

Hide file tree

Showing 21 changed files with 137 additions and 352 deletions.
diff --git a/anda/apps/anki-qt5/anki-qt5.spec b/anda/apps/anki-qt5/anki-qt5.spec
@@ -22,7 +22,7 @@ Anki is based on a theory called spaced repetition.
 %prep
 git clone https://github.com/ankitects/anki .
 git checkout %version
-%patch1 -p1
+%patch 1 -p1
 
 # See https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=anki-qt5
 

diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/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.433
+Version:        0.0.438
 Release:        1%?dist
 Summary:        A snappier Discord rewrite with features like further customization and theming
 License:        MIT AND https://discord.com/terms

diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
 
 Name:           discord-canary
-Version:        0.0.433
+Version:        0.0.438
 Release:        1%?dist
 Summary:        Free Voice and Text Chat for Gamers
 URL:            discord.com

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

diff --git a/anda/apps/discord/discord.spec b/anda/apps/discord/discord.spec
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
 
 Name:			discord
-Version:		0.0.57
+Version:		0.0.58
 Release:		1%?dist
 Summary:		Free Voice and Text Chat for Gamers
 URL:			https://discord.com

diff --git a/anda/apps/envision/envision.spec b/anda/apps/envision/envision.spec
@@ -1,5 +1,5 @@
-%global commit 495ffef93bc987d96aa5acb2920c5d581ca99ea9
-%global commit_date 20240624
+%global commit b594f75778961c281daca398011914e9ac14b753
+%global commit_date 20240625
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:           envision

diff --git a/anda/devs/zed/nightly/anda.hcl b/anda/devs/zed/nightly/anda.hcl
@@ -0,0 +1,9 @@
+project pkg {
+  rpm {
+    spec = "zed-nightly.spec"
+  }
+  labels {
+    nightly = 1
+    large = 1
+  }
+}
diff --git a/anda/devs/zed/nightly/update.rhai b/anda/devs/zed/nightly/update.rhai
@@ -0,0 +1,9 @@
+if filters.contains("nightly") {
+  rpm.global("commit", gh_commit("zed-industries/zed"));
+  if rpm.changed() {
+    let v = find("(\\d+\\.\\d+\\d+\\.\\d+)", find("\nversion = \"(\\d+\\.\\d+\\d+\\.\\d+)\"\n", gh_rawfile("zed-industries/zed", "main", "crates/zed/Cargo.toml"), 1), 1);
+    rpm.global("ver", v);
+    rpm.global("commit_date", date());
+    rpm.release();
+  }
+}
diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec
@@ -0,0 +1,97 @@
+%global commit 0129d4e2506d5ec5e50ef0968382770b9abec390
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commit_date 20240619
+%global ver 0.142.0
+
+%bcond_without check
+
+# Exclude input files from mangling
+%global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$
+
+%global crate zed
+%global app_id dev.zed.Zed-Nightly
+
+Name:           zed-nightly
+Version:        %ver^%commit_date.%shortcommit
+Release:        1%?dist
+Summary:        Zed is a high-performance, multiplayer code editor
+
+License:        MIT
+URL:            https://zed.dev/
+Source0:        https://github.com/zed-industries/zed/archive/%{commit}.zip
+
+Conflicts:      zed
+Provides:       zed
+
+BuildRequires:  cargo-rpm-macros >= 24
+BuildRequires:  anda-srpm-macros
+BuildRequires:  gcc
+BuildRequires:  g++
+BuildRequires:  clang
+BuildRequires:  mold
+BuildRequires:  alsa-lib-devel
+BuildRequires:  fontconfig-devel
+BuildRequires:  wayland-devel
+BuildRequires:  libxkbcommon-x11-devel
+BuildRequires:  openssl-devel
+BuildRequires:  libzstd-devel
+BuildRequires:  perl-FindBin
+BuildRequires:  perl-IPC-Cmd
+BuildRequires:  perl-File-Compare
+BuildRequires:  perl-File-Copy
+BuildRequires:  perl-lib
+BuildRequires:  vulkan-loader
+
+%description
+Code at the speed of thought - Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
+
+%prep
+%autosetup -n %{crate}-%{commit} -p1
+%cargo_prep_online
+
+export DO_STARTUP_NOTIFY="true"
+export APP_ID="%app_id"
+export APP_ICON="%app_id"
+export APP_NAME="Zed Nightly"
+export APP_CLI="zed"
+export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed Nightly from Terra."
+export ZED_RELEASE_CHANNEL=nightly
+export BRANDING_LIGHT="#e9aa6a"
+export BRANDING_DARK="#1a5fb4"
+
+echo "StartupWMClass=$APP_ID" >> crates/zed/resources/zed.desktop.in
+envsubst < "crates/zed/resources/zed.desktop.in" > $APP_ID.desktop # from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=zed-git#n52
+
+envsubst < "crates/zed/resources/flatpak/zed.metainfo.xml.in" > $APP_ID.metainfo.xml
+
+%build
+export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed Nightly from Terra."
+echo "nightly" > crates/zed/RELEASE_CHANNEL
+
+%cargo_build -- --package zed --package cli
+script/generate-licenses
+
+%install
+install -Dm755 target/rpm/zed %{buildroot}%{_libexecdir}/zed-editor
+install -Dm755 target/rpm/cli %{buildroot}%{_bindir}/zed
+
+install -Dm644 %app_id.desktop %{buildroot}%{_datadir}/applications/%app_id.desktop
+install -Dm644 crates/zed/resources/app-icon-nightly.png %{buildroot}%{_datadir}/pixmaps/%app_id.png
+
+install -Dm644 %app_id.metainfo.xml %{buildroot}%{_metainfodir}/%app_id.metainfo.xml
+
+%if %{with check}
+%check
+%cargo_test
+%endif
+
+%files
+%{_libexecdir}/zed-editor
+%{_bindir}/zed
+%{_datadir}/applications/%app_id.desktop
+%{_datadir}/pixmaps/%app_id.png
+%{_metainfodir}/%app_id.metainfo.xml
+%license assets/licenses.md
+
+%changelog
+%autochangelog
diff --git a/anda/games/osu-lazer/osu-lazer.spec b/anda/games/osu-lazer/osu-lazer.spec
@@ -3,7 +3,7 @@
 %define __strip /bin/true
 
 Name:			osu-lazer
-Version:		2024.521.2
+Version:		2024.625.2
 Release:		1%?dist
 Summary:		The future of osu! and the beginning of an open era! Commonly known by the codename osu!lazer. Pew pew.
 ExclusiveArch:	x86_64

diff --git a/anda/langs/python/protobuf/python3-protobuf.spec b/anda/langs/python/protobuf/python3-protobuf.spec
@@ -3,7 +3,7 @@
 
 Name:           python-%{pypi_name}
 Version:        5.27.1
-Release:        1%?dist
+Release:        2%?dist
 Summary:        Protocol Buffers
 
 License:        BSD-3-Clause

diff --git a/anda/langs/rust/nushell/nushell.spec b/anda/langs/rust/nushell/nushell.spec
@@ -1,5 +1,5 @@
 Name:			nushell
-Version:		0.94.2
+Version:		0.95.0
 Release:		1%?dist
 Summary:		A new type of shell
 License:		MIT

diff --git a/anda/lib/libindicator/terra-libindicator.spec b/anda/lib/libindicator/terra-libindicator.spec
@@ -57,7 +57,7 @@ developing applications that use %{name}-gtk3.
 
 %prep
 %setup -q -c
-%patch1 -p1 -b .orig
+%patch 1 -p1 -b .orig
 # Remove all IDO references
 # This is only needed for tools/indicator-loader.c
 sed -i '6d' ./Makefile.am

diff --git a/anda/lib/openh264/anda.hcl b/anda/lib/openh264/anda.hcl
@@ -1,5 +1,5 @@
 project pkg {
   rpm {
-	spec = "openh264.spec"
+    spec = "openh264.spec"
   }
 }