CVS commit: pkgsrc/graphics/R-Cairo

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Tue Aug 11 18:45:25 UTC 2020

Modified Files:
        pkgsrc/graphics/R-Cairo: distinfo
Added Files:
        pkgsrc/graphics/R-Cairo/patches: patch-src_cairotalk.c

Log Message:
Fix build with latest R.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/R-Cairo/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/R-Cairo/patches/patch-src_cairotalk.c

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

Modified files:

Index: pkgsrc/graphics/R-Cairo/distinfo
diff -u pkgsrc/graphics/R-Cairo/distinfo:1.2 pkgsrc/graphics/R-Cairo/distinfo:1.3
--- pkgsrc/graphics/R-Cairo/distinfo:1.2        Wed Jul 31 16:00:30 2019
+++ pkgsrc/graphics/R-Cairo/distinfo    Tue Aug 11 18:45:25 2020
@@ -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

Added files:

Index: pkgsrc/graphics/R-Cairo/patches/patch-src_cairotalk.c
diff -u /dev/null pkgsrc/graphics/R-Cairo/patches/patch-src_cairotalk.c:1.1
--- /dev/null   Tue Aug 11 18:45:25 2020
+++ pkgsrc/graphics/R-Cairo/patches/patch-src_cairotalk.c       Tue Aug 11 18:45:25 2020
@@ -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 {