File r906305.diff of Package kdebase4-runtime
Subject: khelpcenter: missing icon
From: wstephenson@suse.de
Bug:
Patch-upstream: 906305
--- khelpcenter/CMakeLists.txt (revision 906304)
+++ khelpcenter/CMakeLists.txt (revision 906305)
@@ -47,21 +47,12 @@ set(khelpcenter_KDEINIT_SRCS
qt4_add_dbus_adaptor( khelpcenter_KDEINIT_SRCS org.kde.khelpcenter.kcmhelpcenter.xml kcmhelpcenter.h KCMHelpCenter )
kde4_add_kcfg_files(khelpcenter_KDEINIT_SRCS prefs.kcfgc )
+kde4_add_app_icon(khelpcenter_KDEINIT_SRCS "${CMAKE_SOURCE_DIR}/pics/oxygen/*/apps/help-browser.png")
-if (WIN32)
- # there is no kdeinit support on win32
- kde4_add_app_icon(khelpcenter_KDEINIT_SRCS "${KDE4_INSTALL_DIR}/share/icons/oxygen/*/apps/help-browser.png")
- kde4_add_executable(khelpcenter ${khelpcenter_KDEINIT_SRCS})
- set_target_properties(khelpcenter PROPERTIES COMPILE_FLAGS "-Dkdemain=main")
- target_link_libraries(khelpcenter ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KHTML_LIBS} ${QT_QTXML_LIBRARY} ${KDE4_KUTILS_LIBS} )
- install(TARGETS khelpcenter ${INSTALL_TARGETS_DEFAULT_ARGS})
-else (WIN32)
- kde4_add_kdeinit_executable( khelpcenter ${khelpcenter_KDEINIT_SRCS})
- target_link_libraries(kdeinit_khelpcenter ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KHTML_LIBS} ${QT_QTXML_LIBRARY} ${KDE4_KUTILS_LIBS} )
- install(TARGETS kdeinit_khelpcenter ${INSTALL_TARGETS_DEFAULT_ARGS} )
- install(TARGETS khelpcenter ${INSTALL_TARGETS_DEFAULT_ARGS})
-endif (WIN32)
-
+kde4_add_kdeinit_executable( khelpcenter ${khelpcenter_KDEINIT_SRCS})
+target_link_libraries(kdeinit_khelpcenter ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KHTML_LIBS} ${QT_QTXML_LIBRARY} ${KDE4_KUTILS_LIBS} )
+install(TARGETS kdeinit_khelpcenter ${INSTALL_TARGETS_DEFAULT_ARGS} )
+install(TARGETS khelpcenter ${INSTALL_TARGETS_DEFAULT_ARGS})
########### install files ###############
Index: khelpcenter/CMakeLists.txt
===================================================================