From 9f52dce8ab212bfad93bb0c4073405c5818fd575 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Tue, 18 Jan 2022 16:26:36 +0200
Subject: [PATCH 48/48] hawaii.svg: Update to inkscape 1.1.1 format

See osdn #43653

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 data/flags/hawaii-large.png        | Bin 1198 -> 1018 bytes
 data/flags/hawaii-shield-large.png | Bin 776 -> 643 bytes
 data/flags/hawaii-shield.png       | Bin 513 -> 493 bytes
 data/flags/hawaii.png              | Bin 864 -> 770 bytes
 data/flags/hawaii.svg              |  43 +++++++++++++++++------------
 5 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/data/flags/hawaii-large.png b/data/flags/hawaii-large.png
index 4e8dc714b9b4f5dadf74fa3537527696837d7100..3e628371d428cb095c6a2a39da9234dd4aec1c59 100644
GIT binary patch
delta 926
zcmZ3-`HOvmWIZzj14F_Ko~b~JCEd~2k%3`jKlh(RRv=#?*(1o8fuTx`fuW&=f#DZW
zsNn?zL#Y7+!>a@a2CEqi4B`cIb_LonFfe8Z_=LCu72HoM`u*nJ-AC^nqUSNF)OsW>
zdR*3gUPSv@+a%MV8E*0OZ%tfy&D8VBn(hDp|Gz$EN&Pi*@AsQ`{r&r|ckWS6ohCkm
zmIYI`-wsH8m{axV!>6-Xp7!-_xf`AH`|UgXsJV6#v#<5d|FCt>?>~P#W*(BT?6eA-
zeQoyY>y|z<m!A&ESY{hJXF|vN+d(P6-@d<k`xU=-{qxSLAvr6eidJu4arjYw?YocP
zUR=KOFt6sr_I>MjUyH0SSRIkJ@XeytxBV0DMrJ;qzviN{#q0SiZ~MjHjmUg7Z)JG?
z%Gi>%8~0rQ_wV2P_1hm6HN3g~_|5xoZ<lX)RNB0G{mGc(H36B+EJJ7AxcB<^>$mq4
z3-5+!%%8sN{l*=aX09>`oWY^fR6lXwpFe+ZOjzKSu<+s255Hc%z89N&FR`$%uYTLj
zdvE@{|9CqjZTf_*T)IvChOKi}ojo&k#fQziZ%$q87&Fg3ap9w9AAUV~ek-x)tcdnG
zaow{bI>lj~z7_(jfg#SA<n8XlFR_c^CXmBf;1O92q%VUo<CR<QegYZnC7!;n?9Uj5
z_$1{PXvDq(3JD}9`jr9cka{3t0mNXy|3;z_XrPp*i(`nz>Er|jP6H#u%^R2)rLEc3
z#XAn3J$(9jKQDtQHwPDIcgG>o?oMwHFVDw8I$Fx7HID1>hpt(0V)c?Wi@LlGwO7yD
z)iz<nGO>V-+xqkt&$AO>-Kc2B5R#LUl9H3O>PS9YNKRg&W=?%-Zc57GMxdd$4>icP
z+xEO{@HR9{be|-$If>cfsGq@uGY^@PcRdPv^X%EPcMo4aearl1f&Tva^$rVWM+@j3
zU9;w(;=;s-f(sTTU;NT@rK2mYxAQ2Q!^A~G;wPogGxbhsIkM!*l#n?SCrx`dcj8Re
z{&#O={(1Dq#B_aT`OF<4WD%4YSjee&bg4l=SQuOKw8=u}WI_UC98DP7jW;$d>-yQr
zW)hm?VX`2TXVQ`xEDQ{@`OEIuN_6W_KEQ0`V`QXjV5n<o5n^a!Wn^k)Y@lsmU}a#C
y^SpHdFhEsHTq8<S5=&C8a`RI%(<&K^3~*?W-DN8?*^Whnlfl!~&t;ucLK6VaO`{zE

delta 1107
zcmV-Z1g!h|2d)W_8Gi-<0037u{HFi_00v@9M??Ss00000`9r&Z00009a7bBm0002P
z0002P0iDkNGXMYp33hNnX8-^IQ~&?~H~^JWOA`P916N5zK~z}7?U-vwlvx<ZfA93_
znCVm?Q5L(AU67J8?Ka_1YSxZr<%eiD*UNMR2g~eAbRjpy?0>Qm+Li1=F*YTY+wNLR
zR90q;mRdq#H;pK|OgDALv7L8649?<*wBUV-7y5rZJm=4k=RD^;JVyW|R3s7Lu_=oI
zdFy!6B$2k}G}kH{Is{EK3}Juo$GkaWrSHmgX4`zIsD9cZCT?N~`6JzYvKG^OZ5DlJ
zM9U5<2m%@aXMbcQ_3^(FR9nfF<0f{jokn**pD!{A?4jlGGCc(!%FsS~$k0*?&qG2L
z%diF@V$TCE&og7UoS|{i3NmJfQeBdce)JEWZjRLtqB13zamNbiV@{?2&TR55x0#xD
zR54%?pvBQf`mP%o#ze9&Tuc2=N%UKv$yLjIem_)BnSZTgiFEf9Da_Opb@3#=PlD-R
zYT^D%2dQ%oV5@zG&R5_?-fl&J1wfjcY4t8>eY%k}A(&y;O3}qc(bE`%{hfp6&0D=S
zEG8In>_1G;>9GV%n#j3J_c>KsN82a2=h$4WthDCJ4jcZu&IA1F(1|XC-xmK#b43-p
zDF$?LlYcsmZI$5Fs%+(eZwC#R)mRf4fcs;UBEX{TuI=W%66H5-2Oh9>Lzl5%QxZ-I
z$hoUXB1C|U8o|4u_36gX)5D018qE8%=V>app<S4U-`#sOS5)CYY6N0p0=;y8*o)56
zQd39uxG7k#H+nCf%k{4!uwLMzb9VqRj2TE_?td(P^oIsh7VcITe~pdjpY3Jj2mHS&
z(QILkaRiI!CV<;bNbV+9EihsF+m5aF8CqYFjTw_=huyUFH_xT>56dQJc`Qqk$Me4A
z0?%`HAtldaVOb01w;Dg&nq%~XIG8hwV2z8X%Qm73>_Ks8G+R#G;pNTMvI7f(;K^{!
zAAe>B1_(6FUyj@9<kBx@R_v|9;cV;F;9~hB!r}|qwq`1eiuPbHI)icNZlcptWQT2+
z1|X=$M!hi!XGA0^QUvDwiY{T>^|85?#p_FmOFcr9VKReH7ZO-`Q!!vg-eIK_{<_YS
zVKqs0z#_o0=;UwB@ny2E_5g3cC4b*nN-nA^3Dp4$fFw!k7@WOBsG6iYU=dJkU{pfi
zTeH$q9k77PJ_G*)_#ZbmD&ey=lS>0KOffMnFfuJLHdHY=IyE&qG&C(RI65#eq<A@*
z0000bbVXQnWMOn=I&E)cX=Zr<GB7bQEif`IFg8>%IXX2pIy5vbFgQ9eFx4f2C6mbm
zC`dDOMObuHX>@F507GnPaA9(EAYyqSQg31)L1bZVb094sRc>i?Wn>^zbYXO5b094s
ZNMUzjX=yj+X{-PM002ovPDHLkV1m#t?Oy-@

diff --git a/data/flags/hawaii-shield-large.png b/data/flags/hawaii-shield-large.png
index eeda5ca98031a36b5a8b571034fd3824f266182d..3451d4e8c723a4c81d71cc77e14e924c96fddecd 100644
GIT binary patch
delta 573
zcmeBRYi6Aw$-&IPz~I_<?B7I1;fanq^@js|LR|kd{0E9MsMJ2F>$x46r0G6M$hd7&
z-Rvi|T?cnx{Qv(ylUiM9;@sP{z3(^en!fDRgayaWUwi(rzGwHm?N95vAK!SKT)9EZ
zV^Xb6)>T8-M@0=c9D=XtIPOYqJTIcXBC^`Xd%}lpdmop#-13U~@#Mw(eMir)+Ph)-
z;gIC|`GGOBeAAYkI&=Sd&-7!}lT;jf!}3?mUwe*4y}qh<_xls)@8;L9U%0O@v~zF6
ztb@fpHA#~?i{|cKefU`Y^yi&ZdjhNNqvrm6^hB`g>SCZD7)yfuf*Bm1-ADs*lDyqr
zxH2w$2?KIC3p^r=85p<)L71^VC4M4Mu%5ld)7O>#8KV%Nr2KXL+!~<RY)==*5Q)pF
z7p@B(QV?iORJf7!UdnXi@q0((?)_gGbI3~Xarx0d;xcT<{u}DaND6;+F?y<$k(n_w
zM=xGsZN#LfUR%TRO$1HWU;VbFuYW;pzoWS0>#yvGFIw=ZGda$-Dl&`L34hIdXnRii
z@A|_N->ka)bJ3NrW%UZ19{w+rtiPpjuyxyty*axK-vtFG{qdcd=9}Df!uQ&L&l&t?
zcKp`z2E7wEGy>hJTH+c}l9E`GYL#4+3Zxi}42+C)4GeV+EkX=Utc*;pj19F746F<c
mPEF_&LD7(#pOTqY3DlsDL&xs3W-EX?7(8A5T-G@yGywponfQGG

delta 705
zcmZo>?O>ZA$-&0Jz)%!mc4nfYFc)KSkh>GZx^prwCmQP4vn6@Ey8vZ@;HUHMdLYGF
z;1OBOz`!j4!i;N`_m+YL%L*LRfwV9ff2{9W$H2h&!qdeu#NzbYEB+pn3uTUf{2pGm
zf<t`KYK}_|Ws)<i`K*s5@bWlm1{^%o@#4b5*$Gz^d0ck6w0H111;{BGXy{)&s!`7+
zSo9)Tnm;F}J8HB250O@XJFUs_?YaD2zf88ie|h}#?@y0D|NbXe$E5KuxRN2`je7aD
z(~IUkc+%wdsoAr)T>WrvX$I?LpDj~8yeDg`D7pH$gyojB@*72b7L8xg=)Ql}2Kz`C
zEf2MZSvB+1|G(hizFhd}?(>h!mqom@^ZnmkFOh%$>B}uaUv6ZEYb@v&-57J9;d5{y
z*Jk?_c7m~&XKZQNrLMd#;(|%nj5z6nTpxM+qjPueU1$6Fd{wux^_LHN#p~5JJZAg)
zJwJK*rj&irH8J-Xx#aerF_JqSX14j7u`|z4U9qn$d-sX0i{}ddpVsqc&DouuOt&5~
zZ;}1H+ey6MYHQM_=NlzIR5PA<R#&toeTKI9;h5a-ACvxRRuvn|$~u<!T&lme{H<DS
zXzy}EhwJ$d&(Dk1@%1Zy@2%_Z6!=Y*ci&x~u(C7tu@0)DCcG{S1zhfC?cbLA;?oOW
z5igr_?JifhUABx+xw0YkN$D~Z<IpM-mO!uEe~f~HB3@yt^~@2!Y&Ne=wmNz0rCIT2
z$IAslYY(1EsN5?jW5S!hS13ySHpe}Vh{$?I#kU(T?bUUR1||U264!{5l*E!$tK_0o
zAjM#0U}&goV5Dnc7Gh{=Wol|=Vy<goVP#-2b%HVriiX_$l+3hBga!q49Z$~A-T~CX
N;OXk;vd$@?2>@FyAJPB-

diff --git a/data/flags/hawaii-shield.png b/data/flags/hawaii-shield.png
index 1c118075755a116bb05cb457a89d3364ca8d8beb..c132e640a3f30909b806083a4520921e220ddca2 100644
GIT binary patch
literal 493
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zCSkfJR9T^xl_H+M9WCijSl0AZa
z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP$D_NC&cwX!+#*tId1+H
zZ3pY{*-{oAyKAQ3TeI{3|No7X_jfg{dN67Js^v$YcTRm&)NoPO_(4h2c@gbLh4l|g
z8W~h-`x;g@OxpKk&Gs$T)5Xm@>L>1#u<YEt=J>7NIp;)m&WUIjhjq4oFnbHMgRvyY
zFPOpM*^M+1C&}C0g`@4>)G8o{v%n*=n1O*?5QG`)Q{pEA1=&kHeO=j~F$(cX%33P&
z1OSCnJzX3_IIf4D3+HQ45O582bJ^I?b%Xm|{nS2Z&pq|+DRBuOx*d-d2Tqyf6t*WX
zYN5uGcU!Lgbx`z8?~&APo%3VQn%jOqS3chJNTm6;rMUk@|E`Q+c}b6%diGkP_78ct
z2)pnz>gV0$;0`+<cN}P;YKdz^NlIc#s#S7PDv)9@GB7gIH89jQv<NXYu`)8XGP2Y*
oFt9Q(Fui&J<VS>t-29Zxv`X9>TskTOff^V*UHx3vIVCg!06<2lmjD0&

delta 466
zcmaFM+{iLPvYw5BfkECw_acyDOY(Mi0n$M5(|LD2km4-xh%9Dc;1&R3#<j|OOF@EV
z1&--Jnh%UOMt}Uyz`&^G>EaloaenTkv)V3!67BQDb819PHKm;<n{eN4J#pM5^2{N(
z#D#idi*iyjHE;gt=$)mOI%&#{pY_aZI&$<b<)kdKo*mhvlNP2E*S)hm>DjrG&pGES
z&%K}Xy__ZBpQEnB5ubtt+07!ep4$FB=((l!-9Eov%NEU>)FE=Dpq@R#KyXcZ+LpfE
z4ik31&6W#Ze^prgvU$z3Pcz~*HzXd}wzL1rgqyvg;@XKO{#E)ZlUYBmS=jz@ncJh>
zdS{*O^`BGrZY-FZT$_61^6iMbEDp+PPV=h|TUpeuSj!w;Rav)M|F?S-r-N%C%f)tw
z6XCpWW}S<IY97D5v1dP%{<VL6>E}=V7QU-@^`}LX#r5@@B3WFQuIW4D$FpBV_-;tU
zB}d7dDT#mlqGm=^HJr{r_>?_TqC!<|U;IsA08VaV6qYtL)HN{DH82Y?w6rocwK6f*
lHL$QUFi5=5E<Sk!qnJ7ld4Z<=tAR!^c)I$ztaD0e0sy_AxV``Y

diff --git a/data/flags/hawaii.png b/data/flags/hawaii.png
index 5fcf7250e5c8777dda95bbf4b04befc261d1c63b..37d87e4ca873c8f0a67a32fc49aabbd2116bde38 100644
GIT binary patch
delta 659
zcmaFB*2FeJvYwfNfx*q`*jFIMlJ4m1$iT3%pZiZDE0C{{>=ES4z)+>ez|hdb!0-zw
z)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;15)T7>LR^9L<Fe-0_nyU;tYJ{8O|9N=QNiqL
z?|gBK&Rw-Lo>a6Q+;jQ=|NjYT^KR$Wz2CHR)wV13qGlZlsdI1V)_&NsXUgJ}V&)w?
zn&vz%ZF+wD$&6*EuJ_O1*)%sOYk9eK?rp#LHw#x?ls0;hS-vg5>%55ehUlu|u+G=>
zS3bxnZ!Mn3s9Gm((Xo2_mG>KW+{&+;Gi&d<o!4&V)WoFDRdVdNkD42ryW+*Y=T9oz
z_BPCvvg&$u`|;!YlE!UK^QSC2@qY8JJ9)MF#mgitJJ;{J_IAa_BNJDg7122>rgv6U
z*T#E7{ltBrkDOY)N6!f8O~xc|cNd<<&4I~44rhT!WHFHL0Aa@0cP0e^8SEvVzOL-g
z7=`#GW&G4^jsb-Pk`w*PfV3G9s{k<w)H7&rKlTyGSmWv97@~2$^+Ke0V}MB8!wsoi
zGrc`hy3WjeKJ)+o<~Qex3RC7j-g$HN*LyYUjt@TnWM*(QWD)3dNfzSGwwX93IL|kI
zQ_;C-#rS|Li&jh(*~%k2w{5GJglW+$HQv|P%NKhdzNOS-W+}TMaqBMI-Sz@o7urfi
zPqx$KU2QyDf7-jW^sV=D_RcQ<efas_<ClLvS{weTO#S$iynieC&A!KPOsw6MIQ7Pc
zeK-E)Jqw>_ewfAS<|Vy-&n6c!8A%%%=^7a78d`)Hnphc`S{Yer8yHv_7))MtI&$)U
bCNW&{kNy`wo&14GgOkD2)z4*}Q$iB}sDB&Y

delta 753
zcmZo-d%!k9vYw5BfuV4Y*>NDnmgMd30;GZ9r}OT5AjMhW5m^kR8$g)xeAp~=kYHJX
zV>*yF17Z~hGszwD3=B-1o-U3d9><SPi}eUjlsI1h{?Y+Ai)h}BY>^?8mad7AkYbK>
z>zQiq=CpEamm$wyjy*4|KP_@P$yM*g-Wzeb%b|0Dlc3*9LC;ND7mtQ*YIO{rvo&Oq
zMeLlrYiDnM@MC}NymtBj&zrxCHuM}j#niDiM&-AMZLjQMn;I#m1F_jhg)>~ATOL~$
z{g^>y#<ZgCTGLC53zfdv-gq-Rl(|*l1%scj_=m^4#NYcde_!|Ra7M(WX>aarWjkqf
zxL)ja)V%4|lD{YYv0q-!X8-xfisSoryedD5zGrH${PIkjp}QsFLBmYm&%!Ta<fLw?
z{`#frH$$kU+S<5@%c1Z0yZ^=(g};P$@>&1dv^I0&#qEZl{@Pu2IGy6r*r%%>7Av#5
zNa^pn;MnWm7Pw}<U!|QMVqN<!aoV<f{;L*FnDw%&{@V8$Jym&e1woebk8dB~a8@;2
z)4h3SbiB)jm_vOoEkC*g&#9jM;_+By*5?hm(QBnNT7xglx_k6a#;OP5)B7jRsd*Lm
zEFk$ur|1vm({D=4i#P0=^36?rx^;eVbhyWn7?<M1Wmf|(z76tQb~-QN*{tc4FKZXF
zEb>uJyFBS{t)o}$>uL_GZ^0WcwtTHNS$vIYrhd?}O+IZR%cHcpA5`27eB04KTlB?+
z<C?y6xg6|n8?KQ2P!qhAX=>`*ICI68OZT39$UeJZLe!FiuZq44xr>aNSbwbh!zv)X
zXjSdsjTa^dGZ{%68tNJt=^B`Y7+PAHnpzoK>Ka&B85o?;3UrvffJqFO{66!Se<ojK
z((o`Yag8Vm$t=l9WpK{PEJ!RWQAny(2+B`Va7;<eEmqJ~2+hkZNlj4*E=ep&1@S!+
Y%M&v*&7Wni0VYufPgg&ebxsLQ0Le;6CIA2c

diff --git a/data/flags/hawaii.svg b/data/flags/hawaii.svg
index 6479da235c..5d6bdc3b11 100644
--- a/data/flags/hawaii.svg
+++ b/data/flags/hawaii.svg
@@ -1,27 +1,26 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
+
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    height="500"
    id="svg548"
-   sodipodi:docbase="C:\freeciv"
    sodipodi:docname="hawaii.svg"
    sodipodi:version="0.32"
    width="750"
-   inkscape:version="0.44"
-   version="1.0">
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   version="1.0"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <metadata
      id="metadata3">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
-        <dc:title>Clipart by Rob Adams - United States - Hawaii</dc:title>
         <dc:description />
         <dc:subject>
           <rdf:Bag>
@@ -75,13 +74,21 @@
      id="base"
      width="750px"
      inkscape:zoom="1.34"
-     inkscape:cx="375"
-     inkscape:cy="321.06708"
-     inkscape:window-width="1284"
-     inkscape:window-height="663"
-     inkscape:window-x="-158"
-     inkscape:window-y="299"
-     inkscape:current-layer="svg548" />
+     inkscape:cx="374.62687"
+     inkscape:cy="253.73134"
+     inkscape:window-width="1275"
+     inkscape:window-height="939"
+     inkscape:window-x="338"
+     inkscape:window-y="57"
+     inkscape:current-layer="svg548"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:window-maximized="0" />
   <rect
      y="0"
      x="0"
-- 
2.34.1