GNU bug report logs - #64120
[PATCH WIP] gnu: cambalache: Update to 0.12.0.

Previous Next

Package: guix-patches;

Reported by: Liliana Marie Prikler <liliana.prikler <at> gmail.com>

Date: Fri, 16 Jun 2023 23:44:02 UTC

Severity: normal

Tags: patch

Done: Liliana Marie Prikler <liliana.prikler <at> gmail.com>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 64120 in the body.
You can then email your comments to 64120 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox

Report forwarded to liliana.prikler <at> gmail.com, maxim.cournoyer <at> gmail.com, rg <at> raghavgururajan.name, guix-patches <at> gnu.org:
bug#64120; Package guix-patches. (Fri, 16 Jun 2023 23:44:02 GMT) Full text and rfc822 format available.
Acknowledgement sent to Liliana Marie Prikler <liliana.prikler <at> gmail.com>:
New bug report received and forwarded. Copy sent to liliana.prikler <at> gmail.com, maxim.cournoyer <at> gmail.com, rg <at> raghavgururajan.name, guix-patches <at> gnu.org. (Fri, 16 Jun 2023 23:44:02 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: guix-patches <at> gnu.org
Subject: [PATCH WIP] gnu: cambalache: Update to 0.12.0.
Date: Sat, 17 Jun 2023 01:38:47 +0200

* 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
Information forwarded to guix-patches <at> gnu.org:
bug#64120; Package guix-patches. (Sat, 17 Jun 2023 00:32:01 GMT) Full text and rfc822 format available.

Message #8 received at 64120 <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Cc: Raghav Gururajan <rg <at> raghavgururajan.name>, 64120 <at> debbugs.gnu.org
Subject: Re: [bug#64120] [PATCH WIP] gnu: cambalache: Update to 0.12.0.
Date: Fri, 16 Jun 2023 20:31:00 -0400

Hello,

Liliana Marie Prikler <liliana.prikler <at> 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
Information forwarded to guix-patches <at> gnu.org:
bug#64120; Package guix-patches. (Sat, 17 Jun 2023 04:44:02 GMT) Full text and rfc822 format available.

Message #11 received at 64120 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Cc: Raghav Gururajan <rg <at> raghavgururajan.name>, 64120 <at> debbugs.gnu.org
Subject: Re: [bug#64120] [PATCH WIP] gnu: cambalache: Update to 0.12.0.
Date: Sat, 17 Jun 2023 06:43:06 +0200

Am Freitag, dem 16.06.2023 um 20:31 -0400 schrieb Maxim Cournoyer:
> Hello,
> 
> Liliana Marie Prikler <liliana.prikler <at> 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
Reply sent to Liliana Marie Prikler <liliana.prikler <at> gmail.com>:
You have taken responsibility. (Sun, 25 Jun 2023 12:47:02 GMT) Full text and rfc822 format available.
Notification sent to Liliana Marie Prikler <liliana.prikler <at> gmail.com>:
bug acknowledged by developer. (Sun, 25 Jun 2023 12:47:02 GMT) Full text and rfc822 format available.

Message #16 received at 64120-done <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Cc: Raghav Gururajan <rg <at> raghavgururajan.name>, 64120-done <at> debbugs.gnu.org
Subject: Re: [bug#64120] [PATCH WIP] gnu: cambalache: Update to 0.12.0.
Date: Sun, 25 Jun 2023 14:46:15 +0200

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
Information forwarded to guix-patches <at> gnu.org:
bug#64120; Package guix-patches. (Mon, 26 Jun 2023 13:33:02 GMT) Full text and rfc822 format available.

Message #19 received at 64120-done <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Cc: Raghav Gururajan <rg <at> raghavgururajan.name>, 64120-done <at> debbugs.gnu.org
Subject: Re: [bug#64120] [PATCH WIP] gnu: cambalache: Update to 0.12.0.
Date: Mon, 26 Jun 2023 09:32:03 -0400

Hi Liliana,

Liliana Marie Prikler <liliana.prikler <at> 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
bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Tue, 25 Jul 2023 11:24:05 GMT) Full text and rfc822 format available.
This bug report was last modified 1 year and 335 days ago.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.