Update to newest versions of python, inkscape, etc

Makefile

@@ -14,7 +14,7 @@
 #    -> EPS generation
 # 5. convert (ImageMagick)
 #    -> multi-resolution favicon creation
-# 6. python
+# 6. python3
 #    -> Custom script for generating the logo layouts from master SVG
 # 7. pdftk
 #    -> PDF reproducible builds
@@ -52,11 +52,11 @@ ${BGS}: ${FILES}
 	scour -i "$<" -o "$@" --remove-descriptive-elements --enable-viewboxing --enable-id-stripping --enable-comment-stripping --shorten-ids --indent=none --no-line-breaks
 
 %.1.svg: %.2.svg
-	inkscape "--file=$<" --export-area-drawing "--export-plain-svg=$@"
+	inkscape "$<" --export-area-drawing --export-plain-svg "--export-filename=$@"
 
 %.2.svg:
 	mkdir -p ${@D}
-	cat master_template.svg | python proc-template.py "$(*F)" > "$@"
+	cat master_template.svg | python3 proc-template.py "$(*F)" > "$@"
 
 %.png: %.1.png
 	pngcrush "$<" "$@"
@@ -71,12 +71,12 @@ ${BGS}: ${FILES}
 		mode="$${BASH_REMATCH[1]}"
 		dim="$${BASH_REMATCH[2]}"
 		if [ "$$mode" == "h" ] ; then
-			inkscape "--file=$<" "--export-png=$@" "--export-height=$$dim"
+			inkscape "$<" --export-type="png" "--export-filename=$@" "--export-height=$$dim"
 		else
-			inkscape "--file=$<" "--export-png=$@" "--export-width=$$dim"
+			inkscape "$<" --export-type="png" "--export-filename=$@" "--export-width=$$dim"
 		fi
 	else
-		inkscape "--file=$<" "--export-png=$@"
+		inkscape "$<" --export-type="png" "--export-filename=$@"
 	fi
 
 %.pdf: %.1.pdf
@@ -86,13 +86,13 @@ ${BGS}: ${FILES}
 	ps2pdf -dEPSCrop "$<" "$@"
 
 %.2.pdf: %.svg
-	inkscape "--file=$<" "--export-eps=$@"
+	inkscape "$<" --export-type="pdf" "--export-filename=$@"
 
 %.eps: %.1.eps
 	cat "$<" | ps2eps | sed -e ':a;N;$$!ba;s/\n%%CreationDate:[^\n]\+\n/\n/g' > "$@"
 
 %.1.eps: %.svg
-	inkscape "--file=$<" "--export-eps=$@"
+	inkscape "$<" --export-type="eps" "--export-filename=$@"
 
 TMPICONSRC := ${ICONDIR}/tmp-favicon-icon-clearbg.svg
 COMMA := ,
@@ -111,7 +111,7 @@ ${ICONDIR}/%-icon.svg: ${TMPICONSRC}
 	convert -density 384 -background transparent "${TMPICONSRC}" -flatten -colors 256 -define "icon:auto-resize=$(subst ${SPACE},${COMMA},${SIMPLEICONSIZES})" "$@"
 
 ${ICONDIR}/%.1.png: ${TMPICONSRC}
-	inkscape "--file=${TMPICONSRC}" "--export-width=$(subst .1.png,,$(subst ${ICONDIR}/${FILEPREFIX}-icon-,,$@))" "--export-height=$(subst .1.png,,$(subst ${ICONDIR}/${FILEPREFIX}-icon-,,$@))" "--export-png=$@"
+	inkscape "${TMPICONSRC}" "--export-width=$(subst .1.png,,$(subst ${ICONDIR}/${FILEPREFIX}-icon-,,$@))" "--export-height=$(subst .1.png,,$(subst ${ICONDIR}/${FILEPREFIX}-icon-,,$@))" --export-type="png" "--export-filename=$@"
 
 .PHONY: clean
 clean:

build/crysp-logo-pictorial-blackbg.eps

@@ -1,7 +1,7 @@
 %!PS-Adobe-3.0 EPSF-3.0
 %%BoundingBox: 0 0 279 300
 %%HiResBoundingBox: 0.000000 0.000000 279.000000 300.000000
-%%Creator: cairo 1.15.12 (http://cairographics.org)
+%%Creator: cairo 1.16.0 (https://cairographics.org)
 %%DocumentData: Clean7Bit
 %%LanguageLevel: 2
 %%EndComments

build/crysp-logo-pictorial-mono-blackbg-whitefg.eps

@@ -1,7 +1,7 @@
 %!PS-Adobe-3.0 EPSF-3.0
 %%BoundingBox: 0 0 279 300
 %%HiResBoundingBox: 0.000000 0.000000 279.000000 300.000000
-%%Creator: cairo 1.15.12 (http://cairographics.org)
+%%Creator: cairo 1.16.0 (https://cairographics.org)
 %%DocumentData: Clean7Bit
 %%LanguageLevel: 2
 %%EndComments

build/crysp-logo-pictorial-mono-whitebg-blackfg.eps

@@ -1,7 +1,7 @@
 %!PS-Adobe-3.0 EPSF-3.0
 %%BoundingBox: 37 37 242 263
 %%HiResBoundingBox: 37.500000 37.500000 241.500000 263.000000
-%%Creator: cairo 1.15.12 (http://cairographics.org)
+%%Creator: cairo 1.16.0 (https://cairographics.org)
 %%DocumentData: Clean7Bit
 %%LanguageLevel: 2
 %%EndComments

build/crysp-logo-pictorial-whitebg.eps

@@ -1,7 +1,7 @@
 %!PS-Adobe-3.0 EPSF-3.0
 %%BoundingBox: 37 37 242 263
 %%HiResBoundingBox: 37.500000 37.500000 241.500000 263.000000
-%%Creator: cairo 1.15.12 (http://cairographics.org)
+%%Creator: cairo 1.16.0 (https://cairographics.org)
 %%DocumentData: Clean7Bit
 %%LanguageLevel: 2
 %%EndComments

build/crysp-logo-tagline1-blackbg-whitefg.eps

@@ -1,7 +1,7 @@
 %!PS-Adobe-3.0 EPSF-3.0
 %%BoundingBox: 0 0 908 450
 %%HiResBoundingBox: 0.000000 0.000000 907.500000 450.000000
-%%Creator: cairo 1.15.12 (http://cairographics.org)
+%%Creator: cairo 1.16.0 (https://cairographics.org)
 %%DocumentData: Clean7Bit
 %%LanguageLevel: 2
 %%EndComments

build/crysp-logo-tagline1-mono-blackbg-whitefg.eps

@@ -1,7 +1,7 @@
 %!PS-Adobe-3.0 EPSF-3.0
 %%BoundingBox: 0 0 908 450
 %%HiResBoundingBox: 0.000000 0.000000 907.500000 450.000000
-%%Creator: cairo 1.15.12 (http://cairographics.org)
+%%Creator: cairo 1.16.0 (https://cairographics.org)
 %%DocumentData: Clean7Bit
 %%LanguageLevel: 2
 %%EndComments

build/crysp-logo-tagline1-mono-whitebg-blackfg.eps

@@ -1,7 +1,7 @@
 %!PS-Adobe-3.0 EPSF-3.0
 %%BoundingBox: 37 37 870 413
 %%HiResBoundingBox: 37.500000 37.000000 870.000000 413.000000
-%%Creator: cairo 1.15.12 (http://cairographics.org)
+%%Creator: cairo 1.16.0 (https://cairographics.org)
 %%DocumentData: Clean7Bit
 %%LanguageLevel: 2
 %%EndComments

build/crysp-logo-tagline1-whitebg-blackfg.eps

@@ -1,7 +1,7 @@
 %!PS-Adobe-3.0 EPSF-3.0
 %%BoundingBox: 37 37 870 413
 %%HiResBoundingBox: 37.500000 37.000000 870.000000 413.000000
-%%Creator: cairo 1.15.12 (http://cairographics.org)
+%%Creator: cairo 1.16.0 (https://cairographics.org)
 %%DocumentData: Clean7Bit
 %%LanguageLevel: 2
 %%EndComments

build/crysp-logo-tagline2-blackbg-whitefg.eps

@@ -1,7 +1,7 @@
 %!PS-Adobe-3.0 EPSF-3.0
 %%BoundingBox: 0 0 908 450
 %%HiResBoundingBox: 0.000000 0.000000 907.500000 450.000000
-%%Creator: cairo 1.15.12 (http://cairographics.org)
+%%Creator: cairo 1.16.0 (https://cairographics.org)
 %%DocumentData: Clean7Bit
 %%LanguageLevel: 2
 %%EndComments

build/crysp-logo-tagline2-mono-blackbg-whitefg.eps

@@ -1,7 +1,7 @@
 %!PS-Adobe-3.0 EPSF-3.0
 %%BoundingBox: 0 0 908 450
 %%HiResBoundingBox: 0.000000 0.000000 907.500000 450.000000
-%%Creator: cairo 1.15.12 (http://cairographics.org)
+%%Creator: cairo 1.16.0 (https://cairographics.org)
 %%DocumentData: Clean7Bit
 %%LanguageLevel: 2
 %%EndComments

build/crysp-logo-tagline2-mono-whitebg-blackfg.eps

@@ -1,7 +1,7 @@
 %!PS-Adobe-3.0 EPSF-3.0
 %%BoundingBox: 37 37 870 413
 %%HiResBoundingBox: 37.500000 37.000000 870.000000 413.000000
-%%Creator: cairo 1.15.12 (http://cairographics.org)
+%%Creator: cairo 1.16.0 (https://cairographics.org)
 %%DocumentData: Clean7Bit
 %%LanguageLevel: 2
 %%EndComments

build/crysp-logo-tagline2-whitebg-blackfg.eps

@@ -1,7 +1,7 @@
 %!PS-Adobe-3.0 EPSF-3.0
 %%BoundingBox: 37 37 870 413
 %%HiResBoundingBox: 37.500000 37.000000 870.000000 413.000000
-%%Creator: cairo 1.15.12 (http://cairographics.org)
+%%Creator: cairo 1.16.0 (https://cairographics.org)
 %%DocumentData: Clean7Bit
 %%LanguageLevel: 2
 %%EndComments

build/crysp-logo-word-blackbg-whitefg.eps

@@ -1,7 +1,7 @@
 %!PS-Adobe-3.0 EPSF-3.0
 %%BoundingBox: 0 0 908 316
 %%HiResBoundingBox: 0.000000 0.000000 907.500000 316.000000
-%%Creator: cairo 1.15.12 (http://cairographics.org)
+%%Creator: cairo 1.16.0 (https://cairographics.org)
 %%DocumentData: Clean7Bit
 %%LanguageLevel: 2
 %%EndComments

build/crysp-logo-word-mono-blackbg-whitefg.eps

@@ -1,7 +1,7 @@
 %!PS-Adobe-3.0 EPSF-3.0
 %%BoundingBox: 0 0 908 316
 %%HiResBoundingBox: 0.000000 0.000000 907.500000 316.000000
-%%Creator: cairo 1.15.12 (http://cairographics.org)
+%%Creator: cairo 1.16.0 (https://cairographics.org)
 %%DocumentData: Clean7Bit
 %%LanguageLevel: 2
 %%EndComments

build/crysp-logo-word-mono-whitebg-blackfg.eps

@@ -1,7 +1,7 @@
 %!PS-Adobe-3.0 EPSF-3.0
 %%BoundingBox: 37 37 870 279
 %%HiResBoundingBox: 37.500000 37.500000 870.000000 279.000000
-%%Creator: cairo 1.15.12 (http://cairographics.org)
+%%Creator: cairo 1.16.0 (https://cairographics.org)
 %%DocumentData: Clean7Bit
 %%LanguageLevel: 2
 %%EndComments

build/crysp-logo-word-whitebg-blackfg.eps

@@ -1,7 +1,7 @@
 %!PS-Adobe-3.0 EPSF-3.0
 %%BoundingBox: 37 37 870 279
 %%HiResBoundingBox: 37.500000 37.500000 870.000000 279.000000
-%%Creator: cairo 1.15.12 (http://cairographics.org)
+%%Creator: cairo 1.16.0 (https://cairographics.org)
 %%DocumentData: Clean7Bit
 %%LanguageLevel: 2
 %%EndComments

proc-template.py

@@ -3,7 +3,7 @@ import xml.etree.ElementTree as ET
 import re
 
 if len(sys.argv) != 2:
-	print 'Invalid usage; see Makefile'
+	print('Invalid usage; see Makefile')
 	sys.exit(1)
 operations = re.findall(r'\w+', sys.argv[1])
 
@@ -17,7 +17,7 @@ namespaces = {
 	'inkscape': 'http://www.inkscape.org/namespaces/inkscape',
 }
 
-for prefix, namespace in namespaces.items():
+for prefix, namespace in list(namespaces.items()):
 	ET.register_namespace(prefix, namespace)
 
 tree = ET.parse(sys.stdin)
@@ -77,7 +77,7 @@ for wrongBg in ['backgroundTagline', 'backgroundWord', 'backgroundPictorial', 'b
 
 # Handle background color
 if bg is None:
-	print 'No background element found'
+	print('No background element found')
 	sys.exit(1)
 if 'whitebg' in operations:
 	setFillColor(bg, '#ffffff')
@@ -111,4 +111,4 @@ for el in root.findall('.//*[@style]', namespaces):
 	css = re.sub(r'font-(?:feature-settings|variant-caps|variant-ligatures|variant-numeric):[^;"]+[;"]', '', css)
 	el.set('style', css)
 
-tree.write(sys.stdout, xml_declaration=True)
+tree.write(sys.stdout, xml_declaration=True, encoding='unicode')

strip-pdf-metadata.sh

@@ -7,7 +7,7 @@ pdftk "$inf" dump_data | \
   sed -e 's/\(PdfID[0-9]\+:\)\s.*/\1\ /g' | \
   pdftk "$inf" update_info - output "$outf-tmp"
 
-exiftool -all:all= -overwrite_original "$outf-tmp"
+exiftool -m -all:all= -overwrite_original "$outf-tmp"
 qpdf --linearize "$outf-tmp" "$outf"
 
 redact=$(pdftk "$outf" dump_data | \