try R 4.5.0 Windows

Author: pachadotdev

cran-comments.md

@@ -2,26 +2,6 @@
 
 0 errors | 0 warnings | 1 note
 
-* This is a corrected release (5.3.3)
-* Changes:
-  * 'configure' tests that the installed Tesseract version is compatible
-    with the C++ compiler (requested by Prof. Brian Ripley, CRAN).
-  * Adds Tesseract as a MacOS requirement (via brew) and does not use autobrew
-    to install it - requested by CRAN on an email.
-  * Uses 'pdftools' conditionally. Btw, I cannot get to install pdftools
-    on the Niagara cluster, meaning that it is that package that has an issue
-    with clang 19.
-  * The notes for r-release-macos-arm64 - r-oldrel-windows-x86_64 were fixed
-    by moving as much as possible to system packages that can be installed with
-    'apt-get' or similar.
-* CRAN shows this for 5.3.2 on r-devel-linux-x86_64-debian-gcc , I think
-  I don't have a way to change your server
-  permissions from my side:
-  "installing to library
-  ‘/home/hornik/tmp/R.check/r-devel-gcc/Work/build/Packages’
-  Error: ERROR: no permission to install to directory
-  ‘/home/hornik/tmp/R.check/r-devel-gcc/Work/build/Packages’"
-* The warnings with clang19 (and clang-asan) were solved by sending a pull
-  request to Posit (https://github.com/r-lib/cpp11/pull/404/files). This
-  fix required to patch a package used by cpp11tesseract and add a conditional
-  to avoid redeclaring STRICT_R_HEADERS.
+* C++11 specification is essential as the tesseract library requires C++11
+  features.
+* V5.3.6 fixes all CRAN warnings and errors.

src/Makevars.win

@@ -1,37 +1,38 @@
 # Tesseract configuration
-
 RWINLIB = ../windows/tesseract
 PKG_CPPFLAGS = -I${RWINLIB}/include -I${RWINLIB}/include/leptonica -fvisibility=hidden
 
-# Exclude unwanted symbols from DLL 
+# Exclude unwanted symbols from DLL using more aggressive approach
 PKG_LIBS = -L${RWINLIB}/lib${subst gcc,,${COMPILED_BY}}${R_ARCH} \
 	-L${RWINLIB}/lib \
+	-Wl,--whole-archive \
 	-ltesseract -lleptonica \
+	-Wl,--no-whole-archive \
 	-ltiff -lopenjp2 -lwebp -lsharpyuv -ljpeg -lgif -lpng16 -lz \
 	-lws2_32 \
-	-Wl,--exclude-all-symbols
+	-Wl,--exclude-all-symbols \
+	-static-libgcc -static-libstdc++
 
-# CRAN note: consistent C++11 standard usage
-CXX_STD = CXX11
+# For R 4.5.0 compatibility
+ifeq ($(shell ${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe -e 'cat(as.numeric(R.version$$major) + as.numeric(R.version$$minor)/10)'),4.5)
+	PKG_LIBS += -Wl,--version-script=../tools/exports.map
+endif
 
 # Compile
-all: clean winlibs
+all: clean winlibs exports.map
 
 clean:
-	rm -Rf $(OBJECTS) $(SHLIB)
+	rm -Rf $(OBJECTS) $(SHLIB) exports.map cpp11tesseract.def
+
+exports.map: clean
+	@echo "{ global: R_init_cpp11tesseract; local: *; };" > ../tools/exports.map
 
 winlibs:
 	mkdir -p ../inst
 	"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" "../tools/winlibs.R" ${VERSION}
 	cp -Rf ../windows/tessdata ../inst/
 	cp -Rf ${RWINLIB}/share/tessdata ../inst/
 
-# Create DEF file to control exports
-$(SHLIB): $(OBJECTS) cpp11tesseract.def
-
-cpp11tesseract.def:
-	echo EXPORTS > cpp11tesseract.def
-	${DLLTOOL} --input-def cpp11tesseract.def --kill-at --output-lib cpp11tesseract.a $(OBJECTS)
+$(SHLIB): $(OBJECTS)
 
 .PHONY: all winlibs clean
-

tools/export.map

@@ -0,0 +1,6 @@
+{
+  global:
+    R_init_cpp11tesseract;
+  local:
+    *;
+};