diff options
| author | Nicolas Benes <nbenes.gh@xandea.de> | 2023-11-19 18:15:00 +0100 |
|---|---|---|
| committer | Nicolas Benes <nbenes.gh@xandea.de> | 2023-11-19 18:15:00 +0100 |
| commit | 667296fbfc7ea8ce5c5754a1fcc131133de589a1 (patch) | |
| tree | 53fd641b3bc3f52405efd9a9636f14c32f32798c /pkgs/development/libraries/libspectre | |
| parent | 6dfcd5ea1a354edb5329d6fc1dbd6a482db3cd14 (diff) | |
libspectre: 0.2.7 -> 0.2.12
https://gitlab.freedesktop.org/libspectre/libspectre/-/blob/0.2.12/NEWS
Diffstat (limited to 'pkgs/development/libraries/libspectre')
| -rw-r--r-- | pkgs/development/libraries/libspectre/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/development/libraries/libspectre/libspectre-0.2.7-gs918.patch | 42 |
2 files changed, 7 insertions, 47 deletions
diff --git a/pkgs/development/libraries/libspectre/default.nix b/pkgs/development/libraries/libspectre/default.nix index 2d916fa9a9391..9299e4dbfb137 100644 --- a/pkgs/development/libraries/libspectre/default.nix +++ b/pkgs/development/libraries/libspectre/default.nix @@ -2,24 +2,26 @@ stdenv.mkDerivation rec { pname = "libspectre"; - version = "0.2.7"; + version = "0.2.12"; src = fetchurl { url = "https://libspectre.freedesktop.org/releases/${pname}-${version}.tar.gz"; - sha256 = "1v63lqc6bhhxwkpa43qmz8phqs8ci4dhzizyy16d3vkb20m846z8"; + hash = "sha256-VadRfNNXK9JWXfDPRQlEoE1Sc7J567NpqJU5GVfw+WA="; }; - patches = [ ./libspectre-0.2.7-gs918.patch ]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ # Need `libgs.so'. - ghostscript cairo /*for tests*/ + ghostscript ]; doCheck = true; + checkInputs = [ + cairo + ]; + meta = { homepage = "http://libspectre.freedesktop.org/"; description = "PostScript rendering library"; diff --git a/pkgs/development/libraries/libspectre/libspectre-0.2.7-gs918.patch b/pkgs/development/libraries/libspectre/libspectre-0.2.7-gs918.patch deleted file mode 100644 index e9a4eda192bab..0000000000000 --- a/pkgs/development/libraries/libspectre/libspectre-0.2.7-gs918.patch +++ /dev/null @@ -1,42 +0,0 @@ -Fixed error namespace for >=ghostscript-gpl-9.18 - -https://bugs.gentoo.org/563540 - ---- libspectre-0.2.7/libspectre/spectre-gs.c -+++ libspectre-0.2.7/libspectre/spectre-gs.c -@@ -43,12 +43,12 @@ - - if (code <= -100) { - switch (code) { -- case e_Fatal: -+ case gs_error_Fatal: - fprintf (stderr, "fatal internal error %d", code); - return TRUE; - break; - -- case e_ExecStackUnderflow: -+ case gs_error_ExecStackUnderflow: - fprintf (stderr, "stack overflow %d", code); - return TRUE; - break; -@@ -109,9 +109,9 @@ - set = _spectre_strdup_printf ("%d %d translate\n", -x, -y); - error = gsapi_run_string_continue (ghostscript_instance, set, strlen (set), - 0, &exit_code); -- error = error == e_NeedInput ? 0 : error; -+ error = error == gs_error_NeedInput ? 0 : error; - free (set); -- if (error != e_NeedInput && critic_error_code (error)) { -+ if (error != gs_error_NeedInput && critic_error_code (error)) { - fclose (fd); - return FALSE; - } -@@ -126,7 +126,7 @@ - read = fread (buf, sizeof (char), to_read, fd); - error = gsapi_run_string_continue (ghostscript_instance, - buf, read, 0, &exit_code); -- error = error == e_NeedInput ? 0 : error; -+ error = error == gs_error_NeedInput ? 0 : error; - left -= read; - } - |