diff --git a/.gitignore b/.gitignore index 5f66241f5..9938e1e71 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ src/tuxpaint.desktop src/tuxpaint-fullscreen.desktop src/org.tuxpaint.Tuxpaint.appdata.xml test-png +inkscape diff --git a/Makefile b/Makefile index a934b3c0d..a7c41fdb4 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ # Various contributors (see AUTHORS.txt) # https://tuxpaint.org/ -# June 14, 2002 - June 7, 2023 +# June 14, 2002 - June 12, 2023 # The version number, for release: @@ -745,6 +745,7 @@ clean: @-rm -f dlllist a.exe @-rm -f win32/Preprocessed.iss win32/tuxpaint-*.zip win32/tuxpaint-*.exe @-rm -f test-png + @-rm -f ./inkscape @echo # "make uninstall" should remove the various parts from their @@ -882,6 +883,10 @@ $(INSTALLED_THUMB_STARTERS): $(DATA_PREFIX)/%: % install-example-starters-dirs echo-thumb-starters: @echo @echo "...Generating thumbnails for starters..." + @echo "# Don't let ImageMagick use Inkscape; use rsvgconvert instead" > ./inkscape + @echo "exit 1" >> ./inkscape + @chmod 755 ./inkscape + @(eval export PATH=$(shell pwd):$(PATH)) # Create thumbnails for starters .PHONY: thumb-starters @@ -936,6 +941,10 @@ $(INSTALLED_THUMB_TEMPLATES): $(DATA_PREFIX)/%: % echo-thumb-templates: @echo @echo "...Generating thumbnails for templates..." + @echo "# Don't let ImageMagick use Inkscape; use rsvgconvert instead" > ./inkscape + @echo "exit 1" >> ./inkscape + @chmod 755 ./inkscape + @(eval export PATH=$(shell pwd):$(PATH)) # Create thumbnails for templates .PHONY: thumb-templates diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt index 75907e463..2fe6d50d0 100644 --- a/docs/CHANGES.txt +++ b/docs/CHANGES.txt @@ -131,6 +131,15 @@ https://tuxpaint.org/ local filesystem while generating packages, e.g. for Slackware Linux) Tim Dickson + * When generating thumbnails for Starters & Templates, create a + "inkscape" shellscript, which simply does "exit 1", and add the + current directory to the beginning of the $PATH variable. + This will prevent ImageMagick's "convert" utility from using + Inkscape, if installed, and fallback to "rsvgconvert". + (When building Slackware packages, it was noticed that FontConfig + was running and generating a cache, which was unexpected.) + Tim Dickson + 2023.May.18 (0.9.30) * Improvements to Stamp tool: ---------------------------