Tue Jan 15 12:05:56 2019 UTC ()
gnumeric112: add two patches to fix clang build
(wiz)
diff -r1.24 -r1.25 pkgsrc/math/gnumeric112/distinfo
diff -r0 -r1.1 pkgsrc/math/gnumeric112/patches/patch-plugins_python-loader_python-loader.c
diff -r0 -r1.1 pkgsrc/math/gnumeric112/patches/patch-src_mathfunc.c
--- pkgsrc/math/gnumeric112/distinfo 2019/01/09 13:41:44 1.24
+++ pkgsrc/math/gnumeric112/distinfo 2019/01/15 12:05:56 1.25
| @@ -1,8 +1,10 @@ | | | @@ -1,8 +1,10 @@ |
| 1 | $NetBSD: distinfo,v 1.24 2019/01/09 13:41:44 wiz Exp $ | | 1 | $NetBSD: distinfo,v 1.25 2019/01/15 12:05:56 wiz Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (gnumeric-1.12.44.tar.xz) = d6c632ace32d748bbb1f8e90a38a936d792d4bf9 | | 3 | SHA1 (gnumeric-1.12.44.tar.xz) = d6c632ace32d748bbb1f8e90a38a936d792d4bf9 |
| 4 | RMD160 (gnumeric-1.12.44.tar.xz) = f007ae63227026434ddd8db564606b9df3a80ce7 | | 4 | RMD160 (gnumeric-1.12.44.tar.xz) = f007ae63227026434ddd8db564606b9df3a80ce7 |
| 5 | SHA512 (gnumeric-1.12.44.tar.xz) = ea21dcdf5fdf4e02bb9d83671675f2409f12ee928611604d7589e0047ce5d75bf6ac51e6a5322c4af520428acdccf4c2b3b8e3fc6530030e162268aea94a503f | | 5 | SHA512 (gnumeric-1.12.44.tar.xz) = ea21dcdf5fdf4e02bb9d83671675f2409f12ee928611604d7589e0047ce5d75bf6ac51e6a5322c4af520428acdccf4c2b3b8e3fc6530030e162268aea94a503f |
| 6 | Size (gnumeric-1.12.44.tar.xz) = 18010384 bytes | | 6 | Size (gnumeric-1.12.44.tar.xz) = 18010384 bytes |
| 7 | SHA1 (patch-aa) = 87781e2955442d8edc803cd732b949017b0f4f27 | | 7 | SHA1 (patch-aa) = 87781e2955442d8edc803cd732b949017b0f4f27 |
| 8 | SHA1 (patch-ab) = f6fe7aed7ab857f1d8292fd99950bda7a9fb96fa | | 8 | SHA1 (patch-ab) = f6fe7aed7ab857f1d8292fd99950bda7a9fb96fa |
| | | 9 | SHA1 (patch-plugins_python-loader_python-loader.c) = 00417e5e46e3c5ccbae62ff4c2e8121d0d4f7b9f |
| | | 10 | SHA1 (patch-src_mathfunc.c) = 76a1f67fa96f449400258ab679d1a05bcf771b3d |
$NetBSD: patch-plugins_python-loader_python-loader.c,v 1.1 2019/01/15 12:05:56 wiz Exp $
python-loader.c:227:3: error: non-void function 'gplp_func_file_probe' should return a value [-Wreturn-type]
https://gitlab.gnome.org/GNOME/gnumeric/issues/379
--- plugins/python-loader/python-loader.c.orig 2018-11-24 17:05:48.000000000 +0000
+++ plugins/python-loader/python-loader.c
@@ -224,7 +224,9 @@ gplp_func_file_probe (G_GNUC_UNUSED GOFi
g_return_val_if_fail (input != NULL, FALSE);
if (_PyGObject_API == NULL) {
pygobject_init (3, 0, 0);
- g_return_if_fail (_PyGObject_API != NULL);
+ if (_PyGObject_API == NULL) {
+ return FALSE;
+ }
}
loader_data = g_object_get_data (G_OBJECT (service), "loader_data");
$NetBSD: patch-src_mathfunc.c,v 1.1 2019/01/15 12:05:56 wiz Exp $
mathfunc.c:5036:43: error: initializer element is not a compile-time constant
https://gitlab.gnome.org/GNOME/gnumeric/issues/378
--- src/mathfunc.c.orig 2018-11-19 01:34:12.000000000 +0000
+++ src/mathfunc.c
@@ -5033,7 +5033,7 @@ gnm_lambert_w (gnm_float x, int k)
{
gnm_float w;
static const gnm_float one_over_e = 1 / M_Egnum;
- static const gnm_float sqrt_one_over_e = gnm_sqrt (1 / M_Egnum);
+ const gnm_float sqrt_one_over_e = gnm_sqrt (1 / M_Egnum);
static const gboolean debug = FALSE;
gnm_float wmin, wmax;
int i, imax = 20;