From 1a34f7612b5839963b715e45e83edb7d72d46049 Mon Sep 17 00:00:00 2001
From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Fri, 21 Jun 2019 13:33:49 +0200
Subject: [PATCH] glib2: Update to 2.61

glib2 now uses meson as build system

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 glib2/glib2.nm | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/glib2/glib2.nm b/glib2/glib2.nm
index 8d2f2558c..328d57aaa 100644
--- a/glib2/glib2.nm
+++ b/glib2/glib2.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = glib2
-ver_major  = 2.55
+ver_major  = 2.61
 ver_minor  = 1
 version    = %{ver_major}.%{ver_minor}
 release    = 1
@@ -29,18 +29,40 @@ sources    = %{thisapp}.tar.xz
 
 build
 	requires
+		docbook-xsl
 		gettext
 		libffi-devel
-		libmount-devel
+		libmount-devel >= 2.34-2
+		meson >= 0.50.1
 		pcre-devel
 		pkg-config
 		zlib-devel
 	end
 
-	configure_options += \
-		--with-pcre=system
+	prepare_cmds
+		# Explicitly remove PCRE sources since we use --with-pcre=system
+		rm glib/pcre/*.[ch]
+	end
+
+	build
+		%{meson} \
+			--default-library=both \
+			-Dselinux=disabled \
+			-Dman=true \
+			-Ddtrace=false \
+			-Delf=false \
+			-Dfam=false \
+			-Dsystemtap=true \
+			-Dgtk_doc=false \
+			-Dinstalled_tests=false
+
+
+		%{meson_build}
+	end
+
+	install
+		%{meson_install}
 
-	install_cmds
 		mkdir -pv %{BUILDROOT}/etc/profile.d/
 		cp -vf %{DIR_SOURCE}/glib2-locale.sh %{BUILDROOT}/etc/profile.d/
 	end