Merge branch 'frawhide' into add-tracy

terrapkg · Jul 20, 2024 · 9b59dac · 9b59dac
2 parents 95f015a + 42b47fa
commit 9b59dac
Show file tree

Hide file tree

Showing 16 changed files with 23 additions and 919 deletions.
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.453
+Version:        0.0.454
 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.453
+Version:        0.0.454
 Release:        1%?dist
 Summary:        Free Voice and Text Chat for Gamers
 URL:            discord.com

diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec
@@ -1,6 +1,6 @@
-%global commit 07acdf09b3f067f7e48ac05573893cc2ff626928
+%global commit e509ec0aaffce74e520702e16e3e21ea0f168940
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240719
+%global commit_date 20240720
 %global ver v0.38.0
 
 Name:           mpv-nightly

diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec
@@ -1,6 +1,6 @@
 %bcond_without check
 %global debug_package %{nil}
-%global ver 0.145.0
+%global ver 0.145.1
 
 %global crate zed
 %global app_id dev.zed.Zed-Preview

diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec
@@ -7,7 +7,7 @@
 %global app_id dev.zed.Zed
 
 Name:           zed
-Version:        0.144.3
+Version:        0.144.4
 Release:        1%?dist
 Summary:        Zed is a high-performance, multiplayer code editor
 

diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec
@@ -1,11 +1,11 @@
 %global real_name prismlauncher
 %global nice_name PrismLauncher
 
-%global commit dcc58c8b752d0946c1d7f72cbfbb992f23c30068
+%global commit 0041d2a126ae6f35ce1ca2bb5c793ec5853c4343
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f
 
-%global commit_date 20240719
+%global commit_date 20240720
 %global snapshot_info %{commit_date}.%{shortcommit}
 
 %bcond_without qt6

diff --git a/anda/langs/crystal/crystal/update.rhai b/anda/langs/crystal/crystal/update.rhai
@@ -1,9 +1,9 @@
 let v = gh("crystal-lang/crystal");
-let url = `https://github.com/crystal-lang/crystal/releases/download/${v}/crystal-${v}-1-linux-x86_64-bundled.tar.gz`;
-try {
-  find(url, get(`https://github.com/crystal-lang/crystal/releases/tag/${v}`), 0);
+let url = `crystal-${v}-1-linux-x86_64-bundled.tar.gz`;
+
+if get(`https://github.com/crystal-lang/crystal/releases/expanded_assets/${v}`).contains(url) {
   rpm.version(v);
-} catch {
+} else {
   print(`crystal: ${v} (waiting for bundle)`);
   terminate();
 }
diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec
@@ -1,8 +1,8 @@
 %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10
-%global commit 3a103669d18408cd75ca5c5c97c34f4222c6e217
+%global commit 97f54745459b8651b7a38c174b3a8135224ebd09
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global ver 2.1.9
-%global commit_date 20240719
+%global commit_date 20240720
 %global debug_package %nil
 
 Name:			nim-nightly

diff --git a/anda/lib/libhelium/libhelium.spec b/anda/lib/libhelium/libhelium.spec
@@ -1,10 +1,12 @@
+%global ver 1.8.12-10
+%global sanitized_ver %(echo %{ver} | sed -E 's/-/~/g')
 Summary:        The Application Framework for tauOS apps
 Name:           libhelium
-Version:        1.8.12.7
+Version:        %{sanitized_ver}
 Release:        1%?dist
 License:        GPL-3.0
 URL:            https://github.com/tau-OS/libhelium
-Source0:        https://github.com/tau-OS/libhelium/archive/refs/tags/%{version}.tar.gz
+Source0:        https://github.com/tau-OS/libhelium/archive/refs/tags/%{ver}.tar.gz
 
 BuildRequires:  sass
 BuildRequires:  meson
@@ -21,6 +23,7 @@ Requires: gtk4 >= 4.4
 Requires: glib2 >= 2.66.0
 Requires: libgee >= 0.20
 Requires: tau-helium >= 1.1.25
+Requires: tau-hydrogen
 
 %description
 The Application Framework for tauOS apps
@@ -34,7 +37,7 @@ This package contains the libraries and header files that are needed
 for writing applications with libhelium.
 
 %prep
-%autosetup -n libhelium-%{version}
+%autosetup -n libhelium-%{ver}
 
 %build
 %meson \

diff --git a/anda/lib/libhelium/update.rhai b/anda/lib/libhelium/update.rhai
@@ -1 +1 @@
-rpm.version(gh("tau-OS/libhelium"));
+rpm.global("ver",gh("tau-OS/libhelium"));
diff --git a/anda/lib/terra-mesa/Mesa-MLAA-License-Clarification-Email.txt b/anda/lib/terra-mesa/Mesa-MLAA-License-Clarification-Email.txt
diff --git a/anda/lib/terra-mesa/anda.hcl b/anda/lib/terra-mesa/anda.hcl
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		rpm.version(gh("tau-OS/libhelium"));
		rpm.global("ver",gh("tau-OS/libhelium"));