From patchwork Fri Jun 16 23:38:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 50992 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 E9ABE27BBEA; Sat, 17 Jun 2023 00:44: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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,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 A80AF27BBE2 for ; Sat, 17 Jun 2023 00:44:11 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qAJ6q-0002Z4-Kk; Fri, 16 Jun 2023 19:44: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 1qAJ6p-0002Yr-3A for guix-patches@gnu.org; Fri, 16 Jun 2023 19:44:03 -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 1qAJ6o-0007xE-QQ for guix-patches@gnu.org; Fri, 16 Jun 2023 19:44:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qAJ6o-0000GC-KR; Fri, 16 Jun 2023 19:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64120] [PATCH WIP] gnu: cambalache: Update to 0.12.0. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, guix-patches@gnu.org Resent-Date: Fri, 16 Jun 2023 23:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64120 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64120@debbugs.gnu.org Cc: 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.1686959022961 (code B ref -1); Fri, 16 Jun 2023 23:44:02 +0000 Received: (at submit) by debbugs.gnu.org; 16 Jun 2023 23:43:42 +0000 Received: from localhost ([127.0.0.1]:50542 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAJ6T-0000FR-KQ for submit@debbugs.gnu.org; Fri, 16 Jun 2023 19:43:42 -0400 Received: from lists.gnu.org ([209.51.188.17]:37706) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAJ6R-0000FJ-O3 for submit@debbugs.gnu.org; Fri, 16 Jun 2023 19:43:40 -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 1qAJ6R-0002U8-83 for guix-patches@gnu.org; Fri, 16 Jun 2023 19:43:39 -0400 Received: from mail-ej1-x641.google.com ([2a00:1450:4864:20::641]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qAJ6P-0007uN-9U for guix-patches@gnu.org; Fri, 16 Jun 2023 19:43:38 -0400 Received: by mail-ej1-x641.google.com with SMTP id a640c23a62f3a-977d7bdde43so272233566b.0 for ; Fri, 16 Jun 2023 16:43:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686959015; x=1689551015; h=to:content-transfer-encoding:mime-version:subject:date:from :message-id:from:to:cc:subject:date:message-id:reply-to; bh=rOUtrmySmn0BhITCBZnFZvwwdne2t8Ci+VRFRGYTsGc=; b=mFajKv1clGcswXp+4J190w6rluTiUnRoKfZKqlDHhUIW+9mb3dIfpuKCJmvsSIsgaO 4RtpQ7c8o+EDR1y3EfSNk9iqa1mnanoBJIGX/a8QWM/FoJ/0GmmclLkItqcXa7sGrZAe l7sLP4FBvQhs8m1XiunOonfeNX9VrblV6DO+3L+etq48wtMjgw4bwbJg/t3oH8qh7Das QyH6Slvxusb67iNPNEFZ6ZO6TGqabKAkqcuAqv9Oekkbqs3kC1oJFeiT1qEcMwNp6WUd pEIYioPaeclAiQpQ7uHaXtv6cD4P4HIFK6BgeDCoa6bYQrD9qmpVYT4xT+ZzxxMJ+iFW Qgxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686959015; x=1689551015; h=to:content-transfer-encoding:mime-version:subject:date:from :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=rOUtrmySmn0BhITCBZnFZvwwdne2t8Ci+VRFRGYTsGc=; b=ORJo2i0aTYAbRe5+q3OqyIganVBXb1bD7neL0clKvD1QuKtAP8AT+e21L1Se7Ba3WE 3CNLupfSMHH33G/fPy38+kHR34mq16XdySB3IJPwchVVmPxjZ3GZqaqHF+Hc2FBHfr0Y l+qPoVhktDercwAx+s5jcgwKcDYzBZGMm8CeUiYrYAuwfaGpo10Yy1ldWX/sLSfQrlXQ p9AtN/UUpp3/ZBzDcz9B/JYGo53OR+Iwwwp0JbGigluH6bU0HKM4RCUwbaL7jk77WOyW UUQfM6F28XweXH0fLwm3VZmWiq9EC4w1Ya0BVZddFFMUnF0qAjoo9DvcjThtDAiFbIsv dXCw== X-Gm-Message-State: AC+VfDxQKDew9q1IPc3fw6khzmozLRoY6p+9FS4/9HYI04z/LW5EEVuJ AeUqfsJNS7iLTaB8btFKzEKig6gZi7ICT+h8 X-Google-Smtp-Source: ACHHUZ7T0qu0JPbcL2nvgDhJ68Gi85vN/gH44PZvbUWf3cBeg99MOEoK4kr5tJQpMdMaMO8sOp9sGw== X-Received: by 2002:a17:907:1607:b0:982:b253:dc20 with SMTP id hb7-20020a170907160700b00982b253dc20mr2820158ejc.27.1686959015220; Fri, 16 Jun 2023 16:43:35 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id ju20-20020a17090798b400b00982cdc4ff12sm2048230ejc.171.2023.06.16.16.43.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Jun 2023 16:43:34 -0700 (PDT) Message-Id: From: Liliana Marie Prikler Date: Sat, 17 Jun 2023 01:38:47 +0200 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::641; envelope-from=liliana.prikler@gmail.com; helo=mail-ej1-x641.google.com 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , 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 * gnu/packages/gnome.scm (cambalache): Update to 0.12.0. [arguments]<#:tests?>: Disable. <#:phases>: Adjust ‘patch-build’ accordingly. Add ‘fake-cc’. [inputs]: Add gtksourceview-4 and python-pycairo. Replace webkitgtk-with-libsoup2 with webkitgtk and webkitgtk-next. [native-inputs]: Add weston. --- gnu/packages/gnome.scm | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) base-commit: 31336e9f5d68512a9c1c6826bce9f17c892a2125 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 "1nq9bvly4dm1xnh90z3b4c5455qpdgm3jgz2155vg2ai23f22vsy")))) + (base32 "12dhc7mx04cpc9qwcvqiplphh3mar7wy6cbkv208j7pcg5fzkqh0")))) (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 + (lambda _ + (substitute* "tools/cmb_init_dev.py" + (("\"cc") (string-append "\"" #$(cc-for-target)))))) (add-after 'wrap 'python-wrap (assoc-ref python:%standard-phases '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)) (home-page "https://gitlab.gnome.org/jpu/cambalache") (synopsis "Rapid application development tool") (description "Cambalache is a rapid application development (RAD) tool for