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: 40452 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 C082327BBEA; Fri, 1 Jul 2022 20:10:16 +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 2F83027BBE9 for ; Fri, 1 Jul 2022 20:10:16 +0100 (BST) Received: from localhost ([::1]:51962 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o7M1u-0007pB-2H for patchwork@mira.cbaines.net; Fri, 01 Jul 2022 15:10:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53408) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o7M1i-0007om-FQ for guix-patches@gnu.org; Fri, 01 Jul 2022 15:10:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45279) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o7M1i-0000UG-5M for guix-patches@gnu.org; Fri, 01 Jul 2022 15:10:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o7M1h-0003oX-Vu for guix-patches@gnu.org; Fri, 01 Jul 2022 15:10:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56169] [PATCH v2] gnu: Add cambalache. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Jul 2022 19:10:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56169 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56169@debbugs.gnu.org Cc: Daniel =?utf-8?q?Mei=C3=9Fner?= Received: via spool by 56169-submit@debbugs.gnu.org id=B56169.165670257414620 (code B ref 56169); Fri, 01 Jul 2022 19:10:01 +0000 Received: (at 56169) by debbugs.gnu.org; 1 Jul 2022 19:09:34 +0000 Received: from localhost ([127.0.0.1]:39176 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o7M1G-0003nk-Gq for submit@debbugs.gnu.org; Fri, 01 Jul 2022 15:09:34 -0400 Received: from mail-ed1-f66.google.com ([209.85.208.66]:36639) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o7M1E-0003nW-B7 for 56169@debbugs.gnu.org; Fri, 01 Jul 2022 15:09:33 -0400 Received: by mail-ed1-f66.google.com with SMTP id e2so4080179edv.3 for <56169@debbugs.gnu.org>; Fri, 01 Jul 2022 12:09:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:to:cc:content-transfer-encoding:message-id :mime-version; bh=yGZqGywXLTySfL8YagnBXwpJwnb/CbamozDMisy4XtU=; b=RjUeRN4E/6N1mPn5r5CDuNtOlvyzJoOB6+u2uGDAJg9QEHUDKprcvzKx/nZrihVijt oEAHAVCSNwTVSKKiZOiPLlkShzODQu2bdXBRu/Qc23Cm4ZPZcsSuSjp7VHVma344MlNR xsX9Oc5aFo6WhvlA7+Rz+DUwa1MvZrTecS+v2dU0Y+NyMdz0LlaA99ApcPD38+LWZYrI kalaFOcYYDPK780oPUGE/oU9tv2JsMN5smSKIg6A8SyKOZXqLXvHGv1SUIAxOXwQArjM alCYnW1utSl/qVHoB6nIjIT5Y9m2BRN4BsotV8W9we3HOj9UdptUbQP3yeCPkxd4wPOF Uy9Q== 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:cc :content-transfer-encoding:message-id:mime-version; bh=yGZqGywXLTySfL8YagnBXwpJwnb/CbamozDMisy4XtU=; b=TsBWS/Qe6oj0NSg40/jfF3ipMlvOor7u/y4ZmiJR9+G+THcDvMz4+NgtADqXMPxaQy hoybXeKXc9m+SB6VYWk/1r9eQaNARq6z2+LR8qBABo/PyX/0LDebRxcMyB4DaxtcrpDl 5qzCH9xkP+NxY8uMBkxZd73Eq5L4/Beoj5W7oTKUAV+8t9P+G6NY9/KZTJvVf6ynAr2O OanRLbrNG4drLX7k0zssR3R8q/x3vntVdzhktbIngG+HeyRAuLqLQSbEGHex0nAPwfC8 dur65ODz4q6+NymoC8w7Q+U/st+g29EW17TVml/EudW6q1V/Bdm02oHWWiEe3EuqfTZm O6xg== X-Gm-Message-State: AJIora/vgPrzBvEaX8PJg5/fc/uNe4E70rdEwGSAhiGCy0XUBQJwAXQJ w5Lsk7VKdvOxqptTSMOyxNCMkz6umYM= X-Google-Smtp-Source: AGRyM1vmcIXr5jH3TTVueldPVOYDo2nXs5J3NJeidO5kv9hKUTtINlAnQnQ3be9DQuXq/3QYoeJuaQ== X-Received: by 2002:aa7:c783:0:b0:435:2a52:3388 with SMTP id n3-20020aa7c783000000b004352a523388mr20576391eds.164.1656702566379; Fri, 01 Jul 2022 12:09:26 -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 hz11-20020a1709072ceb00b00722fc014e8csm10644371ejc.104.2022.07.01.12.09.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Jul 2022 12:09:25 -0700 (PDT) From: Liliana Marie Prikler Date: Thu, 23 Jun 2022 16:17:23 +0200 Message-ID: MIME-Version: 1.0 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 | 83 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 0cde3caebd..1458a4cb5c 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3208,6 +3208,89 @@ (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) + (let ((out (assoc-ref outputs "out"))) + (for-each + (lambda (prog) + (unless (wrapped-program? prog) + (wrap-program + prog + `("GI_TYPELIB_PATH" suffix + (,(string-append out "/lib/girepository-1.0") + ,(getenv "GI_TYPELIB_PATH")))))) + (find-files (string-append out "/bin"))))))))) + (inputs (list bash-minimal + libadwaita + python python-pygobject python-lxml + gtk + `(,gtk+ "bin") ; broadwayd + `(,gtk "bin") + webkitgtk-with-libsoup2)) + ;; XXX: inside a pure shell, the following need to exist as well + ;; (in addition to glib) for cambalache to function as expected + ;; (propagated-inputs (list adwaita-icon-theme + ;; gsettings-desktop-schemas + ;; (librsvg-for-system))) + (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")