From: Liliana Marie Prikler <liliana.prikler@gmail.com>
To: 64120@debbugs.gnu.org
Cc: Liliana Marie Prikler <liliana.prikler@gmail.com>,
Maxim Cournoyer <maxim.cournoyer@gmail.com>,
Raghav Gururajan <rg@raghavgururajan.name>
Subject: [bug#64120] [PATCH WIP] gnu: cambalache: Update to 0.12.0.
Date: Sat, 17 Jun 2023 01:38:47 +0200 [thread overview]
Message-ID: <bbbad71d52fce8f735d84ce6261cf20b112e9beb.1686958887.git.liliana.prikler@gmail.com> (raw)
* 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(-)
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
base-commit: 31336e9f5d68512a9c1c6826bce9f17c892a2125
--
2.40.1
next reply other threads:[~2023-06-16 23:44 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-16 23:38 Liliana Marie Prikler [this message]
2023-06-17 0:31 ` [bug#64120] [PATCH WIP] gnu: cambalache: Update to 0.12.0 Maxim Cournoyer
2023-06-17 4:43 ` Liliana Marie Prikler
2023-06-25 12:46 ` bug#64120: " Liliana Marie Prikler
2023-06-26 13:32 ` [bug#64120] " Maxim Cournoyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=bbbad71d52fce8f735d84ce6261cf20b112e9beb.1686958887.git.liliana.prikler@gmail.com \
--to=liliana.prikler@gmail.com \
--cc=64120@debbugs.gnu.org \
--cc=maxim.cournoyer@gmail.com \
--cc=rg@raghavgururajan.name \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.