Merge branch 'frawhide' into mado/w/codium-marketplace

Signed-off-by: madomado <[email protected]>
terrapkg · Jul 4, 2024 · be3d019 · be3d019
2 parents 8957ae5 + 3a0d36e
commit be3d019
Show file tree

Hide file tree

Showing 21 changed files with 43 additions and 50 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.438
+Version:        0.0.444
 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.438
+Version:        0.0.444
 Release:        1%?dist
 Summary:        Free Voice and Text Chat for Gamers
 URL:            discord.com

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.92
+Version:        0.0.93
 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.92
+Version:        0.0.93
 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 b594f75778961c281daca398011914e9ac14b753
-%global commit_date 20240625
+%global commit 6cf5e40b96d1cbd99a3cfcef1f03899356e79448
+%global commit_date 20240703
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:           envision

diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec
@@ -1,6 +1,6 @@
-%global commit 68a1a3879ca5b65ecd1f7b63b09b615f968d807a
+%global commit 7c70df093480f0d5fe739a713ecb5339f59b765e
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240629
+%global commit_date 20240702
 %global ver v0.38.0
 
 Name:           mpv-nightly

diff --git a/anda/desktops/elementary/switchboard-plug-wacom/switchboard-plug-wacom.spec b/anda/desktops/elementary/switchboard-plug-wacom/switchboard-plug-wacom.spec
@@ -8,7 +8,7 @@
 
 Name:           switchboard-plug-wacom
 Summary:        Switchboard Wacom Plug
-Version:        1.0.1
+Version:        8.0.0
 Release:        1%?dist
 License:        GPL-3.0-or-later
 

diff --git a/anda/desktops/elementary/switchboard/switchboard.spec b/anda/desktops/elementary/switchboard/switchboard.spec
@@ -1,5 +1,5 @@
 %global srcname switchboard
-%global appname io.elementary.switchboard
+%global appname io.elementary.settings
 
 Name:           switchboard
 Summary:        Modular Desktop Settings Hub
@@ -16,12 +16,10 @@ BuildRequires:  libappstream-glib
 BuildRequires:  meson
 BuildRequires:  vala
 
-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
+BuildRequires:  pkgconfig(granite-7)
+BuildRequires:  pkgconfig(gtk4)
+BuildRequires:  pkgconfig(libadwaita-1)
+BuildRequires:  fdupes sassc
 
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 
@@ -92,7 +90,7 @@ appstream-util validate-relax --nonet \
 
 %{_datadir}/applications/%{appname}.desktop
 %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
-%{_datadir}/icons/hicolor/*/apps/%{appname}.svg
+%{_iconsdir}/hicolor/*/apps/%{appname}.svg
 %{_datadir}/metainfo/%{appname}.appdata.xml
 
 %files libs
@@ -102,19 +100,14 @@ appstream-util validate-relax --nonet \
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/*
 
-%{_libdir}/lib%{name}-2.0.so.0
-%{_libdir}/lib%{name}-2.0.so.2.0
+%{_libdir}/lib%{name}-3.so.0
+%{_libdir}/lib%{name}-3.so.2.0
 
 %files devel
-%{_includedir}/%{name}-2.0/
+%{_includedir}/%{name}-3/
 
-%{_libdir}/lib%{name}-2.0.so
-%{_libdir}/pkgconfig/%{name}-2.0.pc
+%{_libdir}/lib%{name}-3.so
+%{_libdir}/pkgconfig/%{name}-3.pc
 
-%{_datadir}/vala/vapi/%{name}-2.0.deps
-%{_datadir}/vala/vapi/%{name}-2.0.vapi
-
-
-%changelog
-* Sat Oct 15 2022 windowsboy111 <[email protected]> - 6.0.2-1
-- Repackaged for Terra
+%{_datadir}/vala/vapi/%{name}-3.deps
+%{_datadir}/vala/vapi/%{name}-3.vapi
diff --git a/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec b/anda/desktops/kde/latte-dock-nightly/latte-dock-nightly.spec
@@ -1,6 +1,6 @@
 %global forgeurl https://github.com/KDE/latte-dock/
 
-%global commit 6858dcdeb8caff78216dd1a478bbf16fedec5e72
+%global commit 4f1c08054b1f975176375f615cf9d2470f7ec7ed
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global commit_date %(date '+%Y%m%d')
 %global snapshot_info %{commit_date}.%{shortcommit}

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 1fffef0fffc7006c5f95cf6c3e3f087b074a1760
+%global commit b604356068a9bd26b0ccd5a8c8eaccd601c735bd
 %forgemeta
 
 Name:       lomiri-system-settings

diff --git a/anda/devs/codium-marketplace/codium-marketplace.spec b/anda/devs/codium-marketplace/codium-marketplace.spec
@@ -44,4 +44,4 @@ sed -i -e 's/^[[:blank:]]*"serviceUrl":.*/    "serviceUrl": "https:\/\/marketpla
   /usr/share/codium/resources/app/product.json || true
 
 %files
-/tmp/terra-codium-marketplace-dummy-file
+/tmp/terra-codium-marketplace-dummy-file
diff --git a/anda/docker/containerd/containerd.spec b/anda/docker/containerd/containerd.spec
@@ -7,7 +7,7 @@
 
 # https://github.com/containerd/containerd
 %global goipath         github.com/containerd/containerd
-Version:                1.7.18
+Version:                1.7.19
 
 %gometa
 

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 e6234b5086e1623c7c6d238d3de6243cfba06f69
+%global commit 219de667830f69ad200a84413c0120f526955b10
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f
 
-%global commit_date 20240630
+%global commit_date 20240704
 %global snapshot_info %{commit_date}.%{shortcommit}
 
 %bcond_without qt6

diff --git a/anda/langs/nim/dive/umdive.spec b/anda/langs/nim/dive/umdive.spec
@@ -1,5 +1,5 @@
 Name:           umdive
-Version:        0.1.1
+Version:        0.1.2
 Release:        1%?dist
 Summary:        Chroot utility (just like arch-chroot)
 License:        MIT

diff --git a/anda/langs/nim/mkfstab/mkfstab.spec b/anda/langs/nim/mkfstab/mkfstab.spec
@@ -1,5 +1,5 @@
 Name:           mkfstab
-Version:        0.1.1
+Version:        0.1.2
 Release:        1%?dist
 Summary:        An alternative to genfstab: generate output suitable for addition to /etc/fstab
 License:        MIT

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 c88894bf76c230f027cbb24ee88828cf785e4f46
+%global commit 05df263b84de9008266b3d53e2c28b009890ca61
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global ver 2.1.1
-%global commit_date 20240630
+%global commit_date 20240704
 %global debug_package %nil
 
 Name:			nim-nightly

diff --git a/anda/langs/nim/nim/nim.spec b/anda/langs/nim/nim/nim.spec
@@ -2,7 +2,7 @@
 %global debug_package %{nil}
 
 Name:			nim
-Version:		2.0.6
+Version:		2.0.8
 Release:		1%?dist
 Summary:		Imperative, multi-paradigm, compiled programming language
 License:		MIT and BSD

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 a2a52c52d8e7ee9a388edf69ed3e9931035f3fcf
+%global commit ee52e5a530bc4ad93a605add9a1ce184de3f0d9c
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global repo https://gitlab.gnome.org/GNOME/%{real_name}.git
 
-%global commit_date 20240625
+%global commit_date 20240702
 %global snapshot_info %{commit_date}.%{shortcommit}
 
 Name:           vala-nightly

diff --git a/anda/lib/placebo/terra-libplacebo.spec b/anda/lib/placebo/terra-libplacebo.spec
@@ -1,6 +1,6 @@
 Name:           terra-libplacebo
-Version:        6.338.2
-Release:        1%{?dist}
+Version:        7.349.0
+Release:        1%?dist
 Summary:        Reusable library for GPU-accelerated video/image rendering primitives
 
 License:        LGPLv2+
@@ -68,7 +68,7 @@ developing applications that use %{name}.
 %files
 %license LICENSE
 %doc README.md
-%{_libdir}/libplacebo.so.338
+%{_libdir}/libplacebo.so.*
 
 %files devel
 %{_includedir}/*

diff --git a/anda/lib/tdlib/tdlib-nightly.spec b/anda/lib/tdlib/tdlib-nightly.spec
@@ -1,5 +1,5 @@
-%global commit 63c7d0301825b78c30dc7307f1f1466be049eb79
-%global ver 1.8.31
+%global commit 2820a9d281154fc9fc81fbbae976d20057b8f6b1
+%global ver 1.8.32
 %global commit_date 20240219
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 

diff --git a/anda/tools/yt-dlp/yt-dlp-nightly.spec b/anda/tools/yt-dlp/yt-dlp-nightly.spec
@@ -1,8 +1,8 @@
 #bcond_without tests
-%global commit 61edf57f8f13f6dfd81154174e647eb5fdd26089
+%global commit 6075a029dba70a89675ae1250e7cdfd91f0eba41
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240630
-%global ver 2024.05.27
+%global commit_date 20240704
+%global ver 2024.07.02
 
 Name:           yt-dlp-nightly
 Version:        %ver^%commit_date.%shortcommit