From patchwork Fri Sep 1 12:44:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "ashish.is--- via Guix-patches\" via" X-Patchwork-Id: 53361 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id DCF7627BBE9; Fri, 1 Sep 2023 13:46:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5C46F27BBE2 for ; Fri, 1 Sep 2023 13:46:15 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qc3XE-00049Z-8p; Fri, 01 Sep 2023 08:46:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qc3X9-00048v-Eb for guix-patches@gnu.org; Fri, 01 Sep 2023 08:45:56 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qc3X9-0004Da-64 for guix-patches@gnu.org; Fri, 01 Sep 2023 08:45:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qc3XG-0001r8-3T; Fri, 01 Sep 2023 08:46:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65654] [PATCH v2 2/2] gnu: dbus-cxx: Update to 2.4.0. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, guix-patches@gnu.org Resent-Date: Fri, 01 Sep 2023 12:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65654 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65654@debbugs.gnu.org Cc: =?utf-8?b?5a6L5paH5q2m?= , Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan X-Debbugs-Original-Xcc: Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan Received: via spool by 65654-submit@debbugs.gnu.org id=B65654.16935723037054 (code B ref 65654); Fri, 01 Sep 2023 12:46:02 +0000 Received: (at 65654) by debbugs.gnu.org; 1 Sep 2023 12:45:03 +0000 Received: from localhost ([127.0.0.1]:60025 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qc3WJ-0001ph-4E for submit@debbugs.gnu.org; Fri, 01 Sep 2023 08:45:03 -0400 Received: from mail.envs.net ([5.199.136.28]:58288) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qc3WG-0001ou-FP for 65654@debbugs.gnu.org; Fri, 01 Sep 2023 08:45:01 -0400 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id B160238A0143; Fri, 1 Sep 2023 12:44:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1693572290; bh=oR3lhIEB7k/w8Z7fJrsYJ8ev1OTgEz/J05n3BZu1Wvk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lZqD+QmtZKnb9uWXuqmqEmkuG8OyjGWSfY2AfHDFJVBDpdTJNCBaoTBBTwsrcbooS XIvxUd3V6FXfNS8xK4jUywlQACbrNmYchjG3fi9Yy6XrkRH7KXBHFoGYvbq/lEZFCX nOq3ZtljUHo4hTUJUlgYuCfaMsgSS2EeNvn4gJ3dxN+Wrnhld12J6JoW/ipbnl4dYc crSsPRarEZ9x8dMhevrwVGXmtW3jxf/lvc052rC9MzMuQvIVDRF84ptq2Pdhld1eMZ 82YqdPmYG+FRjVqqdU2gaRn16Qy38tolK5WPGhjXZyHpLx1qK7E9dp385g4zbfkJlU v95kCqE7ZH5f+ezb7nl18bxCOwxykEjIflUYiHPb43iPKIU1qKowtlo9cGnCjtyQv6 dP49oHj6nVyRoQPN714uBT7c2AtzM0TqSSPKrb+lf6HHyrLlNNeXYjFB0Y3yx3jNeK H5T1gTUyfAgUFRQXCyqyaA+K725b0EDwKti4XiCKFCWMTI5pOER3IyTjPlVMrCtq8I z+qYhpnxI4WXT3TroOWB274z+cGP8L+kPRl7NDVkh2i7sp2NkFRLVXMs7RZlAtk+X2 JksFOT0xgORpwQ/S6j4YRlK0++bZChjer5o5cvmYfKeTvU/9qGNVzNXnVLkWoxuUFi J+fPiLiIelgMXq59TpUB7bwg= X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 98sK6Y4sCOTZ; Fri, 1 Sep 2023 12:44:45 +0000 (UTC) Received: from localhost (unknown [36.170.58.199]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Fri, 1 Sep 2023 12:44:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 37e60cfe; Fri, 1 Sep 2023 12:44:59 +0000 (UTC) Date: Fri, 1 Sep 2023 20:44:56 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <290e386fa27c8a2c8c098fe0007277149165a68f.1693572252.git.iyzsong@member.fsf.org> References: <290e386fa27c8a2c8c098fe0007277149165a68f.1693572252.git.iyzsong@member.fsf.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: iyzsong@envs.net X-ACL-Warn: , iyzsong--- via Guix-patches X-Patchwork-Original-From: iyzsong--- via Guix-patches via From: "ashish.is--- via Guix-patches\" via" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: 宋文武 * gnu/packages/glib.scm (dbus-cxx): Update to 2.4.0. [source]: Switch to git-fetch. [arguments]: Use g-exps. Adjust configure-flags. Skip 'test-machine-uuid-method' test. [inputs]: Add libcppgenerate. Remove python and glibmm. Move libsigc++ to... [propagated-inputs]: ...here. Add glib. [native-inputs]: Remove m4. [license]: Change to lgpl3+ and bsd-3. --- gnu/packages/glib.scm | 42 ++++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index f523706449..4857c1237e 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -44,6 +44,7 @@ (define-module (gnu packages glib) #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages cpp) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) #:use-module (gnu packages elf) @@ -1255,26 +1256,35 @@ (define-public dbus-c++ (define-public dbus-cxx (package (name "dbus-cxx") - (version "0.12.0") + (version "2.4.0") (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/dbus-cxx/dbus-cxx/" - version "/dbus-cxx-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/dbus-cxx/dbus-cxx") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1acsgpkd9v7b9jdc79ijmh9dbdfrzgkwkaff518i3zpk7y6g5mzw")))) + "0c9q2bjs4m66zq0qysyip8fnkvvjpj46rkjcvw15nhmfhzbq16ag")) + (modules '((guix build utils))) + (snippet '(delete-file-recursively "tools/libcppgenerate")))) (build-system cmake-build-system) (arguments - `(#:configure-flags '("-DENABLE_TESTS=ON" - "-DENABLE_TOOLS=ON" - "-DENABLE_GLIBMM=ON"))) - (inputs (list dbus - libsigc++ - glibmm - python - popt - expat)) - (native-inputs (list pkg-config m4)) + (list #:configure-flags #~(list "-DBUILD_TESTING=ON" + "-DENABLE_TOOLS=ON" + "-DENABLE_GLIB_SUPPORT=ON" + "-DTOOLS_BUNDLED_CPPGENERATE=OFF") + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda _ + ;; XXX: Missing /etc/machine-id in the build environment. + (invoke "ctest" "-E" "test-machine-uuid-method")))))) + (propagated-inputs + ;; Referenced in header and .pc files. + (list glib libsigc++)) + (inputs (list dbus expat libcppgenerate popt)) + (native-inputs (list pkg-config)) (synopsis "C++ wrapper for dbus") (description "Dbus-cxx is a C++ wrapper for dbus.\n It exposes the C API to allow direct manipulation and @@ -1288,7 +1298,7 @@ (define-public dbus-cxx Some codes examples can be find at: @url{https://dbus-cxx.github.io/examples.html}") (home-page "https://dbus-cxx.github.io/") - (license license:gpl3))) + (license (list license:lgpl3+ license:bsd-3)))) ;dual licensed (define-public sdbus-c++ ;; Use the latest commit, which includes unreleased fixes to the pkg-config