From fe81050c2fda6803c96300db9faf2ccbccd77c06 Mon Sep 17 00:00:00 2001 From: Thierry Thomas Date: Wed, 25 Jan 2023 22:46:52 +0100 Subject: [PATCH] math/R-cran-XLConnect: upgrade to 1.0.7 Changelog at . --- math/R-cran-XLConnect/Makefile | 10 ++++++---- math/R-cran-XLConnect/distinfo | 6 +++--- math/R-cran-XLConnect/files/patch-R_onLoad.R | 6 +++--- math/R-cran-XLConnect/pkg-plist | 7 ++++++- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/math/R-cran-XLConnect/Makefile b/math/R-cran-XLConnect/Makefile index 7c27bb530350..e3983f79bb22 100644 --- a/math/R-cran-XLConnect/Makefile +++ b/math/R-cran-XLConnect/Makefile @@ -1,5 +1,5 @@ PORTNAME= XLConnect -PORTVERSION= 1.0.6 +PORTVERSION= 1.0.7 CATEGORIES= math DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -22,9 +22,9 @@ RUN_DEPENDS= R-cran-rJava>0:devel/R-cran-rJava \ USES= cran USE_JAVA= yes -DEP_JARS= commons-codec commons-collections4 commons-compress \ - ooxml-schemas poi poi-ooxml poi-ooxml-full \ - SparseBitSet xmlbeans +DEP_JARS= commons-codec commons-collections4 commons-compress commons-io \ + log4j-api log4j-core poi poi-ooxml poi-ooxml-full SparseBitSet \ + xmlbeans post-install: .for j in ${DEP_JARS} @@ -32,5 +32,7 @@ post-install: .endfor ${LN} -sf ${JAVALIBDIR}/commons-math.jar \ ${STAGEDIR}${PREFIX}/${R_MOD_DIR}/java/commons-math3.jar + ${LN} -sf ${JAVALIBDIR}/commons-codec.jar \ + ${STAGEDIR}${PREFIX}/${R_MOD_DIR}/java/commons-codec-1.15.jar .include diff --git a/math/R-cran-XLConnect/distinfo b/math/R-cran-XLConnect/distinfo index 1b908d34a344..1b7064d003a2 100644 --- a/math/R-cran-XLConnect/distinfo +++ b/math/R-cran-XLConnect/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1666384262 -SHA256 (XLConnect_1.0.6.tar.gz) = b233b9f74d1464b78d5dd28bd8a1fa46ca6254518da2d3bda3c978a3f4aaa4f9 -SIZE (XLConnect_1.0.6.tar.gz) = 1467604 +TIMESTAMP = 1674668978 +SHA256 (XLConnect_1.0.7.tar.gz) = 821dba231c3c3147455e7525119b51e5dc001984c638b7ce519d0974b32de677 +SIZE (XLConnect_1.0.7.tar.gz) = 1478915 diff --git a/math/R-cran-XLConnect/files/patch-R_onLoad.R b/math/R-cran-XLConnect/files/patch-R_onLoad.R index 82613296ce0c..02d90e47d8de 100644 --- a/math/R-cran-XLConnect/files/patch-R_onLoad.R +++ b/math/R-cran-XLConnect/files/patch-R_onLoad.R @@ -1,4 +1,4 @@ ---- R/onLoad.R.orig 2022-10-20 08:32:02 UTC +--- R/onLoad.R.orig 2023-01-24 09:49:21 UTC +++ R/onLoad.R @@ -55,47 +55,7 @@ repo <- "https://repo1.maven.org/maven2" @@ -19,7 +19,7 @@ - paste0(apachePrefix, "/commons/commons-compress/1.21/commons-compress-1.21.jar"), "commons-compress.jar", - "1\\.(1[8-9]|[2-9][0-9]).*", libname, pkgname, debianpkg = "libcommons-compress-java", rpmpkg="apache-commons-compress"), - xlcEnsureDependenciesFor( -- paste0(apachePrefix, "/xmlbeans/xmlbeans/5.0.3/xmlbeans-5.0.3.jar"), "xmlbeans.jar", +- paste0(apachePrefix, "/xmlbeans/xmlbeans/5.1.1/xmlbeans-5.1.1.jar"), "xmlbeans.jar", - "5\\..*", libname, pkgname, debianpkg="libxmlbeans-java"), - xlcEnsureDependenciesFor( - paste0(apachePrefix, "/commons/commons-collections4/4.4/commons-collections4-4.4.jar"), "commons-collections4.jar", @@ -28,7 +28,7 @@ - paste0(apachePrefix, "/commons/commons-math3/3.6.1/commons-math3-3.6.1.jar"), "commons-math3.jar", - "3\\.([6-9]|1[0-9]).*", libname, pkgname, debianpkg="libcommons-math3-java"), - xlcEnsureDependenciesFor( -- paste0(apachePrefix, "/logging/log4j/log4j-api/2.17.2/log4j-api-2.17.2.jar"), "log4j-api.jar", +- paste0(apachePrefix, "/logging/log4j/log4j-api/2.18.0/log4j-api-2.18.0.jar"), "log4j-api.jar", - "2.17.2", libname, pkgname), - xlcEnsureDependenciesFor( - paste0(repo, "/commons-codec/commons-codec/1.15/commons-codec-1.15.jar"), "commons-codec-1.15.jar", diff --git a/math/R-cran-XLConnect/pkg-plist b/math/R-cran-XLConnect/pkg-plist index c58b2c9c5380..6ac20542c769 100644 --- a/math/R-cran-XLConnect/pkg-plist +++ b/math/R-cran-XLConnect/pkg-plist @@ -58,12 +58,15 @@ %%R_MOD_DIR%%/html/R.css %%R_MOD_DIR%%/java/SparseBitSet.jar %%R_MOD_DIR%%/java/XLConnect-1.0.6.jar +%%R_MOD_DIR%%/java/commons-codec-1.15.jar %%R_MOD_DIR%%/java/commons-codec.jar %%R_MOD_DIR%%/java/commons-collections4.jar %%R_MOD_DIR%%/java/commons-compress.jar +%%R_MOD_DIR%%/java/commons-io.jar %%R_MOD_DIR%%/java/commons-math3.jar %%R_MOD_DIR%%/java/curvesapi-1.07.jar -%%R_MOD_DIR%%/java/ooxml-schemas.jar +%%R_MOD_DIR%%/java/log4j-api.jar +%%R_MOD_DIR%%/java/log4j-core.jar %%R_MOD_DIR%%/java/poi-ooxml-full.jar %%R_MOD_DIR%%/java/poi-ooxml.jar %%R_MOD_DIR%%/java/poi.jar @@ -71,6 +74,7 @@ %%R_MOD_DIR%%/tests/run_tests.R %%R_MOD_DIR%%/unitTests/resources/testBug106.xlsx %%R_MOD_DIR%%/unitTests/resources/testBug170.xlsx +%%R_MOD_DIR%%/unitTests/resources/testBug181.xlsx %%R_MOD_DIR%%/unitTests/resources/testBug49.xlsx %%R_MOD_DIR%%/unitTests/resources/testBug52.xlsx %%R_MOD_DIR%%/unitTests/resources/testBug53.xlsx @@ -129,6 +133,7 @@ %%R_MOD_DIR%%/unitTests/runit.workbook.setForceFormulaRecalculation.R %%R_MOD_DIR%%/unitTests/runit.workbook.setMissingValue.R %%R_MOD_DIR%%/unitTests/runit.workbook.setSheetPos.R +%%R_MOD_DIR%%/unitTests/runit.workbook.testBug181.R %%R_MOD_DIR%%/unitTests/runit.workbook.writeNamedRegion.R %%R_MOD_DIR%%/unitTests/runit.workbook.writeWorksheet.R %%R_MOD_DIR%%/unitTests/runit.writeAndReadNamedRegion.R