From: Pierre Ossman <ossman@cendio.se>
Date: Thu, 29 Oct 2020 13:41:23 +0000 (+0100)
Subject: Be explicit about SVG size when building icons
X-Git-Tag: v1.11.90~94
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9d9e9931f14062bb532b91f6bc0f64c2f8893b8f;p=tigervnc.git

Be explicit about SVG size when building icons

Not sure how this has changed, but ImageMagick is now using the first
-size to also determine how to scale the SVGs, which is not what we
want.
---

diff --git a/media/CMakeLists.txt b/media/CMakeLists.txt
index 1daf8be5..91ea6f54 100644
--- a/media/CMakeLists.txt
+++ b/media/CMakeLists.txt
@@ -31,31 +31,31 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/icons/tigervnc_16.png
 add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/icons/tigervnc_22.png
   COMMAND ${CONVERT_EXECUTABLE} -depth 8
     -size 22x22 xc:none -gravity center -background transparent
-    ${CMAKE_CURRENT_SOURCE_DIR}/tigervnc_20.svg -composite
-    ${CMAKE_CURRENT_SOURCE_DIR}/icons/tigervnc_22.png
+    -size 20x20 ${CMAKE_CURRENT_SOURCE_DIR}/tigervnc_20.svg
+    -composite ${CMAKE_CURRENT_SOURCE_DIR}/icons/tigervnc_22.png
   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/tigervnc_20.svg
   COMMENT "Generating icons/tigervnc_22.png")
 
 add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/icons/tigervnc_24.png
   COMMAND ${CONVERT_EXECUTABLE} -depth 8
     -size 24x24 xc:none -gravity center -background transparent
-    ${CMAKE_CURRENT_SOURCE_DIR}/tigervnc_20.svg -composite
-    ${CMAKE_CURRENT_SOURCE_DIR}/icons/tigervnc_24.png
+    -size 20x20 ${CMAKE_CURRENT_SOURCE_DIR}/tigervnc_20.svg
+    -composite ${CMAKE_CURRENT_SOURCE_DIR}/icons/tigervnc_24.png
   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/tigervnc_20.svg
   COMMENT "Generating icons/tigervnc_24.png")
 
 add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/icons/tigervnc_32.png
   COMMAND ${CONVERT_EXECUTABLE} -depth 8
     -size 32x32 xc:none -gravity center -background transparent
-    ${CMAKE_CURRENT_SOURCE_DIR}/tigervnc_28.svg -composite
-    ${CMAKE_CURRENT_SOURCE_DIR}/icons/tigervnc_32.png
+    -size 28x28 ${CMAKE_CURRENT_SOURCE_DIR}/tigervnc_28.svg
+    -composite ${CMAKE_CURRENT_SOURCE_DIR}/icons/tigervnc_32.png
   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/tigervnc_28.svg
   COMMENT "Generating icons/tigervnc_32.png")
 
 add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/icons/tigervnc_48.png
   COMMAND ${CONVERT_EXECUTABLE} -depth 8
     -size 48x48 xc:none -gravity center -background transparent
-    ${CMAKE_CURRENT_SOURCE_DIR}/tigervnc_42.svg -composite
-    ${CMAKE_CURRENT_SOURCE_DIR}/icons/tigervnc_48.png
+    -size 42x42 ${CMAKE_CURRENT_SOURCE_DIR}/tigervnc_42.svg
+    -composite ${CMAKE_CURRENT_SOURCE_DIR}/icons/tigervnc_48.png
   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/tigervnc_42.svg
   COMMENT "Generating icons/tigervnc_48.png")