From eddfd697e88622efc8789b7b2491e7367e15a669 Mon Sep 17 00:00:00 2001 From: Rasmus Thomsen Date: Mon, 4 Mar 2019 22:51:12 +0100 Subject: [PATCH] glib: update to 2.60.0. --- srcpkgs/glib/template | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template index 934648e7d5c..b017921b286 100644 --- a/srcpkgs/glib/template +++ b/srcpkgs/glib/template @@ -1,31 +1,29 @@ # Template file for 'glib' pkgname=glib -version=2.58.3 -revision=2 -build_style=gnu-configure -configure_args="--enable-libelf --disable-fam --with-pcre=system --enable-static" -hostmakedepends="automake libtool pkg-config python3 libxslt docbook-xsl" +version=2.60.0 +revision=1 +build_style=meson +configure_args="-Dfam=false -Dman=true -Dselinux=disabled + -Dgtk_doc=$(vopt_if gtk_doc true false)" +hostmakedepends="pkg-config libxslt docbook-xsl $(vopt_if gtk_doc gtk-doc)" makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel" +checkdepends="desktop-file-utils shared-mime-info tzdata" short_desc="GNU library of C routines" -maintainer="Juan RP " +maintainer="Rasmus Thomsen " license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/GLib" changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS" distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz" -checksum=8f43c31767e88a25da72b52a40f3301fefc49a665b56dc10ee7cc9565cbe7481 +checksum=20865d8b96840d89d9340fc485b4b1131c1bb24d16a258a22d642c3bb1b44353 -if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" glib-devel" - case "$XBPS_TARGET_MACHINE" in - mips*|ppc|ppc-musl) # It seems mips/ppc autoconf cache is not read? - configure_args+=" glib_cv_stack_grows=no glib_cv_rtldglobal_broken=no glib_cv_uscore=no" ;; - esac +build_options="gtk_doc" + +desc_option_gtk_doc="Build GTK API docs" + +if [ -z "$CROSS_BUILD" ]; then + build_options_default+=" gtk_doc" fi -pre_configure() { - NOCONFIGURE=1 ./autogen.sh -} - libglib-devel_package() { depends="${makedepends} glib>=${version}_${revision}" short_desc+=" - development files" @@ -35,7 +33,6 @@ libglib-devel_package() { vmove usr/lib/glib-2.0 vmove usr/lib/pkgconfig vmove "usr/lib/*.so" - vmove "usr/lib/*.a" } }