* [bug#64120] [PATCH WIP] gnu: cambalache: Update to 0.12.0.
@ 2023-06-16 23:38 Liliana Marie Prikler
2023-06-17 0:31 ` Maxim Cournoyer
0 siblings, 1 reply; 5+ messages in thread
From: Liliana Marie Prikler @ 2023-06-16 23:38 UTC (permalink / raw)
To: 64120; +Cc: Liliana Marie Prikler, Maxim Cournoyer, Raghav Gururajan
* 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
^ permalink raw reply related [flat|nested] 5+ messages in thread* [bug#64120] [PATCH WIP] gnu: cambalache: Update to 0.12.0.
2023-06-16 23:38 [bug#64120] [PATCH WIP] gnu: cambalache: Update to 0.12.0 Liliana Marie Prikler
@ 2023-06-17 0:31 ` Maxim Cournoyer
2023-06-17 4:43 ` Liliana Marie Prikler
0 siblings, 1 reply; 5+ messages in thread
From: Maxim Cournoyer @ 2023-06-17 0:31 UTC (permalink / raw)
To: Liliana Marie Prikler; +Cc: Raghav Gururajan, 64120
Hello,
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> * 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.
Just with webkitgtk-next, no?
> [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
Nitpick: what is 'fake' here? I'd just call the phase 'patch-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))
>
Maybe re-indent as
(native-inputs
(list one
two
...))
The rest LGTM!
--
Thanks,
Maxim
^ permalink raw reply [flat|nested] 5+ messages in thread* [bug#64120] [PATCH WIP] gnu: cambalache: Update to 0.12.0.
2023-06-17 0:31 ` Maxim Cournoyer
@ 2023-06-17 4:43 ` Liliana Marie Prikler
2023-06-25 12:46 ` bug#64120: " Liliana Marie Prikler
0 siblings, 1 reply; 5+ messages in thread
From: Liliana Marie Prikler @ 2023-06-17 4:43 UTC (permalink / raw)
To: Maxim Cournoyer; +Cc: Raghav Gururajan, 64120
Am Freitag, dem 16.06.2023 um 20:31 -0400 schrieb Maxim Cournoyer:
> Hello,
>
> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
>
> > * 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.
>
> Just with webkitgtk-next, no?
No, it actually needs both.
> > [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
>
> Nitpick: what is 'fake' here? I'd just call the phase 'patch-cc'.
'Fake', because cc doesn't exist as a binary. 'patch-cc' follows the
'patch-given-input-file' pattern, which I don't want to imply is
happening here.
> > + (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))
> >
>
> Maybe re-indent as
>
> (native-inputs
> (list one
> two
> ...))
Sure.
Cheers
^ permalink raw reply [flat|nested] 5+ messages in thread* bug#64120: [PATCH WIP] gnu: cambalache: Update to 0.12.0.
2023-06-17 4:43 ` Liliana Marie Prikler
@ 2023-06-25 12:46 ` Liliana Marie Prikler
2023-06-26 13:32 ` [bug#64120] " Maxim Cournoyer
0 siblings, 1 reply; 5+ messages in thread
From: Liliana Marie Prikler @ 2023-06-25 12:46 UTC (permalink / raw)
To: Maxim Cournoyer; +Cc: Raghav Gururajan, 64120-done
Am Samstag, dem 17.06.2023 um 06:43 +0200 schrieb Liliana Marie
Prikler:
> > Nitpick: what is 'fake' here? I'd just call the phase 'patch-cc'.
> 'Fake', because cc doesn't exist as a binary. 'patch-cc' follows the
> 'patch-given-input-file' pattern, which I don't want to imply is
> happening here.
I pushed the patch with 'fake' now. For bikeshedding purposes, please
just change the name of the phase :)
Cheers
^ permalink raw reply [flat|nested] 5+ messages in thread
* [bug#64120] [PATCH WIP] gnu: cambalache: Update to 0.12.0.
2023-06-25 12:46 ` bug#64120: " Liliana Marie Prikler
@ 2023-06-26 13:32 ` Maxim Cournoyer
0 siblings, 0 replies; 5+ messages in thread
From: Maxim Cournoyer @ 2023-06-26 13:32 UTC (permalink / raw)
To: Liliana Marie Prikler; +Cc: Raghav Gururajan, 64120-done
Hi Liliana,
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> Am Samstag, dem 17.06.2023 um 06:43 +0200 schrieb Liliana Marie
> Prikler:
>> > Nitpick: what is 'fake' here? I'd just call the phase 'patch-cc'.
>> 'Fake', because cc doesn't exist as a binary. 'patch-cc' follows the
>> 'patch-given-input-file' pattern, which I don't want to imply is
>> happening here.
> I pushed the patch with 'fake' now. For bikeshedding purposes, please
> just change the name of the phase :)
It's fine, thank you!
--
Thanks,
Maxim
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-06-26 13:33 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-16 23:38 [bug#64120] [PATCH WIP] gnu: cambalache: Update to 0.12.0 Liliana Marie Prikler
2023-06-17 0:31 ` 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
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).