diff -Nru orig/ragg/src/Makevars.win patched/ragg/src/Makevars.win
--- orig/ragg/src/Makevars.win	2020-05-04 19:24:44.000000000 +0200
+++ patched/ragg/src/Makevars.win	2020-07-02 18:06:04.858454700 +0200
@@ -1,31 +1,25 @@
-VERSION = 1.16.0
-RWINLIB = ../windows/cairo-${VERSION}
 
 AGG_OBJECTS = agg/src/agg_curves.o agg/src/agg_font_freetype.o \
 	agg/src/agg_trans_affine.o agg/src/agg_vcgen_dash.o \
 	agg/src/agg_vcgen_stroke.o
 
-PKG_CPPFLAGS = -I${RWINLIB}/include/cairo -I${RWINLIB}/include \
-  -I../windows/baselibs-3.5.0/include \
-	-I${RWINLIB}/include/freetype2 -I./agg/include \
+PKG_CPPFLAGS = -I${LOCAL_SOFT}/include/cairo \
+	-I${LOCAL_SOFT}/include/freetype2 -I./agg/include \
 	-DSTRICT_R_HEADERS
 
 PKG_LIBS = -Lagg -lstatagg \
-  -L${RWINLIB}/lib${R_ARCH} \
-	-lfreetype -lharfbuzz -lfreetype -lpng -lbz2 -lz -ljpeg \
-	-L../windows/baselibs-3.5.0/lib${R_ARCH} -ltiff \
-	-lgdi32 -lws2_32
+	-lcairo -lfontconfig -lintl -liconv -lexpat -lharfbuzz -lfreetype \
+	-lharfbuzz -lfreetype -lpixman-1 -lpng -ltiff -ljpeg -lbz2 -lz \
+	-lzstd -lgdi32 -lmsimg32 -lwebp -llzma -lws2_32 $(GRAPHAPP_LIB)
 	
 STATLIB = agg/libstatagg.a
 
-all: clean winlibs
+all: clean 
 
 $(SHLIB): $(STATLIB)
 
 $(STATLIB): $(AGG_OBJECTS)
 
-winlibs:
-	"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" "../tools/winlibs.R" ${VERSION}
 
 clean:
 	rm -f $(OBJECTS) $(STATLIB) $(SHLIB) $(AGG_OBJECTS)