diff mbox series

[yocto-docs,v2,2/6] poky.yaml.in: replace inkscape dependency by librsvg2-bin

Message ID 20241204-update-doc-deps-v2-2-1d9b4063476f@bootlin.com
State New
Headers show
Series Update the dependencies in poky.yaml.in | expand

Commit Message

Antonin Godard Dec. 4, 2024, 12:23 p.m. UTC 
inkscape used to be a requirement to convert SVG images to PNGs/PDFs,
but we replaced it recently by rsvg-convert.

Reviewed-by: Quentin Schulz <quentin.schulz@cherry.de>
Signed-off-by: Antonin Godard <antonin.godard@bootlin.com>
---
 documentation/poky.yaml.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Quentin Schulz Dec. 6, 2024, 1:56 p.m. UTC | #1 
Hi Antonin,

On 12/4/24 1:23 PM, Antonin Godard wrote:
> inkscape used to be a requirement to convert SVG images to PNGs/PDFs,
> but we replaced it recently by rsvg-convert.
> 
> Reviewed-by: Quentin Schulz <quentin.schulz@cherry.de>
> Signed-off-by: Antonin Godard <antonin.godard@bootlin.com>

I would recommend to order the commits differently.

I believe patch 1/6 and 6/6 can be backported to earlier releases. But 
by having 2/6 modify the same part of the code, it is possible that 6/6 
won't cleanly apply when backporting. If we were to reorder the patches 
and have 6/6 before 2/6, this should not happen.

It's anyway you that would experience the pain of backporting and 
resolving conflicts, if there's any, so up to you :)

Cheers,
Quentin
Antonin Godard Dec. 9, 2024, 5:02 p.m. UTC | #2 
Hi Quentin,

On Fri Dec 6, 2024 at 2:56 PM CET, Quentin Schulz via lists.yoctoproject.org wrote:
> Hi Antonin,
>
> On 12/4/24 1:23 PM, Antonin Godard wrote:
>> inkscape used to be a requirement to convert SVG images to PNGs/PDFs,
>> but we replaced it recently by rsvg-convert.
>> 
>> Reviewed-by: Quentin Schulz <quentin.schulz@cherry.de>
>> Signed-off-by: Antonin Godard <antonin.godard@bootlin.com>
>
> I would recommend to order the commits differently.
>
> I believe patch 1/6 and 6/6 can be backported to earlier releases. But 
> by having 2/6 modify the same part of the code, it is possible that 6/6 
> won't cleanly apply when backporting. If we were to reorder the patches 
> and have 6/6 before 2/6, this should not happen.
>
> It's anyway you that would experience the pain of backporting and 
> resolving conflicts, if there's any, so up to you :)

True, true! Thanks for thinking about this, I'll re-order. :)


Antonin
diff mbox series

Patch

diff --git a/documentation/poky.yaml.in b/documentation/poky.yaml.in
index d03809f557960d10a6b9a2753a65c80937c62e13..94849acf9942c7ebddb2ac7f8aaf5eb9d87e0c5b 100644
--- a/documentation/poky.yaml.in
+++ b/documentation/poky.yaml.in
@@ -62,7 +62,7 @@  UBUNTU_DEBIAN_HOST_PACKAGES_ESSENTIAL: >-
 
 UBUNTU_DEBIAN_HOST_PACKAGES_DOC: >-
   git
-  inkscape
+  librsvg2-bin
   make
   python3-saneyaml
   python3-sphinx-rtd-theme
@@ -119,7 +119,7 @@  FEDORA_HOST_PACKAGES_ESSENTIAL: >-
 
 FEDORA_HOST_PACKAGES_DOC: >-
   git
-  inkscape
+  librsvg2-tools
   make
   python3-pip
   python3-saneyaml
@@ -163,9 +163,9 @@  OPENSUSE_PIP3_HOST_PACKAGES_ESSENTIAL: GitPython
 
 OPENSUSE_HOST_PACKAGES_DOC: >-
   git
-  inkscape
   make
   python3-pip
+  rsvg-convert
   texlive-fncychap
   which
 
@@ -209,7 +209,7 @@  ALMALINUX_HOST_PACKAGES_ESSENTIAL: >-
 
 ALMALINUX_HOST_PACKAGES_DOC: >-
   git
-  inkscape
+  librsvg2-tools
   make
   python3-pip
   texlive-fncychap