diff options
| author | Evils <evils.devils@protonmail.com> | 2022-03-09 11:32:58 +0100 |
|---|---|---|
| committer | Kerstin <kerstin@erictapen.name> | 2022-03-10 16:04:11 +0100 |
| commit | 69da642a5a9bb433138ba1b13c8d56fb5bb6ec05 (patch) | |
| tree | 43ef8f6aed984c8e3f9911b4e8388eb616b3ef4f /pkgs/tools/misc/fontforge | |
| parent | 6cc25b31e6aea0ffb36974cd5dca11ee5e866fdc (diff) | |
fontforge: 20201107 -> 20220308
refactor the debian patch to apply still seems required to get the extra binaries Co-authored-by: Jan Tojnar <jtojnar@gmail.com> (suggestion for partial applying the fetched patch)
Diffstat (limited to 'pkgs/tools/misc/fontforge')
| -rw-r--r-- | pkgs/tools/misc/fontforge/default.nix | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index 6bb728af99cac..3de016bf6d688 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchpatch, fetchFromGitHub, lib , cmake, perl, uthash, pkg-config, gettext , python, freetype, zlib, glib, giflib, libpng, libjpeg, libtiff, libxml2, cairo, pango -, readline, woff2, zeromq, libuninameslist +, readline, woff2, zeromq , withSpiro ? false, libspiro , withGTK ? false, gtk3 , withGUI ? withGTK @@ -14,13 +14,13 @@ assert withGTK -> withGUI; stdenv.mkDerivation rec { pname = "fontforge"; - version = "20201107"; + version = "20220308"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-Rl/5lbXaPgIndANaD0IakaDus6T53FjiBb45FIuGrvc="; + sha256 = "sha256-q+71PDPODl5fEEy3d1icRl+rBGY7AhH+2dMUKeBWGgI="; }; patches = [ @@ -28,13 +28,11 @@ stdenv.mkDerivation rec { # Taken from https://salsa.debian.org/fonts-team/fontforge/-/blob/master/debian/patches/0001-add-extra-cmake-install-rules.patch (fetchpatch { url = "https://salsa.debian.org/fonts-team/fontforge/raw/76bffe6ccf8ab20a0c81476a80a87ad245e2fd1c/debian/patches/0001-add-extra-cmake-install-rules.patch"; - sha256 = "u3D9od2xLECNEHhZ+8dkuv9818tPkdP6y/Tvd9CADJg="; - }) - # Fix segmentation fault with some fonts. - # This is merged and should be present in the next release. - (fetchpatch { - url = "https://github.com/fontforge/fontforge/commit/69e263b2aff29ad22f97f13935cfa97a1eabf207.patch"; - sha256 = "06yyf90605aq6ppfiz83mqkdmnaq5418axp9jgsjyjq78b00xb29"; + excludes = [ + # Already handled upstream: https://github.com/fontforge/fontforge/commit/f97a2cd7b344ec8fcb9f8bfb908e1b6f36326d20 + "contrib/cidmap/CMakeLists.txt" + ]; + sha256 = "iQwaGeBHUais979hGVbU2NxKozQSQkpYXjApxPuLI/4="; }) ]; @@ -52,7 +50,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ - readline uthash woff2 zeromq libuninameslist + readline uthash woff2 zeromq python freetype zlib glib giflib libpng libjpeg libtiff libxml2 ] ++ lib.optionals withSpiro [ libspiro ] |