Update at 2023-04-16

files.log

@@ -1,11 +1,11 @@
-https://mac.r-project.org/bin/darwin20/x86_64/apr-1.7.2-darwin.20-x86_64.tar.xz
+https://mac.r-project.org/bin/darwin20/x86_64/apr-1.7.3-darwin.20-x86_64.tar.xz
 https://mac.r-project.org/bin/darwin20/x86_64/apr-util-1.6.3-darwin.20-x86_64.tar.xz
 https://mac.r-project.org/bin/darwin20/x86_64/autoconf-2.71-darwin.20-x86_64.tar.xz
 https://mac.r-project.org/bin/darwin20/x86_64/automake-1.16.5-darwin.20-x86_64.tar.xz
 https://mac.r-project.org/bin/darwin20/x86_64/bdb-6.2.23-darwin.20-x86_64.tar.xz
 https://mac.r-project.org/bin/darwin20/x86_64/boost-1.80.0-darwin.20-x86_64.tar.xz
 https://mac.r-project.org/bin/darwin20/x86_64/bsdtar-3.6.0-darwin.20-x86_64.tar.xz
-https://mac.r-project.org/bin/darwin20/x86_64/cairo-1.16.0-darwin.20-x86_64.tar.xz
+https://mac.r-project.org/bin/darwin20/x86_64/cairo-1.17.6-darwin.20-x86_64.tar.xz
 https://mac.r-project.org/bin/darwin20/x86_64/cgl-0.60.6-darwin.20-x86_64.tar.xz
 https://mac.r-project.org/bin/darwin20/x86_64/clp-1.17.7-darwin.20-x86_64.tar.xz
 https://mac.r-project.org/bin/darwin20/x86_64/coinutils-2.11.6-darwin.20-x86_64.tar.xz
@@ -21,6 +21,7 @@ https://mac.r-project.org/bin/darwin20/x86_64/fribidi-1.0.12-darwin.20-x86_64.ta
 https://mac.r-project.org/bin/darwin20/x86_64/gdal-3.5.3-darwin.20-x86_64.tar.xz
 https://mac.r-project.org/bin/darwin20/x86_64/geos-3.11.0-darwin.20-x86_64.tar.xz
 https://mac.r-project.org/bin/darwin20/x86_64/gettext-0.21-darwin.20-x86_64.tar.xz
+https://mac.r-project.org/bin/darwin20/x86_64/glib-2.76.1-darwin.20-x86_64.tar.xz
 https://mac.r-project.org/bin/darwin20/x86_64/glpk-5.0-darwin.20-x86_64.tar.xz
 https://mac.r-project.org/bin/darwin20/x86_64/gmp-6.2.1-darwin.20-x86_64.tar.xz
 https://mac.r-project.org/bin/darwin20/x86_64/gsl-2.7.1-darwin.20-x86_64.tar.xz
@@ -42,10 +43,12 @@ https://mac.r-project.org/bin/darwin20/x86_64/nlopt-2.7.1-darwin.20-x86_64.tar.x
 https://mac.r-project.org/bin/darwin20/x86_64/openjpeg-2.5.0-darwin.20-x86_64.tar.xz
 https://mac.r-project.org/bin/darwin20/x86_64/openssl-1.1.1t-darwin.20-x86_64.tar.xz
 https://mac.r-project.org/bin/darwin20/x86_64/osi-0.108.7-darwin.20-x86_64.tar.xz
+https://mac.r-project.org/bin/darwin20/x86_64/pango-1.50.14-darwin.20-x86_64.tar.xz
 https://mac.r-project.org/bin/darwin20/x86_64/pcre-8.45-darwin.20-x86_64.tar.xz
 https://mac.r-project.org/bin/darwin20/x86_64/pcre2-10.42-darwin.20-x86_64.tar.xz
-https://mac.r-project.org/bin/darwin20/x86_64/pixman-0.40.0-darwin.20-x86_64.tar.xz
+https://mac.r-project.org/bin/darwin20/x86_64/pixman-0.42.2-darwin.20-x86_64.tar.xz
 https://mac.r-project.org/bin/darwin20/x86_64/pkgconfig-0.29.2-darwin.20-x86_64.tar.xz
+https://mac.r-project.org/bin/darwin20/x86_64/poppler-23.04.0-darwin.20-x86_64.tar.xz
 https://mac.r-project.org/bin/darwin20/x86_64/poppler-data-0.4.11-darwin.20-x86_64.tar.xz
 https://mac.r-project.org/bin/darwin20/x86_64/proj-9.1.0-darwin.20-x86_64.tar.xz
 https://mac.r-project.org/bin/darwin20/x86_64/protobuf-3.20.2-darwin.20-x86_64.tar.xz

opt/R/x86_64/bin/apr-1-config

@@ -19,7 +19,7 @@
 # parameters.
 
 APR_MAJOR_VERSION="1"
-APR_DOTTED_VERSION="1.7.2"
+APR_DOTTED_VERSION="1.7.3"
 
 prefix="/opt/R/x86_64"
 exec_prefix="${prefix}"
@@ -39,22 +39,37 @@ LDFLAGS=""
 LIBS="-lpthread"
 EXTRA_INCLUDES=""
 SHLIBPATH_VAR="DYLD_LIBRARY_PATH"
-APR_SOURCE_DIR="/Volumes/Builds/recipes/build/src/apr-1.7.2"
-APR_BUILD_DIR="/Volumes/Builds/recipes/build/apr-1.7.2-obj"
+APR_SOURCE_DIR="/Volumes/Builds/recipes/build/src/apr-1.7.3"
+APR_BUILD_DIR="/Volumes/Builds/recipes/build/apr-1.7.3-obj"
 APR_SO_EXT="lo"
 APR_LIB_TARGET="-rpath \$(libdir) \$(OBJECTS)"
 APR_LIBNAME="apr-${APR_MAJOR_VERSION}"
 
 # NOTE: the following line is modified during 'make install': alter with care!
 location=installed
 
-# absolute path, but not installed path - we're cross compiling
-case "$0" in
-  "${bindir}/"*) ;;
-  "/"*)         location=crosscompile;
-                APR_TARGET_DIR=${0%${bindir}/apr-${APR_MAJOR_VERSION}-config} ;;
-  *)            ;;
-esac
+cross_compiling=no
+
+if test "$cross_compiling" != "no"; then
+
+    # Normalize $0 and bindir by removing consecutive '/' as the comparison
+    # and the suffix removal below might fail for semantic equal pathes.
+    # XXX: This is not perfect. On Linux we could use realpath for this purpose
+    # but realpath is not portable.
+    normalized_command=`echo $0 | tr -s /`
+    normalized_bindir=`echo ${bindir} | tr -s /`
+    # Remove trailing '/'
+    normalized_bindir=${normalized_bindir%/}
+
+    # absolute path, but not installed path - we're cross compiling
+    case "$normalized_command" in
+      "${normalized_bindir}/"*) ;;
+      "/"*)                     location=crosscompile;
+                                APR_TARGET_DIR=${normalized_command%${normalized_bindir}/apr-${APR_MAJOR_VERSION}-config};
+                                ;;
+      *)                        ;;
+    esac
+fi
 
 show_usage()
 {

opt/R/x86_64/include/apr-1/apr_version.h

@@ -62,7 +62,7 @@
  * The Patch Level never includes API changes, simply bug fixes.
  * Reset to 0 when upgrading APR_MINOR_VERSION
  */
-#define APR_PATCH_VERSION       2
+#define APR_PATCH_VERSION      3
 
 /** 
  * The symbol APR_IS_DEV_VERSION is only defined for internal,

opt/R/x86_64/include/cairo/cairo-features.h

@@ -17,24 +17,16 @@
 #define CAIRO_HAS_XLIB_SURFACE 1
 #define CAIRO_HAS_XLIB_XRENDER_SURFACE 1
 
-/*#undef CAIRO_HAS_BEOS_SURFACE */
-/*#undef CAIRO_HAS_COGL_SURFACE */
-/*#undef CAIRO_HAS_DIRECTFB_SURFACE */
-/*#undef CAIRO_HAS_DRM_SURFACE */
 /*#undef CAIRO_HAS_EGL_FUNCTIONS */
-/*#undef CAIRO_HAS_GALLIUM_SURFACE */
 /*#undef CAIRO_HAS_GLESV2_SURFACE */
 /*#undef CAIRO_HAS_GLESV3_SURFACE */
 /*#undef CAIRO_HAS_GLX_FUNCTIONS */
 /*#undef CAIRO_HAS_GL_SURFACE */
 /*#undef CAIRO_HAS_GOBJECT_FUNCTIONS */
-/*#undef CAIRO_HAS_OS2_SURFACE */
-/*#undef CAIRO_HAS_QT_SURFACE */
 /*#undef CAIRO_HAS_QUARTZ_FONT */
 /*#undef CAIRO_HAS_QUARTZ_IMAGE_SURFACE */
 /*#undef CAIRO_HAS_QUARTZ_SURFACE */
 /*#undef CAIRO_HAS_TEE_SURFACE */
-/*#undef CAIRO_HAS_VG_SURFACE */
 /*#undef CAIRO_HAS_WGL_FUNCTIONS */
 /*#undef CAIRO_HAS_WIN32_FONT */
 /*#undef CAIRO_HAS_WIN32_SURFACE */

opt/R/x86_64/include/cairo/cairo-pdf.h

@@ -47,6 +47,8 @@ CAIRO_BEGIN_DECLS
  * cairo_pdf_version_t:
  * @CAIRO_PDF_VERSION_1_4: The version 1.4 of the PDF specification. (Since 1.10)
  * @CAIRO_PDF_VERSION_1_5: The version 1.5 of the PDF specification. (Since 1.10)
+ * @CAIRO_PDF_VERSION_1_6: The version 1.6 of the PDF specification. (Since 1.18)
+ * @CAIRO_PDF_VERSION_1_7: The version 1.7 of the PDF specification. (Since 1.18)
  *
  * #cairo_pdf_version_t is used to describe the version number of the PDF
  * specification that a generated PDF file will conform to.
@@ -55,7 +57,9 @@ CAIRO_BEGIN_DECLS
  **/
 typedef enum _cairo_pdf_version {
     CAIRO_PDF_VERSION_1_4,
-    CAIRO_PDF_VERSION_1_5
+    CAIRO_PDF_VERSION_1_5,
+    CAIRO_PDF_VERSION_1_6,
+    CAIRO_PDF_VERSION_1_7
 } cairo_pdf_version_t;
 
 cairo_public cairo_surface_t *
@@ -143,6 +147,11 @@ cairo_pdf_surface_set_metadata (cairo_surface_t	     *surface,
 				cairo_pdf_metadata_t  metadata,
                                 const char           *utf8);
 
+cairo_public void
+cairo_pdf_surface_set_custom_metadata (cairo_surface_t	    *surface,
+                                       const char           *name,
+                                       const char           *value);
+
 cairo_public void
 cairo_pdf_surface_set_page_label (cairo_surface_t *surface,
                                   const char      *utf8);

opt/R/x86_64/include/cairo/cairo-svg.h

@@ -55,7 +55,6 @@ typedef enum _cairo_svg_version {
 
 /**
  * cairo_svg_unit_t:
- *
  * @CAIRO_SVG_UNIT_USER: User unit, a value in the current coordinate system.
  *   If used in the root element for the initial coordinate systems it
  *   corresponds to pixels. (Since 1.16)

opt/R/x86_64/include/cairo/cairo-version.h

@@ -2,7 +2,7 @@
 #define CAIRO_VERSION_H
 
 #define CAIRO_VERSION_MAJOR 1
-#define CAIRO_VERSION_MINOR 16
-#define CAIRO_VERSION_MICRO 0
+#define CAIRO_VERSION_MINOR 17
+#define CAIRO_VERSION_MICRO 6
 
 #endif

opt/R/x86_64/include/cairo/cairo.h

@@ -296,6 +296,7 @@ typedef struct _cairo_user_data_key {
  * @CAIRO_STATUS_FREETYPE_ERROR: error occurred in libfreetype (Since 1.16)
  * @CAIRO_STATUS_WIN32_GDI_ERROR: error occurred in the Windows Graphics Device Interface (Since 1.16)
  * @CAIRO_STATUS_TAG_ERROR: invalid tag name, attributes, or nesting (Since 1.16)
+ * @CAIRO_STATUS_DWRITE_ERROR: error occurred in the Windows Direct Write API (Since 1.18)
  * @CAIRO_STATUS_LAST_STATUS: this is a special value indicating the number of
  *   status values defined in this enumeration.  When using this value, note
  *   that the version of cairo at run-time may have additional status values
@@ -356,6 +357,7 @@ typedef enum _cairo_status {
     CAIRO_STATUS_FREETYPE_ERROR,
     CAIRO_STATUS_WIN32_GDI_ERROR,
     CAIRO_STATUS_TAG_ERROR,
+    CAIRO_STATUS_DWRITE_ERROR,
 
     CAIRO_STATUS_LAST_STATUS
 } cairo_status_t;
@@ -405,6 +407,8 @@ typedef enum _cairo_content {
  *   with red in the upper 5 bits, then green in the middle
  *   6 bits, and blue in the lower 5 bits. (Since 1.2)
  * @CAIRO_FORMAT_RGB30: like RGB24 but with 10bpc. (Since 1.12)
+ * @CAIRO_FORMAT_RGB96F: 3 floats, R, G, B. (Since 1.17.2)
+ * @CAIRO_FORMAT_RGBA128F: 4 floats, R, G, B, A. (Since 1.17.2)
  *
  * #cairo_format_t is used to identify the memory format of
  * image data.
@@ -420,7 +424,9 @@ typedef enum _cairo_format {
     CAIRO_FORMAT_A8        = 2,
     CAIRO_FORMAT_A1        = 3,
     CAIRO_FORMAT_RGB16_565 = 4,
-    CAIRO_FORMAT_RGB30     = 5
+    CAIRO_FORMAT_RGB30     = 5,
+    CAIRO_FORMAT_RGB96F    = 6,
+    CAIRO_FORMAT_RGBA128F  = 7
 } cairo_format_t;
 
 
@@ -761,6 +767,9 @@ cairo_set_fill_rule (cairo_t *cr, cairo_fill_rule_t fill_rule);
 cairo_public void
 cairo_set_line_width (cairo_t *cr, double width);
 
+cairo_public void
+cairo_set_hairline (cairo_t *cr, cairo_bool_t set_hairline);
+
 /**
  * cairo_line_cap_t:
  * @CAIRO_LINE_CAP_BUTT: start(stop) the line exactly at the start(end) point (Since 1.0)
@@ -1538,6 +1547,7 @@ cairo_font_face_status (cairo_font_face_t *font_face);
  * @CAIRO_FONT_TYPE_QUARTZ: The font is of type Quartz (Since: 1.6, in 1.2 and
  * 1.4 it was named CAIRO_FONT_TYPE_ATSUI)
  * @CAIRO_FONT_TYPE_USER: The font was create using cairo's user font api (Since: 1.8)
+ * @CAIRO_FONT_TYPE_DWRITE: The font is of type Win32 DWrite (Since: 1.18)
  *
  * #cairo_font_type_t is used to describe the type of a given font
  * face or scaled font. The font types are also known as "font
@@ -1574,7 +1584,8 @@ typedef enum _cairo_font_type {
     CAIRO_FONT_TYPE_FT,
     CAIRO_FONT_TYPE_WIN32,
     CAIRO_FONT_TYPE_QUARTZ,
-    CAIRO_FONT_TYPE_USER
+    CAIRO_FONT_TYPE_USER,
+    CAIRO_FONT_TYPE_DWRITE
 } cairo_font_type_t;
 
 cairo_public cairo_font_type_t
@@ -1742,13 +1753,35 @@ typedef cairo_status_t (*cairo_user_scaled_font_init_func_t) (cairo_scaled_font_
  *
  * The callback is mandatory, and expected to draw the glyph with code @glyph to
  * the cairo context @cr.  @cr is prepared such that the glyph drawing is done in
- * font space.  That is, the matrix set on @cr is the scale matrix of @scaled_font,
+ * font space.  That is, the matrix set on @cr is the scale matrix of @scaled_font.
  * The @extents argument is where the user font sets the font extents for
  * @scaled_font.  However, if user prefers to draw in user space, they can
- * achieve that by changing the matrix on @cr.  All cairo rendering operations
- * to @cr are permitted, however, the result is undefined if any source other
- * than the default source on @cr is used.  That means, glyph bitmaps should
- * be rendered using cairo_mask() instead of cairo_paint().
+ * achieve that by changing the matrix on @cr.
+ *
+ * All cairo rendering operations to @cr are permitted. However, when
+ * this callback is set with
+ * cairo_user_font_face_set_render_glyph_func(), the result is
+ * undefined if any source other than the default source on @cr is
+ * used.  That means, glyph bitmaps should be rendered using
+ * cairo_mask() instead of cairo_paint(). When this callback is set with
+ * cairo_user_font_face_set_render_color_glyph_func(), setting the
+ * source is a valid operation.
+ *
+ * When this callback is set with
+ * cairo_user_font_face_set_render_color_glyph_func(), the default
+ * source is the current source color of the context that is rendering
+ * the user font. That is, the same color a non-color user font will
+ * be rendered in. In most cases the callback will want to set a
+ * specific color. If the callback wishes to use the current context
+ * color after using another source, it should retain a reference to
+ * the source or use cairo_save()/cairo_restore() prior to changing
+ * the source. Note that the default source contains an internal
+ * marker to indicate that it is to be substituted with the current
+ * context source color when rendered to a surface. Querying the
+ * default source pattern will reveal a solid black color, however
+ * this is not representative of the color that will actually be
+ * used. Similarly, setting a solid black color will render black, not
+ * the current context source when the glyph is painted to a surface.
  *
  * Other non-default settings on @cr include a font size of 1.0 (given that
  * it is set up to be in font space), and font options corresponding to
@@ -1768,8 +1801,17 @@ typedef cairo_status_t (*cairo_user_scaled_font_init_func_t) (cairo_scaled_font_
  * extents, it must be ink extents, and include the extents of all drawing
  * done to @cr in the callback.
  *
- * Returns: %CAIRO_STATUS_SUCCESS upon success, or
- * %CAIRO_STATUS_USER_FONT_ERROR or any other error status on error.
+ * Where both color and non-color callbacks has been set using
+ * cairo_user_font_face_set_render_color_glyph_func(), and
+ * cairo_user_font_face_set_render_glyph_func(), the color glyph
+ * callback may return %CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED if the
+ * glyph is not a color glyph. This is the only case in which the
+ * %CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED may be returned from a
+ * render callback.
+ *
+ * Returns: %CAIRO_STATUS_SUCCESS upon success,
+ * %CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED if fallback options should be tried,
+ * or %CAIRO_STATUS_USER_FONT_ERROR or any other error status on error.
  *
  * Since: 1.8
  **/
@@ -1904,6 +1946,10 @@ cairo_public void
 cairo_user_font_face_set_render_glyph_func (cairo_font_face_t                          *font_face,
 					    cairo_user_scaled_font_render_glyph_func_t  render_glyph_func);
 
+cairo_public void
+cairo_user_font_face_set_render_color_glyph_func (cairo_font_face_t                          *font_face,
+                                                  cairo_user_scaled_font_render_glyph_func_t  render_glyph_func);
+
 cairo_public void
 cairo_user_font_face_set_text_to_glyphs_func (cairo_font_face_t                            *font_face,
 					      cairo_user_scaled_font_text_to_glyphs_func_t  text_to_glyphs_func);
@@ -1920,6 +1966,9 @@ cairo_user_font_face_get_init_func (cairo_font_face_t *font_face);
 cairo_public cairo_user_scaled_font_render_glyph_func_t
 cairo_user_font_face_get_render_glyph_func (cairo_font_face_t *font_face);
 
+cairo_public cairo_user_scaled_font_render_glyph_func_t
+cairo_user_font_face_get_render_color_glyph_func (cairo_font_face_t *font_face);
+
 cairo_public cairo_user_scaled_font_text_to_glyphs_func_t
 cairo_user_font_face_get_text_to_glyphs_func (cairo_font_face_t *font_face);
 
@@ -1953,6 +2002,9 @@ cairo_get_fill_rule (cairo_t *cr);
 cairo_public double
 cairo_get_line_width (cairo_t *cr);
 
+cairo_public cairo_bool_t
+cairo_get_hairline (cairo_t *cr);
+
 cairo_public cairo_line_cap_t
 cairo_get_line_cap (cairo_t *cr);
 

opt/R/x86_64/include/gio-unix-2.0/gio/gfiledescriptorbased.h

@@ -0,0 +1,67 @@
+/* GIO - GLib Input, Output and Streaming Library
+ *
+ * Copyright (C) 2010 Christian Kellner
+ *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Christian Kellner <[email protected]>
+ */
+
+#ifndef __G_FILE_DESCRIPTOR_BASED_H__
+#define __G_FILE_DESCRIPTOR_BASED_H__
+
+#include <gio/gio.h>
+
+G_BEGIN_DECLS
+
+#define G_TYPE_FILE_DESCRIPTOR_BASED            (g_file_descriptor_based_get_type ())
+#define G_FILE_DESCRIPTOR_BASED(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_FILE_DESCRIPTOR_BASED, GFileDescriptorBased))
+#define G_IS_FILE_DESCRIPTOR_BASED(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_FILE_DESCRIPTOR_BASED))
+#define G_FILE_DESCRIPTOR_BASED_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_FILE_DESCRIPTOR_BASED, GFileDescriptorBasedIface))
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GFileDescriptorBased, g_object_unref)
+
+/**
+ * GFileDescriptorBased:
+ *
+ * An interface for file descriptor based io objects.
+ **/
+typedef struct _GFileDescriptorBasedIface   GFileDescriptorBasedIface;
+
+/**
+ * GFileDescriptorBasedIface:
+ * @g_iface: The parent interface.
+ * @get_fd: Gets the underlying file descriptor.
+ *
+ * An interface for file descriptor based io objects.
+ **/
+struct _GFileDescriptorBasedIface
+{
+  GTypeInterface g_iface;
+
+  /* Virtual Table */
+  int (*get_fd) (GFileDescriptorBased *fd_based);
+};
+
+GIO_AVAILABLE_IN_ALL
+GType    g_file_descriptor_based_get_type     (void) G_GNUC_CONST;
+
+GIO_AVAILABLE_IN_ALL
+int      g_file_descriptor_based_get_fd       (GFileDescriptorBased *fd_based);
+
+G_END_DECLS
+
+
+#endif /* __G_FILE_DESCRIPTOR_BASED_H__ */