nsis-header.bmp: Generate from SVG

Makefile.am

@@ -53,7 +53,7 @@ BIN_CHECKS=$(top_srcdir)/contrib/devtools/symbol-check.py \
            $(top_srcdir)/contrib/devtools/security-check.py
 
 WINDOWS_PACKAGING = src/qt/res/rendered_icons/bitcoin.ico \
-  $(top_srcdir)/share/pixmaps/nsis-header.bmp \
+  src/qt/res/rendered_icons/nsis-header.bmp \
   src/qt/res/rendered_icons/nsis-wizard.bmp \
   $(top_srcdir)/doc/README_windows.txt
 
@@ -71,7 +71,7 @@ COVERAGE_INFO = baseline.info \
 dist-hook:
 	-$(GIT) archive --format=tar HEAD -- src/clientversion.cpp | $(AMTAR) -C $(top_distdir) -xf -
 
-$(BITCOIN_WIN_INSTALLER): all-recursive
+$(BITCOIN_WIN_INSTALLER): all-recursive src/qt/res/rendered_icons/nsis-header.bmp
 	$(MKDIR_P) $(top_builddir)/release
 	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIND_BIN) $(top_builddir)/release
 	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_QT_BIN) $(top_builddir)/release

configure.ac

@@ -527,6 +527,9 @@ case $host in
      archive_cmds_CXX="\$CC -shared \$libobjs \$deplibs \$compiler_flags -static -o \$output_objdir/\$soname \${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker \$lib"
      postdeps_CXX=
 
+     AC_PATH_PROGS([RSVG_CONVERT], [rsvg-convert rsvg],rsvg-convert)
+     AC_PATH_PROGS([IMAGEMAGICK_CONVERT], [convert],convert)
+
      ;;
   *darwin*)
      if test x$PNG2ICNS = xno; then

contrib/gitian-descriptors/gitian-win.yml

@@ -17,6 +17,7 @@ packages:
 - "libtool"
 - "automake"
 - "faketime"
+- "fonts-tuffy"
 - "bsdmainutils"
 - "mingw-w64"
 - "g++-mingw-w64"

share/setup.nsi.in

@@ -14,7 +14,7 @@ SetCompressor /SOLID lzma
 !define MUI_WELCOMEFINISHPAGE_BITMAP "@abs_top_builddir@/src/qt/res/rendered_icons/nsis-wizard.bmp"
 !define MUI_HEADERIMAGE
 !define MUI_HEADERIMAGE_RIGHT
-!define MUI_HEADERIMAGE_BITMAP "@abs_top_srcdir@/share/pixmaps/nsis-header.bmp"
+!define MUI_HEADERIMAGE_BITMAP "@abs_top_builddir@/src/qt/res/rendered_icons/nsis-header.bmp"
 !define MUI_FINISHPAGE_NOAUTOCLOSE
 !define MUI_STARTMENUPAGE_REGISTRY_ROOT HKLM
 !define MUI_STARTMENUPAGE_REGISTRY_KEY ${REGKEY}

src/Makefile.am

@@ -664,7 +664,8 @@ endif
 
 RES_RENDERED_ICON_SRC = \
   qt/res/src/chart.svg \
-  qt/res/src/bitcoin.svg
+  qt/res/src/bitcoin.svg \
+  qt/res/src/nsis-header.svg
 
 RES_RENDERED_ICONS = \
   qt/res/rendered_icons/chart.png \
@@ -714,6 +715,9 @@ qt/res/rendered_icons/bitcoin_testnet.ico: qt/res/rendered_icons/bitcoin.ico
 qt/res/rendered_icons/nsis-wizard.bmp: qt/res/rendered_icons/bitcoin290.png
 	$(IMAGEMAGICK_CONVERT) $^ -crop 164x290+62+0 -border 0x12 -strip BMP3:$@
 
+qt/res/rendered_icons/nsis-header.bmp: qt/res/src/nsis-header.svg
+	sed 's/PACKAGE_NAME/$(PACKAGE_NAME)/' < "$<" | $(RSVG_CONVERT) -f png -d 57 -p 57 | $(IMAGEMAGICK_CONVERT) - -background white -alpha remove BMP3:$@
+
 endif
 
 if ENABLE_TESTS