From 0f49b3a320794e09255d6a8f3f414195da706e9c Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Feb 24 2021 04:16:31 +0000 Subject: Update to latest version. --- diff --git a/.gitignore b/.gitignore index 1e7e391..e577c22 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /ragg_0.3.1.tar.gz /ragg_0.4.0.tar.gz +/ragg_1.1.0.tar.gz diff --git a/09dcabe6eb74b60101269b9cf910bf6ab5ee13a1.patch b/09dcabe6eb74b60101269b9cf910bf6ab5ee13a1.patch deleted file mode 100644 index 492b09e..0000000 --- a/09dcabe6eb74b60101269b9cf910bf6ab5ee13a1.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 09dcabe6eb74b60101269b9cf910bf6ab5ee13a1 Mon Sep 17 00:00:00 2001 -From: Thomas Lin Pedersen -Date: Thu, 8 Oct 2020 10:48:24 +0200 -Subject: [PATCH] resize instead of reserve for allocating buffers - ---- - src/text_renderer.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/text_renderer.h b/src/text_renderer.h -index 809bfcc..292317c 100644 ---- a/src/text_renderer.h -+++ b/src/text_renderer.h -@@ -203,9 +203,9 @@ class TextRenderer { - } - - int expected_max = strlen(string) * 16; -- x_buffer.reserve(expected_max); -- y_buffer.reserve(expected_max); -- id_buffer.reserve(expected_max); -+ x_buffer.resize(expected_max); -+ y_buffer.resize(expected_max); -+ id_buffer.resize(expected_max); - - int n_glyphs = 0; - ts_string_shape( diff --git a/R-ragg.spec b/R-ragg.spec index 0738f39..3f227af 100644 --- a/R-ragg.spec +++ b/R-ragg.spec @@ -1,28 +1,27 @@ %global packname ragg -%global packver 0.4.0 +%global packver 1.1.0 %global rlibdir %{_libdir}/R/library Name: R-%{packname} -Version: 0.4.0 -Release: 2%{?dist} +Version: 1.1.0 +Release: 1%{?dist} Summary: Graphic Devices Based on AGG License: MIT URL: https://CRAN.R-project.org/package=%{packname} Source0: https://cran.r-project.org/src/contrib/%{packname}_%{packver}.tar.gz -Patch0001: https://github.com/r-lib/ragg/commit/09dcabe6eb74b60101269b9cf910bf6ab5ee13a1.patch # Here's the R view of the dependencies world: # Depends: -# Imports: R-systemfonts >= 0.2.1, R-textshaping +# Imports: R-systemfonts >= 1.0.0, R-textshaping >= 0.3.0 # Suggests: R-covr, R-testthat, R-grid, R-graphics # LinkingTo: # Enhances: BuildRequires: R-devel BuildRequires: tex(latex) -BuildRequires: R-systemfonts-devel >= 0.2.1 -BuildRequires: R-textshaping-devel +BuildRequires: R-systemfonts-devel >= 1.0.0 +BuildRequires: R-textshaping-devel >= 0.3.0 BuildRequires: R-testthat BuildRequires: R-grid BuildRequires: R-graphics @@ -35,20 +34,16 @@ BuildRequires: libjpeg-devel %description Anti-Grain Geometry (AGG) is a high-quality and high-performance 2D drawing -library. The 'ragg' package provides a set of graphic devices based on AGG to -use as alternative to the raster devices provided through the 'grDevices' -package. +library. The 'ragg' package provides a set of graphic devices based on AGG +to use as alternative to the raster devices provided through the +'grDevices' package. %prep %setup -q -c -n %{packname} -pushd %{packname} -%patch0001 -p1 - # Don't need coverage; it's not packaged either. -sed -i 's/covr, //g' DESCRIPTION -popd +sed -i 's/covr, //g' %{packname}/DESCRIPTION %build @@ -62,7 +57,7 @@ rm -f %{buildroot}%{rlibdir}/R.css %check -%{_bindir}/R CMD check %{packname} || (cat %{packname}.Rcheck/tests/testthat.Rout.fail && exit 1) +%{_bindir}/R CMD check %{packname} %files @@ -81,6 +76,9 @@ rm -f %{buildroot}%{rlibdir}/R.css %changelog +* Tue Feb 23 2021 Elliott Sales de Andrade - 1.1.0-1 +- Update to latest version (#1915004) + * Mon Jan 25 2021 Fedora Release Engineering - 0.4.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 1e0399d..45da17d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ragg_0.4.0.tar.gz) = fb47005a3f12fff021399292cd77a5852d0da52b00898f6176b32de9f01ed07408bbece5799412af07bbe35765a79c3b6c296efa3de21764d1ba7dfddc61c56d +SHA512 (ragg_1.1.0.tar.gz) = 31f7c0012f04afd5dd8c0ec77951e1c623ca23115e86d19c1812496c9b813f4b73a6ee4e49a250cf959dc3ade278f1e44ac774ff7756e34c98b314544fb59134