Merge branch 'master' into sdl2.0

Makefile

@@ -4,7 +4,7 @@
 # Various contributors (see AUTHORS.txt)
 # http://www.tuxpaint.org/
 
-# June 14, 2002 - June 29, 2022
+# June 14, 2002 - July 3, 2022
 
 
 # The version number, for release:
@@ -316,6 +316,9 @@ NOSVGFLAG:=$(if $(SVG_LIB),,-DNOSVG$(warning No SVG for you!))
 OLDSVGFLAG:=$(if $(filter -lsvg-cairo,$(SVG_LIB)),-DOLD_SVG,)
 
 
+PNG_CFLAGS:=$(shell $(PKG_CONFIG) libpng --cflags)
+
+
 ifeq ($(hack),1)
 hack:
 	@echo 'SDL2_PANGO_LIB is' $(SDL2_PANGO_LIB)
@@ -717,6 +720,7 @@ clean:
 	@-rm -f TuxPaint.dmg temp.dmg; rm -rf magic/*.dSYM Resources
 	@-rm -f dlllist a.exe
 	@-rm -f win32/Preprocessed.iss win32/tuxpaint-*.zip win32/tuxpaint-*.exe
+	@-rm -f test-png
 	@echo
 
 # "make uninstall" should remove the various parts from their
@@ -1402,3 +1406,7 @@ $(MAGIC_SO): magic/%.$(SO_TYPE): magic/src/%.c
 
 .PHONY: magic-plugins
 magic-plugins:	src/tp_magic_api.h $(MAGIC_SO)
+
+test-png:	src/test-png.c
+	$(CC) $(PNG_CFLAGS) src/test-png.c -o test-png $(PNG)
+