Fix svg thumbnail images not appearing in KControl/Appearance & Themes/ Background.

This resolves bug report 744.
Thanks to Slávek Banko.
(cherry picked from commit 85c2426f98)

CMakeLists.txt

@@ -66,6 +66,7 @@ option( WITH_XRENDER "Enable xrender support" OFF )
 option( WITH_XDAMAGE "Enable xdamage support" OFF )
 option( WITH_XEXT "Enable xext support" OFF )
 option( WITH_XTEST "Enable xext support" OFF )
+option( WITH_LIBART "Enable libart support (for SVG icons and wallpapers)" OFF )
 option( WITH_LIBUSB "Enable control of some mouse models through libusb" OFF )
 option( WITH_LIBRAW1394 "Enable visualization of ieee1394 devices through libraw1394" OFF )
 option( WITH_SUDO_KDESU_BACKEND "Use sudo as backend for kdesu (default is su)" OFF )

ConfigureChecks.cmake

@@ -197,6 +197,16 @@ else( )
   set( WITHOUT_ARTS 1 )
 endif( )
 
+# libart
+
+if( WITH_LIBART )
+  pkg_search_module( LIBART libart-2.0 )
+  if( NOT LIBART_FOUND )
+    message(FATAL_ERROR "\nlibart-2.0 support are requested, but not found on your system" )
+  endif( NOT LIBART_FOUND )
+  set( HAVE_LIBART 1 )
+endif( WITH_LIBART )
+
 
 # required stuff
 find_package( TQt )

config.h.cmake

@@ -18,6 +18,9 @@
 // kxkb
 #cmakedefine HAVE_XTEST 1
 
+// libart
+#cmakedefine HAVE_LIBART 1
+
 // kdm, kioslave
 #cmakedefine HAVE_TERMIOS_H 1
 

kcontrol/background/CMakeLists.txt

@@ -18,6 +18,7 @@ if( BUILD_KCONTROL OR BUILD_KDESKTOP OR BUILD_KDM )
     ${CMAKE_SOURCE_DIR}/libkonq
     ${TDE_INCLUDE_DIR}
     ${TQT_INCLUDE_DIRS}
+    ${LIBART_INCLUDE_DIRS}
   )
 
   link_directories(
@@ -28,6 +29,7 @@ if( BUILD_KCONTROL OR BUILD_KDESKTOP OR BUILD_KDM )
 
   tde_add_library( bgnd STATIC_PIC AUTOMOC
     SOURCES bgrender.cpp bgsettings.cpp
+    LINK ${LIBART_LIBRARIES}
   )
 
 endif( )

kcontrol/icons/CMakeLists.txt

@@ -14,6 +14,7 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
+  ${LIBART_INCLUDE_DIRS}
 )
 
 link_directories(
@@ -30,6 +31,6 @@ install( FILES uninstall.desktop DESTINATION ${APPS_INSTALL_DIR}/Settings/LookNF
 
 tde_add_kpart( kcm_icons AUTOMOC
   SOURCES iconthemes.cpp icons.cpp main.cpp
-  LINK kio-shared
+  LINK kio-shared ${LIBART_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

kdm/kfrontend/themer/CMakeLists.txt

@@ -16,6 +16,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/kdmlib
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
+  ${LIBART_INCLUDE_DIRS}
 )
 
 link_directories(
@@ -38,4 +39,5 @@ tde_add_library( kdmthemer STATIC_PIC AUTOMOC
   SOURCES
     kdmthemer.cpp kdmitem.cpp kdmpixmap.cpp
     kdmrect.cpp kdmlabel.cpp kdmlayout.cpp
+  LINK ${LIBART_LIBRARIES}
 )