From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH] glib2: Update to 2.61 Date: Fri, 21 Jun 2019 13:33:49 +0200 Message-ID: <20190621113349.18871-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7083568286531907006==" List-Id: --===============7083568286531907006== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable glib2 now uses meson as build system Signed-off-by: Stefan Schantl --- 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 @@ ############################################################################= ### =20 name =3D glib2 -ver_major =3D 2.55 +ver_major =3D 2.61 ver_minor =3D 1 version =3D %{ver_major}.%{ver_minor} release =3D 1 @@ -29,18 +29,40 @@ sources =3D %{thisapp}.tar.xz =20 build requires + docbook-xsl gettext libffi-devel - libmount-devel + libmount-devel >=3D 2.34-2 + meson >=3D 0.50.1 pcre-devel pkg-config zlib-devel end =20 - configure_options +=3D \ - --with-pcre=3Dsystem + prepare_cmds + # Explicitly remove PCRE sources since we use --with-pcre=3Dsystem + rm glib/pcre/*.[ch] + end + + build + %{meson} \ + --default-library=3Dboth \ + -Dselinux=3Ddisabled \ + -Dman=3Dtrue \ + -Ddtrace=3Dfalse \ + -Delf=3Dfalse \ + -Dfam=3Dfalse \ + -Dsystemtap=3Dtrue \ + -Dgtk_doc=3Dfalse \ + -Dinstalled_tests=3Dfalse + + + %{meson_build} + end + + install + %{meson_install} =20 - install_cmds mkdir -pv %{BUILDROOT}/etc/profile.d/ cp -vf %{DIR_SOURCE}/glib2-locale.sh %{BUILDROOT}/etc/profile.d/ end --=20 2.20.1 --===============7083568286531907006==--