commit bcbacf8

hovercats  ·  2024-11-13 15:24:25 +0000 UTC
parent 3a0e40f
glib-networking: switch to muon
5 files changed,  +37, -3
+8, -2
 1@@ -2,11 +2,15 @@
 2 
 3 export DESTDIR="$1"
 4 
 5+patch -p1 < 0001-remove-gio-querymodule-post-install.patch
 6+
 7 # Don't build tests that fail due to `gnutls` not being built with `p11-kit`.
 8 sed "/subdir('tests')/d" tls/meson.build > _
 9 mv -f _ tls/meson.build
10 
11-meson setup \
12+: > po/meson.build
13+
14+muon setup \
15 	-Dprefix=/usr \
16 	-Dsysconfdir=/etc \
17 	-Dlocalstatedir=/var \
18@@ -18,7 +22,9 @@ meson setup \
19 	-Dopenssl=disabled \
20 	-Dgnutls=enabled \
21 	-Dgnome_proxy=disabled \
22+	-Dpkg_config_path=/usr/lib/pkgconfig \
23+	-Ddefault_library=shared \
24 	build
25 
26 samu -C build
27-samu -C build install
28+muon -C build install
+1, -0
1@@ -1 +1,2 @@
2 e271ef92bbdd2209ae24afe8d2d468ef8c870529a9607629dfcbf9f60e2952957f
3+9c7a5c025d4487ae21d67f8b745fdcb03c7ed50871dbb33f7da7f8855b8088597c
+26, -0
 1@@ -0,0 +1,26 @@
 2+From 33db26f37240f8445b85bd863c73a4b3cef2d462 Mon Sep 17 00:00:00 2001
 3+From: hovercats <hovercatswithlasereyes@protonmail.com>
 4+Date: Thu, 3 Oct 2024 10:17:30 +0200
 5+Subject: [PATCH] remove gio-querymodule post-install
 6+
 7+---
 8+ meson.build | 3 ---
 9+ 1 file changed, 3 deletions(-)
10+
11+diff --git a/meson.build b/meson.build
12+index a774ea6..5703009 100644
13+--- a/meson.build
14++++ b/meson.build
15+@@ -146,9 +146,6 @@ subdir('po')
16+ subdir('proxy')
17+ subdir('tls')
18+ 
19+-# Will automatically pick it up from the cross file if defined
20+-gnome.post_install(gio_querymodules: gio_module_dir)
21+-
22+ summary({
23+   'GnuTLS support': giomodules.contains('giognutls'),
24+   'OpenSSL support': giomodules.contains('gioopenssl'),
25+-- 
26+2.45.1
27+
+1, -0
1@@ -1 +1,2 @@
2 https://ftp.gnome.org/pub/gnome/sources/glib-networking/2.80/glib-networking-2.80.0.tar.xz
3+patches/0001-remove-gio-querymodule-post-install.patch
+1, -1
1@@ -1 +1 @@
2-2.80.0 2
3+2.80.0 3