Merge branch 'frawhide' into mado/fix/switchboard-plug-wacom

terrapkg · Jul 5, 2024 · 43a7b67 · 43a7b67
2 parents 6d57ea1 + 4d575aa
commit 43a7b67
Show file tree

Hide file tree

Showing 20 changed files with 89 additions and 43 deletions.
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ This monorepo contains the package manifests for all packages in Terra.
 
 ## Installation
 ```bash
-sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra.repo
+sudo dnf install --repofrompath 'terra,https://repos.fyralabs.com/terra$releasever' --setopt='terra.gpgkey=https://repos.fyralabs.com/terra$releasever/key.asc' terra-release
 ```
 You should also install the `terra-release` package so that when our infrastructure has any migrations, you can be assured that your Terra installation will still work as-is.
 

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.442
+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.442
+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 7c70df093480f0d5fe739a713ecb5339f59b765e
+%global commit e07470adc2d144da8d1096e3ca1df8053e70966a
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240702
+%global commit_date 20240705
 %global ver v0.38.0
 
 Name:           mpv-nightly

diff --git a/anda/apps/vencord-desktop/vencord-desktop.spec b/anda/apps/vencord-desktop/vencord-desktop.spec
@@ -6,7 +6,7 @@
 
 Name:		vencord-desktop
 Provides:   VencordDesktop = %{version}-%{release}
-Version:	1.5.2
+Version:	1.5.3
 Release:	1%?dist
 License:	GPL-3.0
 Summary:	Vesktop is a cross platform desktop app aiming to give you a snappier Discord experience with Vencord pre-installed

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/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 c18423947d959485c3236414bd98f17931e13454
 %forgemeta
 
 Name:       lomiri-system-settings

diff --git a/anda/devs/codium-marketplace/anda.hcl b/anda/devs/codium-marketplace/anda.hcl
@@ -0,0 +1,6 @@
+project pkg {
+    arches = ["x86_64"]
+    rpm {
+        spec = "codium-marketplace.spec"
+    }
+}
diff --git a/anda/devs/codium-marketplace/codium-marketplace.spec b/anda/devs/codium-marketplace/codium-marketplace.spec
@@ -0,0 +1,47 @@
+# ref: https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=vscodium-marketplace
+
+Name:       codium-marketplace
+Version:    1.65.0
+Release:    1%?dist
+Summary:    Enable vscode marketplace in vscodium
+License:    MIT
+BuildArch:  noarch
+URL:        https://marketplace.visualstudio.com/vscode
+Requires:   codium sed
+
+%description
+This package replaces the default marketplace (https://open-vsx.org/)
+to the official one used by vscode.
+
+%install
+touch dummy
+install -Dm644 dummy %buildroot/tmp/terra-codium-marketplace-dummy-file
+
+%posttrans
+if [ $1 -gt 1 ]; then  # update/install
+  sed -i -e 's/^[[:blank:]]*"serviceUrl":.*/    "serviceUrl": "https:\/\/marketplace.visualstudio.com\/_apis\/public\/gallery",/' \
+    -e '/^[[:blank:]]*"cacheUrl/d' \
+    -e '/^[[:blank:]]*"serviceUrl/a\    "cacheUrl": "https:\/\/vscode.blob.core.windows.net\/gallery\/index",' \
+    -e 's/^[[:blank:]]*"itemUrl":.*/    "itemUrl": "https:\/\/marketplace.visualstudio.com\/items"/' \
+    -e '/^[[:blank:]]*"linkProtectionTrustedDomains/d' \
+    /usr/share/codium/resources/app/product.json || true
+fi
+
+%preun
+sed -i -e 's/^[[:blank:]]*"serviceUrl":.*/    "serviceUrl": "https:\/\/open-vsx.org\/vscode\/gallery",/' \
+  -e '/^[[:blank:]]*"cacheUrl/d' \
+  -e 's/^[[:blank:]]*"itemUrl":.*/    "itemUrl": "https:\/\/open-vsx.org\/vscode\/item"/' \
+  -e '/^[[:blank:]]*"linkProtectionTrustedDomains/d' \
+  -e '/^[[:blank:]]*"documentationUrl/i\  "linkProtectionTrustedDomains": ["https://open-vsx.org"],' \
+  /usr/share/codium/resources/app/product.json || true
+
+%triggerin -- codium
+sed -i -e 's/^[[:blank:]]*"serviceUrl":.*/    "serviceUrl": "https:\/\/marketplace.visualstudio.com\/_apis\/public\/gallery",/' \
+  -e '/^[[:blank:]]*"cacheUrl/d' \
+  -e '/^[[:blank:]]*"serviceUrl/a\    "cacheUrl": "https:\/\/vscode.blob.core.windows.net\/gallery\/index",' \
+  -e 's/^[[:blank:]]*"itemUrl":.*/    "itemUrl": "https:\/\/marketplace.visualstudio.com\/items"/' \
+  -e '/^[[:blank:]]*"linkProtectionTrustedDomains/d' \
+  /usr/share/codium/resources/app/product.json || true
+
+%files
+/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/osu-lazer/osu-lazer.spec b/anda/games/osu-lazer/osu-lazer.spec
@@ -1,4 +1,4 @@
-%define osuresver 2024.622.0
+%define osuresver 2024.705.0
 %global debug_package %{nil}
 %define __strip /bin/true
 

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

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 43ee545789f94ca36c9f48012f0d1c8682b39756
+%global commit 05df263b84de9008266b3d53e2c28b009890ca61
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global ver 2.1.1
-%global commit_date 20240702
+%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/lib/placebo/terra-libplacebo.spec b/anda/lib/placebo/terra-libplacebo.spec
@@ -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,4 +1,4 @@
-%global commit 35cfcf5d15981b99e8f31a2195641f035dd516c3
+%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 cd68258225dc813c74fbda4c4fda0c736d6fda10
+%global commit 6075a029dba70a89675ae1250e7cdfd91f0eba41
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20240702
-%global ver 2024.07.01
+%global commit_date 20240704
+%global ver 2024.07.02
 
 Name:           yt-dlp-nightly
 Version:        %ver^%commit_date.%shortcommit