Merge 'master' into 'gtk3'.

[pspp] / Smake

diff --git a/Smake b/Smake
index a148027f2a7669ce9cfd6125e8e3351e25abd8af..e976e46379d1af3a535f7c0fc2515b3f90bb979e 100644 (file)
--- a/Smake
+++ b/Smake
@@ -438,14 +438,11 @@ clean:
 # with the alpha channels.  Therefore, it is not recommended for production pspp builds, but might
 # be useful to get something working on a platform which doesn't have a working gimp.
 
-#svg2png=convert $1 $3
+#svg2png=convert -background transparent $1 $3
 
-svg2png=gimp -i -b '(let* ((image  (car  (gimp-file-load 1  "$1"  "$1"))))  (gimp-image-attach-parasite image (list "gimp-comment" 0 "$(shell cat $2)"))  (gimp-file-save 1 image (car  (gimp-image-get-active-drawable image)) "$3" "$3")) (gimp-quit 1)'
-
-
-src/ui/gui/icons/%.png: src/ui/gui/artwork/%.svg src/ui/gui/icons/COPYING_CCBYSA3
+src/ui/gui/icons/%.png: src/ui/gui/artwork/%.svg build-aux/svg2png src/ui/gui/icons/COPYING_CCBYSA3
        mkdir -p $(dir $@)
-       $(call svg2png,$<,$(lastword $^),$@)
+       build-aux/svg2png "$<" "$(lastword $^)" "$@"
 
 
 src/ui/gui/icons/%.svg: src/ui/gui/artwork/%.svg