ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-23 02:59:17 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: cambalache: Update to 0.12.0.

Browse source 
* 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.
This commit is contained in:
Liliana Marie Prikler 2023-06-17 01:38:47 +02:00
parent bf164e8d37
commit 5abcfe7a79
No known key found for this signature in database
GPG key ID: 442A84B8C70E2F87
1 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
gnu/packages/gnome.scm
View file

@ -3303,7 +3303,7 @@ (define-public blueprint-compiler
(define-public cambalache (define-public cambalache
(package (package
(name "cambalache") (name "cambalache")
(version "0.10.3") (version "0.12.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -3311,7 +3311,7 @@ (define-public cambalache
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1nq9bvly4dm1xnh90z3b4c5455qpdgm3jgz2155vg2ai23f22vsy")))) (base32 "12dhc7mx04cpc9qwcvqiplphh3mar7wy6cbkv208j7pcg5fzkqh0"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
(list (list
@ -3321,6 +3321,7 @@ (define-public cambalache
#:modules '((guix build meson-build-system) #:modules '((guix build meson-build-system)
((guix build python-build-system) #:prefix python:) ((guix build python-build-system) #:prefix python:)
(guix build utils)) (guix build utils))
#:tests? #f ; XXX: tests spawn a socket...
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'patch-source (add-after 'unpack 'patch-source
@ -3331,8 +3332,16 @@ (define-public cambalache
inputs (string-append "bin/" cmd))))))) inputs (string-append "bin/" cmd)))))))
(add-after 'unpack 'patch-build (add-after 'unpack 'patch-build
(lambda _ (lambda _
(substitute* "meson.build"
(("find_program\\('gtk-update-icon-cache'.*\\)") "")
(("find_program\\('update-desktop-database'.*\\)") ""))
(substitute* "postinstall.py" (substitute* "postinstall.py"
(("gtk-update-icon-cache") "true")
(("update-desktop-database") "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)) (add-after 'wrap 'python-wrap (assoc-ref python:%standard-phases 'wrap))
(delete 'check) (delete 'check)
(add-after 'install 'add-install-to-pythonpath (add-after 'install 'add-install-to-pythonpath
@ -3372,18 +3381,26 @@ (define-public cambalache
adwaita-icon-theme hicolor-icon-theme adwaita-icon-theme hicolor-icon-theme
gsettings-desktop-schemas gsettings-desktop-schemas
gtk gtk
gtksourceview-4
`(,gtk+ "bin") ; broadwayd `(,gtk+ "bin") ; broadwayd
`(,gtk "bin") `(,gtk "bin")
libadwaita libadwaita
libhandy libhandy
(librsvg-for-system) (librsvg-for-system)
python python
python-pycairo
python-pygobject python-pygobject
python-lxml python-lxml
webkitgtk-with-libsoup2)) webkitgtk
(native-inputs (list `(,glib "bin") gobject-introspection webkitgtk-next))
gettext-minimal pkg-config (native-inputs
python-pytest xorg-server-for-tests)) (list `(,glib "bin")
gobject-introspection
gettext-minimal
pkg-config
python-pytest
weston
xorg-server-for-tests))
(home-page "https://gitlab.gnome.org/jpu/cambalache") (home-page "https://gitlab.gnome.org/jpu/cambalache")
(synopsis "Rapid application development tool") (synopsis "Rapid application development tool")
(description "Cambalache is a rapid application development (RAD) tool for (description "Cambalache is a rapid application development (RAD) tool for