diff options
author | Darrell Anderson <humanreadable@yahoo.com> | 2012-06-01 12:41:02 -0500 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-03 03:27:39 +0200 |
commit | e234e073f7b1b7ea730d638f2576056a82bf01fd (patch) | |
tree | d08505baec00ab8017d864a89f28373afc26b920 | |
parent | 902cf55735cbe6dd71ae1ca2b30b68fa1622606d (diff) | |
download | tdebase-e234e073f7b1b7ea730d638f2576056a82bf01fd.tar.gz tdebase-e234e073f7b1b7ea730d638f2576056a82bf01fd.zip |
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 85c2426f988de375bc666bef5a24529989737470)
-rw-r--r-- | CMakeLists.txt | 1 | ||||
-rw-r--r-- | ConfigureChecks.cmake | 10 | ||||
-rw-r--r-- | config.h.cmake | 3 | ||||
-rw-r--r-- | kcontrol/background/CMakeLists.txt | 2 | ||||
-rw-r--r-- | kcontrol/icons/CMakeLists.txt | 3 | ||||
-rw-r--r-- | kdm/kfrontend/themer/CMakeLists.txt | 2 |
6 files changed, 20 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 44766ac5c..a114e1b51 100644 --- a/CMakeLists.txt +++ b/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 ) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index d6b3b49da..4a78853c9 100644 --- a/ConfigureChecks.cmake +++ b/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 ) diff --git a/config.h.cmake b/config.h.cmake index 27b055f73..413f9e745 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -18,6 +18,9 @@ // kxkb #cmakedefine HAVE_XTEST 1 +// libart +#cmakedefine HAVE_LIBART 1 + // kdm, kioslave #cmakedefine HAVE_TERMIOS_H 1 diff --git a/kcontrol/background/CMakeLists.txt b/kcontrol/background/CMakeLists.txt index 693d6330c..74d7e7934 100644 --- a/kcontrol/background/CMakeLists.txt +++ b/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( ) 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/kdm/kfrontend/themer/CMakeLists.txt b/kdm/kfrontend/themer/CMakeLists.txt index ff65734af..296b9ab83 100644 --- a/kdm/kfrontend/themer/CMakeLists.txt +++ b/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} ) |