From 3d8bdca298f6e284d45288728fe46156a1adb738 Mon Sep 17 00:00:00 2001
From: kumattau <kumattau@gmail.com>
Date: Thu, 21 Oct 2021 00:30:05 +0900
Subject: [PATCH] Fix the conflict of family name between Material Design Icons
 5.x and 6.x

python fontname.py "Material Design Icons 5.9.55" materialdesignicons5-webfont.ttf
https://github.com/chrissimpkins/fontname.py/blob/v2.0.0/fontname.py
---
 qtawesome/__init__.py                         |   4 ++--
 ...materialdesignicons5-webfont-charmap.json} |   0
 ...t.ttf => materialdesignicons5-webfont.ttf} | Bin 1026176 -> 1026284 bytes
 qtawesome/iconic_font.py                      |   2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename qtawesome/fonts/{materialdesignicons-webfont-charmap.json => materialdesignicons5-webfont-charmap.json} (100%)
 rename qtawesome/fonts/{materialdesignicons-webfont.ttf => materialdesignicons5-webfont.ttf} (99%)

diff --git a/qtawesome/__init__.py b/qtawesome/__init__.py
index 11b57d06..c17fc951 100644
--- a/qtawesome/__init__.py
+++ b/qtawesome/__init__.py
@@ -73,8 +73,8 @@ def _instance():
              'fontawesome5-brands-webfont.ttf',
              'fontawesome5-brands-webfont-charmap.json'),
             ('ei', 'elusiveicons-webfont.ttf', 'elusiveicons-webfont-charmap.json'),
-            ('mdi', 'materialdesignicons-webfont.ttf',
-             'materialdesignicons-webfont-charmap.json'),
+            ('mdi', 'materialdesignicons5-webfont.ttf',
+             'materialdesignicons5-webfont-charmap.json'),
             ('mdi6', 'materialdesignicons6-webfont.ttf',
              'materialdesignicons6-webfont-charmap.json'),
             ('ph', 'phosphor.ttf', 'phosphor-charmap.json'),
diff --git a/qtawesome/fonts/materialdesignicons-webfont-charmap.json b/qtawesome/fonts/materialdesignicons5-webfont-charmap.json
similarity index 100%
rename from qtawesome/fonts/materialdesignicons-webfont-charmap.json
rename to qtawesome/fonts/materialdesignicons5-webfont-charmap.json
diff --git a/qtawesome/fonts/materialdesignicons-webfont.ttf b/qtawesome/fonts/materialdesignicons5-webfont.ttf
similarity index 99%
rename from qtawesome/fonts/materialdesignicons-webfont.ttf
rename to qtawesome/fonts/materialdesignicons5-webfont.ttf
index 55456295b3f19915380fa8d5c4c99db2b034bbc9..4e2dd13168060de9ccb17f4a36cb8e72778bfdb6 100644
GIT binary patch
delta 656
zcmY+9PiPZS5Ql%Wn?G$fc`HaYU@R-PBGpEeZrP&tARZJeg&KOXs7tygk=-ODsZ@|u
z(9oV@rE2QIyC8y)LlHs{MDgIkQk7oBOFanUse%_>C;9|?_;}y^-poASjn&bwtD}oO
zbNZuY0IBhFhmMRl&#wVwaXp##?4sIij{z5^LGfzFy>|KMv!nf>wHBh*X4bK%Ten{D
zJzC6gmV=<T^9=hY)0g!sv)KXvJ?~otrrx=Qv|W4BegnF?!S%Xl&lck@)h=;EoCl1&
z?K!@BB@7XL3aIg7p<Jo1Z`_8^UxSw4g1C$Mwov|ZQ9t$_n!*8az5n6!&iV1)XU+Hh
zw)&V}a@hst&jjwY_Ae!<_hy~u>(oJER3^X#nGh3Zx|nVz!e~sCiLKO0)U>$-Z|uAe
z-Wo<ix{4m`l^#GJEa^dLn35jC9%Q6PZ~zO^HEc%{Dk#v+iG^3v6$t#2u3~_q9Zzvn
z0H<hJUIej&s?tL^L3gD`Fi9VzYuKk8JZo2+QqFdblTJC8$s4EBg?!mClOsvfY<!A|
z!@4Yt2`4k-+NH)eA$rB%hQWVXQixp4fQckV7!zjWz7Xl%TOt^kfWv>CfeRa@#t$Km
Y@A_{BgIgQshjg(rr0Zi3mMlvB2D-M4MF0Q*

delta 553
zcmY+7KS&#47{;IX?h<Rxd?%D>29X=ANQBfll!J;mh)^_0Tgg&sIpb*}cS-Of+C?iO
zSp>BXQAZ~S3k3%&h&Txahe{QsE+US)>FA$V{2cni4}RbCJ>U0U9=3lwY+r~>fh+)h
zy&qq<_HKUq3(y>&Q)$mGsGGYzz~^6}=;W~bb?A2c?JLkxHL9%ZjAIWD{O*|M?iuqY
z!$H8S?PlL$8ZusSA``nm=Kn5${v$V^wr79r9)QMqU;l|`PZXjq%{Fl%$`8z(?K!T0
zehLxR0A-_)_luJ!7xNItPtfw8#p@;$1nghw_g{>*8|Vr@`+pYCqDysDUtV1|KFnBD
zvgi?oQ5lU1FhQn*dBIdNAx3AanDCZGqNGnn_+wtiqo4v2=_*^Dbd5bBJpdhD(t~)3
z_tHaX#-Mba^LeNst&)=%)}$*CIFPP#{_oL~T+$FDO<n|0LviUrG*YMZ5K=TEUFUo+
zX&0T*tnHeej-MUQneWp1oL~MP7K!?lGwNsaIWrM&d2T(Go;r77ku8r2F;Kn{qOFuP
L#8%QUx>p_mzTI^i

diff --git a/qtawesome/iconic_font.py b/qtawesome/iconic_font.py
index 28282a2b..b0507ded 100644
--- a/qtawesome/iconic_font.py
+++ b/qtawesome/iconic_font.py
@@ -37,7 +37,7 @@
     'fontawesome5-solid-webfont.ttf': 'acf50f59802f20d8b45220eaae532a1c',
     'fontawesome5-brands-webfont.ttf': 'ed2b8bf117160466ba6220a8f1da54a4',
     'elusiveicons-webfont.ttf': '207966b04c032d5b873fd595a211582e',
-    'materialdesignicons-webfont.ttf': '174c02fc4609e8fc4389f5d21f16a296',
+    'materialdesignicons5-webfont.ttf': 'b7d40e7ef80c1d4af6d94902af66e524',
     'materialdesignicons6-webfont.ttf': '9a2f455e7cbce011368aee95d292613b',
     'phosphor.ttf': '5b8dc57388b2d86243566b996cc3a789',
     'remixicon.ttf': '888e61f04316f10bddfff7bee10c6dd0',