From 8e0664462ec98722471b1c4c811a7e034d06bc83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Lesimple?= <speed47_github@speed47.net>
Date: Tue, 25 Aug 2020 20:15:00 +0200
Subject: [PATCH] icon for Windows, make windist

---
 GNUmakefile.template |  21 +++++++++++++++++----
 icons/win.ico        | Bin 0 -> 7406 bytes
 regtest/common.bash  |   2 +-
 winres.rc            |   2 ++
 4 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 icons/win.ico
 create mode 100644 winres.rc

diff --git a/GNUmakefile.template b/GNUmakefile.template
index 2d96985..e84b4c0 100644
--- a/GNUmakefile.template
+++ b/GNUmakefile.template
@@ -86,7 +86,11 @@ time-stamp:
 
 dvdisaster: $(ICONS) $(OFILES) 
 	@echo "Linking  : dvdisaster"
-	@$(CC) $(LOPTS) $(OFILES) $(LIBS) -o dvdisaster
+	@if test $(CFG_SYS_OPTIONS) == -DSYS_MINGW; \
+	then windres -v winres.rc -O coff -o winres.o >/dev/null ; \
+	     $(CC) $(LOPTS) $(OFILES) $(LIBS) winres.o -o dvdisaster ; \
+	else @$(CC) $(LOPTS) $(OFILES) $(LIBS) -o dvdisaster ; \
+	fi
 	@if test -e locale/de/LC_MESSAGES/dvdisaster.mo \
 	 || echo $(WITH_OPTIONS) | grep "NLS_NO" >/dev/null; \
 	then echo "not touching locale"; \
@@ -225,7 +229,7 @@ show:
 ######################################################################
 
 .PHONY : install uninstall clean distclean arch
-.PHONY : srcdist
+.PHONY : srcdist dist
 
 install: dvdisaster manual
 	@echo "Installing package..."
@@ -330,5 +334,14 @@ srcdist: INSTALL distclean manual manualclean
 	@cd .. ; tar -c -j -X $(PKGNAME)/NODIST -f $(TAR_PREFIX)/$(PKGNAME).tar.bz2 $(PKGNAME)
 	@cd .. ; gpg --homedir .gnupg --default-key 758BCC23 --detach-sign --output $(TAR_PREFIX)/$(PKGNAME).tar.bz2.gpg --armor $(TAR_PREFIX)/$(PKGNAME).tar.bz2 
 
-
-
+MINGWROOT = $(shell dirname $(CC))/..
+windist:
+	rm -rf dist
+	mkdir -p dist/lib dist/locale dist/share/themes
+	for i in libatk-1.0-*.dll libbrotlicommon.dll libbrotlidec.dll libbz2-*.dll libcairo-*.dll libdatrie-*.dll libexpat-*.dll libffi-*.dll libfontconfig-*.dll libfreetype-*.dll libfribidi-*.dll libgcc_s_*.dll libgdk_pixbuf-2.0-*.dll libgdk-win32-2.0-*.dll libgio-2.0-*.dll libglib-2.0-*.dll libgmodule-2.0-*.dll libgobject-2.0-*.dll libgraphite2.dll libgtk-win32-2.0-*.dll libharfbuzz-*.dll libiconv-*.dll libintl-*.dll libpango-1.0-*.dll libpangocairo-1.0-*.dll libpangoft2-1.0-*.dll libpangowin32-1.0-*.dll libpcre-*.dll libpixman-1-*.dll libpng16-*.dll libssp-*.dll libstdc++-*.dll libthai-*.dll libwinpthread-*.dll zlib1.dll; \
+		do cp -v $(MINGWROOT)/bin/$$i dist/ ; done
+	cp -v dvdisaster.exe dist/
+	cp -vr locale/*/ dist/locale/
+	cp -vr $(MINGWROOT)/share/themes/MS-Windows dist/share/themes/
+	cp -vr $(MINGWROOT)/lib/gtk-2.0 dist/lib/
+	find dist -type f -name "*.a" -delete
diff --git a/icons/win.ico b/icons/win.ico
new file mode 100644
index 0000000000000000000000000000000000000000..bd5807223d8846d96e0cdf12c29f45a5991f404a
GIT binary patch
literal 7406
zcmeHMdvuh=75`11n+@ds-h^H9A`e2|FY-<xKuCZ<NQenZhz1ZO2@+ocLPV(oD%2+e
z4J{xhfVD+P2^0(>1%;M+1dctFlD43&3RMI}<&fSx`+b|;O|%|Q+rOA|zMb#R{oQ%o
znYr_uZvg>YxVb^5`Sw5xy%`Kfxl;plP+44@BD(;E^hA)zCI)&02t+AY$ZXJ0e}6wd
zDJ#Ivt}YZ87h_{u4BD10!=wOjoH}(156>#Y+Y{38(MKQQ!Lf;`t*u3FW(M}}-;b)1
z0r=CDZ0yR4$CfQy&>9<#8#iuX+2SU&jLSw}UmqTtR*Y<&FK)~##FZ;o@Xa^hVC&d1
zxHLTv4^&s;(Uv7RapD9XThWGP8Hs31h{Ru}<zU~wedryZimT=0uxr;YY#JMjPHLyK
zvlH7hV$n+2+qZAy<jIqGIdwFaFK)(lYU572<AFOK`0*aF3vk!zk|LCdgP4(eomQ*U
z=|;#ZV??ZOjHl-qrC_)aUb--E?=X^eWD+cdzb@R@H=JdPLUBU4+VeZ7Bnn29Y=?P7
zM9KoAEP~=k`9yPp#4|*QsL>Kn^$Fo@FgOb*Ss%40M2L+|h;WeYA%^6rgoG%OXzHL4
z8jT1HHTD-69!#C^b8#HXBNY1ZnJdso+Fo0ronqwoJ&a*2+psOiSpz+}^r&&R-HwDI
z635wpmgS?OqC&>7jTEy=0)6oQ`|o4v(xnIr3c}ICG_*vGM1FogKK=Al9653Xfm#hV
zY}kM`Yu2Elp#iVwBw$WRATD0KC}U)%k2@ZZ3zu=Ysi_H`o}O^Ax5HOoeI;Wf$KBA-
zP#K>mO`3#16lI_%KN%l>_#qaCk3hNJ4^JmXz|&cazn13W)yz12@WBW0^Yg=j0|&5b
z)hbk1SEJD13mT0EZ84$v_S<ja>gtMP$Btp!wr!}ZtHY8dOQ5l}!M`Y8dpkOyn$CuI
zCZ^-rq$re?mEq916nN1=))-;H*I$2)t5>h$(xpo{ckUeYdOa#DD^Xux4-W@>xVyU}
z$JYaYo|=Q*+41n#I$=#h1bk?0L9|YMHIDeaVmxYsb@J@GI4u`{oScD!1<BZu8qLcL
zUWD-?yPlpNcv4?IJUp;>?_P9tbYSh;wQ#bvMWC}2{Cs^eA;1f-Whc-a(t07^xzgjS
zaex=K_j&nvoTq+Fp}FcL-`q)eJn%pDK<21|0<V(5A=^lZX(-L0-J;je3@smP4XI8`
zt<g%Y{AtcwV1bxZA2iW(KuvG=PBsHLjTR#vSe+Lho~OVnDbOit&S)Wmr&4*<40rb#
zRVqNOp}L+noi0kRZ<;+phzYZs6u`YoAJRxIc%x6@kS$`SD0+RCtUsZUOLemb+3TC-
zFpF3%g6}6Qi}pz_=L%e;K6O6VYSw=iLrI;SB=zGA(OhDgW|FIiNwp9uk#|`tSt<cM
z6ut1tPpq&;cme6EUU<hvE_P0|_csF-nCpcYZWpVWG%r5egdn}Cezl$?w>o<jK=rHr
zQ`M9^&g048MEz67XQmdyWtxpt^Y|4181*Ru0V(_z7a{fR9~k{B^>@$p^P77&y^isf
zdg))|{IEW$F+{HqX(We^U&wmn{6Nkx>%+>pv@DEXdAgPPg<K!3H?zNw)av>GuP>Pf
z+Aq=TE7kP{(E2ncwg0v`db9Nj%;6<CkZR{vSgdcLI!&%JBV@#Md#n9HZb&F{F|L%L
zdlD86+F$G_BoFgQPtPru??3d1&i?-XKF9w4cF}(uSaA!;xe4e$16=z6M}B$%TYlP!
zO8k&V#rG-pTo>2Lb#oismTZ%nW}d<)R~<bjo}wjTh(vJwV@5u@=ss9lS}N~WMLKVs
zIdcYWZEZ+SPKLj~KNd$CaD?t>AAkHY4j(>@1q&8n{rdGt@Nkjmb9i{T<T0y=oAB9s
zrZ`KU*PAzQMomqP<S*B+Uzc~kmX;Rm*|SI95uKcz5HehgY#$GKX0KkoT5^nxj0{Yi
zI1%&1Mxb?ch`a-?Pm06^I-9%mlIT3Qkz9s32lI=|moMY=>C-rR^eCdEqv?(uCpiXl
zB<3FH&!2~ji;Lu4-QC?NDJj9ql`GNO+A4X7JMoYpXAM%l+;C;)IQ*?N52uMcZAp)T
zot+&D{5(+_<cqb$OK#n|g@XqV!pFx4At52yy?Zxy?AReWS58h2>}W4Auc#;9#ysc&
z;&?s8RhXk)yLL@-y$csE;Jx?WgM)(uoSmKF<>iI+^mJrpWudUJP;!>3Q>UW6y&Y9m
zRamrW5n|nkBg5Mr*N6)-muv_P!gAtgPsWeJbIDP7F(n!X;y9P-uI*rB17|y1Bzd|@
z&cyueq3B?F7q=ne<LPJ*Z{j>U;+yH-Za7zxg$2Y9_vR&{i8vec&Npek`OeM!@8->$
z`0~py<(;0n<k_=las2pk*xTE~(a}+IMXgqgLx&E*mpB&lNxr)?7u~*nJHo=kuyyNJ
zL`6j*DJco-)~!QkW~Su1k5IpIb90fGmxmQAR-n1L8I6sNSh#SZ{Qf{Y7{h1|{G1#y
zg2wknMIjPBT#-dwm^mzeyO<jmB>9{TVVRdQ-}9mIF`wq|1YeNPKABk{zeD_;<~E(?
zIg8dDbI!B0R+;Zjr}^b?5Qk~b_R$)fM|Cnke}%q3JWPG;ptbN4`S?!y@gBJEu1W8{
zyS(J_MZfuvbrb=QR2tM&_{7qOzt1F8bI;y)8dbE+A6!gl?a*mw=hHiIzXh6wLvQRI
z60dzhB=4Lx2u=lKb`N3DktoErp5G3IHym*vWUxI@h;>+EgdaQF({uEgnQ3c?l|cu=
z#Vg%55@TQfQdieY<@V+VmMv(hGeZ3QR}%47_uSb+%%0o*mYKm3^D*pvf#KrrW(n9@
z^bAYS6m2!b8^)M<sgw0WAW8z_HW|fDapri#8>S(IK5Ya%OV@l#e$!U7yn33S1^$p}
z;&P2}@$%aeupAq?U?Y}W;0=qF2I|Ku__Rk4Frsng$ay;5ypby{SBBw1Wi53naAAwz
z$r=wka7_+}Evq*emKqz#R`CfhHYt$!mX>&Hw88L%#6SO(iWgz<8H^ezDU|!6!2}o8
zKU?8DpdS3Th#Poy058^Mj+;0bW-57{@or{#u|9N{{Vz>=>ldP#zy@=?sJ#d7zyGy0
zP?482e!2x-te)Y7w%6Y5Ek0Rw(Aw<XA@F4F_=^QzGd+Kb9`8a+3yHVv&p=~=`uTX^
zNectnAB*u0!1>K3>!E0K136xEe_Fzc$aj>lGBc3=G@CDLxDaDE?Kg9loG-KWFc>eA
z=A1A!U|bI{t+xSqoxgvbA}x%apc)w08%*n2#n<GppL1%YoUwDXidWXNX}>7=DWkf*
zAA8KZd(;$Jkg`X?tNVriSFlL7IK_xlu$9FDk1BX|KSJH_idBBQ+?EI0^JPKaJ|li$
zze9;93O+5^2naS_IPQf}9Ec}S;+2Bel*ce4rd%Tn(kmq1JYGR7BbtJ*eQq+vQJcxn
z)yjg1*QK?2Jfy!|INqwMtjJ^OQjelCDX-1^3E^8U<1N7P+?0asva;-gjAA&35!^bS
zQw!!@GFghJN*|%2Sl7<;N$1fJ$rZ<kK92x8?*<ucLF9Lxchp2^t{O^>hHFOb9KXyI
zmbnwwslF?FAlyw&1>{xI8f76r-|(v2hUwEc@7QEf{C^Von#SLCjTa~5H(n|8rHae>
zlEry1UDP;lr~4G=+&}uEdl%ij0D_YNK=(1akqzWzP8HDiV<qq7oW3Wkc`wVh^ex&d
zZ)ce}`hP3$<@$zbr;p3c`lI$!&8^3yj#C{sxj_2C<d<H>PgH^Qo9agbTKd`O_kRO)
CbeOXM

literal 0
HcmV?d00001

diff --git a/regtest/common.bash b/regtest/common.bash
index 5dea3ab..6a2a277 100644
--- a/regtest/common.bash
+++ b/regtest/common.bash
@@ -216,7 +216,7 @@ function run_regtest()
 
      filter=cat
      echo "$options" | grep -qw SORTED && filter=sort
-     if [ "${CODEC_PREFIX}_${testsymbol}" = RS01_scan_no_device ]; then
+     if [ "${CODEC_PREFIX}_${testsymbol}" = RS01_scan_no_device ] || [ "${CODEC_PREFIX}_${testsymbol}" = RS01_read_no_device ]; then
 	     # for Windows
 	     sed -i -re "s=device $NON_EXISTENT_DEVICE\.=/dev/sdz: No such file or directory=" $NEWLOG
      fi
diff --git a/winres.rc b/winres.rc
new file mode 100644
index 0000000..00e04c3
--- /dev/null
+++ b/winres.rc
@@ -0,0 +1,2 @@
+
+1 ICON "icons/win.ico"