Skip to content

Commit

Permalink
databases/R-cran-RSQLite: Update to 2.3.6
Browse files Browse the repository at this point in the history
While I'm here,

- remove conditionals regarding llvm16 build fix as port build fine
  without it.
- add test target

ChangeLog: https://cran.r-project.org/web/packages/RSQLite/news/news.html

Differential Revision:	https://reviews.freebsd.org/D44592
  • Loading branch information
einsibjarni authored and nunotexbsd committed Apr 5, 2024
1 parent 23655b7 commit d4fe7a4
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 19 deletions.
26 changes: 10 additions & 16 deletions databases/R-cran-RSQLite/Makefile
@@ -1,33 +1,27 @@
PORTNAME= RSQLite
PORTVERSION= 2.2.19
PORTREVISION= 1
PORTVERSION= 2.3.6
CATEGORIES= databases
DISTNAME= ${PORTNAME}_${PORTVERSION}

MAINTAINER= skreuzer@FreeBSD.org
COMMENT= Database Interface R driver for SQLite
WWW= https://cran.r-project.org/web/packages/RSQLite/

LICENSE= LGPL20
LICENSE= LGPL21

CRAN_DEPENDS= R-cran-DBI>=1.1.0:databases/R-cran-DBI \
R-cran-bit64>0:devel/R-cran-bit64 \
R-cran-blob>0:devel/R-cran-blob \
CRAN_DEPENDS= R-cran-bit64>0:devel/R-cran-bit64 \
R-cran-blob>=1.2.0:devel/R-cran-blob \
R-cran-cpp11>=0.4.0:devel/R-cran-cpp11 \
R-cran-DBI>=1.2.0:databases/R-cran-DBI \
R-cran-memoise>0:devel/R-cran-memoise \
R-cran-Rcpp>0:devel/R-cran-Rcpp \
R-cran-pkgconfig>0:devel/R-cran-pkgconfig \
R-cran-plogr>0:devel/R-cran-plogr
R-cran-plogr>=0.2.0:devel/R-cran-plogr \
R-cran-Rcpp>=0.4.00:devel/R-cran-Rcpp \
R-cran-rlang>0:devel/R-cran-rlang
BUILD_DEPENDS= ${CRAN_DEPENDS}
RUN_DEPENDS= ${CRAN_DEPENDS}
TEST_DEPENDS= R-cran-testthat>0:devel/R-cran-testthat

USES= cran:auto-plist,compiles

.include <bsd.port.options.mk>

post-patch:
.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
@${REINPLACE_CMD} -e 's|PKG_CPPFLAGS=|PKG_CPPFLAGS=-Wno-error=enum-constexpr-conversion |g' \
${WRKSRC}/src/Makevars
.endif

.include <bsd.port.mk>
6 changes: 3 additions & 3 deletions databases/R-cran-RSQLite/distinfo
@@ -1,3 +1,3 @@
TIMESTAMP = 1669913013
SHA256 (RSQLite_2.2.19.tar.gz) = 720f6b3bd0f910d200f4900f90feda177d1a6da098b373f91f14abcffd785f86
SIZE (RSQLite_2.2.19.tar.gz) = 3730412
TIMESTAMP = 1711979278
SHA256 (RSQLite_2.3.6.tar.gz) = fbb1b7a58ff49af30059a802a9fed0055b8cf1e401b8022382b94fc6c3c9f8f2
SIZE (RSQLite_2.3.6.tar.gz) = 4249332
@@ -0,0 +1,27 @@
Fix to skip a windows only test that does not exclude FreeBSD.
https://github.com/r-dbi/RSQLite/pull/504

--- tests/testthat/test-encoding.R.orig 2024-01-20 09:56:34 UTC
+++ tests/testthat/test-encoding.R
@@ -34,9 +34,7 @@ test_that("list the field of tables whose colnames are
})
test_that("list the field of tables whose colnames are BIG5 encoded (#277)", {
- skip_on_os("linux")
- skip_on_os("mac")
- skip_on_os("solaris")
+ skip_if_not(.Platform$OS.type == "windows")
if (.Platform$OS.type == "windows") {
withr::local_collate("cht")
} else {
@@ -133,9 +131,7 @@ test_that("write tables whose colnames or contents are
})
test_that("write tables whose colnames or contents are BIG5 encoded (#277)", {
- skip_on_os("linux")
- skip_on_os("mac")
- skip_on_os("solaris")
+ skip_if_not(.Platform$OS.type == "windows")

.loc <- Sys.getlocale("LC_COLLATE")
suppressWarnings(Sys.setlocale(locale = "cht"))

0 comments on commit d4fe7a4

Please sign in to comment.