From patchwork Fri Jun 21 21:33:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 2314 Return-Path: Received: from mail01.ipfire.org (mail01.i.ipfire.org [172.28.1.200]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail01.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web07.i.ipfire.org (Postfix) with ESMTPS id 9CF51887664 for ; Fri, 21 Jun 2019 12:33:56 +0100 (BST) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 45Vc5b5WPtz5KKZd; Fri, 21 Jun 2019 12:33:55 +0100 (BST) Received: from tuxedo.tremer.co.uk (unknown [88.215.19.234]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 45Vc5W6y2Wz5M5fD; Fri, 21 Jun 2019 12:33:51 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201904rsa; t=1561116832; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=lGY28SdWWt64XsuaiJbCCiVmY6+4cOM2iLb3OkMyF/c=; b=WizbBiPvtmw05jdoikEFhdiI+AabsAEgUSh6f1w7L0fSWQ4QkRtQWhnBsDGyOnod91QcNQ p6OJsoQTdsqibAgos0kNDr7Mucged1oETl3V9gxNQmRUJUSX60fC1p2ia9vfcGsRqSgVIs oSXlCpnkSB2zAGf0NMiw0ZC2UO7pENlimSy1jmGGILAoaAuuiAnPtqL3kTUBtFhlQcybjH nxsO5flS0bwURXom0cvT063l+z/253wescvw9lNwIF9rGe4Mf9WXEKXx0zN6a64Z5rBUPP 37QgUOC51v+r+jPLEq21zeYIn5Lc2sxmd+9RbctBOMsjzHvacFkSOeXUSCZ4mw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201904ed25519; t=1561116832; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=lGY28SdWWt64XsuaiJbCCiVmY6+4cOM2iLb3OkMyF/c=; b=eMnM/rulz4L2C7CcUigOX7V1yfQWvDgyZ4ylWDnWO9ckDJhsd2A+oZo6oxK+3agxP1E28b PZhvWUPMsVr1fKBQ== 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> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Authentication-Results: mail01.ipfire.org; auth=pass smtp.auth=stevee smtp.mailfrom=stefan.schantl@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" X-Spam: Yes 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 @@ ############################################################################### 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