diff options
| author | wiz <wiz@pkgsrc.org> | 2019-01-15 12:05:56 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2019-01-15 12:05:56 +0000 |
| commit | 584035f4d51f696b469c13d341433fb39fb81afc (patch) | |
| tree | 92345f1d2a0e2707e2d2a1400d468d9d6eb51c83 /math/gnumeric112 | |
| parent | f18234eb9f0363639f4c74372176e99ff7f3c542 (diff) | |
| download | pkgsrc-584035f4d51f696b469c13d341433fb39fb81afc.tar.gz | |
gnumeric112: add two patches to fix clang build
Diffstat (limited to 'math/gnumeric112')
| -rw-r--r-- | math/gnumeric112/distinfo | 4 | ||||
| -rw-r--r-- | math/gnumeric112/patches/patch-plugins_python-loader_python-loader.c | 18 | ||||
| -rw-r--r-- | math/gnumeric112/patches/patch-src_mathfunc.c | 16 |
3 files changed, 37 insertions, 1 deletions
diff --git a/math/gnumeric112/distinfo b/math/gnumeric112/distinfo index f568bf0c025..a508d8e14e0 100644 --- a/math/gnumeric112/distinfo +++ b/math/gnumeric112/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.24 2019/01/09 13:41:44 wiz Exp $ +$NetBSD: distinfo,v 1.25 2019/01/15 12:05:56 wiz Exp $ SHA1 (gnumeric-1.12.44.tar.xz) = d6c632ace32d748bbb1f8e90a38a936d792d4bf9 RMD160 (gnumeric-1.12.44.tar.xz) = f007ae63227026434ddd8db564606b9df3a80ce7 @@ -6,3 +6,5 @@ SHA512 (gnumeric-1.12.44.tar.xz) = ea21dcdf5fdf4e02bb9d83671675f2409f12ee9286116 Size (gnumeric-1.12.44.tar.xz) = 18010384 bytes SHA1 (patch-aa) = 87781e2955442d8edc803cd732b949017b0f4f27 SHA1 (patch-ab) = f6fe7aed7ab857f1d8292fd99950bda7a9fb96fa +SHA1 (patch-plugins_python-loader_python-loader.c) = 00417e5e46e3c5ccbae62ff4c2e8121d0d4f7b9f +SHA1 (patch-src_mathfunc.c) = 76a1f67fa96f449400258ab679d1a05bcf771b3d diff --git a/math/gnumeric112/patches/patch-plugins_python-loader_python-loader.c b/math/gnumeric112/patches/patch-plugins_python-loader_python-loader.c new file mode 100644 index 00000000000..2250b410887 --- /dev/null +++ b/math/gnumeric112/patches/patch-plugins_python-loader_python-loader.c @@ -0,0 +1,18 @@ +$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"); diff --git a/math/gnumeric112/patches/patch-src_mathfunc.c b/math/gnumeric112/patches/patch-src_mathfunc.c new file mode 100644 index 00000000000..df1c0ad133f --- /dev/null +++ b/math/gnumeric112/patches/patch-src_mathfunc.c @@ -0,0 +1,16 @@ +$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; |