Merge lp:~midori/midori/svgtrans into lp:midori

[Cris Dywan]

Rasterize SVG to PNG with rsvg-convert

[Olivier Duchateau (duchateau-olivier)]

In icons/CMakeLists.txt file SVG2PNG macro is not necessary, otherwise in scalable/ directory SVG images will be rasterized.

--- ./icons/CMakeLists.txt.orig 2013-09-20 16:37:11.000000000 +0000
+++ ./icons/CMakeLists.txt 2013-09-20 16:53:03.000000000 +0000
@@ -7,13 +7,7 @@

 macro(install_icon name cat size)
     file(GLOB FILENAME RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${size}/${name}.*")
- string(FIND ${FILENAME} ".svg" EXTENSION)
- if (EXTENSION GREATER -1)
- string(SUBSTRING ${FILENAME} 0 ${EXTENSION} BASENAME)
- SVG2PNG(${BASENAME} ${CMAKE_INSTALL_DATADIR}/icons/hicolor/${size}/${cat})
- else ()
- install(FILES ${FILENAME} DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/${size}/${cat})
- endif ()
+ install(FILES ${FILENAME} DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/${size}/${cat})
 endmacro()

 foreach(SIZE 16x16 22x22 scalable)

review: Needs Fixing

[Paweł Forysiuk (tuxator)]

Seems to work properly

review: Approve

=== added file 'cmake/FindConvert.cmake'
--- cmake/FindConvert.cmake	1970-01-01 00:00:00 +0000
+++ cmake/FindConvert.cmake	2013-09-22 14:50:19 +0000
@@ -0,0 +1,19 @@
+# Copyright (C) 2013 Christian Dywan
+# Copyright (C) 2013 Olivier Duchateau
+
+find_program (RSVG_CONVERT rsvg-convert)
+
+if (RSVG_CONVERT)
+    set (CONVERT_FOUND TRUE)
+    macro (SVG2PNG filename install_destination)
+        string(REPLACE "/" "_" target ${filename})
+        file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${filename}")
+        add_custom_target ("${target}.png" ALL
+            ${RSVG_CONVERT} --keep-aspect-ratio --format=png "${CMAKE_CURRENT_SOURCE_DIR}/${filename}.svg"
+                --output "${CMAKE_CURRENT_BINARY_DIR}/${filename}.png"
+        )
+        install (FILES "${CMAKE_CURRENT_BINARY_DIR}/${filename}.png"
+            DESTINATION ${install_destination})
+    endmacro (SVG2PNG filename)
+endif ()
+

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2013-09-08 17:20:49 +0000
+++ data/CMakeLists.txt	2013-09-22 14:50:19 +0000
@@ -1,5 +1,10 @@
 # Copyright (C) 2013 Christian Dywan <[e-mail]>
 
+include(FindConvert)
+if (NOT CONVERT_FOUND)
+    message(FATAL_ERROR "rsvg-convert not found")
+endif ()
+
 include(FindIntltool)
 if (NOT INTLTOOL_MERGE_FOUND)
     message(FATAL_ERROR "intltool-merge not found")
@@ -15,6 +20,7 @@
     string(FIND ${FILE} "midori." MIDORI_FILE)
     string(FIND ${FILE} ".desktop" DESKTOP_FILE)
     string(FIND ${FILE} ".appdata.xml" APPDATA_FILE)
+    string(FIND ${FILE} ".svg" SVG_FILE)
     if (FAQ_FILE GREATER -1)
         install(FILES ${FILE} DESTINATION ${CMAKE_INSTALL_DOCDIR})
     elseif (DESKTOP_FILE GREATER -1 AND NOT WIN32)
@@ -24,6 +30,9 @@
         string(SUBSTRING ${FILE} 0 ${APPDATA_FILE} DESKTOP_ID)
         INTLTOOL_MERGE_APPDATA (${DESKTOP_ID} po)
         # install(FILES ${FILE} DESTINATION ${CMAKE_INSTALL_DATADIR}/appdata/)
+    elseif (SVG_FILE GREATER -1)
+        string(SUBSTRING ${FILE} 0 ${SVG_FILE} IMG_ID)
+        SVG2PNG (${IMG_ID} "${CMAKE_INSTALL_DATADIR}/midori/res/")
     elseif(MIDORI_FILE GREATER -1)
     else()
         string(FIND ${FILE} "/" IS_DIR)