nsis-header.bmp: Generate from SVG

2025-05-12 19:20:42 +02:00 · 2017-09-06 22:11:10 +00:00 · 2017-09-06 22:11:10 +00:00 · 2b237aa21b
commit 2b237aa21b
parent 4143bfd25f
6 changed files with 71 additions and 4 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -52,7 +52,7 @@ BIN_CHECKS=$(top_srcdir)/contrib/devtools/symbol-check.py \
           $(top_srcdir)/contrib/devtools/utils.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

--- a/configure.ac
+++ b/configure.ac
@ -681,6 +681,9 @@ case $host in
     dnl Avoid the use of aligned vector instructions when building for Windows.
     dnl See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54412.
     AX_CHECK_COMPILE_FLAG([-Wa,-muse-unaligned-vector-move], [CORE_CXXFLAGS="$CORE_CXXFLAGS -Wa,-muse-unaligned-vector-move"], [], [$CXXFLAG_WERROR])
+
+     AC_PATH_PROGS([RSVG_CONVERT], [rsvg-convert rsvg],rsvg-convert)
+     AC_PATH_PROGS([IMAGEMAGICK_CONVERT], [convert],convert)
     ;;
  *darwin*)
     if test x$PNG2ICNS = xno; then
--- a/contrib/guix/manifest.scm
+++ b/contrib/guix/manifest.scm
@ -25,6 +25,7 @@
             ((gnu packages tls) #:select (openssl))
             ((gnu packages version-control) #:select (git-minimal))
             (guix build-system cmake)
+             (guix build-system font)
             (guix build-system gnu)
             (guix build-system python)
             (guix build-system trivial)
@ -165,6 +166,25 @@ chain for " target " development."))
      (home-page (package-home-page pthreads-xgcc))
      (license (package-license pthreads-xgcc)))))

+(define-public font-tuffy
+  (package
+    (name "font-tuffy")
+    (version "20120614")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://tulrich.com/fonts/tuffy-" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "02vf72bgrp30vrbfhxjw82s115z27dwfgnmmzfb0n9wfhxxfpyf6"))))
+    (build-system font-build-system)
+    (home-page "http://tulrich.com/fonts/")
+    (synopsis "The Tuffy Truetype Font Family")
+    (description
+     "Thatcher Ulrich's first outline font design. He started with the goal of producing a neutral, readable sans-serif text font. There are lots of \"expressive\" fonts out there, but he wanted to start with something very plain and clean, something he might want to actually use. ")
+    (license license:public-domain)))
+
 ;; While LIEF is packaged in Guix, we maintain our own package,
 ;; to simplify building, and more easily apply updates.
 ;; Moreover, the Guix's package uses cmake, which caused build
@ -540,7 +560,7 @@ inspecting signatures in Mach-O binaries.")
        python-lief)
  (let ((target (getenv "HOST")))
    (cond ((string-suffix? "-mingw32" target)
-           (list zip
+           (list font-tuffy zip
                 (make-mingw-pthreads-cross-toolchain "x86_64-w64-mingw32")
                 nsis-x86_64
                 nss-certs
--- a/share/setup.nsi.in
+++ b/share/setup.nsi.in
@ -19,7 +19,7 @@ Unicode true
 !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}
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -1108,7 +1108,9 @@ endif

 # Rendered icons must be here, not in Makefile.qt.include, since they are distributed with the source tarball

-RES_RENDERED_ICON_SRC = qt/res/src/bitcoin.svg
+RES_RENDERED_ICON_SRC = \
+  qt/res/src/bitcoin.svg \
+  qt/res/src/nsis-header.svg

 RES_RENDERED_ICONS = \
  qt/res/rendered_icons/bitcoin.ico \
@ -1144,6 +1146,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


--- a/src/qt/res/src/nsis-header.svg
+++ b/src/qt/res/src/nsis-header.svg
@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Designer: Jonas Schnelli
+  	 License: MIT
+-->
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1"
+	 id="svg2" xmlns:dc="http://purl.org/dc/elements/1.1/" 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:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="2.632in" height="1in"
+	 viewBox="-34 -34 1526 580" enable-background="new 0 0 1024 1024" xml:space="preserve">
+	
+	<style type="text/css"><![CDATA[
+		text {
+			font-family: "Tuffy";
+			font-size: 210px;
+			fill: black;
+			text-anchor: left;
+		}
+	]]></style>
+	<g transform="scale(0.54, 0.54) translate(-25, 230)">
+		<path fill="black" d="M254.647,174.6l-13.983,56.08c15.855,3.951,64.735,20.071,72.656-11.656
+			C321.568,185.928,270.503,178.552,254.647,174.6z"/>
+		
+		<path fill="black" d="M233.608,258.984l-15.425,61.832c19.04,4.729,77.769,23.584,86.448-11.296
+			C313.703,273.144,252.647,263.736,233.608,258.984z"/>
+		
+		<path fill="black" d="M317.871,7.656c-137.12-34.192-276.024,49.28-310.2,186.44
+			c-34.208,137.136,49.256,276.048,186.36,310.24c137.16,34.199,276.063-49.265,310.256-186.408
+			C538.479,180.776,455.023,41.848,317.871,7.656z M368.807,219.528c-3.688,24.936-17.512,37.008-35.864,41.24
+			c25.2,13.12,38.024,33.239,25.809,68.12c-15.16,43.319-51.176,46.976-99.072,37.912l-11.624,46.584l-28.088-7l11.472-45.96
+			c-7.279-1.809-14.72-3.729-22.384-5.809l-11.512,46.177l-28.056-7l11.624-46.673c-6.561-1.68-13.225-3.464-20.024-5.168
+			l-36.552-9.111l13.943-32.152c0,0,20.696,5.504,20.416,5.096c7.952,1.969,11.48-3.216,12.872-6.672l18.368-73.64l0.048-0.2
+			l13.104-52.568c0.344-5.968-1.712-13.496-13.088-16.336c0.439-0.296-20.4-5.072-20.4-5.072l7.472-30l38.736,9.673l-0.032,0.144
+			c5.824,1.448,11.824,2.824,17.937,4.216L245.423,89.2l28.072,7l-11.28,45.224c7.536,1.721,15.12,3.456,22.504,5.297l11.2-44.929
+			l28.088,7l-11.504,46.145C347.967,167.152,373.904,185.464,368.807,219.528z"/>
+	</g>
+    <text x="320" y="336">PACKAGE_NAME</text>
+</svg>