From 8fa4f985d3e188130c5b37570b8e649f5989b938 Mon Sep 17 00:00:00 2001
From: "Salvador E. Tropea" <salvador@inti.gob.ar>
Date: Tue, 16 Aug 2022 09:47:15 -0300
Subject: [PATCH] [Dependencies] Boosted PcbDraw version to 0.9.0.3

- The upstream is currently undergoing a major rewrite and isn't
  usable. It has problems with KiCad 5 and 6.
---
 README.md               |  4 +++-
 kibot/config_reader.py  | 10 ++++++++++
 kibot/dep_downloader.py |  4 +++-
 src/kibot-check         | 10 +++++++---
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index d596da0e..d8f94ce0 100644
--- a/README.md
+++ b/README.md
@@ -129,9 +129,10 @@ Notes:
 - Mandatory for `kicost`
 - Optional to find components costs and specs for `bom`
 
-[**PcbDraw**](https://github.com/INTI-CMNB/pcbdraw) v0.9.0 [![Tool](https://raw.githubusercontent.com/INTI-CMNB/KiBot/master/docs/images/llave-inglesa-22x22.png)](https://github.com/INTI-CMNB/pcbdraw) ![Auto-download](https://raw.githubusercontent.com/INTI-CMNB/KiBot/master/docs/images/auto_download-22x22.png)
+[**PcbDraw**](https://github.com/INTI-CMNB/pcbdraw) v0.9.0.3 [![Tool](https://raw.githubusercontent.com/INTI-CMNB/KiBot/master/docs/images/llave-inglesa-22x22.png)](https://github.com/INTI-CMNB/pcbdraw) ![Auto-download](https://raw.githubusercontent.com/INTI-CMNB/KiBot/master/docs/images/auto_download-22x22.png)
 - Mandatory for `pcbdraw`
 - Optional to create realistic solder masks for `pcb_print`
+- Note: Currently the upstream version is broken, please use the mentioned fork
 
 [**Interactive HTML BoM**](https://github.com/INTI-CMNB/InteractiveHtmlBom) v2.4.1.4 [![Tool](https://raw.githubusercontent.com/INTI-CMNB/KiBot/master/docs/images/llave-inglesa-22x22.png)](https://github.com/INTI-CMNB/InteractiveHtmlBom) ![Auto-download](https://raw.githubusercontent.com/INTI-CMNB/KiBot/master/docs/images/auto_download-22x22.png)
 - Mandatory for `ibom`
@@ -175,6 +176,7 @@ Notes:
 
 [**Pandoc**](https://pandoc.org/) [![Tool](https://raw.githubusercontent.com/INTI-CMNB/KiBot/master/docs/images/llave-inglesa-22x22.png)](https://pandoc.org/) [![Debian](https://raw.githubusercontent.com/INTI-CMNB/KiBot/master/docs/images/debian-openlogo-22x22.png)](https://packages.debian.org/bullseye/pandoc)
 - Optional to create PDF/ODF/DOCX files for `report`
+- Note: In CI/CD environments: the `kicad_auto_test` docker image contains it.
 
 [**RAR**](https://www.rarlab.com/) [![Tool](https://raw.githubusercontent.com/INTI-CMNB/KiBot/master/docs/images/llave-inglesa-22x22.png)](https://www.rarlab.com/) [![Debian](https://raw.githubusercontent.com/INTI-CMNB/KiBot/master/docs/images/debian-openlogo-22x22.png)](https://packages.debian.org/bullseye/rar) ![Auto-download](https://raw.githubusercontent.com/INTI-CMNB/KiBot/master/docs/images/auto_download-22x22.png)
 - Optional to compress in RAR format for `compress`
diff --git a/kibot/config_reader.py b/kibot/config_reader.py
index 54bcbc0a..e4355218 100644
--- a/kibot/config_reader.py
+++ b/kibot/config_reader.py
@@ -804,6 +804,15 @@ class MyEncoder(json.JSONEncoder):
         return o.__dict__
 
 
+def print_dep_comments(dep):
+    if len(dep.comments) == 1:
+        print('- Note: '+dep.comments[0])
+    elif len(dep.comments) > 1:
+        print('- Notes:')
+        for comment in dep.comments:
+            print('  - '+comment)
+
+
 def print_dependencies(markdown=True, jsn=False):
     # Compute the importance of each dependency
     for dep in RegDependency.get_registered().values():
@@ -875,4 +884,5 @@ def print_dependencies(markdown=True, jsn=False):
                     if o.version:
                         ver = ' (v'+'.'.join(map(str, o.version))+')'
                     print('  - {} for {}{}'.format(o.desc, global2human(o.output), ver))
+        print_dep_comments(dep)
         print()
diff --git a/kibot/dep_downloader.py b/kibot/dep_downloader.py
index 4dd6cd82..05e6a844 100644
--- a/kibot/dep_downloader.py
+++ b/kibot/dep_downloader.py
@@ -50,10 +50,12 @@ Dependencies:
     debian: imagemagick
   - name: PcbDraw
     # 0.9.0 implements KiCad 6 support
-    version: 0.9.0
+    # 0.9.0.3 Fixes KiCad 5 problems
+    version: 0.9.0.3
     github: INTI-CMNB/pcbdraw
     pypi: PcbDraw
     downloader: pytool
+    comments: 'Currently the upstream version is broken, please use the mentioned fork'
   - name: KiCost
     github: hildogjr/KiCost
     pypi: KiCost
diff --git a/src/kibot-check b/src/kibot-check
index 15ee682c..e9cff57b 100755
--- a/src/kibot-check
+++ b/src/kibot-check
@@ -489,7 +489,9 @@ deps = '{\
     },\
     "PcbDraw": {\
         "command": "pcbdraw",\
-        "comments": [],\
+        "comments": [\
+            "Currently the upstream version is broken, please use the mentioned fork"\
+        ],\
         "deb_package": "pcbdraw",\
         "downloader": {},\
         "downloader_str": "pytool",\
@@ -513,7 +515,8 @@ deps = '{\
                 "version": [\
                     0,\
                     9,\
-                    0\
+                    0,\
+                    3\
                 ]\
             },\
             {\
@@ -523,7 +526,8 @@ deps = '{\
                 "version": [\
                     0,\
                     9,\
-                    0\
+                    0,\
+                    3\
                 ]\
             }\
         ],\