CVS commit: pkgsrc/math/gnumeric112

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Jan 15 12:05:56 UTC 2019

Modified Files:
        pkgsrc/math/gnumeric112: distinfo
Added Files:
        pkgsrc/math/gnumeric112/patches:
            patch-plugins_python-loader_python-loader.c patch-src_mathfunc.c

Log Message:
gnumeric112: add two patches to fix clang build


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/math/gnumeric112/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/math/gnumeric112/patches/patch-plugins_python-loader_python-loader.c \
    pkgsrc/math/gnumeric112/patches/patch-src_mathfunc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/math/gnumeric112/distinfo
diff -u pkgsrc/math/gnumeric112/distinfo:1.24 pkgsrc/math/gnumeric112/distinfo:1.25
--- pkgsrc/math/gnumeric112/distinfo:1.24       Wed Jan  9 13:41:44 2019
+++ pkgsrc/math/gnumeric112/distinfo    Tue Jan 15 12:05:56 2019
@@ -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) = ea21d
 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

Added files:

Index: pkgsrc/math/gnumeric112/patches/patch-plugins_python-loader_python-loader.c
diff -u /dev/null pkgsrc/math/gnumeric112/patches/patch-plugins_python-loader_python-loader.c:1.1
--- /dev/null   Tue Jan 15 12:05:56 2019
+++ pkgsrc/math/gnumeric112/patches/patch-plugins_python-loader_python-loader.c Tue Jan 15 12:05:56 2019
@@ -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");
Index: pkgsrc/math/gnumeric112/patches/patch-src_mathfunc.c
diff -u /dev/null pkgsrc/math/gnumeric112/patches/patch-src_mathfunc.c:1.1
--- /dev/null   Tue Jan 15 12:05:56 2019
+++ pkgsrc/math/gnumeric112/patches/patch-src_mathfunc.c        Tue Jan 15 12:05:56 2019
@@ -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;