From patchwork Thu Jun 23 14:17:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 40272 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 B05F427BBEA; Thu, 23 Jun 2022 16:08:39 +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=unavailable 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 2B52227BBE9 for ; Thu, 23 Jun 2022 16:08:39 +0100 (BST) Received: from localhost ([::1]:60582 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o4ORi-0007Xa-B5 for patchwork@mira.cbaines.net; Thu, 23 Jun 2022 11:08:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60816) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o4OLL-00056g-Jl for guix-patches@gnu.org; Thu, 23 Jun 2022 11:02:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45686) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o4OLL-0004fd-B8 for guix-patches@gnu.org; Thu, 23 Jun 2022 11:02:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o4OLK-0001Yg-Sz for guix-patches@gnu.org; Thu, 23 Jun 2022 11:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56169] [PATCH] gnu: Add cambalache. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 23 Jun 2022 15:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 56169 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56169@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16559964985944 (code B ref -1); Thu, 23 Jun 2022 15:02:02 +0000 Received: (at submit) by debbugs.gnu.org; 23 Jun 2022 15:01:38 +0000 Received: from localhost ([127.0.0.1]:39581 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o4OKv-0001Xi-B2 for submit@debbugs.gnu.org; Thu, 23 Jun 2022 11:01:37 -0400 Received: from lists.gnu.org ([209.51.188.17]:51548) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o4OKp-0001XN-5i for submit@debbugs.gnu.org; Thu, 23 Jun 2022 11:01:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60568) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o4OKo-0004X0-He for guix-patches@gnu.org; Thu, 23 Jun 2022 11:01:30 -0400 Received: from mail-ej1-x642.google.com ([2a00:1450:4864:20::642]:34604) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o4OKi-0004ZY-TQ for guix-patches@gnu.org; Thu, 23 Jun 2022 11:01:30 -0400 Received: by mail-ej1-x642.google.com with SMTP id t5so9172070eje.1 for ; Thu, 23 Jun 2022 08:01:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:to:content-transfer-encoding:message-id :mime-version; bh=yCVseM6atyz787LuU6RHQB6pdvXAJfV+2zc9Q3zIV2k=; b=edtWhej4bH7QRW0hvXc61C7eMeIanGE2vfl/1zORwFMk+efC5ccuo1KkmV5USNCsqs 5qDMlKR5lEIWihN7JA/aidiun9wmgjStJQiaNFjBlWhSwUxEgIg9cHi4fQt+NqRJTv2k 36KlFEB+dXK4yblJyS+JjxJuv3XsM0srdBWuNskCms5YfYH8rzofnMyY2mWLHQnbK8Tg pe6n8bWdSWqzeTWnLpeuuscOjQq7wvIzsS4e69BaREapjAMDFTss6u6KqRAgJaZYFOk1 KglsdXaJs4H3wstA7Tl2KqsyDM0whWmtUIWInbI5Cxo1BCFm66vz+ty2/MtxUnRngMgP Tghw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:to:content-transfer-encoding :message-id:mime-version; bh=yCVseM6atyz787LuU6RHQB6pdvXAJfV+2zc9Q3zIV2k=; b=qaN6z6LEgHnSXoSO0wfw+SbvxmwmfQODxRAGv7sJzr7voTx4E6VTyhP9CQGxdoqb77 NlXza7ax9w8CM2WSetUtXongQ28af+k5CLyTFrJO/MrC2RkiK3CgUjRbodGdo8Q7wQNE ZAn5rvplOIZYmdT+Njw4Bh2ax4B1LKPAY8y3fl6wbtePa+vBJ9VIJRRSCusNVSNlPsMb 5rKxp73EOQ8a4WemTJmNppYAYZtHrA4wbBUIM4biog2pIubVRjt19kNNP25hFSPppQGQ +Pay6xqpGbcAgiRuoOdqmneb64w+IzTo7QLBYQl1aQsFZ/MipW8lWpl0tESVlnoQTA45 6ZIA== X-Gm-Message-State: AJIora/UnLL9dyu8mr6gZ6ZPIsd6ylE+eZqEr64/D1k8XJz790bImuOZ 8a2QZTowBFV6aVWPYWnY5DdYFnQkZmk= X-Google-Smtp-Source: AGRyM1srtY1FJx2A557cS0zVXTORR6a3KXdTPoy/Gm25gBuyyLXZEUfC9Q76nz3J9oA8LR21PqhwjA== X-Received: by 2002:a17:906:2dd:b0:712:1293:3dd8 with SMTP id 29-20020a17090602dd00b0071212933dd8mr8736603ejk.448.1655996482795; Thu, 23 Jun 2022 08:01:22 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id 12-20020a170906318c00b0072124df085bsm8510951ejy.15.2022.06.23.08.01.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jun 2022 08:01:22 -0700 (PDT) From: Liliana Marie Prikler Date: Thu, 23 Jun 2022 16:17:23 +0200 Message-ID: MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::642; envelope-from=liliana.prikler@gmail.com; helo=mail-ej1-x642.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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gnome.scm (cambalache): New variable. --- gnu/packages/gnome.scm | 75 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 0cde3caebd..71667086f4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3208,6 +3208,81 @@ (define-public glade3 (variable "GLADE_MODULE_SEARCH_PATH") (files '("lib/glade/modules"))))))) +(define-public cambalache + (package + (name "cambalache") + (version "0.10.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.gnome.org/jpu/cambalache") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1mw5gk98zx03yal3p8slaqwhwkc9p2vnh0cssnmg6ivxsjscqhgz")))) + (build-system meson-build-system) + (arguments + (list + #:glib-or-gtk? #t + #:imported-modules `((guix build python-build-system) + ,@%meson-build-system-modules) + #:modules '((guix build meson-build-system) + ((guix build python-build-system) #:prefix python:) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "cambalache/cmb_view.py" + (("GLib\\.find_program_in_path\\('(.*)'\\)" all cmd) + (string-append "'" + (search-input-file inputs + (string-append "/bin/" cmd)) + "'"))))) + (add-after 'unpack 'patch-build + (lambda _ + (substitute* "postinstall.py" + (("update-desktop-database") "true")))) + (add-after 'wrap 'python-wrap (assoc-ref python:%standard-phases 'wrap)) + (delete 'check) + (add-after 'install 'add-install-to-pythonpath + (assoc-ref python:%standard-phases 'add-install-to-pythonpath)) + (add-after 'add-install-to-pythonpath 'pre-check + (lambda _ + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1"))) + (add-after 'pre-check 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion ".." + (invoke "python3" "-m" "pytest"))))) + (add-after 'glib-or-gtk-wrap 'wrap-typelib + (lambda* (#:key outputs #:allow-other-keys) + (for-each + (lambda (prog) + (unless (wrapped-program? prog) + (wrap-program + prog + `("GI_TYPELIB_PATH" suffix (,(getenv "GI_TYPELIB_PATH")))))) + (find-files (string-append (assoc-ref outputs "out") + "/bin")))))))) + (inputs (list bash-minimal + python python-pygobject python-lxml + gtk + `(,gtk+ "bin") ; broadwayd + `(,gtk "bin") + webkitgtk-with-libsoup2)) + (native-inputs (list `(,glib "bin") gobject-introspection + gettext-minimal pkg-config + python-pytest 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 +Gtk 4 and 3 with a clear model-view-controller (MVC) design and +data model first philosophy.") + (license (list license:lgpl2.1 + license:gpl2)))) ; tools + (define-public libcroco (package (name "libcroco")