From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id kDzsACccz2KsFQEAbAwnHQ (envelope-from ) for ; Wed, 13 Jul 2022 21:25:27 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 4CPnACccz2IjiQAAauVa8A (envelope-from ) for ; Wed, 13 Jul 2022 21:25:27 +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 BC351353EC for ; Wed, 13 Jul 2022 21:25:26 +0200 (CEST) Received: from localhost ([::1]:59950 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oBhzB-00074G-Sx for larch@yhetil.org; Wed, 13 Jul 2022 15:25:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51974) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oBhyp-000735-1S for guix-patches@gnu.org; Wed, 13 Jul 2022 15:25:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53865) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oBhyo-0003Jz-Oz for guix-patches@gnu.org; Wed, 13 Jul 2022 15:25:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oBhyo-0005Zv-G6 for guix-patches@gnu.org; Wed, 13 Jul 2022 15:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56169] [PATCH v3] gnu: Add cambalache. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 13 Jul 2022 19:25:02 +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.165774026121388 (code B ref 56169); Wed, 13 Jul 2022 19:25:02 +0000 Received: (at 56169) by debbugs.gnu.org; 13 Jul 2022 19:24:21 +0000 Received: from localhost ([127.0.0.1]:47762 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oBhy9-0005Yt-7r for submit@debbugs.gnu.org; Wed, 13 Jul 2022 15:24:21 -0400 Received: from mail-ej1-f68.google.com ([209.85.218.68]:35345) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oBhy6-0005Yb-0f for 56169@debbugs.gnu.org; Wed, 13 Jul 2022 15:24:20 -0400 Received: by mail-ej1-f68.google.com with SMTP id j22so21611467ejs.2 for <56169@debbugs.gnu.org>; Wed, 13 Jul 2022 12:24:17 -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=xOiRvItBJZ6NPYgQfVU0wcdSbaKcWEY2Mvxw8D5OpzE=; b=G90veIyHAJp/uzuO4ZO/ZiMsy2HWfyM6q1QY/4TyBd3GlFBWmNaG4IXldx7qk6THxi dvvOkPtUchjomKQN/uqQ94eLi4K1ys/tvl6r8FeRXEtSq0IwSD9WV4JOIljFYBaCBbfZ HpEO25KsgippKUkqzAFiGlBepqRWQ8Vf1m8qW07z77chcLnbW4TsZElhuDU8X3e02Hph z8kir9cDZ+r7re2ShvijqicKGmA4/XAZL6/BD0NGHnqGCOoGXwBp0KCE4p4W2y3MrneF lc1I0x1SFw4jt4QrtY/+SpCbUwh5Ajjo4gVWeO4SFB169raGR0N8bNXXZboPb3mJk7c3 hTeg== 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=xOiRvItBJZ6NPYgQfVU0wcdSbaKcWEY2Mvxw8D5OpzE=; b=Xz+se4p4FQJW31TvV4NAMBPr8gUTDDsWnC+vdNBffJkZyTBo5AHgvesvQ5y+AgnO9g 9DHv0zBmnv/D+lQc1knUvpfSG2lVuvH0hlrnxTshZxJ1deWnMI1VtRb9NSnxaoq3/+RQ Vy1X3UmySA5HjrMNNOf3FPyjdqOnNzhaJ20gssezgixR0x3bgjIjV50FdXUsfMCxaRci hmiQsArk5G/0XlojRGkiQaGEjItv1YyMHR1F41bysrQE11tTSWd6ZaotyhKc1fdG2R3M 5ug5B3zXRGK0z1XVuZrttuWBNwlA/0SJHWYEy4FHGRJlT8Ka6JpjnCfU/DeU8QM6B1BJ Mocg== X-Gm-Message-State: AJIora8HWRR4HXyhwxuJ72DHTLe3na+mMPJNUg332SvQAQryc0lA0mtS /y6TmPsyakHVXnYd8biEM261WLtmTl8= X-Google-Smtp-Source: AGRyM1vby8To1phYncOC35K5LTE05fK6RKPi5iRMT89sf8OJHtRP2/aQHWFC0WwVbjB3MMzTdYEt9A== X-Received: by 2002:a17:907:97d3:b0:726:a5db:3a3a with SMTP id js19-20020a17090797d300b00726a5db3a3amr5065291ejc.654.1657740252089; Wed, 13 Jul 2022 12:24:12 -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 o12-20020a17090611cc00b0072afb9fe3f3sm5259182eja.110.2022.07.13.12.24.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Jul 2022 12:24:11 -0700 (PDT) From: Liliana Marie Prikler Date: Thu, 23 Jun 2022 16:17:23 +0200 Content-Transfer-Encoding: 7bit Message-ID: <04bac8db1ebbdaa64eba1c3c1dec8d5d8e7ae9bc.camel@gmail.com> 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1657740326; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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=xOiRvItBJZ6NPYgQfVU0wcdSbaKcWEY2Mvxw8D5OpzE=; b=bdLup+jSn46LVyjOlfVKqMVUiY5sXzcmFJuj9JLETaRvzfEvDpofbKcmFSWI3FzjTjVJfQ IoCt4wM2k3hRxxtMYkW7LnRp0oDdOAwIfMLHt6HlgoU9m4bM6LtiZaFCjSInCuzZQ2KzPr FGMz8eZHA6qbZUOTcSzXCUogXfPQg/C+mfCw9ApDJ/lBn/qB06/cIRZZvEjzP3xjjf3K6J pfCwFyJnrOG3I/knKxKl5AJNbnk58B0TjFPgaGLW/j/d1b0UJJArbtho3D+phf/HeNvyVu RtqHzxHAXTtSpgQWfzkVJrik2h+zDUjL33qXdAiraZ2n+D7XzH1y1DCaMyQ5Xg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1657740326; a=rsa-sha256; cv=none; b=nm41TuEdnj+qtrx2uSFtiVEQdMLXnrT2BTdfILq2vOpjHBysigjMVnPm1YjW97/pvY7rGo /Q+fUS7bXpsF1W3EYheFy4dmPhuafyOON14r0hzlm0jGTOi4Ui4+wz+Z87f8ynGyIfvdRp VLndwYZDzcMnnxlg38PVqC+nGvltVyfVmw0dsG+9OysQgPH8Ob6ORlEjm7c6UtWgsFvusN cjfjG3u1W6zyb8w0X8N7olv1yrEPdwEtquqR41VCPr8BA2YcLisMUVUAbyzAJOePz9DBEx rpSP8CXSCYtZcqud9fcW8sLNgZH6mQqFlbkwD5bNGLeuoLVt+WfHO9CnPTHrxw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=G90veIyH; 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-Spam-Score: 6.26 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=G90veIyH; 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-Queue-Id: BC351353EC X-Spam-Score: 6.26 X-Migadu-Scanner: scn0.migadu.com X-TUID: //chM2MYw6tH * gnu/packages/gnome.scm (cambalache): New variable. --- gnu/packages/gnome.scm | 92 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 0ce96d41de..29e91d2bce 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3204,6 +3204,98 @@ (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"))) + ;; icons and schemas + `("XDG_DATA_DIRS" suffix + #$(map + (lambda (input) + (file-append (this-package-input input) "/share")) + '("adwaita-icon-theme" "hicolor-icon-theme" + "gsettings-desktop-schemas"))) + ;; Wrapping GDK_PIXBUF_MODULE_FILE allows Cambalache to + ;; load its own icons in pure environments. + `("GDK_PIXBUF_MODULE_FILE" = + (,(getenv "GDK_PIXBUF_MODULE_FILE")))))) + (find-files (string-append out "/bin"))))))))) + (inputs (list bash-minimal + adwaita-icon-theme hicolor-icon-theme + gsettings-desktop-schemas + gtk + `(,gtk+ "bin") ; broadwayd + `(,gtk "bin") + libadwaita + libhandy + (librsvg-for-system) + python python-pygobject python-lxml + 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") -- 2.36.1