Skip to content

Commit

Permalink
(graphics/R-Cairo) Updated 1.15.2 to 1.6.0
Browse files Browse the repository at this point in the history
NEWS/Changelog

1.6-0	(2022-07-05)
    o	Added text drawing using Harfbuzz and ICU. This significantly
	improves the quality of text rendeded by Cairo and enables
	support for right-to-left and bi-directional text. (#23)
	It also enables the use of ligatures. (#18)
	This feature is only enabled if `pkg-config` is present and
	knows how to use the `harfbuzz-icu` module.

    o	The `family=` argument in text drawing is now honored also for
	FreeType and Harfbuzz back-ends.

    o	configure gains two arguments: `--with-freetype` and
	`--with-harfbuzz`. They both default to `auto` which means
	FreeType and Harfbuzz will be used if present. If set to `yes`
	then the support is required. If set to `no` (or the
	`--without` form is used) then the corresponding support is
	explicitly disabled. Note that Harfbuzz requires FreeType.

    o	added `--enable-debug` argument to configure which will make
	Cairo extremely chatty on the console.

    o	By default `cairo-ft` will be ignored on Windows, becasue it
	it does not work without associated FontConfig configuration
	files and font cache. (#37)
	This behavior can be changed by using `-DUSE_CAIRO_FT=1` to
	force the use of `cairo-ft` unconditionally.

    o	Cairo.capabilities() now also reports two capabilities
	which are not format-related: "freetype" and "harfbuzz". The
	former indicates whether `cairo-ft` is used and the later
	indicates whether the newly introduced Harfbuzz + ICU
	bi-directional rendering support is present.


1.5-15	(2022-03-16)
    o	CairoX11 (xlib back-end): install an X11 I/O error handler
	while processing events such that broken connections are
	detected and don't kill R.

    o	added the option to license under GPL v3. All original
	authors explicitly agreed and included code based on R is
	licensed under GPL-2+ allowing this.


1.5-14	(2021-12-21)
    o	update configure/autoconf, some dependencies such as libtiff
	are now also detected using pkg-config. Tests are now correctly
	using CPPFLAGS from R.

    o	add entry points for GE version 13 (needed for R 4.1.0)
	Note that this is just a port of CRAN NMU which was posted as
	version 1.15-12.2 on CRAN, but was not an actual Cairo version.


1.5-13	(2020-04-15)
    o	add support for CairoFont(usePUA=FALSE) to support regular
	fonts without Adobe Symbol Encoding as symbol fonts in
	R 4.0.0 and higher. Setting usePUA=FALSE in older versions of
	R will issue a warning.
  • Loading branch information
mef committed Feb 19, 2023
1 parent cec656e commit fdf78a7
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 16 deletions.
5 changes: 2 additions & 3 deletions graphics/R-Cairo/Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# $NetBSD: Makefile,v 1.8 2023/01/29 21:16:26 ryoon Exp $
# $NetBSD: Makefile,v 1.9 2023/02/19 01:51:01 mef Exp $

R_PKGNAME= Cairo
R_PKGVER= 1.5-12.2
PKGREVISION= 1
R_PKGVER= 1.6-0
CATEGORIES= graphics

MAINTAINER= pkgsrc-users@NetBSD.org
Expand Down
10 changes: 5 additions & 5 deletions graphics/R-Cairo/distinfo
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$NetBSD: distinfo,v 1.6 2021/10/26 10:45:54 nia Exp $
$NetBSD: distinfo,v 1.7 2023/02/19 01:51:01 mef Exp $

BLAKE2s (R/Cairo_1.5-12.2.tar.gz) = 96fd83b6599271a2fc6dfdf5e1af8b5be50ab74a77668cb817e73cd0da046871
SHA512 (R/Cairo_1.5-12.2.tar.gz) = 5d817bb4b384a76d2aa4160a08a006bf5bb4f8b17d1e95a9ba51a8bf1817027481350753c3d49f3713a15c0f3655d38d4af68c3b40970889fc6f4e8523a0e247
Size (R/Cairo_1.5-12.2.tar.gz) = 88631 bytes
SHA1 (patch-configure) = eb4918abf1d80c02afbeea52aeccaa8675ee2021
BLAKE2s (R/Cairo_1.6-0.tar.gz) = 1251972a29eb097f1cc72793af6aa04f509f7d9f9fceee800ff9cf8c6c3261ed
SHA512 (R/Cairo_1.6-0.tar.gz) = 15a169fe238a7bcf4348462089d87b43e6d8601d2674242a3cdc01404eccdb0ae49d2b97d87d5e6d1b8768b43e1f0a0d6f5341fba3b91d98ebaeb864dce6755a
Size (R/Cairo_1.6-0.tar.gz) = 98278 bytes
SHA1 (patch-configure) = 9ab0b88b803c9c09682ee2633fb6024c8f0dcb3f
34 changes: 26 additions & 8 deletions graphics/R-Cairo/patches/patch-configure
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
$NetBSD: patch-configure,v 1.1 2018/05/21 17:12:35 minskim Exp $
$NetBSD: patch-configure,v 1.2 2023/02/19 01:51:01 mef Exp $

Fix "==" tests.

--- configure.orig 2014-06-26 14:50:25.000000000 +0000
+++ configure
@@ -3461,7 +3461,7 @@ fi
--- configure.orig 2022-07-05 13:13:31.000000000 +0900
+++ configure 2023-02-19 10:45:53.963992687 +0900
@@ -3534,7 +3534,7 @@


have_cairo=no
-if test "xx$CAIRO_LIBS" == "xx"; then
+if test "xx$CAIRO_LIBS" = "xx"; then
if test "xx$PKGCONF" != "xx"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pkg-config knows about cairo" >&5
$as_echo_n "checking whether pkg-config knows about cairo... " >&6; }
@@ -3581,8 +3581,8 @@ fi
rm -f core conftest.err conftest.$ac_objext \
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether pkg-config knows about cairo" >&5
printf %s "checking whether pkg-config knows about cairo... " >&6; }
@@ -3754,8 +3754,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext

-if test "xx${CAIRO_LIBS}" == "xx"; then
Expand All @@ -24,3 +24,21 @@ Fix "==" tests.
CAIRO_LIBS="-lcairo -lpng -lz -framework ApplicationServices"
else
CAIRO_LIBs="-lcairo -lpng -lz"
@@ -5227,7 +5227,7 @@
/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
line = \$ 0
split(line, arg, " ")
- if (arg[1] == "#") {
+ if (arg[1] = "#") {
defundef = arg[2]
mac1 = arg[3]
} else {
@@ -5245,7 +5245,7 @@
# Replace #undef with comments. This is necessary, for example,
# in the case of _POSIX_SOURCE, which is predefined and required
# on some systems where configure will not decide to define it.
- if (defundef == "undef") {
+ if (defundef = "undef") {
print "/*", prefix defundef, macro, "*/"
next
}

0 comments on commit fdf78a7

Please sign in to comment.