Update to latest version.
This commit is contained in:
Elliott Sales de Andrade
parent
002af13c3e
commit
6a066cdf6a
|
|
@ -3,3 +3,4 @@
|
|||
/fs_1.3.0.tar.gz
|
||||
/fs_1.3.1.tar.gz
|
||||
/fs_1.4.1.tar.gz
|
||||
/fs_1.4.2.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
From eaeab0f3f5ef81d08436144cc8be04b89fbb38e5 Mon Sep 17 00:00:00 2001
|
||||
From bdf668ceec4ee205cd93e6e74c948ac8f27eeef3 Mon Sep 17 00:00:00 2001
|
||||
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
Date: Sat, 22 Sep 2018 23:50:25 -0400
|
||||
Subject: [PATCH 1/2] Use system libuv.
|
||||
Subject: [PATCH] Use system libuv.
|
||||
|
||||
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
---
|
||||
inst/COPYRIGHTS | 79 -------------------------------------------------
|
||||
src/Makevars | 24 ++-------------
|
||||
2 files changed, 3 insertions(+), 100 deletions(-)
|
||||
src/Makevars | 19 ++----------
|
||||
2 files changed, 3 insertions(+), 95 deletions(-)
|
||||
|
||||
diff --git a/inst/COPYRIGHTS b/inst/COPYRIGHTS
|
||||
index 912533e3..ed998717 100644
|
||||
|
|
@ -100,7 +100,7 @@ index 912533e3..ed998717 100644
|
|||
use one of the following licenses:
|
||||
|
||||
diff --git a/src/Makevars b/src/Makevars
|
||||
index a4c07030..6e08a28f 100644
|
||||
index 97c8f059..18a71d98 100644
|
||||
--- a/src/Makevars
|
||||
+++ b/src/Makevars
|
||||
@@ -1,6 +1,6 @@
|
||||
|
|
@ -111,7 +111,7 @@ index a4c07030..6e08a28f 100644
|
|||
|
||||
SOURCES = $(wildcard *.cc unix/*.cc)
|
||||
OBJECTS = $(SOURCES:.cc=.o)
|
||||
@@ -19,24 +19,11 @@
|
||||
@@ -19,24 +19,11 @@ ifeq ($(UNAME), Linux)
|
||||
OBJECTS += bsd/setmode.o bsd/strmode.o bsd/reallocarray.o
|
||||
endif
|
||||
|
||||
|
|
@ -138,5 +138,6 @@ index a4c07030..6e08a28f 100644
|
|||
clean:
|
||||
- $(MAKE) --directory=libuv distclean
|
||||
rm -f $(OBJECTS)
|
||||
--
|
||||
2.20.1
|
||||
--
|
||||
2.25.4
|
||||
|
||||
|
|
|
|||
|
|
@ -1,27 +0,0 @@
|
|||
From 69d07f43f13c7fa50d87e9d0c38cec23860dd5eb Mon Sep 17 00:00:00 2001
|
||||
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
Date: Sun, 5 May 2019 14:21:57 -0400
|
||||
Subject: [PATCH 2/2] Initialize stat buf to be zero.
|
||||
|
||||
This works around https://github.com/libuv/libuv/issues/2262.
|
||||
|
||||
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
---
|
||||
src/file.cc | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/file.cc b/src/file.cc
|
||||
index ed017e8f..184094fa 100644
|
||||
--- a/src/file.cc
|
||||
+++ b/src/file.cc
|
||||
@@ -148,6 +148,7 @@ List stat_(CharacterVector path, bool fail) {
|
||||
for (i = 0; i < Rf_xlength(path); ++i) {
|
||||
uv_fs_t req;
|
||||
const char* p = CHAR(STRING_ELT(path, i));
|
||||
+ memset(&req, 0, sizeof(req));
|
||||
int res = uv_fs_lstat(uv_default_loop(), &req, p, NULL);
|
||||
|
||||
bool is_na = STRING_ELT(path, i) == NA_STRING;
|
||||
--
|
||||
2.20.1
|
||||
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
diff -up fs/src/file.cc.fix fs/src/file.cc
|
||||
--- fs/src/file.cc.fix 2020-06-07 10:06:16.061054314 -0400
|
||||
+++ fs/src/file.cc 2020-06-07 10:06:46.228385680 -0400
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
#undef ERROR
|
||||
|
||||
-#include <string>
|
||||
+#include <cstring>
|
||||
#include <vector>
|
||||
|
||||
#include "error.h"
|
||||
21
R-fs.spec
21
R-fs.spec
|
|
@ -1,24 +1,21 @@
|
|||
%global packname fs
|
||||
%global packname fs
|
||||
%global packver 1.4.2
|
||||
%global rlibdir %{_libdir}/R/library
|
||||
|
||||
Name: R-%{packname}
|
||||
Version: 1.4.1
|
||||
Version: 1.4.2
|
||||
Release: 1%{?dist}
|
||||
Summary: Cross-Platform File System Operations Based on 'libuv'
|
||||
|
||||
License: GPLv3
|
||||
URL: https://CRAN.R-project.org/package=%{packname}
|
||||
Source0: https://cran.r-project.org/src/contrib/%{packname}_%{version}.tar.gz
|
||||
Source0: https://cran.r-project.org/src/contrib/%{packname}_%{packver}.tar.gz
|
||||
# Fedora-specific.
|
||||
Patch0001: 0001-Use-system-libuv.patch
|
||||
# Workaround for https://github.com/libuv/libuv/issues/2262
|
||||
Patch0002: 0002-Initialize-stat-buf-to-be-zero.patch
|
||||
# Fix issue where file.cc needs cstring.h
|
||||
Patch0003: 0003-fix-cstring.patch
|
||||
|
||||
# Here's the R view of the dependencies world:
|
||||
# Depends:
|
||||
# Imports: R-methods, R-Rcpp
|
||||
# Imports: R-methods
|
||||
# Suggests: R-testthat, R-covr, R-pillar >= 1.0.0, R-tibble >= 1.1.0, R-crayon, R-rmarkdown, R-knitr, R-withr, R-spelling
|
||||
# LinkingTo:
|
||||
# Enhances:
|
||||
|
|
@ -27,7 +24,6 @@ BuildRequires: pkgconfig(libuv) >= 1.18.0
|
|||
BuildRequires: R-devel
|
||||
BuildRequires: tex(latex)
|
||||
BuildRequires: R-methods
|
||||
BuildRequires: R-Rcpp-devel
|
||||
BuildRequires: R-testthat
|
||||
BuildRequires: R-pillar >= 1.0.0
|
||||
BuildRequires: R-tibble >= 1.1.0
|
||||
|
|
@ -51,10 +47,6 @@ pushd %{packname}
|
|||
rm -rf src/libuv
|
||||
sed -i -e '/libuv/d' MD5
|
||||
|
||||
%patch0002 -p1
|
||||
|
||||
%patch0003 -p1
|
||||
|
||||
# Don't need coverage; it's not packaged either.
|
||||
sed -i 's/, covr//g' DESCRIPTION
|
||||
popd
|
||||
|
|
@ -93,6 +85,9 @@ export LANG=C.UTF-8
|
|||
|
||||
|
||||
%changelog
|
||||
* Tue Jul 21 2020 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 1.4.2-1
|
||||
- Update to latest version
|
||||
|
||||
* Thu Jun 4 2020 Tom Callaway <spot@fedoraproject.org> - 1.4.1-1
|
||||
- update to 1.4.1
|
||||
- rebuild for R 4
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (fs_1.4.1.tar.gz) = bb5a9459f994c5a56e0cd282e88c0ed8a049723669a18587ba42a688adc81229d84626cdc8208034808e42d19e46ce31544507473481964fef6e352c61a9b640
|
||||
SHA512 (fs_1.4.2.tar.gz) = 4910f73af96a99d024e6a7b5eb2154cd6c1fcde4b51f0980abb8a3a3b74a4ee145ab2757e91a548e0f914684487648ef24e304325dace1a1a099926cc537e4a3
|
||||
|
|
|
|||
Loading…
Reference in New Issue