From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 0CdrEAz/jGQELQAASxT56A (envelope-from ) for ; Sat, 17 Jun 2023 02:32:12 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id yD6YEAz/jGTrxwAA9RJhRA (envelope-from ) for ; Sat, 17 Jun 2023 02:32:12 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C9D7539ADD for ; Sat, 17 Jun 2023 02:32:11 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qAJrH-0002Xu-Vk; Fri, 16 Jun 2023 20:32:04 -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 1qAJrG-0002Xk-Sn for guix-patches@gnu.org; Fri, 16 Jun 2023 20:32:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qAJrG-0001wk-KQ for guix-patches@gnu.org; Fri, 16 Jun 2023 20:32:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qAJrF-0001Qf-U3 for guix-patches@gnu.org; Fri, 16 Jun 2023 20:32:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64120] [PATCH WIP] gnu: cambalache: Update to 0.12.0. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Jun 2023 00:32:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64120 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Liliana Marie Prikler Cc: Raghav Gururajan , 64120@debbugs.gnu.org Received: via spool by 64120-submit@debbugs.gnu.org id=B64120.16869618725431 (code B ref 64120); Sat, 17 Jun 2023 00:32:01 +0000 Received: (at 64120) by debbugs.gnu.org; 17 Jun 2023 00:31:12 +0000 Received: from localhost ([127.0.0.1]:50599 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAJqR-0001PX-NB for submit@debbugs.gnu.org; Fri, 16 Jun 2023 20:31:12 -0400 Received: from mail-qk1-f182.google.com ([209.85.222.182]:47212) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAJqO-0001PI-KQ for 64120@debbugs.gnu.org; Fri, 16 Jun 2023 20:31:09 -0400 Received: by mail-qk1-f182.google.com with SMTP id af79cd13be357-76240c53846so16036885a.2 for <64120@debbugs.gnu.org>; Fri, 16 Jun 2023 17:31:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686961863; x=1689553863; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=3vHC7nBfeSHoL38yijv+wkOV2adenrZUqRdQD4fyhus=; b=HMlYPYq6hbhrLY1biARvK8xlHUVn4RCfkwZRlUjCJ4SefiOgx6nsMF8TAW7ezQjkUR nDItjofZ/evVIGI6RMk1y0KZmA9ILjroy/TmEx6oettQkvWqic/BORroYAw8Jv9pk23w jQQeBz0J367+vhgqwovErfilOT0f9faA4TUaO0j/3dIpIk8Ph8IrWkCQGZI4hqHvhG3f +f3xyhdexBDEPUKZLE7E/NGy7SYC2BV/ds49UWVGVeOPcXffTYsIXdOi8HL/D3u5vFKh Qf2v652gOuvexaKziFqrIhe65pL6t7lih3F/a4w4m4Nu6H817YLvGD1jrukLE6+BEpcG egZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686961863; x=1689553863; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=3vHC7nBfeSHoL38yijv+wkOV2adenrZUqRdQD4fyhus=; b=lNfpvKdBTbbO+XLZ4f/HHQZLBnrUsO2D1m2xcWnZn7HB+BCjpaWjOmaHF6K1yEOC6x AcWDFBNrFhn9wQxQYjD3/8yNw1t4IfwuHAKG2ZW3Th7O/FrON5FGqltI3R4CIkDlbTgd xRAhtWL4JbmFsMFb2BMyocUqqRyV9d6vGeVkh/l3HkzBXTCRZO+TWsbWIhG6vevqFN/V OQJIgVj/AAMdh2rGuB8lts8613HYWnZCkA2nbh4w3GHGCLsdE2c0cATt2QQJxEnGWl2D sXwV9ik/2PBoiNwI695R9dkEej3jlvcIit6SbUifE1RJv4SE/ju35hpCXRF4bbBOnsJC tviw== X-Gm-Message-State: AC+VfDytI4YKDiCAH/vek5B48zRUJM/fo3Rx1zYrE/Brn07spar7TgvV yK/xUQpPOqw9teufH43EUDM= X-Google-Smtp-Source: ACHHUZ6rdJjLVnrnfdhzVf0uLnWF1uK5WxCxwyVp7Y1JUEenHlxPRk1zLnGsBYKfiPvLhsDn7+EAtw== X-Received: by 2002:a05:620a:4b45:b0:75d:4025:99dc with SMTP id su5-20020a05620a4b4500b0075d402599dcmr3080484qkn.10.1686961862952; Fri, 16 Jun 2023 17:31:02 -0700 (PDT) Received: from hurd (dsl-151-232.b2b2c.ca. [66.158.151.232]) by smtp.gmail.com with ESMTPSA id u10-20020ae9c00a000000b007593bf6e345sm6993274qkk.113.2023.06.16.17.31.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Jun 2023 17:31:02 -0700 (PDT) From: Maxim Cournoyer References: Date: Fri, 16 Jun 2023 20:31:00 -0400 In-Reply-To: (Liliana Marie Prikler's message of "Sat, 17 Jun 2023 01:38:47 +0200") Message-ID: <87cz1vudyz.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1686961931; a=rsa-sha256; cv=none; b=s4DaCx0YFHoVcnVpteOE+j57O6v5znT7U3hmGWQT2+YaducIJqETpAWbYsl9QBZ+9E/P+M fs/W8mkAU0ql7izb2fQOUkbPPY3qYHNvFrpPfLdPoli46KTWsMu0Oj3Zdd3D/ngpjBXPJ5 1mF4HntHUZ3lgPnu49qEPqp2+SOtVKoR9PShWDldAD6z81XaNIQuCbh6F9GdWKg8WBoYhy po64ZQut0+ambwxn9hZD56bwYGUN0CRRnaVPlcU3Gv0HSFv77LHrjMU9EulL1eMwyTfscN hYhmOaHldBw8A4WiVBrYSN+pS2qZXzdyF+ZdvhNbz3hGGg4Xmm0mlTlI4PHwfw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=HMlYPYq6; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1686961931; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=3vHC7nBfeSHoL38yijv+wkOV2adenrZUqRdQD4fyhus=; b=uA7wLewFEBquQHXB8z8QbUegt4qaPx4WY0TvLPVAGQN2Rr5PdG3VLRZa17zi4dXP+mpOtU QsbGdRnIAo/1XWM89WKfIL8dERcoxONm4TCHppB2JNqtZSYtqPnWZKLBf05Oqkqi38RgAY RnAMDM8rCuCpPbbz5uM8SOjtDA0f+ytoydq+j52o4c3TSa+XUWzgNgT+BXiNcsoM2L345T cNAEaedYLT9dy46NlNu199hb3VR1HlFBXlTxFBGJQzcaxdVLPenbCp6OBicgwvttZ3GMpF ynNCzn3Hp75FXejvnovY3IjgUc19d8Wlvtap28+7QAZ/N1aH1BGZ37WDM9zyDg== Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=HMlYPYq6; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Scanner: scn0.migadu.com X-Migadu-Spam-Score: -1.73 X-Spam-Score: -1.73 X-Migadu-Queue-Id: C9D7539ADD X-TUID: NMACxfCN39Vz Hello, Liliana Marie Prikler writes: > * gnu/packages/gnome.scm (cambalache): Update to 0.12.0. > [arguments]<#:tests?>: Disable. > <#:phases>: Adjust =E2=80=98patch-build=E2=80=99 accordingly. Add =E2=80= =98fake-cc=E2=80=99. > [inputs]: Add gtksourceview-4 and python-pycairo. > Replace webkitgtk-with-libsoup2 with webkitgtk and webkitgtk-next. Just with webkitgtk-next, no? > [native-inputs]: Add weston. > --- > gnu/packages/gnome.scm | 28 ++++++++++++++++++++++------ > 1 file changed, 22 insertions(+), 6 deletions(-) > > diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm > index a698fdf274..21a5ad424d 100644 > --- a/gnu/packages/gnome.scm > +++ b/gnu/packages/gnome.scm > @@ -3303,7 +3303,7 @@ (define-public blueprint-compiler > (define-public cambalache > (package > (name "cambalache") > - (version "0.10.3") > + (version "0.12.0") > (source (origin > (method git-fetch) > (uri (git-reference > @@ -3311,7 +3311,7 @@ (define-public cambalache > (commit version))) > (file-name (git-file-name name version)) > (sha256 > - (base32 "1nq9bvly4dm1xnh90z3b4c5455qpdgm3jgz2155vg2ai23f2= 2vsy")))) > + (base32 "12dhc7mx04cpc9qwcvqiplphh3mar7wy6cbkv208j7pcg5fz= kqh0")))) > (build-system meson-build-system) > (arguments > (list > @@ -3321,6 +3321,7 @@ (define-public cambalache > #:modules '((guix build meson-build-system) > ((guix build python-build-system) #:prefix python:) > (guix build utils)) > + #:tests? #f ; XXX: tests spawn a socket... > #:phases > #~(modify-phases %standard-phases > (add-after 'unpack 'patch-source > @@ -3331,8 +3332,16 @@ (define-public cambalache > inputs (string-append "bin/" cmd))))))) > (add-after 'unpack 'patch-build > (lambda _ > + (substitute* "meson.build" > + (("find_program\\('gtk-update-icon-cache'.*\\)") "") > + (("find_program\\('update-desktop-database'.*\\)") "")) > (substitute* "postinstall.py" > + (("gtk-update-icon-cache") "true") > (("update-desktop-database") "true")))) > + (add-after 'unpack 'fake-cc Nitpick: what is 'fake' here? I'd just call the phase 'patch-cc'. > + (lambda _ > + (substitute* "tools/cmb_init_dev.py" > + (("\"cc") (string-append "\"" #$(cc-for-target)))))) > (add-after 'wrap 'python-wrap (assoc-ref python:%standard-phas= es 'wrap)) > (delete 'check) > (add-after 'install 'add-install-to-pythonpath > @@ -3372,18 +3381,25 @@ (define-public cambalache > adwaita-icon-theme hicolor-icon-theme > gsettings-desktop-schemas > gtk > + gtksourceview-4 > `(,gtk+ "bin") ; broadwayd > `(,gtk "bin") > libadwaita > libhandy > (librsvg-for-system) > python > + python-pycairo > python-pygobject > python-lxml > - webkitgtk-with-libsoup2)) > - (native-inputs (list `(,glib "bin") gobject-introspection > - gettext-minimal pkg-config > - python-pytest xorg-server-for-tests)) > + webkitgtk > + webkitgtk-next)) > + (native-inputs (list `(,glib "bin") > + gobject-introspection > + gettext-minimal > + pkg-config > + python-pytest > + weston > + xorg-server-for-tests)) > Maybe re-indent as (native-inputs (list one two ...)) The rest LGTM! --=20 Thanks, Maxim