diff options
author | Anderson Torres <torres.anderson.85@protonmail.com> | 2023-09-15 19:34:33 -0300 |
---|---|---|
committer | Anderson Torres <torres.anderson.85@protonmail.com> | 2023-09-16 13:22:03 +0000 |
commit | 74489d7ff66172e843ec1e1d07ad2a958afa746d (patch) | |
tree | fd87361e7da520b6b172d781df41e969d1df03b7 | |
parent | 057496d1b240d2ce5670979cbacb9700eb91d600 (diff) |
algol68g: 2.8.4 -> 3.3.22
-rw-r--r-- | pkgs/by-name/al/algol68g/0001-plotutils-png-support.diff | 27 | ||||
-rw-r--r-- | pkgs/by-name/al/algol68g/package.nix | 11 |
2 files changed, 3 insertions, 35 deletions
diff --git a/pkgs/by-name/al/algol68g/0001-plotutils-png-support.diff b/pkgs/by-name/al/algol68g/0001-plotutils-png-support.diff deleted file mode 100644 index 14e7ccd562443..0000000000000 --- a/pkgs/by-name/al/algol68g/0001-plotutils-png-support.diff +++ /dev/null @@ -1,27 +0,0 @@ -diff -Naur algol68g-2.8.4-old/source/plotutils.c algol68g-2.8.4-new/source/plotutils.c ---- algol68g-2.8.4-old/source/plotutils.c 2016-10-11 18:14:48.000000000 -0300 -+++ algol68g-2.8.4-new/source/plotutils.c 2021-07-30 02:42:29.762627511 -0300 -@@ -1026,10 +1026,10 @@ - X_COORD (&DEVICE (f)) = 0; - Y_COORD (&DEVICE (f)) = 0; - return (PLOTTER (&DEVICE (f))); -- } else if (!strcmp (device_type, "gif")) { --/*------------------------------------+ --| Supported plotter type - pseudo GIF | --+------------------------------------*/ -+ } else if (!strcmp (device_type, "gif") || !strcmp (device_type, "png")) { -+/*-------------------------------------------+ -+| Supported plotter type - pseudo GIF or PNG | -++-------------------------------------------*/ - char *z = DEREF (char, &A68_PAGE_SIZE (&DEVICE (f))), size[BUFFER_SIZE]; - /* Establish page size */ - if (!scan_int (&z, &(WINDOW_X_SIZE (&DEVICE (f))))) { -@@ -1067,7 +1067,7 @@ - (void) pl_setplparam (PLOTTER_PARAMS (&DEVICE (f)), "BITMAPSIZE", size); - (void) pl_setplparam (PLOTTER_PARAMS (&DEVICE (f)), "BG_COLOR", (void *) "black"); - (void) pl_setplparam (PLOTTER_PARAMS (&DEVICE (f)), "GIF_ANIMATION", (void *) "no"); -- PLOTTER (&DEVICE (f)) = pl_newpl_r ("gif", NULL, STREAM (&DEVICE (f)), stderr, PLOTTER_PARAMS (&DEVICE (f))); -+ PLOTTER (&DEVICE (f)) = pl_newpl_r (device_type, NULL, STREAM (&DEVICE (f)), stderr, PLOTTER_PARAMS (&DEVICE (f))); - if (PLOTTER (&DEVICE (f)) == NULL) { - diagnostic_node (A68_RUNTIME_ERROR, p, ERROR_DEVICE_CANNOT_OPEN); - exit_genie (p, A68_RUNTIME_ERROR); diff --git a/pkgs/by-name/al/algol68g/package.nix b/pkgs/by-name/al/algol68g/package.nix index 05e57ff3da2c0..25d0d9f4c5186 100644 --- a/pkgs/by-name/al/algol68g/package.nix +++ b/pkgs/by-name/al/algol68g/package.nix @@ -9,19 +9,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "algol68g"; - version = "2.8.4"; + version = "3.3.22"; src = fetchurl { url = "https://jmvdveer.home.xs4all.nl/algol68g-${finalAttrs.version}.tar.gz"; - hash = "sha256-WCPM0MGP4Qo2ihF8w5JHSMSl0P6N/w2dgY/3PDQlZfA="; + hash = "sha256-cSD6lngCy7SC2P7GyUCajk6i863a3vvCjtgZLF0TrIA="; }; - outputs = [ "out" ] ++ lib.optional withPDFDoc "doc"; - - patches = [ - # add PNG support - ./0001-plotutils-png-support.diff - ]; + outputs = [ "out" "man" ] ++ lib.optional withPDFDoc "doc"; buildInputs = [ gsl |