try building kplot directly into nip4

Author: jcupitt

CHANGELOG.md

@@ -1,5 +1,7 @@
 ## master
 
+## 9.0.1-2
+
 - try to fix kplot on win
 
 ## 9.0.1 2025/02/24

meson.build

@@ -1,6 +1,6 @@
 project('nip4', 'c',
   # ie. a major after nip2 8.9 for workspace save file versioning
-  version: '9.0.1-1',
+  version: '9.0.1-2',
   license: 'GPL',
   meson_version: '>=0.64',
   default_options: [

src/kplot/README.md

@@ -2,8 +2,7 @@ Copied from:
 
     https://github.com/kristapsdz/kplot
 
-With minimal modifications. That repo hasn't been updated in 8 years, sadly.
-Maybe it'll come alive again.
+With minimal modifications.
 
 
 

src/kplot/meson.build

@@ -36,9 +36,5 @@ reallocarray(void *optr, size_t nmemb, size_t size)
 		return NULL;
 	}
 
-	// some realloc() on some platforms fail with realloc(0)
-	if (optr)
-		return realloc(optr, size * nmemb);
-	else
-		return malloc(size * nmemb);
+	return realloc(optr, size * nmemb);
 }

src/kplot/reallocarray.c

@@ -1,6 +1,3 @@
-# build this first
-subdir('kplot')
-
 marshal = gnome.genmarshal(
   'nip4marshal',
   prefix: 'nip4',
@@ -135,6 +132,24 @@ sources = files (
   'workspaceroot.c',
   'workspaceview.c',
   'workspaceviewlabel.c',
+  'kplot/array.c',
+  'kplot/border.c',
+  'kplot/bucket.c',
+  'kplot/buffer.c',
+  'kplot/colours.c',
+  'kplot/draw.c',
+  'kplot/grid.c',
+  'kplot/hist.c',
+  'kplot/kdata.c',
+  'kplot/kplot.c',
+  'kplot/label.c',
+  'kplot/margin.c',
+  'kplot/mean.c',
+  'kplot/plotctx.c',
+  'kplot/reallocarray.c',
+  'kplot/stddev.c',
+  'kplot/tic.c',
+  'kplot/vector.c',
 )
 
 parse_c = custom_target('parse.c',
@@ -173,7 +188,6 @@ nip4 = executable('nip4', [
     'main-gui.c',
   ],
   dependencies: nip4_deps,
-  link_with: kplot_lib,
   win_subsystem: 'windows',
   install: true,
 )
@@ -188,7 +202,6 @@ nip4_batch = executable('nip4-batch', [
     'main-batch.c',
   ],
   dependencies: nip4_deps,
-  link_with: kplot_lib,
   win_subsystem: 'console',
   install: true,
 )