[Fix] To support older rsvg-convert tools

set-soft · set-soft · commit cbdfc8c0f69d · 2025-08-11T13:57:34.000-03:00
We have a 2.26.3 as downloadable fallback, so now we catch errors about
unsupported --unlimited and retry without it.
diff --git a/docs/source/dependencies.rst b/docs/source/dependencies.rst
@@ -89,17 +89,17 @@
    -  Find commit hash and/or date for `sch_replace`
    -  Find commit hash and/or date for `set_text_variables`
 
-`RSVG tools <https://gitlab.gnome.org/GNOME/librsvg>`__ :index:`: <pair: dependency; RSVG tools>`  v2.40.3 |image37| |image38| |Auto-download|
+`RSVG tools <https://gitlab.gnome.org/GNOME/librsvg>`__ :index:`: <pair: dependency; RSVG tools>`  |image37| |image38| |Auto-download|
 
 -  Optional to:
 
-   -  SVG logos for the BoM for `bom` (v2.40.3)
-   -  Create outputs preview for `navigate_results` (v2.40.3)
-   -  Create PNG icons for `navigate_results` (v2.40.3)
-   -  Create outputs preview for `navigate_results_rb` (v2.40.3)
-   -  Create PNG icons for `navigate_results_rb` (v2.40.3)
-   -  Create PDF, PNG, PS and EPS formats for `pcb_print` (v2.40.3)
-   -  Create PNG, JPG and BMP images for `pcbdraw` (v2.40.3)
+   -  SVG logos for the BoM for `bom`
+   -  Create outputs preview for `navigate_results`
+   -  Create PNG icons for `navigate_results`
+   -  Create outputs preview for `navigate_results_rb`
+   -  Create PNG icons for `navigate_results_rb`
+   -  Create PDF, PNG, PS and EPS formats for `pcb_print`
+   -  Create PNG, JPG and BMP images for `pcbdraw`
 
 `ImageMagick <https://imagemagick.org/>`__ :index:`: <pair: dependency; ImageMagick>`  |image39| |image40| |Auto-download|
 
diff --git a/kibot/dep_downloader.py b/kibot/dep_downloader.py
@@ -40,7 +40,6 @@
     arch: librsvg
     command: rsvg-convert
     downloader: rsvg
-    version: 2.40.3
     id: RSVG
     tests:
       - command: [convert, -list, font]
diff --git a/kibot/out_any_navigate_results.py b/kibot/out_any_navigate_results.py
@@ -105,6 +105,9 @@ def _run_command(cmd):
         cmd_output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
     except subprocess.CalledProcessError as e:
         odecoded = e.output.decode() if e.output else None
+        if '--unlimited' in odecoded:
+            cmd.remove('--unlimited')
+            return _run_command(cmd)
         if odecoded:
             logger.debug('Output from command: '+odecoded)
         logger.non_critical_error(f'Failed to run {cmd[0]}, error {e.returncode}')
diff --git a/kibot/out_pcb_print.py b/kibot/out_pcb_print.py
@@ -38,6 +38,7 @@
 import importlib
 from pcbnew import B_Cu, B_Mask, F_Cu, F_Mask, FromMM, IsCopperLayer, LSET, PLOT_CONTROLLER, PLOT_FORMAT_SVG
 from shutil import rmtree, copy2
+from subprocess import CalledProcessError
 import sys
 from .error import KiPlotConfigurationError
 from .fil_base import BaseFilter, apply_exclude_filter
@@ -93,7 +94,13 @@ def pcbdraw_warnings(tag, msg):
 
 
 def _run_command(cmd):
-    run_command(cmd, err_lvl=PDF_PCB_PRINT)
+    try:
+        run_command(cmd, err_lvl=PDF_PCB_PRINT, just_raise=True)
+    except CalledProcessError as e:
+        output = e.stdout or e.stderr
+        if '--unlimited' in output.decode():
+            cmd.remove('--unlimited')
+            return run_command(cmd, err_lvl=PDF_PCB_PRINT)
 
 
 def hex_to_rgb(value):
diff --git a/kibot/out_pcbdraw.py b/kibot/out_pcbdraw.py
@@ -22,6 +22,7 @@
 if PROFILE_PLOT:
     import cProfile
 import os
+from subprocess import CalledProcessError
 # Here we import the whole module to make monkeypatch work
 from .error import KiPlotConfigurationError
 from .kiplot import load_sch, get_board_comps_data, run_command
@@ -46,7 +47,13 @@ def pcbdraw_warnings(tag, msg):
 
 
 def _run_command(cmd):
-    run_command(cmd, err_lvl=PCBDRAW_ERR)
+    try:
+        run_command(cmd, err_lvl=PCBDRAW_ERR, just_raise=True)
+    except CalledProcessError as e:
+        output = e.stdout or e.stderr
+        if '--unlimited' in output.decode():
+            cmd.remove('--unlimited')
+            return run_command(cmd, err_lvl=PCBDRAW_ERR)
 
 
 class PcbDrawStyle(Optionable):
diff --git a/src/kibot-check b/src/kibot-check
@@ -1211,83 +1211,55 @@ deps = '{\
                 "mandatory": false,\
                 "max_version": null,\
                 "output": "bom",\
-                "version": [\
-                    2,\
-                    40,\
-                    3\
-                ]\
+                "version": null\
             },\
             {\
                 "all_versions": {},\
                 "desc": "Create outputs preview",\
                 "mandatory": false,\
                 "max_version": null,\
                 "output": "navigate_results",\
-                "version": [\
-                    2,\
-                    40,\
-                    3\
-                ]\
+                "version": null\
             },\
             {\
                 "all_versions": {},\
                 "desc": "Create PNG icons",\
                 "mandatory": false,\
                 "max_version": null,\
                 "output": "navigate_results",\
-                "version": [\
-                    2,\
-                    40,\
-                    3\
-                ]\
+                "version": null\
             },\
             {\
                 "all_versions": {},\
                 "desc": "Create outputs preview",\
                 "mandatory": false,\
                 "max_version": null,\
                 "output": "navigate_results_rb",\
-                "version": [\
-                    2,\
-                    40,\
-                    3\
-                ]\
+                "version": null\
             },\
             {\
                 "all_versions": {},\
                 "desc": "Create PNG icons",\
                 "mandatory": false,\
                 "max_version": null,\
                 "output": "navigate_results_rb",\
-                "version": [\
-                    2,\
-                    40,\
-                    3\
-                ]\
+                "version": null\
             },\
             {\
                 "all_versions": {},\
                 "desc": "Create PDF, PNG, PS and EPS formats",\
                 "mandatory": false,\
                 "max_version": null,\
                 "output": "pcb_print",\
-                "version": [\
-                    2,\
-                    40,\
-                    3\
-                ]\
+                "version": null\
             },\
             {\
                 "all_versions": {},\
                 "desc": "Create PNG, JPG and BMP images",\
                 "mandatory": false,\
                 "max_version": null,\
                 "output": "pcbdraw",\
-                "version": [\
-                    2,\
-                    40,\
-                    3\
-                ]\
+                "version": null\
             }\
         ],\
         "tests": [\
