glib2: Update to 2.74.2

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/glib2/glib2.nm b/glib2/glib2.nm
index 328d57aaab4f91ce5227b9db07921e75a295d84d..d0e6e3bbda11e3dad489739aabeb30521e521c53 100644 (file)
--- a/glib2/glib2.nm
+++ b/glib2/glib2.nm
@@ -4,13 +4,12 @@
 ###############################################################################
 
 name       = glib2
-ver_major  = 2.61
-ver_minor  = 1
+ver_major  = 2.74
+ver_minor  = 2
 version    = %{ver_major}.%{ver_minor}
 release    = 1
 thisapp    = glib-%{version}
 
-maintainer = Erik Kapfer <erik.kapfer@ipfire.org>
 groups     = System/Libraries
 url        = http://www.gtk.org
 license    = LGPLv2+
@@ -24,39 +23,32 @@ description
        object system.
 end
 
-source_dl  = http://ftp.gnome.org/pub/gnome/sources/glib/%{ver_major}/
+source_dl  = https://ftp.gnome.org/pub/gnome/sources/glib/%{ver_major}/
 sources    = %{thisapp}.tar.xz
 
 build
        requires
                docbook-xsl
+               elfutils-devel
                gettext
                libffi-devel
                libmount-devel >= 2.34-2
                meson >= 0.50.1
-               pcre-devel
+               pcre2-devel
                pkg-config
                zlib-devel
        end
 
-       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 \
+                       -Dsystemtap=false \
                        -Dgtk_doc=false \
                        -Dinstalled_tests=false
 
-
                %{meson_build}
        end