[pkgsrc/trunk]: pkgsrc/graphics/R-Cairo Fix build with latest R.

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/788cb80e82af
branches:  trunk
changeset: 436909:788cb80e82af
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Aug 11 18:45:25 2020 +0000

description:
Fix build with latest R.

diffstat:

 graphics/R-Cairo/distinfo                      |   3 ++-
 graphics/R-Cairo/patches/patch-src_cairotalk.c |  15 +++++++++++++++
 2 files changed, 17 insertions(+), 1 deletions(-)

diffs (32 lines):

diff -r a77d2ffc2fa1 -r 788cb80e82af graphics/R-Cairo/distinfo
--- a/graphics/R-Cairo/distinfo Tue Aug 11 18:44:53 2020 +0000
+++ b/graphics/R-Cairo/distinfo Tue Aug 11 18:45:25 2020 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.2 2019/07/31 16:00:30 brook Exp $
+$NetBSD: distinfo,v 1.3 2020/08/11 18:45:25 joerg Exp $
 
 SHA1 (R/Cairo_1.5-10.tar.gz) = 527fa2bf7f88020864aa8c5cffc673d6da15f872
 RMD160 (R/Cairo_1.5-10.tar.gz) = ef6f53d0e6267593d2a2c35404a2516103594474
 SHA512 (R/Cairo_1.5-10.tar.gz) = 220f0f36ba8195e4049f2848fa8b56d55e3895884965a3c8339e42924cf922a99620ff88e99802c5c0d89e039c1c0364b71afdfff9eb9358d79adb26d3bdc831
 Size (R/Cairo_1.5-10.tar.gz) = 87699 bytes
 SHA1 (patch-configure) = eb4918abf1d80c02afbeea52aeccaa8675ee2021
+SHA1 (patch-src_cairotalk.c) = a40d0bfe608bdb1369a4effa8569486a51fca218
diff -r a77d2ffc2fa1 -r 788cb80e82af graphics/R-Cairo/patches/patch-src_cairotalk.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/R-Cairo/patches/patch-src_cairotalk.c    Tue Aug 11 18:45:25 2020 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_cairotalk.c,v 1.1 2020/08/11 18:45:25 joerg Exp $
+
+Deal with R-4.0.2 API change.
+
+--- src/cairotalk.c.orig       2020-08-10 12:15:24.950964228 +0000
++++ src/cairotalk.c
+@@ -514,7 +514,7 @@ static void CairoGD_MetricInfo(int c,  R
+       } else if (gc->fontface == 5) {
+               char s[2];
+               s[0] = c; s[1] = '\0';
+-              AdobeSymbol2utf8(str, s, 16);           
++              AdobeSymbol2utf8(str, s, 16, TRUE);
+       } else if(Unicode) {
+               Rf_ucstoutf8(str, (unsigned int) c);
+       } else {