From patchwork Thu Aug 20 15:10:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danny Milosavljevic X-Patchwork-Id: 23712 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 4924327BBE6; Thu, 20 Aug 2020 16:14:46 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id BACB027BBE5 for ; Thu, 20 Aug 2020 16:14:45 +0100 (BST) Received: from localhost ([::1]:56426 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k8mH7-0003Ki-5p for patchwork@mira.cbaines.net; Thu, 20 Aug 2020 11:14:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35212) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k8mEX-0007HV-So for guix-patches@gnu.org; Thu, 20 Aug 2020 11:12:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60222) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k8mEX-00071K-GF for guix-patches@gnu.org; Thu, 20 Aug 2020 11:12:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k8mEX-0006Ci-C9 for guix-patches@gnu.org; Thu, 20 Aug 2020 11:12:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42958] [PATCH core-updates 22/29] gnu: atkmm: Update package definition. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 20 Aug 2020 15:12:05 +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 Cc: Raghav Gururajan , Danny Milosavljevic Received: via spool by 42958-submit@debbugs.gnu.org id=B42958.159793628423635 (code B ref 42958); Thu, 20 Aug 2020 15:12:05 +0000 Received: (at 42958) by debbugs.gnu.org; 20 Aug 2020 15:11:24 +0000 Received: from localhost ([127.0.0.1]:43496 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDr-000693-LF for submit@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:24 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:42392) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8mDV-00064B-Sv for 42958@debbugs.gnu.org; Thu, 20 Aug 2020 11:11:03 -0400 Received: from dayas.lan (80-110-126-103.cgn.dynamic.surfer.at [80.110.126.103]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 8576433681D8; Thu, 20 Aug 2020 17:11:00 +0200 (CEST) From: Danny Milosavljevic Date: Thu, 20 Aug 2020 17:10:43 +0200 Message-Id: <20200820151050.9529-22-dannym@scratchpost.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200820151050.9529-1-dannym@scratchpost.org> References: <20200820150914.9443-1-dannym@scratchpost.org> <20200820151050.9529-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From: Raghav Gururajan * gnu/packages/gtk.scm (atkmm): Update package definition. [build-system]: Change from gnu to glib-or-gtk. [outputs]: Add new output "doc". [arguments]<#:phases>['move-doc]: New phase. [native-inputs]: Add graphviz, doxygen, m4, mm-common, perl and libxslt. [synopsis]: Modify. [description]: Modify. [home-page]: Modify. [license]: Add gpl2+. Signed-off-by: Danny Milosavljevic --- gnu/packages/gtk.scm | 60 +++++++++++++++++++++++++++++++------------- 1 file changed, 43 insertions(+), 17 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index e8ba76694c..d595a8c7ec 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -75,6 +75,7 @@ #:use-module (gnu packages image) #:use-module (gnu packages libffi) #:use-module (gnu packages linux) + #:use-module (gnu packages m4) #:use-module (gnu packages man) #:use-module (gnu packages pdf) #:use-module (gnu packages perl) @@ -1224,24 +1225,49 @@ library.") (package (name "atkmm") (version "2.28.0") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0fnxrspxkhhbrjphqrpvl3zjm66n50s4cywrrrwkhbflgy8zqk2c")))) - (build-system gnu-build-system) - (native-inputs `(("pkg-config" ,pkg-config))) + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "0fnxrspxkhhbrjphqrpvl3zjm66n50s4cywrrrwkhbflgy8zqk2c")))) + (build-system glib-or-gtk-build-system) + (outputs '("out" "doc")) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'move-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + (mkdir-p (string-append doc "/share")) + (rename-file + (string-append out "/share/doc") + (string-append doc "/share/doc")) + #t)))))) + (native-inputs + `(("dot" ,graphviz) + ("doxygen" ,doxygen) + ("m4" ,m4) + ("mm-common" ,mm-common) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("xsltproc" ,libxslt))) (propagated-inputs - `(("glibmm" ,glibmm) ("atk" ,atk))) - (home-page "https://www.gtkmm.org") - (synopsis "C++ interface to the ATK accessibility library") - (description - "ATKmm provides a C++ programming interface to the ATK accessibility -toolkit.") - (license license:lgpl2.1+))) + `(("atk" ,atk) + ("glibmm" ,glibmm-2.64))) + (synopsis "C++ bindings for ATK") + (description "ATKmm is the C++ binding for the ATK library.") + (home-page "https://wiki.gnome.org/Accessibility") + (license + (list + ;; Library + license:lgpl2.1+ + ;; Tools + license:gpl2+)))) (define-public gtkmm (package