From patchwork Thu Aug 31 10:51:14 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: 53340 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 580EB27BBEA; Thu, 31 Aug 2023 11:52:12 +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=ham 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 2ED4127BBE9 for ; Thu, 31 Aug 2023 11:52:11 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qbfHK-0007In-Fb; Thu, 31 Aug 2023 06:51:58 -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 1qbfHH-0007I9-PP for guix-patches@gnu.org; Thu, 31 Aug 2023 06:51:55 -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 1qbfHH-0005QU-Hf for guix-patches@gnu.org; Thu, 31 Aug 2023 06:51:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qbfHO-0007iO-D7; Thu, 31 Aug 2023 06:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65654] [PATCH] 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: Thu, 31 Aug 2023 10:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 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-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan Received: via spool by submit@debbugs.gnu.org id=B.169347909829621 (code B ref -1); Thu, 31 Aug 2023 10:52:02 +0000 Received: (at submit) by debbugs.gnu.org; 31 Aug 2023 10:51:38 +0000 Received: from localhost ([127.0.0.1]:55021 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbfGz-0007hg-Fo for submit@debbugs.gnu.org; Thu, 31 Aug 2023 06:51:37 -0400 Received: from lists.gnu.org ([2001:470:142::17]:53192) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qbfGw-0007ej-T2 for submit@debbugs.gnu.org; Thu, 31 Aug 2023 06:51:35 -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 1qbfGi-00078j-V3 for guix-patches@gnu.org; Thu, 31 Aug 2023 06:51:20 -0400 Received: from mail.envs.net ([5.199.136.28]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qbfGg-0005J4-48 for guix-patches@gnu.org; Thu, 31 Aug 2023 06:51:20 -0400 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 42D9338A0132; Thu, 31 Aug 2023 10:51:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1693479069; bh=2IYp5OH5T3KLEmvL3ulgthnOdELiMPu8MbyTXf5PyNM=; h=From:To:Cc:Subject:Date:From; b=RyAZq5ejkK3FpaMAi4/d7Q9i2MDus0YjaviqEpUitRN03Jyx5+ANd+TyY+IygbaPY N1ysZsqFToZzd9II9fMBJYXLPgoCW/MWIw/PhAmNyskJaWMvt9xgI/CUkwSIDg8zg8 N6RRZWlhEWs+K7bZFrUWqG79oC797Rm8uIIe7I6ImI/JD8jB9i17uaavRY3Aa5E2of i6JMxvlgDB3/+JJUkGEp23B8P9JoX2GTMs0y6+PUKo1xKCuwsVkcEy3sKR1wiw8kI9 UOiuTSLtPMWqeNHlZEHiBOV86FFUh+Kjajnrl0SbJ8zJJ1kG2jvdQ2jLkrexQhiJsa 9+WsMh6JtSL6EzDl/yFU4Pis3NftjfP21qIj5QbXLesIhntgF/DmMBJkZXASprPd7O hCnqyFDwxRa8qKoncv1tzLVlcSSk9qPZbjMGwY9M4h5xr1kdIzdn/7nLGBj5ewXrHx XpYB1JWY6o6LdT1/Fy+dvkQL2E9F9f9fjk0sTI8urQS81eAm5f3nDctsXVSx7QMLdq aAdbqNKCacfgQl3smygwvleGL2rJBi9qIu02wVmClVWUkbqAzz/gB8S1TWjYOJ/hkc 8HvZITr/vsGNGp9/maY6fx5sDCKh/cNZnJuOaLinw/e84mt5l9j/V7zG5LgyL2kjS2 5O7HSa/rV5j9q84zT8Dpr340= 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 9TEnd5sZ6CGa; Thu, 31 Aug 2023 10:51:04 +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; Thu, 31 Aug 2023 10:51:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 1c896687; Thu, 31 Aug 2023 10:51:19 +0000 (UTC) Date: Thu, 31 Aug 2023 18:51:14 +0800 Message-ID: <5686dc3309451165e7875231057a98030399a085.1693479069.git.iyzsong@member.fsf.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=5.199.136.28; envelope-from=iyzsong@envs.net; helo=mail.envs.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action 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]: 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 | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) base-commit: 299d0463d54c97b237deb2fe9e464108544344c0 diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index f523706449..043d506a9e 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -1255,26 +1255,30 @@ (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")))) (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") + #: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 (list glib libsigc++)) + (inputs (list dbus expat 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 +1292,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)))) (define-public sdbus-c++ ;; Use the latest commit, which includes unreleased fixes to the pkg-config