[packages/glib2] - updated to 2.84.0

[qboosh]

commit f0151f9e7cc4c427675267552f3bdcdcaeb3c4d6
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Mar 9 19:03:48 2025 +0100

    - updated to 2.84.0

 glib-linux.patch | 15 +++++++++++++++
 glib2.spec       | 33 +++++++++++++++++++++------------
 2 files changed, 36 insertions(+), 12 deletions(-)
---
diff --git a/glib2.spec b/glib2.spec
index 608e19c..da2f2ff 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -22,13 +22,14 @@ Summary(pt_BR.UTF-8):	Conjunto de funções gráficas utilitárias
 Summary(tr.UTF-8):	Yararlı ufak yordamlar kitaplığı
 Summary(zh_CN.UTF-8):	实用工具函数库
 Name:		glib2
-Version:	2.82.5
+Version:	2.84.0
 Release:	1
 Epoch:		1
 License:	LGPL v2+
 Group:		Libraries
-Source0:	https://download.gnome.org/sources/glib/2.82/glib-%{version}.tar.xz
-# Source0-md5:	87c7641e80b23a05b8ab506d52c970e3
+Source0:	https://download.gnome.org/sources/glib/2.84/glib-%{version}.tar.xz
+# Source0-md5:	ed2676d7ea8094a151e0431f226343b8
+Patch0:		glib-linux.patch
 URL:		https://www.gtk.org/
 BuildRequires:	automake
 BuildRequires:	docbook-dtd412-xml
@@ -47,7 +48,7 @@ BuildRequires:	libmount-devel >= 2.28
 %{?with_selinux:BuildRequires:	libselinux-devel >= 2.2}
 BuildRequires:	libstdc++-devel
 BuildRequires:	libxslt-progs
-BuildRequires:	meson >= 1.2.0
+BuildRequires:	meson >= 1.4.0
 BuildRequires:	ninja >= 1.5
 BuildRequires:	pcre2-8-devel >= 10.32
 BuildRequires:	perl-base
@@ -69,7 +70,7 @@ BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
 BuildRequires:	zlib-devel
 %if %{with apidocs}
-BuildRequires:	gi-docgen >= 2023.1
+BuildRequires:	gi-docgen >= 2024.1
 %endif
 Requires:	iconv
 Requires:	libmount >= 2.28
@@ -244,21 +245,27 @@ Sondy systemtap/dtrace dla GLib 2.
 
 %prep
 %setup -q -n glib-%{version}
+%patch -P0 -p1
+
+%{__sed} -i -e '/^python_shebang/ s,/usr/bin/env python3,%{__python3},' meson.build
 
 %build
 %meson \
 	%{?debug:--debug} \
-	-Dglib_debug=%{?debug:enabled}%{!?debug:disabled} \
+	-Ddocumentation=%{__true_false apidocs} \
 	-Ddtrace=%{__true_false systemtap} \
-	%{!?with_introspection:-Dintrospection=disabled} \
+	-Dglib_debug=%{?debug:enabled}%{!?debug:disabled} \
+	-Dintrospection=%{__enabled_disabled introspection} \
+	-Dlibelf=enabled \
+	-Dlibmount=enabled \
+	-Dman-pages=enabled \
+	-Dnls=enabled \
+	-Dselinux=%{__enabled_disabled selinux} \
+	-Dsysprof=%{__enabled_disabled sysprof} \
 	-Dsystemtap=%{__true_false systemtap} \
 %ifarch %{ix86}
-	%{?with_systemtap:-Dtapset_install_dir=%{_datadir}/systemtap/tapset/i386} \
+	%{?with_systemtap:-Dtapset_install_dir=%{_datadir}/systemtap/tapset/i386}
 %endif
-	-Ddocumentation=%{__true_false apidocs} \
-	-Dselinux=%{?with_selinux:enabled}%{!?with_selinux:disabled} \
-	%{?with_sysprof:-Dsysprof=enabled} \
-	-Dman-pages=enabled
 
 %meson_build
 
@@ -278,6 +285,8 @@ install -d $RPM_BUILD_ROOT%{_gidocdir}
 %{__mv} $RPM_BUILD_ROOT%{_docdir}/{gio,gio-unix,girepository,glib,glib-unix,gmodule,gobject}-2.0 $RPM_BUILD_ROOT%{_gidocdir}
 %endif
 
+%{__rm} -r $RPM_BUILD_ROOT%{_libexecdir}/installed-tests
+
 > $RPM_BUILD_ROOT%{_libdir}/gio/modules/giomodule.cache
 > $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas/gschemas.compiled
 
diff --git a/glib-linux.patch b/glib-linux.patch
new file mode 100644
index 0000000..e0fec58
--- /dev/null
+++ b/glib-linux.patch
@@ -0,0 +1,15 @@
+Fix build on Linux with libnl installed (<netlink/netlink_route.h> seems to be FreeBSD specific)
+
+Ref: https://gitlab.gnome.org/GNONE/glib/-/issues/3630
+--- glib-2.84.0/gio/gnetworkmonitornetlink.c.orig	2025-03-06 14:09:13.000000000 +0100
++++ glib-2.84.0/gio/gnetworkmonitornetlink.c	2025-03-09 17:08:25.186737361 +0100
+@@ -41,8 +41,7 @@
+ #ifdef HAVE_LINUX_NETLINK_H
+ #include <linux/netlink.h>
+ #include <linux/rtnetlink.h>
+-#endif
+-#ifdef HAVE_NETLINK_NETLINK_H
++#elif defined(HAVE_NETLINK_NETLINK_H)
+ #include <netlink/netlink.h>
+ #include <netlink/netlink_route.h>
+ #endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/glib2.git/commitdiff/f0151f9e7cc4c427675267552f3bdcdcaeb3c4d6