mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 13:20:08 +02:00
63 lines
1.5 KiB
Plaintext
63 lines
1.5 KiB
Plaintext
From 9a67a68adf7f44d14cf28d9151a730b3758b34f0 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
|
|
Date: Sun, 12 Aug 2018 10:37:06 +0200
|
|
Subject: PNG build fix
|
|
|
|
|
|
diff --git a/libplot/z_write.c b/libplot/z_write.c
|
|
index d76a7cc..cfb1906 100644
|
|
--- a/libplot/z_write.c
|
|
+++ b/libplot/z_write.c
|
|
@@ -164,7 +164,7 @@ _pl_z_maybe_output_image (S___(Plotter *_plotter))
|
|
}
|
|
|
|
/* cleanup after libpng errors (error handler does a longjmp) */
|
|
- if (setjmp (png_ptr->jmpbuf))
|
|
+ if (png_jmpbuf (png_ptr))
|
|
{
|
|
png_destroy_write_struct (&png_ptr, (png_info **)NULL);
|
|
return -1;
|
|
@@ -444,7 +444,7 @@ _our_error_fn_stdio (png_struct *png_ptr, const char *data)
|
|
#endif
|
|
}
|
|
|
|
- longjmp (png_ptr->jmpbuf, 1);
|
|
+ longjmp (png_jmpbuf (png_ptr), 1);
|
|
}
|
|
|
|
static void
|
|
@@ -515,7 +515,7 @@ _our_error_fn_stream (png_struct *png_ptr, const char *data)
|
|
#endif
|
|
}
|
|
|
|
- longjmp (png_ptr->jmpbuf, 1);
|
|
+ longjmp (png_jmpbuf (png_ptr), 1);
|
|
}
|
|
|
|
static void
|
|
--
|
|
2.16.4
|
|
|
|
|
|
From 4df75ea2e441d7259f32b97018749722253b4051 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
|
|
Date: Sun, 12 Aug 2018 10:39:13 +0200
|
|
Subject: Autoreconf fix
|
|
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 8fb7b64..1ee3d31 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -5,6 +5,7 @@
|
|
AC_INIT([GNU plotutils],[2.6],[bug-plotutils@gnu.org])
|
|
AC_PREREQ(2.59)
|
|
AC_CONFIG_SRCDIR(graph/graph.c)
|
|
+AC_PROG_CXX
|
|
AM_INIT_AUTOMAKE([plotutils],[2.6])
|
|
AM_CONFIG_HEADER(config.h:config.hin)
|
|
|
|
--
|
|
2.16.4
|
|
|