more merges

terrapkg · Mar 29, 2024 · 7d5beea · 7d5beea
1 parent e8a0943
commit 7d5beea
Show file tree

Hide file tree

Showing 12 changed files with 59 additions and 31 deletions.
diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec
@@ -1,6 +1,6 @@
-%global commit a46ce9e28cd97f7280c085649a79f85aa1d0fe70
+%global commit 7ab1080749b02e3e545166e67528c6a039e04969
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240325
+%global commit_date 20240329
 %global ver v0.37.0
 
 Name:           mpv-nightly

diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec
@@ -1,13 +1,13 @@
 %global real_name prismlauncher
 %global nice_name PrismLauncher
 
-%global commit df0280f52b68f4352d8da711136609c16ce4db7b
+%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 20240325
+%global commit_date 20240329
 %global snapshot_info %{commit_date}.%{shortcommit}
 
 %bcond_without qt6

diff --git a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec
@@ -1,13 +1,13 @@
 %global real_name prismlauncher
 %global nice_name PrismLauncher
 
-%global commit df0280f52b68f4352d8da711136609c16ce4db7b
+%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 20240325
+%global commit_date 20240329
 %global snapshot_info %{commit_date}.%{shortcommit}
 
 %bcond_with qt6

diff --git a/anda/langs/nim/choosenim/choosenim.spec b/anda/langs/nim/choosenim/choosenim.spec
@@ -1,6 +1,6 @@
 Name:			choosenim
 Version:		0.8.4
-Release:		2%?dist
+Release:		1%?dist
 Summary:		Easily install and manage multiple versions of the Nim programming language
 License:		BSD-3-Clause
 URL:			https://github.com/dom96/choosenim

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 33902d9dbb65fbfdfbd6e3b2a34c6e19eccb762f
+%global commit 4b6a9e4add2af2a458d171b23030acb5d1c70ecb
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global ver 2.1.1
-%global commit_date 20240322
+%global commit_date 20240329
 %global debug_package %nil
 
 Name:			nim-nighlty

diff --git a/anda/langs/rust/starship/0001-gix-0.61.1-0.61.0.patch b/anda/langs/rust/starship/0001-gix-0.61.1-0.61.0.patch
@@ -0,0 +1,25 @@
+From b62e3879abe83e0b879421a023d8e944e31f00cb Mon Sep 17 00:00:00 2001
+From: madomado <[email protected]>
+Date: Mon, 25 Mar 2024 18:33:25 +0800
+Subject: [PATCH] gix 0.61.1 -> 0.61.0
+
+---
+ Cargo.toml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index d98ba90..c3059c9 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -82,7 +82,7 @@ version = "1.0.4"
+ version = "0.4.3"
+
+ [dependencies.gix]
+-version = "0.61.1"
++version = "0.61.0"
+ features = [
+     "max-performance-safe",
+     "revision",
+-- 
+2.44.0
+
diff --git a/anda/langs/rust/starship/rust-starship.spec b/anda/langs/rust/starship/rust-starship.spec
@@ -1,21 +1,21 @@
-%global debug_package %{nil}
-# Generated by rust2rpm 24
-%bcond_without check
+# Generated by rust2rpm 26
+#bcond_without check
 
 %global crate starship
 
 Name:           rust-starship
 Version:        1.18.1
-Release:        1%?dist
+Release:        %autorelease
 Summary:        Minimal, blazing-fast, and infinitely customizable prompt for any shell! ☄🌌️
 
 License:        ISC
 URL:            https://crates.io/crates/starship
 Source:         %{crates_source}
-# Automatically generated patch to strip foreign dependencies
-Patch:          starship-fix-metadata-auto.diff
+# Automatically generated patch to strip dependencies and normalize metadata
+Patch0:         starship-fix-metadata-auto.diff
+Patch1:         0001-gix-0.61.1-0.61.0.patch
 
-BuildRequires:  rust-packaging >= 21
+BuildRequires:  cargo-rpm-macros >= 24
 BuildRequires:  anda-srpm-macros
 BuildRequires:  cmake
 BuildRequires:  pkgconfig
@@ -29,11 +29,13 @@ shell! ☄🌌️.}
 
 %package     -n %{crate}
 Summary:        %{summary}
+License:        ISC
 
 %description -n %{crate} %{_description}
 
 %files       -n %{crate}
 %license LICENSE
+#license LICENSE.dependencies
 %doc README.md
 %{_bindir}/starship
 
@@ -170,14 +172,14 @@ use the "starship-battery" feature of the "%{crate}" crate.
 %ghost %{crate_instdir}/Cargo.toml
 
 %prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
+%autosetup -n %{crate}-%{version} -p1
 %cargo_prep_online
 
 %build
-%cargo_build
+%{cargo_build}
 
 %install
-%cargo_install
+%{cargo_install}
 
 %if %{with check}
 %check

diff --git a/anda/langs/rust/starship/starship-fix-metadata-auto.diff b/anda/langs/rust/starship/starship-fix-metadata-auto.diff
@@ -1,14 +1,14 @@
---- starship-1.14.2/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ starship-1.14.2/Cargo.toml	2023-04-25T12:48:23.509565+00:00
-@@ -254,18 +254,3 @@
+--- starship-1.18.1/Cargo.toml	1970-01-01T00:00:01+00:00
++++ starship-1.18.1/Cargo.toml	2024-03-24T13:14:24.022475+00:00
+@@ -263,18 +263,3 @@
  ]
  default-features = false
 
 -[target."cfg(windows)".dependencies.deelevate]
 -version = "0.2.0"
 -
 -[target."cfg(windows)".dependencies.windows]
--version = "0.48.0"
+-version = "0.54.0"
 -features = [
 -    "Win32_Foundation",
 -    "Win32_UI_Shell",

diff --git a/anda/langs/vala/vala-nightly/vala-nightly.spec b/anda/langs/vala/vala-nightly/vala-nightly.spec
@@ -3,11 +3,11 @@
 %global priority 90
 
 %global real_name vala
-%global commit 933eb2d0e41bb7fdc4fe5fc01a03254965990f3e
+%global commit 86984c59734f975c9778251dddf80d247ade28a7
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global repo https://gitlab.gnome.org/GNOME/%{real_name}.git
 
-%global commit_date 20240218
+%global commit_date 20240327
 %global snapshot_info %{commit_date}.%{shortcommit}
 
 Name:           vala-nightly

diff --git a/anda/langs/vala/vala-panel-appmenu/vala-panel-appmenu.spec b/anda/langs/vala/vala-panel-appmenu/vala-panel-appmenu.spec
@@ -158,4 +158,3 @@ Vala appmenu support for Java Swing applications.
 
 %changelog
 %autochangelog
-
diff --git a/anda/langs/vala/vala-panel/update.rhai b/anda/langs/vala/vala-panel/update.rhai
@@ -0,0 +1 @@
+rpm.version(gitlab("6865057"));
diff --git a/anda/langs/vala/vala-panel/vala-panel.spec b/anda/langs/vala/vala-panel/vala-panel.spec
@@ -1,10 +1,9 @@
+Name:    vala-panel
+Version: 24.03
 %global forgeurl https://gitlab.com/vala-panel-project/vala-panel
-%global commit ead4e7a36b0e4b0a2ac43c5d9ca17eb753461afe
 %forgemeta
 
-Name:    vala-panel
-Version: 0.5.0
-Release: 2%?dist
+Release: 1%?dist
 License: LGPL-3.0-or-later
 Summary: This package provides Application Menu plugin for vala-panel
 Group:   System/GUI/Other
@@ -38,7 +37,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 %forgeautosetup
 
 %build
-%meson -Dwnck=enabled -Dplatforms='layer-shell,x11'
+%meson -Dwnck=enabled -Dplatforms='wayland,x11'
 %meson_build
 
 %install
@@ -73,6 +72,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.valapanel.applica
 %{_datadir}/vala-panel/applets/*.plugin
 %dir %{_datadir}/vala-panel/images
 %{_datadir}/vala-panel/images/background.png
+%{_libdir}/girepository-1.0/ValaPanel-%version.typelib
 
 %files devel
 %doc README.md
@@ -82,6 +82,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.valapanel.applica
 %{_libdir}/libvalapanel.so
 %{_libdir}/pkgconfig/vala-panel.pc
 %{_datadir}/vala/vapi/vala-panel.*
+%{_datadir}/gir-1.0/ValaPanel-%version.gir
 
 %changelog
 %autochangelog
Original file line number	Diff line number	Diff line change
Expand Up		@@ -158,4 +158,3 @@ Vala appmenu support for Java Swing applications.

		%changelog
		%autochangelog