Fix

jeroen · jeroen · commit 79c1e6c8b749 · 2025-02-27T18:20:20.000+01:00
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,5 +1,5 @@
 Package: xslt
-Version: 1.5.0
+Version: 1.5.1
 Title: Extensible Style-Sheet Language Transformations
 Description: An extension for the 'xml2' package to transform XML documents
     by applying an 'xslt' style-sheet.
diff --git a/NEWS b/NEWS
@@ -1,3 +1,6 @@
+1.5.1
+  - Small fix for compat with new xml2
+
 1.5.0
   - Windows: build with libxslt from Rtools if found
 
diff --git a/src/Makevars.in b/src/Makevars.in
@@ -1,4 +1,4 @@
-PKG_CPPFLAGS=@cflags@ -DSTRICT_R_HEADERS
+PKG_CPPFLAGS=@cflags@ -DSTRICT_R_HEADERS -DSTRICT_R_HEADERS -DR_NO_REMAP
 PKG_LIBS=@libs@
 
 all: clean
diff --git a/src/Makevars.win b/src/Makevars.win
@@ -1,7 +1,7 @@
 PKG_CONFIG_NAME = libexslt
 PKG_CONFIG ?= $(BINPREF)pkg-config
 PKG_LIBS := $(shell $(PKG_CONFIG) --libs $(PKG_CONFIG_NAME))
-STATIC_CFLAGS = -DLIBXML_STATIC -DLIBXSLT_STATIC -DLIBEXSLT_STATIC -DSTRICT_R_HEADERS
+STATIC_CFLAGS = -DLIBXML_STATIC -DLIBXSLT_STATIC -DLIBEXSLT_STATIC -DSTRICT_R_HEADERS  -DSTRICT_R_HEADERS -DR_NO_REMAP
 
 ifneq ($(PKG_LIBS),)
 $(info using $(PKG_CONFIG_NAME) from Rtools)

-Original file line number
+Diff line change
@@ @@ -1,3 +1,6 @@ @@
 +1.5.1
 +  - Small fix for compat with new xml2
++
 .5.0
   - Windows: build with libxslt from Rtools if found
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-PKG_CPPFLAGS=@cflags@ -DSTRICT_R_HEADERS`
	`1`	`+PKG_CPPFLAGS=@cflags@ -DSTRICT_R_HEADERS -DSTRICT_R_HEADERS -DR_NO_REMAP`
`2`	`2`	`PKG_LIBS=@libs@`
`3`	`3`
`4`	`4`	`all: clean`