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

This resolves bug report 637.
Thanks to Slávek Banko.

6 files changed, 20 insertions, 1 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 437675bbf..b87e76ee7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -67,6 +67,7 @@ option( WITH_XRENDER "Enable xrender support" ${WITH_ALL_OPTIONS} )
 option( WITH_XDAMAGE "Enable xdamage support" ${WITH_ALL_OPTIONS} )
 option( WITH_XEXT "Enable xext support" ${WITH_ALL_OPTIONS} )
 option( WITH_XTEST "Enable xext support" ${WITH_ALL_OPTIONS} )
+option( WITH_LIBART "Enable libart support (for SVG icons and wallpapers)" ${WITH_ALL_OPTIONS} )
 option( WITH_LIBUSB "Enable control of some mouse models through libusb" ${WITH_ALL_OPTIONS} )
 option( WITH_LIBRAW1394 "Enable visualization of ieee1394 devices through libraw1394" ${WITH_ALL_OPTIONS} )
 option( WITH_SUDO_TDESU_BACKEND "Use sudo as backend for tdesu (default is su)" ${WITH_ALL_OPTIONS} )
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 90d78be21..ded1d0025 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -211,6 +211,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 )
diff --git a/config.h.cmake b/config.h.cmake
index bd99f603f..a334fe786 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -21,6 +21,9 @@
 // kxkb
 #cmakedefine HAVE_XTEST 1
 
+// libart
+#cmakedefine HAVE_LIBART 1
+
 // tdm, kioslave
 #cmakedefine HAVE_TERMIOS_H 1
 
diff --git a/kcontrol/background/CMakeLists.txt b/kcontrol/background/CMakeLists.txt
index 9f3f492f3..d45c31f19 100644
--- a/kcontrol/background/CMakeLists.txt
+++ b/kcontrol/background/CMakeLists.txt
@@ -18,6 +18,7 @@ if( BUILD_KCONTROL OR BUILD_KDESKTOP OR BUILD_TDM )
     ${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_TDM )
 
   tde_add_library( bgnd STATIC_PIC AUTOMOC
     SOURCES bgrender.cpp bgsettings.cpp
+    LINK ${LIBART_LIBRARIES}
   )
 
 endif( )
diff --git a/kcontrol/icons/CMakeLists.txt b/kcontrol/icons/CMakeLists.txt
index 4e7a856ce..0a7dfbefb 100644
--- a/kcontrol/icons/CMakeLists.txt
+++ b/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}
 )
diff --git a/tdm/kfrontend/themer/CMakeLists.txt b/tdm/kfrontend/themer/CMakeLists.txt
index fc0b80fc3..008c5d687 100644
--- a/tdm/kfrontend/themer/CMakeLists.txt
+++ b/tdm/kfrontend/themer/CMakeLists.txt
@@ -16,6 +16,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/tdmlib
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
+  ${LIBART_INCLUDE_DIRS}
 )
 
 link_directories(
@@ -38,4 +39,5 @@ tde_add_library( tdmthemer STATIC_PIC AUTOMOC
   SOURCES
     tdmthemer.cpp tdmitem.cpp tdmpixmap.cpp
     tdmrect.cpp tdmlabel.cpp tdmlayout.cpp
+  LINK ${LIBART_LIBRARIES}
 )