From patchwork Mon Apr 26 10:28:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 28909 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 890F227BC7E; Mon, 26 Apr 2021 11:30:21 +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.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,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 ESMTPS id E3C3027BC7D for ; Mon, 26 Apr 2021 11:30:20 +0100 (BST) Received: from localhost ([::1]:37740 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1layVQ-0003qo-1K for patchwork@mira.cbaines.net; Mon, 26 Apr 2021 06:30:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53632) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1layVA-0003om-Pi for guix-patches@gnu.org; Mon, 26 Apr 2021 06:30:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33174) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1layVA-0001Y1-Hs for guix-patches@gnu.org; Mon, 26 Apr 2021 06:30:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1layVA-0004RD-DR for guix-patches@gnu.org; Mon, 26 Apr 2021 06:30:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48028] [PATCH wip-gnome v4 1/8] gnu: gtkmm@2: Remove inheritance from gtkmm@3. References: <7c08ca5b-a7cb-cdf3-c8bb-673cec8876a8@raghavgururajan.name> In-Reply-To: <7c08ca5b-a7cb-cdf3-c8bb-673cec8876a8@raghavgururajan.name> Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Apr 2021 10:30:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48028 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48028@debbugs.gnu.org Cc: Raghav Gururajan Received: via spool by 48028-submit@debbugs.gnu.org id=B48028.161943295416914 (code B ref 48028); Mon, 26 Apr 2021 10:30:04 +0000 Received: (at 48028) by debbugs.gnu.org; 26 Apr 2021 10:29:14 +0000 Received: from localhost ([127.0.0.1]:44705 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1layUL-0004Od-V9 for submit@debbugs.gnu.org; Mon, 26 Apr 2021 06:29:14 -0400 Received: from out1.migadu.com ([91.121.223.63]:42969) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1layUD-0004Na-UG for 48028@debbugs.gnu.org; Mon, 26 Apr 2021 06:29:07 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1619432943; 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=iF7nEhIOcGWL7uP3tYoWjNmGPRauLSpgih9gL/4OWv0=; b=dP5xcqM5naPghceunMHCNBt0yJxrnYA/x9AqPdXqSSom8SYjDyTLjwCvvzR331shdEqTp+ Smp3p987IK/KmZgJjUzoGuWHps5fheLlUySc+mxDpwstHYo4MGyMOSYsUk08t4I4McnvY2 be3C+KbitkpOHL768WIZW4UAoK4DeuVf+7uFO8LHkh6bQjOMe46G9qVmBxHnhr5TpcTVM7 rJRrxF0gsYTPAK6Ia+CwIBfS4DcjUMBN9ElX3IcmV77Ultt/MheV0Ia0mfqRva7Q0G1HRd v32y8yVD+xlj2owO/k3tUGjnsTV16x5RvyQ4UqyhrnYdY56CHCozHm2HAOpGsQ== Date: Mon, 26 Apr 2021 06:28:27 -0400 Message-Id: <20210426102834.636-1-rg@raghavgururajan.name> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: rg@raghavgururajan.name 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" Reply-to: Raghav Gururajan X-ACL-Warn: , Raghav Gururajan via Guix-patches X-Patchwork-Original-From: Raghav Gururajan via Guix-patches via From: Raghav Gururajan X-getmail-retrieved-from-mailbox: Patches Remove inheritance to prevent rebuilds of packages like inkscape and gtk+, whenever changes are made to gtkmm@3. * gnu/packages/gtk.scm (gtkmm-2)[build-system,outputs,arguments, native-inputs,synopsis,description,home-page,license]: New fields. --- gnu/packages/gtk.scm | 48 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 04a0db1161..81ac4a7197 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1660,7 +1660,6 @@ tutorial.") (define-public gtkmm-2 (package - (inherit gtkmm) (name "gtkmm") (version "2.24.5") (source @@ -1672,12 +1671,57 @@ tutorial.") name "-" version ".tar.xz")) (sha256 (base32 "0wkbzvsx4kgw16f6xjdc1dz7f77ldngdila4yi5lw2zrgcxsb006")))) + (build-system glib-or-gtk-build-system) + (outputs '("out" "doc")) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'pre-check + (lambda _ + ;; Tests require a running X server. + (system "Xvfb :1 +extension GLX &") + (setenv "DISPLAY" ":1") + ;; For missing '/etc/machine-id'. + (setenv "DBUS_FATAL_WARNINGS" "0") + #t)) + (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) + ("xorg-server" ,xorg-server-for-tests))) (propagated-inputs `(("atkmm" ,atkmm-2.28) ("cairomm" ,cairomm-1.13) ("glibmm" ,glibmm-2.64) ("gtk+" ,gtk+-2) - ("pangomm" ,pangomm-2.42))))) + ("pangomm" ,pangomm-2.42))) + (synopsis "C++ Interfaces for GTK+ and GNOME") + (description "GTKmm is the official C++ interface for the popular GUI +library GTK+. Highlights include typesafe callbacks, and a comprehensive set of +widgets that are easily extensible via inheritance. You can create user +interfaces either in code or with the Glade User Interface designer, using +libglademm. There's extensive documentation, including API reference and a +tutorial.") + (home-page "https://gtkmm.org/") + (license + (list + ;; Library + license:lgpl2.1+ + ;; Tools + license:gpl2+)))) (define-public gtksourceviewmm (package