Merge #222230: fontforge: 20220308 -> 20230101

...into staging
This commit is contained in:
Vladimír Čunát 2023-04-16 09:08:10 +02:00
commit c367a473a6
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA

View file

@ -14,28 +14,15 @@ assert withGTK -> withGUI;
stdenv.mkDerivation rec {
pname = "fontforge";
version = "20220308";
version = "20230101";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "sha256-q+71PDPODl5fEEy3d1icRl+rBGY7AhH+2dMUKeBWGgI=";
sha256 = "sha256-/RYhvL+Z4n4hJ8dmm+jbA1Ful23ni2DbCRZC5A3+pP0=";
};
patches = [
# Allow installing contrib files (e.g. extras and tools).
# 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";
excludes = [
# Already handled upstream: https://github.com/fontforge/fontforge/commit/f97a2cd7b344ec8fcb9f8bfb908e1b6f36326d20
"contrib/cidmap/CMakeLists.txt"
];
sha256 = "iQwaGeBHUais979hGVbU2NxKozQSQkpYXjApxPuLI/4=";
})
];
# use $SOURCE_DATE_EPOCH instead of non-deterministic timestamps
postPatch = ''
find . -type f -name '*.c' -exec sed -r -i 's#\btime\(&(.+)\)#if (getenv("SOURCE_DATE_EPOCH")) \1=atol(getenv("SOURCE_DATE_EPOCH")); else &#g' {} \;