math/R-cran-XLConnect: upgrade to 1.0.6
Changelog at <https://cran.r-project.org/web/packages/XLConnect/NEWS>.
This commit is contained in:
Thierry Thomas
parent
5d3daeb240
commit
e916f2a010
@ -1,5 +1,5 @@
|
||||
PORTNAME= XLConnect
|
||||
PORTVERSION= 1.0.5
|
||||
PORTVERSION= 1.0.6
|
||||
CATEGORIES= math
|
||||
DISTNAME= ${PORTNAME}_${PORTVERSION}
|
||||
|
||||
@ -23,7 +23,7 @@ USES= cran
|
||||
USE_JAVA= yes
|
||||
|
||||
DEP_JARS= commons-codec commons-collections4 commons-compress \
|
||||
ooxml-schemas poi poi-ooxml poi-ooxml-schemas \
|
||||
ooxml-schemas poi poi-ooxml poi-ooxml-full \
|
||||
SparseBitSet xmlbeans
|
||||
|
||||
post-install:
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
TIMESTAMP = 1651219653
|
||||
SHA256 (XLConnect_1.0.5.tar.gz) = 975c2ef57f28ccfac79ae5d285b7e82e60791fb121052616c10bc52e2bca16ad
|
||||
SIZE (XLConnect_1.0.5.tar.gz) = 1406818
|
||||
TIMESTAMP = 1666384262
|
||||
SHA256 (XLConnect_1.0.6.tar.gz) = b233b9f74d1464b78d5dd28bd8a1fa46ca6254518da2d3bda3c978a3f4aaa4f9
|
||||
SIZE (XLConnect_1.0.6.tar.gz) = 1467604
|
||||
|
||||
@ -1,26 +1,26 @@
|
||||
--- R/onLoad.R.orig 2021-09-30 08:28:06 UTC
|
||||
--- R/onLoad.R.orig 2022-10-20 08:32:02 UTC
|
||||
+++ R/onLoad.R
|
||||
@@ -54,44 +54,7 @@
|
||||
@@ -55,47 +55,7 @@
|
||||
repo <- "https://repo1.maven.org/maven2"
|
||||
}
|
||||
apachePrefix <- paste0(repo, "/org/apache")
|
||||
- sharedPaths <- tryCatch({
|
||||
- c(
|
||||
- xlcEnsureDependenciesFor(
|
||||
- paste0(apachePrefix, "/poi/poi-ooxml-schemas/4.1.2/poi-ooxml-schemas-4.1.2.jar"), "poi-ooxml-schemas.jar",
|
||||
- "4\\.[1-9].*", libname, pkgname, debianpkg = "libapache-poi-java", rpmpkg="apache-poi"),
|
||||
- paste0(apachePrefix, "/poi/poi-ooxml-full/5.2.3/poi-ooxml-full-5.2.3.jar"), "poi-ooxml-full.jar",
|
||||
- "5.2.3", libname, pkgname),
|
||||
- xlcEnsureDependenciesFor(
|
||||
- paste0(apachePrefix, "/poi/poi-ooxml/4.1.2/poi-ooxml-4.1.2.jar"), "poi-ooxml.jar",
|
||||
- "4\\.[1-9].*", libname, pkgname, debianpkg = "libapache-poi-java", rpmpkg="apache-poi"),
|
||||
- paste0(apachePrefix, "/poi/poi-ooxml/5.2.3/poi-ooxml-5.2.3.jar"), "poi-ooxml.jar",
|
||||
- "5.2.3", libname, pkgname, debianpkg = "libapache-poi-java", rpmpkg="apache-poi"),
|
||||
- xlcEnsureDependenciesFor(
|
||||
- paste0(apachePrefix, "/poi/poi/4.1.2/poi-4.1.2.jar"), "poi.jar",
|
||||
- "4\\.[1-9].*", libname, pkgname, debianpkg = "libapache-poi-java", rpmpkg="apache-poi"),
|
||||
- paste0(apachePrefix, "/poi/poi/5.2.3/poi-5.2.3.jar"), "poi.jar",
|
||||
- "5.2.3", libname, pkgname, debianpkg = "libapache-poi-java", rpmpkg="apache-poi"),
|
||||
- xlcEnsureDependenciesFor(
|
||||
- paste0(apachePrefix, "/commons/commons-compress/1.20/commons-compress-1.20.jar"), "commons-compress.jar",
|
||||
- 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/3.1.0/xmlbeans-3.1.0.jar"), "xmlbeans.jar",
|
||||
- "3\\..*", libname, pkgname, debianpkg="libxmlbeans-java"),
|
||||
- paste0(apachePrefix, "/xmlbeans/xmlbeans/5.0.3/xmlbeans-5.0.3.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",
|
||||
- "4-4\\.([2-9]|1[0-9]).*", libname, pkgname, debianpkg="libcommons-collections4-java", rpmpkg="apache-commons-collections4"),
|
||||
@ -28,11 +28,14 @@
|
||||
- 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",
|
||||
- "2.17.2", libname, pkgname),
|
||||
- xlcEnsureDependenciesFor(
|
||||
- paste0(repo, "/commons-codec/commons-codec/1.15/commons-codec-1.15.jar"), "commons-codec-1.15.jar",
|
||||
- "1\\.(1[1-9]|[2-9][0-9]).*", libname, pkgname, debianpkg="libcommons-codec-java", rpmpkg="apache-commons-codec"),
|
||||
- xlcEnsureDependenciesFor(
|
||||
- paste0(apachePrefix, "/poi/ooxml-schemas/1.4/ooxml-schemas-1.4.jar"), "ooxml-schemas.jar",
|
||||
- "1\\.([4-9]|[1-9][0-9]).*", libname, pkgname),
|
||||
- paste0(repo, "/commons-io/commons-io/2.11.0/commons-io-2.11.0.jar"), "commons-io-2.11.0.jar",
|
||||
- "2\\.(1[1-9]|[2-9][0-9]).*", libname, pkgname, debianpkg="libcommons-io-java", rpmpkg="apache-commons-io"),
|
||||
- xlcEnsureDependenciesFor(
|
||||
- paste0(repo, "/com/zaxxer/SparseBitSet/1.2/SparseBitSet-1.2.jar"), "SparseBitSet.jar",
|
||||
- "1\\.([2-9]|[1-9][0-9]).*", libname, pkgname)
|
||||
@ -43,6 +46,6 @@
|
||||
- }
|
||||
- )
|
||||
+ sharedPaths <- ""
|
||||
.jpackage(name = pkgname, jars = "*", morePaths = sharedPaths)
|
||||
.jpackage(name = pkgname, jars = "*", morePaths = sharedPaths, own.loader=TRUE)
|
||||
# Perform general XLConnect settings - pass package description
|
||||
XLConnectSettings(packageDescription(pkgname))
|
||||
|
||||
@ -57,19 +57,20 @@
|
||||
%%R_MOD_DIR%%/html/00Index.html
|
||||
%%R_MOD_DIR%%/html/R.css
|
||||
%%R_MOD_DIR%%/java/SparseBitSet.jar
|
||||
%%R_MOD_DIR%%/java/XLConnect-1.0.3.jar
|
||||
%%R_MOD_DIR%%/java/XLConnect-1.0.6.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-math3.jar
|
||||
%%R_MOD_DIR%%/java/curvesapi-1.06.jar
|
||||
%%R_MOD_DIR%%/java/curvesapi-1.07.jar
|
||||
%%R_MOD_DIR%%/java/ooxml-schemas.jar
|
||||
%%R_MOD_DIR%%/java/poi-ooxml-schemas.jar
|
||||
%%R_MOD_DIR%%/java/poi-ooxml-full.jar
|
||||
%%R_MOD_DIR%%/java/poi-ooxml.jar
|
||||
%%R_MOD_DIR%%/java/poi.jar
|
||||
%%R_MOD_DIR%%/java/xmlbeans.jar
|
||||
%%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/testBug49.xlsx
|
||||
%%R_MOD_DIR%%/unitTests/resources/testBug52.xlsx
|
||||
%%R_MOD_DIR%%/unitTests/resources/testBug53.xlsx
|
||||
@ -93,6 +94,8 @@
|
||||
%%R_MOD_DIR%%/unitTests/resources/testWorkbookForceRecalc.xlsx
|
||||
%%R_MOD_DIR%%/unitTests/resources/testWorkbookMissingValue.xls
|
||||
%%R_MOD_DIR%%/unitTests/resources/testWorkbookMissingValue.xlsx
|
||||
%%R_MOD_DIR%%/unitTests/resources/testWorkbookOverwriteFormulas.xls
|
||||
%%R_MOD_DIR%%/unitTests/resources/testWorkbookOverwriteFormulas.xlsx
|
||||
%%R_MOD_DIR%%/unitTests/resources/testWorkbookReadNamedRegion.xls
|
||||
%%R_MOD_DIR%%/unitTests/resources/testWorkbookReadNamedRegion.xlsx
|
||||
%%R_MOD_DIR%%/unitTests/resources/testWorkbookReadWorksheet.xls
|
||||
@ -123,6 +126,7 @@
|
||||
%%R_MOD_DIR%%/unitTests/runit.workbook.readWorksheet.R
|
||||
%%R_MOD_DIR%%/unitTests/runit.workbook.renameSheet.R
|
||||
%%R_MOD_DIR%%/unitTests/runit.workbook.saveWorkbook.R
|
||||
%%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.writeNamedRegion.R
|
||||
|
||||
Loading…
Reference in New Issue
Block a user