From 5672dac7d1647986b6b4dc8bbc763ef31e6675d6 Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Wed, 16 Feb 2022 14:14:12 +0100
Subject: [PATCH] Windows: update to poppler 22.02 CI: test on Windows oldrel
 too

---
 .github/workflows/R-CMD-check.yaml | 3 ++-
 src/Makevars.win                   | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
index 55e4e8e..6d76530 100644
--- a/.github/workflows/R-CMD-check.yaml
+++ b/.github/workflows/R-CMD-check.yaml
@@ -17,8 +17,9 @@ jobs:
       matrix:
         config:
           - {os: macOS-latest,    r: 'release'}
-          - {os: windows-latest,  r: 'release'}
           - {os: windows-latest,  r: 'devel'}
+          - {os: windows-latest,  r: '4.1'}
+          - {os: windows-latest,  r: '3.6'}
           - {os: ubuntu-latest,   r: 'devel', http-user-agent: 'release'}
           - {os: ubuntu-latest,   r: 'release'}
           - {os: ubuntu-latest,   r: 'oldrel-1'}
diff --git a/src/Makevars.win b/src/Makevars.win
index c0caf3c..84342df 100644
--- a/src/Makevars.win
+++ b/src/Makevars.win
@@ -1,10 +1,11 @@
-VERSION=21.04.0
-DATA=0.4.10
+VERSION=22.02.0
+DATA=0.4.11
 
 # Need older poppler for R < 4.0
 ifeq ($(R_COMPILED_BY),gcc 4.9.3)
 VERSION=0.73.0
 DATA=0.4.9
+EXTRALIB=-lharfbuzz
 endif
 
 CXX_STD=CXX11
@@ -17,7 +18,7 @@ PKG_LIBS= \
 	-L$(RWINLIB)/lib${subst gcc,,${COMPILED_BY}}${R_ARCH} \
 	-L$(RWINLIB)/lib${R_ARCH}${CRT} \
 	-lpoppler-cpp -lpoppler -llcms2 -ljpeg -lpng16 -ltiff -lopenjp2 \
-	-lfreetype -lharfbuzz -lfreetype -lbz2 -liconv -lz
+	-lfreetype $EXTRALIB -lfreetype -lbz2 -liconv -lz
 
 all: clean winlibs