Merge branch 'frawhide' into mado/fix/zed-preview-update

Signed-off-by: madomado <[email protected]>
terrapkg · Aug 18, 2024 · b95214a · b95214a
2 parents 2e51e5b + 8ecd29c
commit b95214a
Show file tree

Hide file tree

Showing 29 changed files with 56 additions and 240 deletions.
diff --git a/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec b/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.99
+Version:        0.0.100
 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-ptb/discord-ptb.spec b/anda/apps/discord-ptb/discord-ptb.spec
@@ -6,7 +6,7 @@
 %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
 
 Name:           discord-ptb
-Version:        0.0.99
+Version:        0.0.100
 Release:        1%?dist
 Summary:        Free Voice and Text Chat for Gamers.
 URL:            https://discord.com

diff --git a/anda/apps/komikku/komikku.spec b/anda/apps/komikku/komikku.spec
@@ -5,7 +5,7 @@
 %global pure_protobuf_version 2.0.0
 
 Name:           komikku
-Version:        1.54.0
+Version:        1.55.0
 %forgemeta
 Release:        1%?dist
 Summary:        A manga reader for GNOME

diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec
@@ -1,6 +1,6 @@
-%global commit acc69e082fff67398834de3045ef48d33d2f4d54
+%global commit a3baf94ab9f3b43a8027d74c43991a3c2da732e0
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240814
+%global commit_date 20240817
 %global ver 0.38.0
 
 Name:           mpv-nightly

diff --git a/anda/apps/ruffle/ruffle-nightly.spec b/anda/apps/ruffle/ruffle-nightly.spec
@@ -1,4 +1,4 @@
-%global ver 2024-08-16
+%global ver 2024-08-18
 %global goodver %(echo %ver | sed 's/-//g')
 %global __brp_mangle_shebangs %{nil}
 %bcond_without mold

diff --git a/anda/desktops/elementary/elementary-camera/elementary-camera.spec b/anda/desktops/elementary/elementary-camera/elementary-camera.spec
@@ -20,7 +20,7 @@ BuildRequires:  fdupes
 BuildRequires:  pkgconfig(gee-0.8)
 BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(granite) >= 6.0.0
+BuildRequires:  pkgconfig(granite-7)
 BuildRequires:  pkgconfig(gstreamer-1.0)
 BuildRequires:  pkgconfig(gstreamer-pbutils-1.0)
 BuildRequires:  pkgconfig(gtk+-3.0)

diff --git a/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec b/anda/desktops/lomiri-unity/lomiri-system-settings/lomiri-system-settings.spec
@@ -1,5 +1,5 @@
 %global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings
-%global commit 8d7e90d1e1e4f807584834ab2448618d0b67c860
+%global commit 4c819ca69476a43cf6ec7539094684f7e0ba4598
 %forgemeta
 
 Name:       lomiri-system-settings

diff --git a/anda/desktops/lomiri-unity/unity-session/unity-session.spec b/anda/desktops/lomiri-unity/unity-session/unity-session.spec
@@ -1,4 +1,4 @@
-%define _ubuntu_rel 1ubuntu4
+%define _ubuntu_rel 7ubuntu1
 
 Name:    unity-session
 Summary: Lightdm profile for Unity 7

diff --git a/anda/devs/flow/flow-control-nightly.spec b/anda/devs/flow/flow-control-nightly.spec
@@ -1,6 +1,6 @@
-%global commit 78489e31f6fada3f3cd868cf2de77f9a4b5ad54c
+%global commit 36a24d84e3e57552cfe73d578f8749bd7c704fcf
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240816
+%global commit_date 20240818
 
 Name:           flow-control-nightly
 Version:        %commit_date.%shortcommit

diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec
@@ -1,6 +1,6 @@
-%global commit 09b6e3f2a6a3b422d04934c5c0fc88ad8dc72741
+%global commit 5e6e465294c0605eaa76a30c9dcea2f98d410010
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240816
+%global commit_date 20240818
 %global ver 0.150.0
 
 %bcond_with check

diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec
@@ -1,6 +1,6 @@
 %bcond_with check
 
-%global ver 0.148.1
+%global ver 0.149.1
 # Exclude input files from mangling
 %global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$
 # Use Mold as the linker

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.731.0
+Version:		2024.817.0
 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/dart/dart.spec b/anda/langs/dart/dart.spec
@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 
 Name: dart
-Version: 3.5.0
+Version: 3.5.1
 Release: 1%?dist
 Summary: The Dart Language
 License: BSD-3-Clause

diff --git a/anda/langs/kotlin/kotlin-native/kotlin-native.spec b/anda/langs/kotlin/kotlin-native/kotlin-native.spec
@@ -9,7 +9,7 @@ ExclusiveArch:  x86_64
 
 License:        ASL 2.0
 URL:            https://kotlinlang.org/docs/reference/native-overview.html
-Source0:        https://github.com/JetBrains/kotlin/releases/download/v%version/kotlin-native-linux-x86_64-%version.tar.gz
+Source0:        https://github.com/JetBrains/kotlin/releases/download/v%version/kotlin-native-prebuilt-linux-x86_64-%version.tar.gz
 
 BuildRequires:  tar
 BuildRequires:  sed
@@ -28,15 +28,15 @@ Kotlin compiler and native implementation of the Kotlin standard library.
 
 
 %prep
-tar -xf %{SOURCE0} && cd kotlin-native-linux-x86_64-%{version}
+tar -xf %{SOURCE0} && cd kotlin-native-prebuilt-linux-x86_64-%{version}
 sed -i "s|\(DIR *= *\).*|\1%{_bindir}|" bin/*
 sed -i "s|\(KONAN_HOME *= *\).*|\1%{_datadir}/%{name}|" bin/*
 
 
 %build
 
 %install
-rm -rf %{buildroot} && mkdir -p %{buildroot}%{_bindir}/ && cd kotlin-native-linux-x86_64-%{version}
+rm -rf %{buildroot} && mkdir -p %{buildroot}%{_bindir}/ && cd kotlin-native-prebuilt-linux-x86_64-%{version}
 install -m 0755 bin/cinterop %{buildroot}%{_bindir}/
 install -m 0755 bin/generate-platform %{buildroot}%{_bindir}/
 install -m 0755 bin/jsinterop %{buildroot}%{_bindir}/

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 298ada3412c9cf5971abc2b3b891b9bb8612e170
+%global commit f7c11a8978a1fc7182ef18c4bdc80e920ce6ad88
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global ver 2.1.9
-%global commit_date 20240816
+%global commit_date 20240818
 %global debug_package %nil
 
 Name:			nim-nightly

diff --git a/anda/langs/python/ruff/python3-ruff.spec b/anda/langs/python/ruff/python3-ruff.spec
@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 
 Name:			python3-ruff
-Version:		0.6.0
+Version:		0.6.1
 Release:		1%?dist
 Summary:		An extremely fast Python linter, written in Rust
 License:		MIT

diff --git a/anda/langs/rust/bandwhich/rust-bandwhich.spec b/anda/langs/rust/bandwhich/rust-bandwhich.spec
@@ -4,8 +4,8 @@
 %global crate bandwhich
 
 Name:           rust-bandwhich
-Version:        0.22.2
-Release:        1%{?dist}
+Version:        0.23.0
+Release:        1%?dist
 Summary:        Display current network utilization by process, connection and remote IP/hostname
 
 License:        MIT

diff --git a/anda/lib/libhelium/libhelium.spec b/anda/lib/libhelium/libhelium.spec
@@ -1,4 +1,4 @@
-%global ver 1.8.15-2
+%global ver 1.8.16
 %global sanitized_ver %(echo %{ver} | sed -E 's/-/~/g')
 Summary:        The Application Framework for tauOS apps
 Name:           libhelium

diff --git a/anda/lib/tdlib/tdlib-nightly.spec b/anda/lib/tdlib/tdlib-nightly.spec
@@ -1,4 +1,4 @@
-%global commit 8d08b34e22a08e58db8341839c4e18ee06c516c5
+%global commit 9b6ff5863e5d0b2a07b50f4aa1a3344a51a1f80f
 %global ver 1.8.35
 %global commit_date 20240219
 %global shortcommit %(c=%{commit}; echo ${c:0:7})

diff --git a/anda/misc/openbangla-keyboard/openbangla-keyboard-nightly.spec b/anda/misc/openbangla-keyboard/openbangla-keyboard-nightly.spec
@@ -1,6 +1,6 @@
 %global ver 2.0.0
-%global commit 2e6d0996c1e7f58889b222ae2fdece110b737433
-%global commit_date 20240814
+%global commit c036b843513ead56c37463c7fde5875271751f22
+%global commit_date 20240817
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:           openbangla-keyboard-nightly

diff --git a/anda/system/mesa-freeworld/mesa-freeworld.spec b/anda/system/mesa-freeworld/mesa-freeworld.spec
@@ -6,7 +6,7 @@ algorithms and decoding only VC1 algorithm.
 %global with_radeonsi 1
 %global with_vmware 1
 %global with_vulkan_hw 0
-#global with_vdpau 1
+%global with_vdpau 1
 %global with_va 1
 %if !0%{?rhel}
 %global with_r300 1
@@ -173,6 +173,7 @@ BuildRequires:  python3-mako
 BuildRequires:  python3-ply
 %endif
 BuildRequires:  python3-pycparser
+BuildRequires:  python3-pyyaml
 BuildRequires:  vulkan-headers
 BuildRequires:  glslang
 %if 0%{?with_vulkan_hw}
@@ -219,7 +220,7 @@ export RUSTFLAGS="%build_rustflags"
   -Ddri3=enabled \
   -Dosmesa=false \
 %if 0%{?with_hardware}
-  -Dgallium-drivers=swrast,virgl,nouveau%{?with_r300:,r300}%{?with_crocus:,crocus}%{?with_i915:,i915}%{?with_iris:,iris}%{?with_vmware:,svga}%{?with_radeonsi:,radeonsi}%{?with_r600:,r600}%{?with_freedreno:,freedreno}%{?with_etnaviv:,etnaviv}%{?with_tegra:,tegra}%{?with_vc4:,vc4}%{?with_v3d:,v3d}%{?with_kmsro:,kmsro}%{?with_lima:,lima}%{?with_panfrost:,panfrost}%{?with_vulkan_hw:,zink} \
+  -Dgallium-drivers=swrast,virgl,nouveau%{?with_r300:,r300}%{?with_crocus:,crocus}%{?with_i915:,i915}%{?with_iris:,iris}%{?with_vmware:,svga}%{?with_radeonsi:,radeonsi}%{?with_r600:,r600}%{?with_freedreno:,freedreno}%{?with_etnaviv:,etnaviv}%{?with_tegra:,tegra}%{?with_vc4:,vc4}%{?with_v3d:,v3d}%{?with_lima:,lima}%{?with_panfrost:,panfrost}%{?with_vulkan_hw:,zink} \
 %else
   -Dgallium-drivers=swrast,virgl \
 %endif
@@ -300,6 +301,7 @@ rm -rf %{buildroot}%{_libdir}/{d3d,EGL,gallium-pipe,libGLX,pkgconfig}
 rm -rf %{buildroot}%{_includedir}/{d3dadapter,EGL,GL,KHR}
 rm -fr %{buildroot}%{_sysconfdir}/OpenGL
 rm -fr %{buildroot}%{_libdir}/libGL.so*
+rm -fr %{buildroot}%{_libdir}/libgallium-*.so
 rm -fr %{buildroot}%{_libdir}/libglapi.so*
 rm -fr %{buildroot}%{_libdir}/libOSMesa.so*
 rm -fr %{buildroot}%{_libdir}/pkgconfig/osmesa.pc
@@ -312,11 +314,6 @@ rm -fr %{buildroot}%{_libdir}/dri/*_dri.so
 rm -fr %{buildroot}%{_libdir}/libvulkan*.so
 rm -fr %{buildroot}%{_libdir}/libVkLayer_MESA_device_select.so
 
-%if 0%{?with_vdpau}
-%else
-rm %buildroot%_datadir/metainfo/org.mesa3d.vdpau.freeworld.metainfo.xml
-%endif
-
 %if 0%{?with_va}
 %files -n %{srcname}-va-drivers-freeworld
 %{_libdir}/dri/nouveau_drv_video.so
@@ -326,6 +323,7 @@ rm %buildroot%_datadir/metainfo/org.mesa3d.vdpau.freeworld.metainfo.xml
 %if 0%{?with_radeonsi}
 %{_libdir}/dri/radeonsi_drv_video.so
 %endif
+%{_libdir}/dri/libgallium_drv_video.so
 %{_libdir}/dri/virtio_gpu_drv_video.so
 %{_metainfodir}/org.mesa3d.vaapi.freeworld.metainfo.xml
 %license docs/license.rst
@@ -340,14 +338,21 @@ rm %buildroot%_datadir/metainfo/org.mesa3d.vdpau.freeworld.metainfo.xml
 %if 0%{?with_radeonsi}
 %{_libdir}/vdpau/libvdpau_radeonsi.so.1*
 %endif
+%{_libdir}/vdpau/libvdpau_gallium.so.1*
 %{_libdir}/vdpau/libvdpau_virtio_gpu.so.1*
 %{_metainfodir}/org.mesa3d.vdpau.freeworld.metainfo.xml
 %license docs/license.rst
 %endif
 
 %changelog
-* Thu Aug 1 2024 Thorsten Leemhuis <[email protected]> - 24.1.5-1
-- Update to 24.1.5
+* Thu Aug 8 2024 Thorsten Leemhuis <[email protected]> - 24.2.0~rc4-1
+- Update to 24.2.0-rc4
+
+* Fri Aug 02 2024 RPM Fusion Release Engineering <[email protected]> - 24.2.0~rc3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Thu Aug 1 2024 Thorsten Leemhuis <[email protected]> - 24.2.0~rc3-1
+- Update to 24.2.0-rc3
 - Drop upstreamed patch
 
 * Fri Jul 19 2024 Thorsten Leemhuis <[email protected]> - 24.1.4-2

diff --git a/anda/terra/srpm-macros/anda-srpm-macros.spec b/anda/terra/srpm-macros/anda-srpm-macros.spec
@@ -1,15 +1,11 @@
 Name:           anda-srpm-macros
 Version:        0.1.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        SRPM macros for extra Fedora packages
 
 License:        MIT
-# URL:
-Source0:        macros.cargo_extra
-Source1:        macros.caching
-Source2:        macros.anda
-Source3:        macros.go_extra
-Source4:        macros.nim_extra
+URL:            https://github.com/terrapkg/srpm-macros
+Source0:        %url/archive/refs/tags/v%{version}.tar.gz
 
 Recommends:     rust-packaging
 Requires:       git-core
@@ -21,25 +17,27 @@ BuildArch:      noarch
 %{summary}
 
 %prep
+%autosetup -n srpm-macros-%version
 
 %build
 
 %install
-install -D -p -m 0644 -t %{buildroot}%{_rpmmacrodir} %{SOURCE0}
-install -D -p -m 0644 -t %{buildroot}%{_rpmmacrodir} %{SOURCE1}
-install -D -p -m 0644 -t %{buildroot}%{_rpmmacrodir} %{SOURCE2}
-install -D -p -m 0644 -t %{buildroot}%{_rpmmacrodir} %{SOURCE3}
-install -D -p -m 0644 -t %{buildroot}%{_rpmmacrodir} %{SOURCE4}
+for file in ./macros.*; do
+    install -Dpm644 -t %buildroot%_rpmmacrodir $file
+done
 
 %files
-%{_rpmmacrodir}/macros.cargo_extra
-%{_rpmmacrodir}/macros.caching
 %{_rpmmacrodir}/macros.anda
+%{_rpmmacrodir}/macros.caching
+%{_rpmmacrodir}/macros.cargo_extra
 %{_rpmmacrodir}/macros.go_extra
 %{_rpmmacrodir}/macros.nim_extra
 
 
 %changelog
+* Wed Aug 14 2024 madonuko <[email protected]> - 0.1.7-2
+- Move sources outside of packages repo
+
 * Wed Mar 13 2024 madonuko <[email protected]> - 0.1.6-1
 - Add nim_c, nim_tflags and nim_lflags
 

diff --git a/anda/terra/srpm-macros/macros.anda b/anda/terra/srpm-macros/macros.anda
diff --git a/anda/terra/srpm-macros/macros.caching b/anda/terra/srpm-macros/macros.caching