From patchwork Fri Mar 26 20:12:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 28133 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 4890D27BC5C; Fri, 26 Mar 2021 20:58:14 +0000 (GMT) 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 5189C27BC5D for ; Fri, 26 Mar 2021 20:57:34 +0000 (GMT) Received: from localhost ([::1]:57570 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lPtWP-0001YC-D9 for patchwork@mira.cbaines.net; Fri, 26 Mar 2021 16:57:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60766) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lPsqI-0006lu-9E for guix-patches@gnu.org; Fri, 26 Mar 2021 16:14:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59257) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lPsqH-0003sz-Vs for guix-patches@gnu.org; Fri, 26 Mar 2021 16:14:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lPsqH-0001bn-Ps for guix-patches@gnu.org; Fri, 26 Mar 2021 16:14:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42958] Big changes from wip-desktop. Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 26 Mar 2021 20:14: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, Danny Milosavljevic , Ricardo Wurmus , =?utf-8?q?L=C3=A9o?= Le Bouter Received: via spool by 42958-submit@debbugs.gnu.org id=B42958.16167895826100 (code B ref 42958); Fri, 26 Mar 2021 20:14:01 +0000 Received: (at 42958) by debbugs.gnu.org; 26 Mar 2021 20:13:02 +0000 Received: from localhost ([127.0.0.1]:42569 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lPspK-0001aJ-Me for submit@debbugs.gnu.org; Fri, 26 Mar 2021 16:13:02 -0400 Received: from out0.migadu.com ([94.23.1.103]:17025) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lPspI-0001Zl-JR for 42958@debbugs.gnu.org; Fri, 26 Mar 2021 16:13:01 -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=1616789577; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=izpvXKHxxOjP+jif28wrf0sQP7QDr9JCqKNOhs9ol7Q=; b=J3pEwzr9YV2B/mg+IfRLgeVKY2ME2nOCHipkt2/tXLZiWchJ7z+d02rts/IU4QUjwz3RhJ 3JVps2WgpMfTHxPT90csPjEtMSqajkjegZlIGecnmk1njDINfBTgdX7GgPPWn62udDf7yD uHcrtDGyBBY9IgzONXeKmcVFmBP+07SEMr0t3K+piQiP98zuvxjSkG2YhzXSZM08LYJJ2I 1saA3CR811EEZlK3Vg/25AVvW+nGqev8XwA+Qd6ExGn9e8PYOU9051/KeATor1opld5TWn IxHrOc175qkeP1OqqOIIz/P5PIplJfpLOrOOJrF5ND7Br3z6AkixeWnoIcrnvA== References: <7bef0b9f-b8a6-bd56-52e7-e283d8342470@raghavgururajan.name> <2b0dc6df-d533-8793-697c-82d664e93ddb@raghavgururajan.name> Message-ID: Date: Fri, 26 Mar 2021 16:12:53 -0400 MIME-Version: 1.0 In-Reply-To: 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 @(rekado|lle-bout|danny) >> Could any of you please review and merge the attached patches to >> core-updates? >> >> These patches has been successfully built on bayfront, from which you >> can obtain substitutes, if needed. >> >> I will send some more patches for this #42958 by tomorrow. >> >> It would be great if we could together finish-off this #42958 ASAP, so >> that I can bring remaining patches from wip-deskop. >> >> P.S >> Please pardon two cosmetic changes patches, which were done very long >> ago and had to use it to cleanly apply succeeding patches. Also, I >> must have used #t with lambda out of habit. > > Since there was master <--> core-updates merge, here I have attached > rebased patches. Thanks to Léo Le Bouter. So I have attached all the patches for this batch. These are non-signed-off, just for the record. :) Regards, RG. From 730f60b68f50e562cecea119338f8736d1f9f8bc Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 18 Jul 2020 06:18:38 -0400 Subject: [PATCH 83/83] gnu: gtkmm-2: Fix build. * gnu/packages/gtk.scm (gtkmm-2)[arguments]: Remove field. [native-inputs]: Remove field. [propagated-inputs]: Change; atkmm to atkmm-2.28, pangomm to pangomm-2.42, cairomm to cairomm-1.13 and glibmm to glibmm-2.64. Signed-off-by: Danny Milosavljevic --- gnu/packages/gtk.scm | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 5da8954dc9..517264d88b 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1654,25 +1654,25 @@ tutorial.") license:gpl2+)))) (define-public gtkmm-2 - (package (inherit gtkmm) + (package + (inherit gtkmm) (name "gtkmm") (version "2.24.5") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0wkbzvsx4kgw16f6xjdc1dz7f77ldngdila4yi5lw2zrgcxsb006")))) - (arguments '()) - (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 "0wkbzvsx4kgw16f6xjdc1dz7f77ldngdila4yi5lw2zrgcxsb006")))) (propagated-inputs - `(("pangomm" ,pangomm) - ("cairomm" ,cairomm) - ("atkmm" ,atkmm) + `(("atkmm" ,atkmm-2.28) + ("cairomm" ,cairomm-1.13) + ("glibmm" ,glibmm-2.64) ("gtk+" ,gtk+-2) - ("glibmm" ,glibmm))))) + ("pangomm" ,pangomm-2.42))))) (define-public gtksourceviewmm (package -- 2.31.0