diff --git a/Makefile.am b/Makefile.am index 7325cf2e5b..49b483d274 100644 --- 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 diff --git a/configure.ac b/configure.ac index 62e91ec951..326b1fbdda 100644 --- 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 diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index b93928cacb..2b716a69ef 100644 --- 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 diff --git a/share/setup.nsi.in b/share/setup.nsi.in index 3d54d572f5..f4297ecc3b 100644 --- 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} diff --git a/src/Makefile.am b/src/Makefile.am index 3391e2050c..d21ab7a87f 100644 --- 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 diff --git a/src/qt/res/src/nsis-header.svg b/src/qt/res/src/nsis-header.svg new file mode 100644 index 0000000000..b534b4b49d --- /dev/null +++ b/src/qt/res/src/nsis-header.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + PACKAGE_NAME +