Revert to old librsvg on Windows

ropensci · Apr 21, 2018 · 0b748be · 0b748be
1 parent e979a1a
commit 0b748be
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/NEWS b/NEWS
@@ -1,5 +1,4 @@
 1.2
-  - Windows: update librsvg stack to rwinlib/rsvg@2.40.20
   - MacOS: use librsvg 2.40.19 because 2.42 has static linking bug
 
 1.1

diff --git a/src/Makevars.win b/src/Makevars.win
@@ -1,4 +1,4 @@
-VERSION=2.40.20
+VERSION=2.40.16
 RWINLIB=../windows/rsvg-$(VERSION)
 
 all: clean winlibs
@@ -20,9 +20,9 @@ PKG_LIBS= \
 	-L$(RWINLIB)/lib${R_ARCH} \
 	-lrsvg-2 \
 	-lxml2 -llzma \
-	-lpangocairo-1.0 -lpango-1.0 -lpangoft2-1.0 -lpangowin32-1.0 -lfribidi \
+	-lpangocairo-1.0 -lpango-1.0 -lpangoft2-1.0 -lpangowin32-1.0 \
 	-lcairo -lfontconfig -lfreetype -lpixman-1 -lexpat -lbz2 -lz \
 	-lharfbuzz -lcroco-0.6 -lgdk_pixbuf-2.0 \
 	-lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 \
-	-lffi -lpcre -lpng -lintl \
+	-lffi -lpcre -lpng16 -lintl -liconv \
 	-lusp10 -liphlpapi -lgdiplus -lgdi32 -lole32 -lwinmm -ldnsapi -lws2_32