From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id sKmPIBugbF+SNwAA0tVLHw (envelope-from ) for ; Thu, 24 Sep 2020 13:33:15 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id MP5QHBugbF/LHgAAB5/wlQ (envelope-from ) for ; Thu, 24 Sep 2020 13:33:15 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 9DC019406BB for ; Thu, 24 Sep 2020 13:33:14 +0000 (UTC) Received: from localhost ([::1]:46520 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kLRN3-0001YZ-LB for larch@yhetil.org; Thu, 24 Sep 2020 09:33:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43512) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kLRMs-0001X1-68 for guix-patches@gnu.org; Thu, 24 Sep 2020 09:33:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55665) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kLRMr-0004cL-SV for guix-patches@gnu.org; Thu, 24 Sep 2020 09:33:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kLRMr-00008o-O9 for guix-patches@gnu.org; Thu, 24 Sep 2020 09:33:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42958] [PATCH core-updates 05/29] gnu: gobject-introspection: Update package, definition. Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 24 Sep 2020 13:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42958 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42958@debbugs.gnu.org Received: via spool by 42958-submit@debbugs.gnu.org id=B42958.1600954364517 (code B ref 42958); Thu, 24 Sep 2020 13:33:01 +0000 Received: (at 42958) by debbugs.gnu.org; 24 Sep 2020 13:32:44 +0000 Received: from localhost ([127.0.0.1]:38978 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLRMZ-00008G-Gq for submit@debbugs.gnu.org; Thu, 24 Sep 2020 09:32:43 -0400 Received: from knopi.disroot.org ([178.21.23.139]:57490) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLRMV-000085-75 for 42958@debbugs.gnu.org; Thu, 24 Sep 2020 09:32:42 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 8350E51C08 for <42958@debbugs.gnu.org>; Thu, 24 Sep 2020 15:32:37 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with UTF8SMTP id euQYQ9ZWwczT for <42958@debbugs.gnu.org>; Thu, 24 Sep 2020 15:32:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1600954350; bh=CUrJ1M5wAwiZq/4LjiARZRWh6IYWXgv37Isxay9eog8=; h=Subject:From:To:References:Date:In-Reply-To; b=Ccvw/5psNQpKXXesMcQkFvTCmIRNyJ+I9fjQLjx+3xQKJChwZUMTNUp1mdIFh/65T G3weB1p4ylejQXweQAI+oCtNaCJtAgs9hlDqK9wvq6qu8Kwb+EngZ31rwUsXbfFT2D 4cxCTKki4H6NxNyf7J54RXlFX9HLpi4EHgxcuJl0EfBdM1dJSBwn9JobI7hSjs0E/9 spAfwYm/S02O4C3SqbfodQFhFrV3eRLTlGkwNDM70w62rkULR/HBIkO9F6ruEoKFWv TyVvofVieEASoh7cp/c+R/v6ydrHUCi6lkqkwYoSfB6OTDdSNWxDOFn3bktAe0a42j ERG60GUYV9o5A== From: Raghav Gururajan References: <99547ba6-ba27-7b8f-a6da-ba0b3ccb9965@disroot.org> Message-ID: Date: Thu, 24 Sep 2020 09:32:28 -0400 Mime-Version: 1.0 In-Reply-To: <99547ba6-ba27-7b8f-a6da-ba0b3ccb9965@disroot.org> Content-Type: multipart/mixed; boundary="------------0DFAC8C7B8AAC0F6CEAB8657" Content-Language: en-US X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=disroot.org header.s=mail header.b=Ccvw/5ps; dmarc=fail reason="SPF not aligned (relaxed)" header.from=disroot.org (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 0.59 X-TUID: aIobxdvjNkdd This is a multi-part message in MIME format. --------------0DFAC8C7B8AAC0F6CEAB8657 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit @Danny Please find the attached revised split patches. Regards, RG. --------------0DFAC8C7B8AAC0F6CEAB8657 Content-Type: text/x-patch; charset=UTF-8; name="0014-gnu-gobject-introspection-Make-some-cosmetic-changes.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0014-gnu-gobject-introspection-Make-some-cosmetic-changes.pa"; filename*1="tch" >From ddef11acfd31b50a7dfaf81a0890ae6c76fb2ee8 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 08:58:26 -0400 Subject: [PATCH 14/16] gnu: gobject-introspection: Make some cosmetic changes. * gnu/packages/glib.scm (gobject-introspection): Make some cosmetic changes. --- gnu/packages/glib.scm | 45 ++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index b15c75a740..549145e799 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -332,17 +332,20 @@ threads, dynamic loading, and an object system.") (package (name "gobject-introspection") (version "1.62.0") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" - "gobject-introspection/" (version-major+minor version) - "/gobject-introspection-" version ".tar.xz")) - (sha256 - (base32 "18lhglg9v6y83lhqzyifc1z0wrlawzrhzzxx0a3h1g7xaz97xvmi")) - (patches (search-patches - "gobject-introspection-cc.patch" - "gobject-introspection-girepository.patch" - "gobject-introspection-absolute-shlib-path.patch")))) + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" + "gobject-introspection/" (version-major+minor version) + "/gobject-introspection-" version ".tar.xz")) + (sha256 + (base32 "18lhglg9v6y83lhqzyifc1z0wrlawzrhzzxx0a3h1g7xaz97xvmi")) + (patches + (search-patches + "gobject-introspection-cc.patch" + "gobject-introspection-girepository.patch" + "gobject-introspection-absolute-shlib-path.patch")))) (build-system meson-build-system) (arguments `(#:phases @@ -353,25 +356,23 @@ threads, dynamic loading, and an object system.") (("#!@PYTHON_CMD@") (string-append "#!" (which "python3")))) #t))))) + (native-inputs + `(("glib" ,glib "bin") + ("pkg-config" ,pkg-config))) (inputs `(("bison" ,bison) ("flex" ,flex) ("glib" ,glib) ("python" ,python-wrapper) ("zlib" ,zlib))) - (native-inputs - `(("glib" ,glib "bin") - ("pkg-config" ,pkg-config))) (propagated-inputs - `(;; In practice, GIR users will need libffi when using - ;; gobject-introspection. - ("libffi" ,libffi))) + `(("libffi" ,libffi))) (native-search-paths - (list (search-path-specification - (variable "GI_TYPELIB_PATH") - (files '("lib/girepository-1.0"))))) + (list + (search-path-specification + (variable "GI_TYPELIB_PATH") + (files '("lib/girepository-1.0"))))) (search-paths native-search-paths) - (home-page "https://wiki.gnome.org/GObjectIntrospection") (synopsis "Generate interface introspection data for GObject libraries") (description "GObject introspection is a middleware layer between C libraries (using @@ -379,7 +380,7 @@ GObject) and language bindings. The C library can be scanned at compile time and generate a metadata file, in addition to the actual native C library. Then at runtime, language bindings can read this metadata and automatically provide bindings to call into the C library.") - ; Some bits are distributed under the LGPL2+, others under the GPL2+ + (home-page "https://wiki.gnome.org/GObjectIntrospection") (license license:gpl2+))) (define intltool -- 2.28.0 --------------0DFAC8C7B8AAC0F6CEAB8657 Content-Type: text/x-patch; charset=UTF-8; name="0015-gnu-gobject-introspection-Update-to-1.64.1.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0015-gnu-gobject-introspection-Update-to-1.64.1.patch" >From d3fe71f442d71dc4e4ee1479a62043e86d8e2084 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 09:27:48 -0400 Subject: [PATCH 15/16] gnu: gobject-introspection: Update to 1.64.1. * gnu/packages/glib.scm (gobject-introspection) [version]: Update to 1.64.1. [arguments]<#:glib-or-gtk?>: New argument. <#:phases>: Remove all phases. [native-inputs]: Add bison and flex. [inputs]: Remove bison, flex, glib and zlib. [propagated-inputs]: Add glib. --- gnu/packages/glib.scm | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 549145e799..cda8a97d5f 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -331,7 +331,7 @@ threads, dynamic loading, and an object system.") (define gobject-introspection (package (name "gobject-introspection") - (version "1.62.0") + (version "1.64.1") (source (origin (method url-fetch) @@ -340,7 +340,7 @@ threads, dynamic loading, and an object system.") "gobject-introspection/" (version-major+minor version) "/gobject-introspection-" version ".tar.xz")) (sha256 - (base32 "18lhglg9v6y83lhqzyifc1z0wrlawzrhzzxx0a3h1g7xaz97xvmi")) + (base32 "19vz7vp10h0zj3f491yk72dp89bix6rgkzxg4qcm4d6151ksxgl0")) (patches (search-patches "gobject-introspection-cc.patch" @@ -348,25 +348,17 @@ threads, dynamic loading, and an object system.") "gobject-introspection-absolute-shlib-path.patch")))) (build-system meson-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'do-not-use-/usr/bin/env - (lambda _ - (substitute* "tools/g-ir-tool-template.in" - (("#!@PYTHON_CMD@") - (string-append "#!" (which "python3")))) - #t))))) + `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas (native-inputs - `(("glib" ,glib "bin") - ("pkg-config" ,pkg-config))) - (inputs `(("bison" ,bison) ("flex" ,flex) - ("glib" ,glib) - ("python" ,python-wrapper) - ("zlib" ,zlib))) + ("glib" ,glib "bin") + ("pkg-config" ,pkg-config))) + (inputs + `(("python" ,python-wrapper))) (propagated-inputs - `(("libffi" ,libffi))) + `(("glib" ,glib) + ("libffi" ,libffi))) (native-search-paths (list (search-path-specification -- 2.28.0 --------------0DFAC8C7B8AAC0F6CEAB8657 Content-Type: text/x-patch; charset=UTF-8; name="0016-gnu-gobject-introspection-Update-synopsis-descriptio.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0016-gnu-gobject-introspection-Update-synopsis-descriptio.pa"; filename*1="tch" >From a6268885731b9e66e834cd241e52920690196e73 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 09:30:21 -0400 Subject: [PATCH 16/16] gnu: gobject-introspection: Update synopsis, description, home-page and license. * gnu/packages/glib.scm (gobject-introspection) [synopsis]: Modify. [description]: Modify. [home-page]: Modify. [license]: Modify. --- gnu/packages/glib.scm | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index cda8a97d5f..f7a3a866bf 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -365,15 +365,19 @@ threads, dynamic loading, and an object system.") (variable "GI_TYPELIB_PATH") (files '("lib/girepository-1.0"))))) (search-paths native-search-paths) - (synopsis "Generate interface introspection data for GObject libraries") - (description - "GObject introspection is a middleware layer between C libraries (using -GObject) and language bindings. The C library can be scanned at compile time -and generate a metadata file, in addition to the actual native C library. Then -at runtime, language bindings can read this metadata and automatically provide -bindings to call into the C library.") - (home-page "https://wiki.gnome.org/GObjectIntrospection") - (license license:gpl2+))) + (synopsis "GObject introspection tools and libraries") + (description "GObject introspection is a middleware layer between +C libraries (using GObject) and language bindings. The C library can be scanned +at compile time and generate metadata files, in addition to the actual native +C library. Then language bindings can read this metadata and automatically +provide bindings to call into the C library.") + (home-page "https://wiki.gnome.org/Projects/GObjectIntrospection") + (license + (list + ;; For library. + license:lgpl2.0+ + ;; For tools. + license:gpl2+)))) (define intltool (package -- 2.28.0 --------------0DFAC8C7B8AAC0F6CEAB8657--