Skip to content

Commit 973058f

Browse files
hellocodelinux-althellocodelinux-alt
committed
Merge branch 'void-linux:master' into master
2 parents 2448ffb + e082cf7 commit 973058f

156 files changed

Lines changed: 843 additions & 1196 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎common/shlibs‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -770,8 +770,8 @@ libbrasero-media3.so.1 brasero-2.91.90_1
770770
libbrasero-utils3.so.1 brasero-2.91.90_1
771771
libXss.so.1 libXScrnSaver-1.1.3_1
772772
libyelp.so.0 yelp-3.36.0_1
773-
libpeas-1.0.so.0 libpeas-1.0.0_2
774-
libpeas-gtk-1.0.so.0 libpeas-1.0.0_2
773+
libpeas-1.0.so.1 libpeas-1.38.1_1
774+
libpeas-gtk-1.0.so.1 libpeas-1.38.1_1
775775
libpeas-2.so.0 libpeas2-2.0.1_1
776776
libtotem.so.0 libtotem-3.6.2_1
777777
libclutter-1.0.so.0 clutter-1.14.0_1
@@ -867,6 +867,7 @@ libdiscid.so.0 libdiscid-0.2.2_1
867867
librhythmbox-core.so.10 librhythmbox-3.4.1_1
868868
libdmapsharing-4.0.so.3 libdmapsharing-3.9.13_1
869869
libgexiv2.so.2 libgexiv2-0.6.1_1
870+
libgexiv2-0.16.so.4 libgexiv2-0.16-0.16.0_1
870871
libraw.so.23 libraw-0.21.0_1
871872
libraw_r.so.23 libraw-0.21.0_1
872873
libdjvulibre.so.21 libdjvulibre-3.5.24_1
@@ -3710,11 +3711,11 @@ libqhttpengine.so.1 qhttpengine-1.0.1_1
37103711
libqmdnsengine.so.0 qmdnsengine-0.1.0_1
37113712
libyang.so.1 libyang-1.0r5_1
37123713
libhtp.so.2 libhtp-0.5.30_1
3713-
libgedit-48.2.so gedit-48.2_1
3714+
libgedit-50.so gedit-50.0_1
37143715
libgedit-amtk-5.so.0 libgedit-amtk-5.8.0_1
3715-
libgedit-gtksourceview-300.so.3 libgedit-gtksourceview-299.4.0_1
3716+
libgedit-gtksourceview-300.so.5 libgedit-gtksourceview-299.7.0_1
37163717
libgedit-gfls-1.so.0 libgedit-gfls-0.1.0_1
3717-
libgedit-tepl-6.so.3 libgedit-tepl-6.13.0_1
3718+
libgedit-tepl-6.so.4 libgedit-tepl-6.14.0_1
37183719
libchewing.so.3 libchewing-0.5.1_1
37193720
libdwarves.so.1 pahole-1.12_1
37203721
libdwarves_emit.so.1 pahole-1.12_1

‎srcpkgs/Endeavour/patches/libpeas-1.38.patch‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
diff -rup src/gui/gtd-application.c.orig src/gui/gtd-application.c
2+
--- a/src/gui/gtd-application.c
3+
+++ b/src/gui/gtd-application.c
4+
@@ -32,7 +32,7 @@
5+
#include <glib.h>
6+
#include <glib-object.h>
7+
#include <gio/gio.h>
8+
-#include <girepository.h>
9+
+#include <girepository/girepository.h>
10+
#include <glib/gi18n.h>
11+
12+
13+
@@ -286,7 +286,7 @@ gtd_application_local_command_line (GApp
14+
gchar ***arguments,
15+
gint *exit_status)
16+
{
17+
- g_application_add_option_group (application, g_irepository_get_option_group());
18+
+ g_application_add_option_group (application, gi_repository_get_option_group());
19+
20+
return G_APPLICATION_CLASS (gtd_application_parent_class)->local_command_line (application,
21+
arguments,
22+

‎srcpkgs/Endeavour/template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Template file for 'Endeavour'
22
pkgname=Endeavour
33
version=43.0
4-
revision=3
4+
revision=4
55
build_style=meson
66
build_helper="gir"
77
configure_args="-Dintrospection=$(vopt_if gir true false)"

‎srcpkgs/ImapGoose/template‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Template file for 'ImapGoose'
22
pkgname=ImapGoose
3-
version=0.4.2
3+
version=0.5.0
44
revision=1
55
build_style=go
66
go_import_path="git.sr.ht/~whynothugo/ImapGoose"
@@ -13,7 +13,7 @@ license="ISC"
1313
homepage="https://git.sr.ht/~whynothugo/ImapGoose"
1414
changelog="https://git.sr.ht/~whynothugo/ImapGoose/blob/main/CHANGELOG.md"
1515
distfiles="https://git.sr.ht/~whynothugo/ImapGoose/archive/v${version}.tar.gz"
16-
checksum=13752532007c0ae16b9e5605fc2f9d7b74370ae7dca08649b76d28bf23b06277
16+
checksum=8e46c30e4d4f2c884d132cf1a086071e22756d71d5a1e48e826a6f9faab71220
1717
nopie=yes
1818

1919
post_install() {

‎srcpkgs/Thunar/template‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Template file for 'Thunar'
22
pkgname=Thunar
3-
version=4.20.7
3+
version=4.20.8
44
revision=1
55
build_style=gnu-configure
66
build_helper="gir"
@@ -18,7 +18,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
1818
homepage="https://docs.xfce.org/xfce/thunar/Start"
1919
changelog="https://gitlab.xfce.org/xfce/thunar/-/raw/xfce-${version%.*}/NEWS"
2020
distfiles="https://archive.xfce.org/src/xfce/thunar/${version%.*}/thunar-${version}.tar.bz2"
21-
checksum=e0dfbb732c3d7c9174d1c0216dd6177f1d4e9297e623dbced32efd3f3e8682e5
21+
checksum=cc735954d948a88eba2e40016a94c598f876309b736686c9f4d0273a05870c69
2222

2323
Thunar-devel_package() {
2424
depends="libglib-devel gtk+3-devel ${sourcepkg}>=${version}_${revision}"

‎srcpkgs/astroid/patches/libpeas-1.38.patch‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
From ad5b290816c57cae153ebf2dfbd64e8c7924344c Mon Sep 17 00:00:00 2001
2+
From: Johannes Rosenberger <johannes@jorsn.eu>
3+
Date: Mon, 5 Jan 2026 17:14:37 +0100
4+
Subject: [PATCH] gir_main plugin: add compatibility with girepository-2.0
5+
6+
fix #765
7+
---
8+
src/plugin/gir_main.c | 10 ++++++++--
9+
1 file changed, 8 insertions(+), 2 deletions(-)
10+
11+
diff --git a/src/plugin/gir_main.c b/src/plugin/gir_main.c
12+
index 2afda0835..6be395984 100644
13+
--- a/src/plugin/gir_main.c
14+
+++ b/src/plugin/gir_main.c
15+
@@ -4,7 +4,13 @@
16+
*
17+
*/
18+
19+
-# include <girepository.h>
20+
+// compatibility with girepository-1.0 and 2.0
21+
+#if __has_include(<girepository.h>) // girepository-1.0
22+
+ #include <girepository.h>
23+
+ #define gi_repository_get_option_group g_irepository_get_option_group
24+
+#else
25+
+ #include <girepository/girepository.h>
26+
+#endif
27+
28+
# include "astroid_activatable.h"
29+
30+
@@ -14,7 +20,7 @@ int main (int argc, char ** argv) {
31+
GError *error = NULL;
32+
33+
ctx = g_option_context_new (NULL);
34+
- g_option_context_add_group (ctx, g_irepository_get_option_group ());
35+
+ g_option_context_add_group (ctx, gi_repository_get_option_group ());
36+
37+
if (!g_option_context_parse (ctx, &argc, &argv, &error)) {
38+
g_print ("astroid girmain: %s\n", error->message);

‎srcpkgs/astroid/template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Template file for 'astroid'
22
pkgname=astroid
33
version=0.17
4-
revision=5
4+
revision=6
55
build_style=cmake
66
build_helper=gir
77
hostmakedepends="pkg-config scdoc protobuf gobject-introspection"

‎srcpkgs/aurorae/template‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Template file for 'aurorae'
22
pkgname=aurorae
3-
version=6.6.2
3+
version=6.6.3
44
revision=1
55
build_style=cmake
66
configure_args="-DKDE_INSTALL_QMLDIR=lib/qt6/qml
@@ -15,4 +15,4 @@ maintainer="John <me@johnnynator.dev>"
1515
license="LGPL-2.0-or-later"
1616
homepage="https://invent.kde.org/plasma/aurorae"
1717
distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
18-
checksum=014d2934cd9608af22ceb503a01660ea5adb0b4ec9d6b1748ece161bb4b0b423
18+
checksum=2a196fea76980f20b53bbd94f5ef7a6b5ee08b68ba7a1a5917a780b789c57e91

‎srcpkgs/b3sum/template‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Template file for 'b3sum'
22
pkgname=b3sum
3-
version=1.8.3
3+
version=1.8.4
44
revision=1
55
build_wrksrc="b3sum"
66
build_style=cargo
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
99
license="CC0-1.0"
1010
homepage="https://github.com/BLAKE3-team/BLAKE3/"
1111
distfiles="https://github.com/BLAKE3-team/BLAKE3/archive/${version}.tar.gz"
12-
checksum=5a11e3f834719b6c1cae7aced1e848a37013f6f10f97272e7849aa0da769f295
12+
checksum=b5ee5f5c5e025eb2733ae3af8d4c0e53bb66dff35095decfd377f1083e8ac9be

‎srcpkgs/babelfish/template‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
# Template file for 'babelfish'
22
pkgname=babelfish
3-
version=1.1.0
4-
revision=3
3+
version=1.2.0
4+
revision=1
55
build_style=go
66
go_import_path="bou.ke/babelfish"
77
short_desc="Translate bash scripts to fish"
88
maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@proton.me>"
99
license="MIT"
1010
homepage="https://github.com/bouk/babelfish/"
1111
distfiles="https://github.com/bouk/babelfish/archive/refs/tags/v$version.tar.gz"
12-
checksum=7896c3e998e82ed15300f0951052af1e3a5a4c54fa9a07f1e2f743854b7ad239
12+
checksum=349e142b200ef138c0045e1b6fc989aad81c0764ba65796e2e384e456f091123
1313

1414
post_install() {
1515
vcompletion babel.fish fish

0 commit comments

Comments
 (0)