[PATCH 0/3] Update Komikku

  • Done
  • quality assurance status badge
Details
2 participants
  • Liliana Marie Prikler
  • Maxim Cournoyer
Owner
unassigned
Submitted by
Liliana Marie Prikler
Severity
normal

Debbugs page

L
L
Liliana Marie Prikler wrote on 31 Mar 07:52 -0700
(address . guix-patches@gnu.org)
cover.1711896729.git.liliana.prikler@gmail.com
With the recent big merges out of the way, I can finally relax and so
some of the smaller ones.

Cheers

Liliana Marie Prikler (3):
gnu: Add python-colorthief.
gnu: blueprint-compiler: Update to 0.12.0.
gnu: komikku: Update to 1.34.2.

gnu/packages/gnome.scm | 28 ++++++++++++++++------------
gnu/packages/python-xyz.scm | 19 +++++++++++++++++++
2 files changed, 35 insertions(+), 12 deletions(-)


base-commit: 0485e3a4a6b33c5efe5367a04ba86f3563afd1e8
--
2.41.0
M
M
Maxim Cournoyer wrote on 31 Mar 17:04 -0700
(name . Liliana Marie Prikler)(address . liliana.prikler@gmail.com)
87cyrax81q.fsf@gmail.com
Hi,

Liliana Marie Prikler <liliana.prikler@gmail.com> writes:

Toggle quote (10 lines)
> With the recent big merges out of the way, I can finally relax and so
> some of the smaller ones.
>
> Cheers
>
> Liliana Marie Prikler (3):
> gnu: Add python-colorthief.
> gnu: blueprint-compiler: Update to 0.12.0.
> gnu: komikku: Update to 1.34.2.

It appears the actual patches haven't made it to the list.

--
Thanks,
Maxim
L
L
Liliana Marie Prikler wrote on 31 Mar 07:48 -0700
[PATCH 1/3] gnu: Add python-colorthief.
(address . 70107@debbugs.gnu.org)
044d88017b0b844348c5e3d1fff3d3cbc0371fb7.1711896729.git.liliana.prikler@gmail.com
* gnu/packages/python-xyz.scm (python-colorthief): New variable.
---
gnu/packages/python-xyz.scm | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)

Toggle diff (32 lines)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index cd10f304c8..ae984c493b 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -1078,6 +1078,25 @@ (define-public python-colorful
as functions or string constants to form colored terminal output.")
(license license:expat)))
+(define-public python-colorthief
+ (package
+ (name "python-colorthief")
+ (version "0.2.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "colorthief" version))
+ (sha256
+ (base32 "08bjsmmkihyksms2vgndslln02rvw56lkxz28d39qrnxbg4v1707"))))
+ (build-system pyproject-build-system)
+ (propagated-inputs (list python-pillow))
+ (home-page "https://github.com/fengsp/color-thief-py")
+ (synopsis "Grab the color palette from an image.")
+ (description
+ "This package provides a module for grabbing the color palette from an
+image.")
+ (license license:bsd-3)))
+
(define-public python-construct-classes
(package
(name "python-construct-classes")
--
2.41.0
L
L
Liliana Marie Prikler wrote on 31 Mar 07:48 -0700
[PATCH 2/3] gnu: blueprint-compiler: Update to 0.12.0.
(address . 70107@debbugs.gnu.org)
55d1171e5191a507233c364dec77205c895d4cb9.1711896729.git.liliana.prikler@gmail.com
* gnu/packages/gnome.scm (blueprint-compiler): Update to 0.12.0.
[arguments]: Remove ‘wrap-gi’ phase, add ‘pre-check’.
[native-inputs]: Add libadwaita and xorg-server-for-tests. Reindent.
---
gnu/packages/gnome.scm | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)

Toggle diff (47 lines)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 42f758f8d8..8cf138b650 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3278,7 +3278,7 @@ (define-public glade3
(define-public blueprint-compiler
(package
(name "blueprint-compiler")
- (version "0.4.0")
+ (version "0.12.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -3288,7 +3288,7 @@ (define-public blueprint-compiler
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
- "0hj7f4xhwjc4x32r3lswwclbw37fw3spy806g4plkmym25hz4ydy"))))
+ "15cm2bksmygf8sifryrawxxblvvw27p4w3m42gvp3jlq50a15xm6"))))
(build-system meson-build-system)
(arguments
(list
@@ -3303,13 +3303,15 @@ (define-public blueprint-compiler
#~(modify-phases %standard-phases
(add-after 'wrap 'wrap-python
(assoc-ref python:%standard-phases 'wrap))
- (add-after 'wrap-python 'wrap-gi
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
- (gi-typelib-path (getenv "GI_TYPELIB_PATH")))
- (wrap-program (string-append out "/bin/blueprint-compiler")
- `("GI_TYPELIB_PATH" ":" suffix (,gi-typelib-path)))))))))
- (native-inputs (list gtk python-pygobject python))
+ (add-before 'check 'pre-check
+ (lambda _
+ (system "Xvfb :1 &")
+ (setenv "DISPLAY" ":1"))))))
+ (native-inputs (list gtk
+ libadwaita
+ python
+ python-pygobject
+ xorg-server-for-tests))
(inputs (list python))
(synopsis "Template markup language")
(description
--
2.41.0
L
L
Liliana Marie Prikler wrote on 31 Mar 07:49 -0700
[PATCH 3/3] gnu: komikku: Update to 1.34.2.
(address . 70107@debbugs.gnu.org)
9b7b812b6c255450e062d9e85a9bf0260328f543.1711896729.git.liliana.prikler@gmail.com
* gnu/packages/gnome.scm (komikku): Update to 1.34.2.
[inputs]: Add python-colorthief.
[native-inputs]: Add blueprint-compiler.
---
gnu/packages/gnome.scm | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)

Toggle diff (42 lines)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 8cf138b650..1263d24219 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -13421,7 +13421,7 @@ (define-public gnome-builder
(define-public komikku
(package
(name "komikku")
- (version "1.17.0")
+ (version "1.34.2")
(source
(origin
(method git-fetch)
@@ -13431,7 +13431,7 @@ (define-public komikku
(file-name (git-file-name name version))
(sha256
(base32
- "0snb6vdgb3l2mw0kr0yb4zjpq46w56rpi554vqn5ks6qwywvs58g"))))
+ "044m3z7h1hi2avx4z6qgjzhgn1fkf1iclxhr4j7pb6flbqvwnxhs"))))
(build-system meson-build-system)
(arguments
(list
@@ -13468,6 +13468,7 @@ (define-public komikku
python-beautifulsoup4
python-brotli
python-cloudscraper
+ python-colorthief
python-dateparser
python-emoji
python-keyring
@@ -13484,7 +13485,8 @@ (define-public komikku
python-unidecode
webkitgtk))
(native-inputs
- (list desktop-file-utils
+ (list blueprint-compiler
+ desktop-file-utils
gettext-minimal
`(,glib "bin")
gobject-introspection
--
2.41.0
M
M
Maxim Cournoyer wrote on 2 Apr 20:43 -0700
Re: [bug#70107] [PATCH 1/3] gnu: Add python-colorthief.
(name . Liliana Marie Prikler)(address . liliana.prikler@gmail.com)
87r0fnun50.fsf@gmail.com
Hello!

Liliana Marie Prikler <liliana.prikler@gmail.com> writes:

Toggle quote (28 lines)
> * gnu/packages/python-xyz.scm (python-colorthief): New variable.
> ---
> gnu/packages/python-xyz.scm | 19 +++++++++++++++++++
> 1 file changed, 19 insertions(+)
>
> diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
> index cd10f304c8..ae984c493b 100644
> --- a/gnu/packages/python-xyz.scm
> +++ b/gnu/packages/python-xyz.scm
> @@ -1078,6 +1078,25 @@ (define-public python-colorful
> as functions or string constants to form colored terminal output.")
> (license license:expat)))
>
> +(define-public python-colorthief
> + (package
> + (name "python-colorthief")
> + (version "0.2.1")
> + (source
> + (origin
> + (method url-fetch)
> + (uri (pypi-uri "colorthief" version))
> + (sha256
> + (base32 "08bjsmmkihyksms2vgndslln02rvw56lkxz28d39qrnxbg4v1707"))))
> + (build-system pyproject-build-system)
> + (propagated-inputs (list python-pillow))
> + (home-page "https://github.com/fengsp/color-thief-py")
> + (synopsis "Grab the color palette from an image.")

There should be no period in the synopsis ('guix lint' is a useful
reminder of that).

Toggle quote (4 lines)
> + (description
> + "This package provides a module for grabbing the color palette from an
> +image.")

I haven't read the upstream description of the package, but if they have
something more to say, I think the description could be a little bit
more descriptive :-).

--
Thanks,
Maxim
M
M
Maxim Cournoyer wrote on 2 Apr 20:45 -0700
Re: [bug#70107] [PATCH 2/3] gnu: blueprint-compiler: Update to 0.12.0.
(name . Liliana Marie Prikler)(address . liliana.prikler@gmail.com)
87msqbun1y.fsf@gmail.com
Hi,

Liliana Marie Prikler <liliana.prikler@gmail.com> writes:

Toggle quote (4 lines)
> * gnu/packages/gnome.scm (blueprint-compiler): Update to 0.12.0.
> [arguments]: Remove ‘wrap-gi’ phase, add ‘pre-check’.
> [native-inputs]: Add libadwaita and xorg-server-for-tests. Reindent.

I suppose the GI wrapping was in order for the test suite to pass only,
rather than being useful at run time?

If so, LGTM.

--
Thanks,
Maxim
M
M
Maxim Cournoyer wrote on 2 Apr 20:45 -0700
Re: [bug#70107] [PATCH 3/3] gnu: komikku: Update to 1.34.2.
(name . Liliana Marie Prikler)(address . liliana.prikler@gmail.com)
87il0zun1h.fsf@gmail.com
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:

Toggle quote (4 lines)
> * gnu/packages/gnome.scm (komikku): Update to 1.34.2.
> [inputs]: Add python-colorthief.
> [native-inputs]: Add blueprint-compiler.

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail>

--
Thanks,
Maxim
L
L
Liliana Marie Prikler wrote on 3 Apr 13:12 -0700
Re: [bug#70107] [PATCH 1/3] gnu: Add python-colorthief.
(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
4c474cb1b63497c264840b399cb3c66e34563fe5.camel@gmail.com
Am Dienstag, dem 02.04.2024 um 23:43 -0400 schrieb Maxim Cournoyer:
Toggle quote (46 lines)
> Hello!
>
> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
>
> > * gnu/packages/python-xyz.scm (python-colorthief): New variable.
> > ---
> >  gnu/packages/python-xyz.scm | 19 +++++++++++++++++++
> >  1 file changed, 19 insertions(+)
> >
> > diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-
> > xyz.scm
> > index cd10f304c8..ae984c493b 100644
> > --- a/gnu/packages/python-xyz.scm
> > +++ b/gnu/packages/python-xyz.scm
> > @@ -1078,6 +1078,25 @@ (define-public python-colorful
> >  as functions or string constants to form colored terminal
> > output.")
> >      (license license:expat)))
> >  
> > +(define-public python-colorthief
> > +  (package
> > +    (name "python-colorthief")
> > +    (version "0.2.1")
> > +    (source
> > +     (origin
> > +       (method url-fetch)
> > +       (uri (pypi-uri "colorthief" version))
> > +       (sha256
> > +        (base32
> > "08bjsmmkihyksms2vgndslln02rvw56lkxz28d39qrnxbg4v1707"))))
> > +    (build-system pyproject-build-system)
> > +    (propagated-inputs (list python-pillow))
> > +    (home-page "https://github.com/fengsp/color-thief-py")
> > +    (synopsis "Grab the color palette from an image.")
>
> There should be no period in the synopsis ('guix lint' is a useful
> reminder of that).
>
> > +    (description
> > +     "This package provides a module for grabbing the color
> > palette from an
> > +image.")
>
> I haven't read the upstream description of the package, but if they
> have something more to say, I think the description could be a little
> bit more descriptive :-).
Well, they don't, but I've locally expanded it to
"This package provides methods to determine the dominant color
of an image, as well as constructing a representative color palette."

WDYT?
M
M
Maxim Cournoyer wrote on 4 Apr 06:11 -0700
(name . Liliana Marie Prikler)(address . liliana.prikler@gmail.com)
87jzldtgr8.fsf@gmail.com
Hi,

Liliana Marie Prikler <liliana.prikler@gmail.com> writes:

Toggle quote (7 lines)
> Am Dienstag, dem 02.04.2024 um 23:43 -0400 schrieb Maxim Cournoyer:
>> Hello!
>>
>> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
>>
>> > * gnu/packages/python-xyz.scm (python-colorthief): New variable.

[...]

Toggle quote (7 lines)
>> I haven't read the upstream description of the package, but if they
>> have something more to say, I think the description could be a little
>> bit more descriptive :-).
> Well, they don't, but I've locally expanded it to
> "This package provides methods to determine the dominant color
> of an image, as well as constructing a representative color palette."

This reads much better to me, thank you! LGTM.

--
Thanks,
Maxim
L
L
Liliana Marie Prikler wrote on 5 Apr 21:46 -0700
Re: [bug#70107] [PATCH 3/3] gnu: komikku: Update to 1.34.2.
(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
86fd892cc88c7293659d1c4e90fa1a15bac24b95.camel@gmail.com
Am Dienstag, dem 02.04.2024 um 23:45 -0400 schrieb Maxim Cournoyer:
Toggle quote (7 lines)
> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
>
> > * gnu/packages/gnome.scm (komikku): Update to 1.34.2.
> > [inputs]: Add python-colorthief.
> > [native-inputs]: Add blueprint-compiler.
>
> Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail>
Fixed up the Reviewed-by: tags and pushed.

Thanks
Closed
M
M
Maxim Cournoyer wrote on 6 Apr 08:51 -0700
(name . Liliana Marie Prikler)(address . liliana.prikler@gmail.com)
87wmpasd55.fsf@gmail.com
Hi,

Liliana Marie Prikler <liliana.prikler@gmail.com> writes:

Toggle quote (10 lines)
> Am Dienstag, dem 02.04.2024 um 23:45 -0400 schrieb Maxim Cournoyer:
>> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
>>
>> > * gnu/packages/gnome.scm (komikku): Update to 1.34.2.
>> > [inputs]: Add python-colorthief.
>> > [native-inputs]: Add blueprint-compiler.
>>
>> Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail>
> Fixed up the Reviewed-by: tags and pushed.

Great. Note that 'b4 shazam <message-id>' can pull the tags for you
automatically, in case that's useful.

--
Thanks,
Maxim
Closed
?
Your comment

This issue is archived.

To comment on this conversation send an email to 70107@patchwise.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 70107
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch