From a3c5e4ba7fc7f07397942d19c036614dd649060a Mon Sep 17 00:00:00 2001 From: Garrett LeSage Date: Mon, 11 Apr 2016 17:25:43 +0200 Subject: [PATCH] use a precompiled favicon this should eliminate the need for compile-time favicon generation... and imagemagick, which then pulled in X11 (in Fedora, *) (this fixes #296) --- Gemfile | 3 --- Gemfile.lock | 10 +++------- source/images/favicon.ico | Bin 6518 -> 24838 bytes source/images/favicon.png | Bin 0 -> 686 bytes 4 files changed, 3 insertions(+), 10 deletions(-) create mode 100644 source/images/favicon.png diff --git a/Gemfile b/Gemfile index 4fdd6a70..68a90e48 100644 --- a/Gemfile +++ b/Gemfile @@ -34,9 +34,6 @@ gem 'middleman-deploy' # Thumbnailer #gem "middleman-thumbnailer", github: "nhemsley/middleman-thumbnailer" -# favicon support (favicon PNG should be 144×144) -gem "middleman-favicon-maker" - # HTML & XML parsing smarts gem "nokogiri" diff --git a/Gemfile.lock b/Gemfile.lock index 510f3a1b..1486b0c8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -36,7 +36,6 @@ GEM compass-import-once (1.0.5) sass (>= 3.2, < 3.5) curb (0.8.8) - docile (1.1.5) em-websocket (0.5.1) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) @@ -44,8 +43,6 @@ GEM eventmachine (1.0.7) execjs (2.5.1) expression_parser (0.9.0) - favicon_maker (1.3) - docile (~> 1.1) feedjira (1.6.0) curb (~> 0.8) loofah (~> 2.0) @@ -106,9 +103,6 @@ GEM middleman-core (>= 3.2) net-sftp ptools - middleman-favicon-maker (3.7) - favicon_maker (~> 1.3) - middleman-core (>= 3.0.0) middleman-livereload (3.4.2) em-websocket (~> 0.5.1) middleman-core (>= 3.3) @@ -210,7 +204,6 @@ DEPENDENCIES middleman (~> 3.3.3) middleman-blog middleman-deploy - middleman-favicon-maker middleman-livereload middleman-piwik middleman-syntax @@ -225,3 +218,6 @@ DEPENDENCIES therubyracer wdm (~> 0.1.0) wikicloth + +BUNDLED WITH + 1.10.6 diff --git a/source/images/favicon.ico b/source/images/favicon.ico index 39f9bc327442b26b4738fcf52b958c1d3caee9ac..8553c2a0cb90d104d78c68e661d7eb51fab93455 100644 GIT binary patch literal 24838 zcmeI)$!}d(9S87NH5Ce=sv{I=gT+uX$4ML~j_u}oh~p`Vlh{exW@@IUL)d}D3M7P7 z1W2%F!Lq9&u|f!m1q%c##x4KK;eM|33#YI5zUTKGJFfa7o!)!T@Eg9r>D+Ul+h{z| z*w%RFnMQFPXx!V@Xv{Pkjh9|peg0s3qw!JEH!!gJ{9!R~_~}NY*<5|zIoW9ZcSobK zvshCM6%IO^YioR%9Se*^G%+U ztuaSj%3pHQ)vH&_xYb`pGw(Ae@*cWmi`*OYE@|=8!hkJar$UmKAkNM;yznpXJ+O-k~yw03Hlg^$w zTQ>Ll78VxL_3PJ5IU+yT@i9(s^+kEG&wbyMi(d2$WpUt6KQmznWmCEiROv);`fKswm(j$r~WXJUb;V&rY5J# z8euNHUFnVA<;#~#JB1yLl^7H<%j5XN$@sBj$I|6Xm(#(yk@WcwPoyvYW;`7^HCpyX ze3;A5Y7}3BLtcl`@f@*2NB$S}XKHFHtz1}6yQdGQeN#i}(#plMCefRn%(bRdOool| zf(@+PYizl6b}5}dcfO<*n1o$D$9nhent7p1tmBh>MO@=;jxj!rM?ANq8)M|9ul_dLG3m-AZn0=R;9&0;YtzkFx&1E||hTX_b4}4&bFFx$qO@3ofd&BTIz7_t2Kf8(# zJkfTNk zvRBRT)Q6t>h?aXb!L$0Mj^#SVxVol(8fUxLUw^&a$K-Q6@r`k7?5pS>^@#5FMe1~3 zm(^Qxs=xSJYoB6YVjtHFe{#U{jW^!-#5)K+TF4q_3-Rn~-@;~9H9DWy?w;KCe*7rk z`|A%qTkpL$zyogHPkPbanxGrB*w$W!5Arc~rlS`7RPn;!*#d6tmdn{r*BGNG8hp)u zUHrZE)?4YFcit(l`YtZ7q?L0Q((=-3TRFF!E*5)dV|@PJy?g1#jTD-JoD$l1B2<+=7F^1#!!0Y=4#tzWZL%U>GbtWhtgzo zvK))^&{&5zec;FzY($qF`?zQOz)Ot7g1_+x@|nli*l1|@NczfmkEE~N9xCN!Z*$EN z`_`~0KSGP{uqR9KtGbe#FR-8dLmu|D)_k~#Yww0=(d9~koA_W?jU43UKYT#0ia4m^ zS=SdBl1DR7A9`#>FYf|yW#6C^^J9JV_i{yx{xC%^WMEIebnDiw(l+@Roz<*f_~mQR zWCO7n`Wtu8u6$9GkMfve7uc*P_Xi(#jWeC-T<`JZ{YKHc1-5&H=G zdZrgF_8$xS;7rKXS-bOm_~dJPz31b;k2r@z+tpe3ojZ3*44eh! z=ZL-X>1G}Mom#$wto9*ob_5q0`w`9bY{7k#jcRUFZ#SXZd*X1wMe!de39) zWT@*WTlhcOoF(hitRW8@8FRK6-`MKtwf3XqEHtM9+o10XTlzbv-faITFP+$g4Dw*e zX3Ra?IZKCuc8`eOWXT*ac;UW*T`SH7^loMZ3zIPzYr4!IAg`|a{T zzSg>Ed4Ju#x$=np##XU?$g0*w9`G)Z*DHCA-Q)`M_=|e2sp(og8#BjTG_1vg?#AQ> zekM+0EM(ZsYi>7klFc_+d4O$vOIG`RW0kAaf3o{_Y0sc`$%By(-Rm=E4lJ#ScPqJ- zzsvdP+k3((Fv#WE2pobwesq<0m=|SBF!13Qe!~DSa5YdR-v@-KFRAKP`SzkKC) zMs$ENy6Dl@K1I%o+7oidReVG)boIQ4E`xj1SMLv}7k)C5p8x6b^xQ8-)3d)COV9pt zG(Gq8(e(TW$I}Zx9!Wc{7k~G)cQxnH6V_yq^CGVXFIT#em!9k{|FV}gn%n}n$Q5hB zg1^GhdKh?Kt3Q#+UMBK^Jc#%1eS6Z2KO9L<{G<47-M=5S|9t%Z$-kXUFW(s|@LK(C zTkP}1y5FFLzEwH|CK0c4aKs{6_-MQJLDTx+OMgDJmUXc{uKXwBQf%{qok#bjr++=3 z8vk1TePR60(DjMG&y@Dxy}$U|royJyvjH8f??wi5`AVxEAzPv2f8@OKTwq?giueAcF z+)v;Ix10u@;YUw3(SAC9!^pq+BLBB0WX;z<%6s&qu^YazFOg@;nqSBfJk4c4zQVWp zCV7K~HGIifnI|6XV`IIm`R2hMeLV3F8m{^L$8jIBRPi>(FWE2GGslG=1um^Lg7#L> zvsJcu=I5<`8)I=5*O3p!j+ljqxaf4ABlfhQwNdCvqL#n^KRqJ1)#(Boxgv4_{pr-nZ_txh`3@gyhjAV6jp!$b_e60G16Z`< zBX7y?_O|S=sb6&Kw3gkSH^2^t?f7ig7@5@}@hg|LvkM!m@pRX`)5RX0@2G+8v4xbOZ=Q5fHgNOzG?R~2b z12okdwKH(c>21b6nY|;Dwd!oaxEv)n$Z>4X2lzsjd@Zks zK6j(;$rWe6Rr_80RA+?hTjZ-wHI82PQ1<%aFY$LzIR@_49CX!^jnc7>F8< zPxaH$UdFjw?CZKce}k<(68+HN=k|u=2^`>rhj)q1jsY@w|7Rn4i@fx9-oak{lH6ic zeW=5+T|Z3W80Vj`7C+8ljL8?qhIaJVGe&FHkVW2u8)s&+H>~GyKWtwoQH%=aPVz_eEgB!_``a2#~%&;E!T!G#5W~;`Gs8b zD0tQBTh%YO%YX8^eG6Y#v*f~!l7*j(0ec@lrm4N+uS&*^?xU-`#78$H2L-P9@_B7D z__o85Od(ghd5?PRaq)fBdi3f2|D3RoMIVd45A=PY?*n}w*eo9?{`Ua=f1hCl{s(+m BB98z7 literal 6518 zcmeHLc}$c?6rV*dx$pZ}L=cf%5xEbSg=Ke$*R;`LQ z));HG6;rE;(Zt5|h|<&(ss*VZ zButN4SuwOy=4Zf|FJnw9ef4d}SUSf1Fa{D(yc|cv7{srLm4aGaTwEf*MZIg-60M8~{r#0vsdNEk@k&os?J?aLxY@XF&ijkf)Ey4?_CA=4m_2*8A}}zp zqO!75#`#GWiA2J%S5I$m?-;bMPEJmNsfqIKiX{0~cQ^NNb8~YCA0MAMTU%QxX!W2A z?f!N32N_hLbtFA4UcC6^vSrJ@p+0nK9S{(ZL47K^`s4f-78XvhfvjmLGMQ|fpPyeA z$(xdr(xR`gZwP)B$tdPeN=g#e#5pNoAKT{7pTEP|*?EyLh#%-%9uX1Ig7a^L{<3L2 zAt6C4|MBC;Sz}`(+r4|Yw7a{zcF&$Y(uRfxwq?r}p;CX>u3fH}+t|_3;Y+k#U0qs! zuE)30@;$z*E%`|)Y67Z6=%E82DlTv1Y^E^Zer)=`ox#Y+2)ldt?zsB&=~J`&_wTdY zw{NpMckYav7xNHJPfw3PN4&kgz2kTYOT2&hI0j!jrXp6Z*tBWWz?wB{F2nz-;eLg9 zAg1HrdU|@oJp6Ios#UAb*VfiPNlQzs=kvTJEHQq2d%O5*vh?)yL#tP>?uFmZD<~*9 zix~PTVz>D?!dC-We;VRPTVY}0Mfm%|6)RTU$jQmMB&H`UG5*e-JH=!S`>)0tKhOlp zj#ym3cJ10Lh#THwV#Ggt;GS2hRINrvM*1|LmzQ@AF?6?>mary+k60_+uwlb6V$&?X z26Bl-Wo2bI5d#gqocw=3~&y`pC%0T>echVsit|?k4F?TqcW8d>$SiK{YisBd)HlUgCA$^o<(b3VBKnP20f5>0-kt5eY zZ~fr;3H#iEd{7D7nt}Y%2)Sw%$zow_#+bjc2`h5XXSvQ)3s{j`J_|K}J_J}*Rb?@H2#$x;n7cN9rR8(kEQ&XGBkBAG-f+5epmY1D- zYMQT^F}sy~kM*lG?03|@v=J6=X{VN@wUw8bKQJ@H`~(HLUODnx&E?CNmx%E@J3B4m zt4=}J*O4=4<83i6TR`sU0iX7FTv*g<7H;m$9w!*D?a?+$9TV_=&pzNh5>Z&7wkcUd+ww=2cH!J`94Ryl<1E0{(r%zx8L&R%fF=9 z#`&p5oNL8he^^pdavNuR6noZA(;35m97Y@#-Za{YSDne?(>i#AAHh0uz6RmIH?-rf zj=-PHLUq8M`VDv|FsI!wcq^LnaeSZf_4SSA-@KhHK77?i#Ifzf2MjO7v#Zee&%hSmntVNK@wT>x ztXFU*w_x)@GzR_>#DuXI3*!^vbN^3#yucS8gdJVOU2cc(9fI#T3>}#8d2tJSqxW|^ zV#P3c_rZ^R1>3zSrklwB@7uSJ-uYuH?s*a3v?H+b8+doC;LqtlmoYTDJT!;cOZ$#R z-f{`Nqp*wjbZMwhSYrS8;>8R0?Afz175@vd=g*&8Qad;}DEv1hrV)SB|3^=rJfZ)T j1m4ln(J^ZhJz0fZ8Px8^=Vdl&^?|ILac@Yo#ne;|l2$Atz>l)wH*?VFc zeWiG6EW}be4ikIxNb>o-G%=)&ZZ?~a<1`wLBi8H-*zfo2_4=Hc*LB^U3x=e1Ivt6q zswzuWt5v{KsYEr?G`rodZQHnpVN@!WMR85j%H?vgSR9YXqtU2PC=gu~ShRx5~n?ZJ8NZY~G|5QLB<$P~-6!Y~A6>o5q7U`v0w zrawPx`fA_@fP|tb>h*f8#)KfO#2*@2E0MeRl8I>A$G0*?_r~Pk- z{2VtttD9thY){PPS7s`;o6TN-{PX+Y+_8a^y8mVRc{<%2id)Z0Z^XfEXVXch7ftuk zYhxpNx@M$zYx{5SU3z%ootj(v^)b7?y7Hkg**SUq&z;P{;ojHvvJmIatlYeO`uBuZ M!m|g~``+ZqKWBEJX#fBK literal 0 HcmV?d00001