kdiff3 patch

kdiff3-0.9.95-optional-kde.patch (text/plain), 18.44 KB, created by Matthew Turnbull on 2010-01-31 02:33:24 UTC

diff -rupN kdiff3-0.9.95.orig/CMakeLists.txt kdiff3-0.9.95/CMakeLists.txt
--- kdiff3-0.9.95.orig/CMakeLists.txt	2009-01-01 07:07:00.000000000 -0500
+++ kdiff3-0.9.95/CMakeLists.txt	2010-01-11 20:31:12.606634544 -0500
@@ -1,38 +1,28 @@
 cmake_minimum_required(VERSION 2.6)
 project(kdiff3)
 
-find_package(KDE4 REQUIRED)
-include (MacroLibrary)
-SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
-MACRO_OPTIONAL_FIND_PACKAGE(LibKonq)
-MACRO_BOOL_TO_01(LIBKONQ_FOUND HAVE_LIBKONQ)
-
-add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
-
-include_directories( 
-    ${KDE4_INCLUDE_DIR} 
-    ${QT_INCLUDES}  
-    ${CMAKE_CURRENT_BINARY_DIR}
-    )
-
-link_directories(
-    ${KDE4_LIB_DIR}
-    )
+find_package(Qt4 4.4.0 COMPONENTS QtCore QtGui REQUIRED)
+include(${QT_USE_FILE})
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-kdiff3.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kdiff3.h )
+include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/MacroOptionalFindPackage.cmake)
+
+macro_optional_find_package(KDE4)
+if(KDE4_FOUND)
+	macro_optional_find_package(LibKonq)
+	add_definitions(${KDE4_DEFINITIONS})
+	include_directories(${KDE4_INCLUDE_DIR})
+else(KDE4_FOUND)
+	# Since we don't have KDE4, define the necessary paths, macros, and flags
+	include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/KDE4Replacement.cmake)
+endif(KDE4_FOUND)
 
 add_subdirectory(src-QT4)
 add_subdirectory(po)
-add_subdirectory(doc)
-if(LIBKONQ_FOUND)
-  message(STATUS "")
-  message(STATUS "libkonq module found........... YES")
-  message(STATUS "   => kdiff3plugin (KDiff3 contextmenu plugin for Konqueror) will be built.")
-  message(STATUS "")
-  add_subdirectory(kdiff3plugin-QT4)
-else(LIBKONQ_FOUND)
-  message(STATUS "")
-  message(STATUS "libkonq module found........... NO")
-  message(STATUS "   => kdiff3plugin (KDiff3 contextmenu plugin for Konqueror) will not be built.)")
-  message(STATUS "")
-endif(LIBKONQ_FOUND)
+
+if(KDE4_FOUND)
+	add_subdirectory(doc)
+	if(LIBKONQ_FOUND)
+		add_subdirectory(kdiff3plugin-QT4)
+	endif(LIBKONQ_FOUND)
+endif(KDE4_FOUND)
+
diff -rupN kdiff3-0.9.95.orig/cmake/modules/FindLibKonq.cmake kdiff3-0.9.95/cmake/modules/FindLibKonq.cmake
--- kdiff3-0.9.95.orig/cmake/modules/FindLibKonq.cmake	2008-08-31 13:22:13.000000000 -0400
+++ kdiff3-0.9.95/cmake/modules/FindLibKonq.cmake	1969-12-31 19:00:00.000000000 -0500
@@ -1,39 +0,0 @@
-# - Try to find konqueror library
-# Once done this will define
-#
-#  LIBKONQ_FOUND - system has libkonq library
-#  LIBKONQ_INCLUDE_DIR - the LIBKONQ include directory
-#  LIBKONQ_LIBRARY - the libkonq library
-#
-#  Original file: FindMarbleWidget.cmake (found in digikam-0.10.0-beta2)
-#  copyright 2008 by Patrick Spendrin <[e-mail]>
-#  use this file as you like
-#
-#  Modifications to find libkonq by Joachim Eibl 2008
-
-if(LIBKONQ_INCLUDE_DIR AND LIBKONQ_LIBRARY)
-
-  # Already in cache
-  set(LIBKONQ_FOUND TRUE)
-
-else(LIBKONQ_INCLUDE_DIR AND LIBKONQ_LIBRARY)
-  find_path(LIBKONQ_INCLUDE_DIR konq_popupmenuplugin.h )
-
-  find_library(LIBKONQ_LIBRARY konq)
-
-  if(LIBKONQ_INCLUDE_DIR AND LIBKONQ_LIBRARY)
-    set(LIBKONQ_FOUND TRUE)
-  endif(LIBKONQ_INCLUDE_DIR AND LIBKONQ_LIBRARY)
-
-  if(LIBKONQ_FOUND)
-    if (NOT LIBKONQ_FIND_QUIETLY)
-      message(STATUS "Found libkonq: ${LIBKONQ_LIBRARY}")
-    endif (NOT LIBKONQ_FIND_QUIETLY)
-  else(LIBKONQ_FOUND)
-    if(LIBKONQ_FIND_REQUIRED)
-      message(FATAL_ERROR "Could NOT find KDE4 libkonq library")
-    endif(LIBKONQ_FIND_REQUIRED)
-  endif(LIBKONQ_FOUND)
-
-  mark_as_advanced(LIBKONQ_INCLUDE_DIR LIBKONQ_LIBRARY)
-endif(LIBKONQ_INCLUDE_DIR AND LIBKONQ_LIBRARY)
diff -rupN kdiff3-0.9.95.orig/cmake/modules/KDE4Replacement.cmake kdiff3-0.9.95/cmake/modules/KDE4Replacement.cmake
--- kdiff3-0.9.95.orig/cmake/modules/KDE4Replacement.cmake	1969-12-31 19:00:00.000000000 -0500
+++ kdiff3-0.9.95/cmake/modules/KDE4Replacement.cmake	2010-01-06 05:05:00.912635815 -0500
@@ -0,0 +1,116 @@
+###
+### Adapted from FindKDE4Internal
+###
+
+set(BIN_INSTALL_DIR		"bin")
+set(LIB_INSTALL_DIR		"lib${LIB_SUFFIX}")
+set(DATA_INSTALL_DIR		"share/apps")
+set(ICON_INSTALL_DIR		"share/icons")
+set(LOCALE_INSTALL_DIR		"share/locale")
+set(XDG_APPS_INSTALL_DIR	"share/applications/kde4")
+
+set(INSTALL_TARGETS_DEFAULT_ARGS RUNTIME DESTINATION "${BIN_INSTALL_DIR}"
+		LIBRARY DESTINATION "${LIB_INSTALL_DIR}"
+		ARCHIVE DESTINATION "${LIB_INSTALL_DIR}" COMPONENT Devel)
+
+if(APPLE)
+	set(BUNDLE_INSTALL_DIR "/Applications")
+	set(INSTALL_TARGETS_DEFAULT_ARGS ${INSTALL_TARGETS_DEFAULT_ARGS}
+		BUNDLE DESTINATION "${BUNDLE_INSTALL_DIR}")
+endif(APPLE)
+
+add_definitions(-DQT_NO_DEBUG -DQT_NO_STL -DQT_NO_CAST_TO_ASCII -D_REENTRANT)
+
+###
+### Adapted from KDE4Macros
+###
+
+set(_KDE4_ICON_GROUP_mime "mimetypes")
+set(_KDE4_ICON_GROUP_filesys "places")
+set(_KDE4_ICON_GROUP_device "devices")
+set(_KDE4_ICON_GROUP_app "apps")
+set(_KDE4_ICON_GROUP_action "actions")
+set(_KDE4_ICON_GROUP_mimetypes "mimetypes")
+set(_KDE4_ICON_GROUP_places "places")
+set(_KDE4_ICON_GROUP_devices "devices")
+set(_KDE4_ICON_GROUP_apps "apps")
+set(_KDE4_ICON_GROUP_actions "actions")
+set(_KDE4_ICON_GROUP_categories "categories")
+set(_KDE4_ICON_GROUP_status "status")
+set(_KDE4_ICON_GROUP_emblems "emblems")
+set(_KDE4_ICON_GROUP_emotes "emotes")
+set(_KDE4_ICON_GROUP_animations "animations")
+set(_KDE4_ICON_GROUP_intl "intl")
+
+set(_KDE4_ICON_THEME_ox "oxygen")
+set(_KDE4_ICON_THEME_cr "crystalsvg")
+set(_KDE4_ICON_THEME_lo "locolor")
+set(_KDE4_ICON_THEME_hi "hicolor")
+
+if(NOT COMMAND KDE4_INSTALL_ICONS)
+	macro(KDE4_INSTALL_ICONS _defaultpath)
+		file(GLOB _icons *.png)
+		foreach(_current ${_icons})
+			string(REGEX MATCH "^.*/([a-zA-Z]+)([0-9]+)\\-([a-z]+)\\-(.+\\.png)$" _dummy "${_current}")
+			set(_theme ${_KDE4_ICON_THEME_${CMAKE_MATCH_1}})
+			set(_size "${CMAKE_MATCH_2}")
+			set(_group ${_KDE4_ICON_GROUP_${CMAKE_MATCH_3}})
+			set(_name "${CMAKE_MATCH_4}")
+#			if(_theme && _size && _group && _name)
+			if(_theme)
+			if(_size)
+			if(_group)
+			if(_name)
+				install(FILES ${_current} DESTINATION ${_defaultpath}/${_theme}/${_size}x${_size}/${_group}/ RENAME ${_name})
+			endif(_name)
+			endif(_group)
+			endif(_size)
+			endif(_theme)
+#			endif(_theme && _size && _group && _name)
+		endforeach(_current)
+	endmacro(KDE4_INSTALL_ICONS _defaultpath)
+endif(NOT COMMAND KDE4_INSTALL_ICONS)
+
+###
+### Adapted from KDE's FindGettext
+###
+
+if(NOT COMMAND GETTEXT_PROCESS_PO_FILES)
+	MACRO(GETTEXT_PROCESS_PO_FILES _lang)
+		SET(_gmoFiles)
+		SET(_args ${ARGN})
+		SET(_addToAll)
+		SET(_installDest)
+
+		LIST(GET _args 0 _tmp)
+		IF("${_tmp}" STREQUAL "ALL")
+			SET(_addToAll ALL)
+			LIST(REMOVE_AT _args 0)
+		ENDIF("${_tmp}" STREQUAL "ALL")
+
+		LIST(GET _args 0 _tmp)
+		IF("${_tmp}" STREQUAL "INSTALL_DESTINATION")
+			LIST(GET _args 1 _installDest)
+			LIST(REMOVE_AT _args 0 1)
+		ENDIF("${_tmp}" STREQUAL "INSTALL_DESTINATION")
+
+		FOREACH(_current_PO_FILE ${_args})
+			GET_FILENAME_COMPONENT(_basename ${_current_PO_FILE} NAME_WE)
+			SET(_gmoFile ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.gmo)
+			add_custom_command(
+				OUTPUT ${_gmoFile}
+				COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${_gmoFile} ${_current_PO_FILE}
+				WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+				DEPENDS ${_current_PO_FILE}
+				)
+
+			IF(_installDest)
+				INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.gmo DESTINATION ${_installDest}/${_lang}/LC_MESSAGES/ RENAME ${_basename}.mo)
+			ENDIF(_installDest)
+
+			LIST(APPEND _gmoFiles ${_gmoFile})
+		ENDFOREACH(_current_PO_FILE)
+		ADD_CUSTOM_TARGET(pofiles ${_addToAll} DEPENDS ${_gmoFiles})
+	ENDMACRO(GETTEXT_PROCESS_PO_FILES)
+endif(NOT COMMAND GETTEXT_PROCESS_PO_FILES)
+
diff -rupN kdiff3-0.9.95.orig/cmake/modules/MacroOptionalFindPackage.cmake kdiff3-0.9.95/cmake/modules/MacroOptionalFindPackage.cmake
--- kdiff3-0.9.95.orig/cmake/modules/MacroOptionalFindPackage.cmake	1969-12-31 19:00:00.000000000 -0500
+++ kdiff3-0.9.95/cmake/modules/MacroOptionalFindPackage.cmake	2010-01-10 14:53:22.333633517 -0500
@@ -0,0 +1,28 @@
+# - MACRO_OPTIONAL_FIND_PACKAGE() combines FIND_PACKAGE() with an OPTION()
+# MACRO_OPTIONAL_FIND_PACKAGE( <name> [QUIT] )
+# This macro is a combination of OPTION() and FIND_PACKAGE(), it
+# works like FIND_PACKAGE(), but additionally it automatically creates
+# an option name WITH_<name>, which can be disabled via the cmake GUI.
+# or via -DWITH_<name>=OFF
+# The standard <name>_FOUND variables can be used in the same way
+# as when using the normal FIND_PACKAGE()
+
+# Copyright (c) 2006, Alexander Neundorf, <[e-mail]>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+
+MACRO(MACRO_OPTIONAL_FIND_PACKAGE _name)
+   OPTION(WITH_${_name} "Search for ${_name} package" ON)
+   if(WITH_${_name})
+      FIND_PACKAGE(${_name} ${ARGN})
+   else(WITH_${_name})
+      set(${_name}_FOUND)
+      set(${_name}_INCLUDE_DIR)
+      set(${_name}_INCLUDES)
+      set(${_name}_LIBRARY)
+      set(${_name}_LIBRARIES)
+   endif(WITH_${_name})
+ENDMACRO(MACRO_OPTIONAL_FIND_PACKAGE)
+
diff -rupN kdiff3-0.9.95.orig/config-kdiff3.h.cmake kdiff3-0.9.95/config-kdiff3.h.cmake
--- kdiff3-0.9.95.orig/config-kdiff3.h.cmake	2008-08-31 13:35:05.000000000 -0400
+++ kdiff3-0.9.95/config-kdiff3.h.cmake	1969-12-31 19:00:00.000000000 -0500
@@ -1,4 +0,0 @@
-/* config-kdiff3.h.cmake. */
-
-/* Define to 1 if you have KDE4 libkonq shared library installed */
-#cmakedefine HAVE_LIBKONQ 1
diff -rupN kdiff3-0.9.95.orig/configure kdiff3-0.9.95/configure
--- kdiff3-0.9.95.orig/configure	2008-11-21 09:11:28.000000000 -0500
+++ kdiff3-0.9.95/configure	1969-12-31 19:00:00.000000000 -0500
@@ -1,30 +0,0 @@
-#!/bin/sh
-# Manually created configure
-echo "configure for KDiff3 Qt4/KDE4 by Joachim Eibl"
-if [ "$1" = "kde4" ]; then
-   echo Trying to build for KDE4. If anything fails see the README for details.
-   echo Creating and entering subdir "release"
-   mkdir release                                  # create sub directory
-   cd release
-   echo "Running cmake .. -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix`"
-   cmake .. -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix`  # create Makefile
-   echo Running make.
-   make                                           # run make (compile and link)
-   echo "If everything went OK then KDiff3 was built in the release-subdir."
-   echo "Install as root (requires password)."
-   sudo make install                              # install as root user
-elif [ "$1" = "qt4" ]; then
-   echo Trying to build for Qt4 without KDE
-   echo "Entering subdir src-QT4"
-   cd src-QT4
-   echo "Running qmake kdiff3.pro"
-   qmake kdiff3.pro
-   echo "Running make"
-   make
-   echo "If everything went OK then KDiff3 was built as src-QT4/kdiff3"
-else
-   echo Usage 1: configure kde4
-   echo Usage 2: configure qt4
-   echo For requirements, more options and details in case of failure see the README.
-fi
-
diff -rupN kdiff3-0.9.95.orig/kdiff3plugin-QT4/CMakeLists.txt kdiff3-0.9.95/kdiff3plugin-QT4/CMakeLists.txt
--- kdiff3-0.9.95.orig/kdiff3plugin-QT4/CMakeLists.txt	2008-08-31 13:26:19.000000000 -0400
+++ kdiff3-0.9.95/kdiff3plugin-QT4/CMakeLists.txt	2010-01-03 20:48:00.155687928 -0500
@@ -1,15 +1,13 @@
 ########### kdiff3 plugin ###############
-find_package(LibKonq REQUIRED)
 set(kdiff3plugin_SRCS 
-   kdiff3plugin.cpp ) 
+   kdiff3plugin.cpp) 
 
 kde4_add_plugin(kdiff3plugin WITH_PREFIX ${kdiff3plugin_SRCS})
 
-target_link_libraries(kdiff3plugin ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} konq )
-#${KDE4_KDECORE_LIBRARY} ${KDE4_KDEUI_LIBRARY} ${KDE4_KIO_LIBRARY} QtGui QtCore konq )
+target_link_libraries(kdiff3plugin ${KDE4_KPARTS_LIBS} ${LIBKONQ_LIBRARY})
 
-install(TARGETS kdiff3plugin DESTINATION ${PLUGIN_INSTALL_DIR} )
+install(TARGETS kdiff3plugin DESTINATION ${PLUGIN_INSTALL_DIR})
 
 ########## install files ###############
 
-install( FILES kdiff3_plugin.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install(FILES kdiff3_plugin.desktop DESTINATION ${SERVICES_INSTALL_DIR})
diff -rupN kdiff3-0.9.95.orig/src-QT4/CMakeLists.txt kdiff3-0.9.95/src-QT4/CMakeLists.txt
--- kdiff3-0.9.95.orig/src-QT4/CMakeLists.txt	2008-07-19 10:59:05.000000000 -0400
+++ kdiff3-0.9.95/src-QT4/CMakeLists.txt	2010-01-11 20:31:42.460509407 -0500
@@ -1,57 +1,76 @@
-
-
-add_definitions(-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
-
-
 ########### kdiff3 KPart ###############
 
 set(kdiff3part_PART_SRCS 
-   kdiff3_part.cpp 
-   kdiff3.cpp 
-   directorymergewindow.cpp 
-   merger.cpp 
-   pdiff.cpp 
-   difftextwindow.cpp 
-   diff.cpp 
-   optiondialog.cpp 
-   mergeresultwindow.cpp 
-   fileaccess.cpp 
-   gnudiff_analyze.cpp 
-   gnudiff_io.cpp 
-   gnudiff_xmalloc.cpp 
-   common.cpp 
-   smalldialogs.cpp )
-
-kde4_add_plugin(kdiff3part WITH_PREFIX ${kdiff3part_PART_SRCS})
-
-set_target_properties(kdiff3part PROPERTIES DEFINE_SYMBOL KDIFF3_PART)
-
-target_link_libraries(kdiff3part  ${KDE4_KPARTS_LIBS} ${QT_QT3SUPPORT_LIBRARY})
-
-install(TARGETS kdiff3part DESTINATION ${PLUGIN_INSTALL_DIR} )
+	kdiff3_part.cpp 
+	kdiff3.cpp 
+	directorymergewindow.cpp 
+	merger.cpp 
+	pdiff.cpp 
+	difftextwindow.cpp 
+	diff.cpp 
+	optiondialog.cpp 
+	mergeresultwindow.cpp 
+	fileaccess.cpp 
+	gnudiff_analyze.cpp 
+	gnudiff_io.cpp 
+	gnudiff_xmalloc.cpp 
+	common.cpp 
+	smalldialogs.cpp)
+
+if(KDE4_FOUND)
+	kde4_add_plugin(kdiff3part WITH_PREFIX ${kdiff3part_PART_SRCS})
+	set_target_properties(kdiff3part PROPERTIES DEFINE_SYMBOL KDIFF3_PART)
+	target_link_libraries(kdiff3part  ${KDE4_KPARTS_LIBS})
+	install(TARGETS kdiff3part DESTINATION ${PLUGIN_INSTALL_DIR})
+endif(KDE4_FOUND)
 
 ########### kdiff3 executable ###############
 
 set(kdiff3_SRCS 
-   main.cpp 
-   kdiff3_shell.cpp
-   ${kdiff3part_PART_SRCS}
-    )
-
-kde4_add_executable(kdiff3 ${kdiff3_SRCS})
-
-target_link_libraries(kdiff3  ${KDE4_KPARTS_LIBS} ${QT_QT3SUPPORT_LIBRARY} )
+	main.cpp 
+	kdiff3_shell.cpp
+	${kdiff3part_PART_SRCS})
+
+if(KDE4_FOUND)
+	kde4_add_executable(kdiff3 ${kdiff3_SRCS})
+	target_link_libraries(kdiff3 ${KDE4_KPARTS_LIBS})
+else(KDE4_FOUND)
+	include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+	include_directories(${CMAKE_CURRENT_SOURCE_DIR}/kreplacements)
+
+	set(kdiff3_QT_SRCS
+		${kdiff3_SRCS}
+		kreplacements/kreplacements.cpp
+		kreplacements/ShellContextMenu.cpp)
+
+	set(kdiff3_QT_HEADERS
+		difftextwindow.h
+		directorymergewindow.h
+		fileaccess.h
+		kdiff3.h
+		kdiff3_part.h
+		kdiff3_shell.h
+		mergeresultwindow.h
+		optiondialog.h
+		smalldialogs.h
+		kreplacements/kreplacements.h)
+
+	qt4_wrap_cpp(kdiff3_MOC_SRCS ${kdiff3_QT_HEADERS})
+	add_executable(kdiff3 ${kdiff3_QT_SRCS} ${kdiff3_MOC_SRCS})
+	target_link_libraries(kdiff3 ${QT_LIBRARIES})
+endif(KDE4_FOUND)
 
 install(TARGETS kdiff3 ${INSTALL_TARGETS_DEFAULT_ARGS})
 
-
 ########### install files ###############
 
-install( FILES  kdiff3part.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES  kdiff3_part.rc DESTINATION ${DATA_INSTALL_DIR}/kdiff3 )
-install( FILES  kdiff3_shell.rc DESTINATION ${DATA_INSTALL_DIR}/kdiff3 )
-install( FILES  kdiff3.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install(FILES  kdiff3.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
 
-kde4_install_icons( ${ICON_INSTALL_DIR} )
+if(KDE4_FOUND)
+	install(FILES  kdiff3part.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+	install(FILES  kdiff3_part.rc DESTINATION ${DATA_INSTALL_DIR}/kdiff3)
+	install(FILES  kdiff3_shell.rc DESTINATION ${DATA_INSTALL_DIR}/kdiff3)
+endif(KDE4_FOUND)
 
+kde4_install_icons(${ICON_INSTALL_DIR})
 
diff -rupN kdiff3-0.9.95.orig/src-QT4/gnudiff_xmalloc.cpp kdiff3-0.9.95/src-QT4/gnudiff_xmalloc.cpp
--- kdiff3-0.9.95.orig/src-QT4/gnudiff_xmalloc.cpp	2008-07-14 16:44:06.000000000 -0400
+++ kdiff3-0.9.95/src-QT4/gnudiff_xmalloc.cpp	2010-01-10 15:26:23.147508575 -0500
@@ -19,8 +19,6 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-# include <config-kdiff3.h>
-
 #include <sys/types.h>
 
 
diff -rupN kdiff3-0.9.95.orig/src-QT4/kdiff3.desktop kdiff3-0.9.95/src-QT4/kdiff3.desktop
--- kdiff3-0.9.95.orig/src-QT4/kdiff3.desktop	2009-03-03 14:34:53.000000000 -0500
+++ kdiff3-0.9.95/src-QT4/kdiff3.desktop	2010-01-06 05:01:24.904635797 -0500
@@ -29,7 +29,8 @@ GenericName[uk]=Графічна обоÐ
 GenericName[x-test]=xxDiff/Patch Frontendxx
 GenericName[zh_CN]=Diff/Patch 前端
 GenericName[zh_TW]=比較/修補程式前端介面
-Exec=kdiff3 %i %m -caption "%c"
+Exec=kdiff3
+TryExec=kdiff3
 Icon=kdiff3
 Type=Application
 DocPath=kdiff3/index.html
diff -rupN kdiff3-0.9.95.orig/src-QT4/kdiff3.h kdiff3-0.9.95/src-QT4/kdiff3.h
--- kdiff3-0.9.95.orig/src-QT4/kdiff3.h	2009-01-17 12:46:17.000000000 -0500
+++ kdiff3-0.9.95/src-QT4/kdiff3.h	2010-01-10 15:26:43.574633797 -0500
@@ -20,8 +20,6 @@
 
 #include "diff.h"
 
-#include <config-kdiff3.h>
-
 // include files for Qt
 #include <QSplitter>
 #include <QScrollBar>
diff -rupN kdiff3-0.9.95.orig/src-QT4/kdiff3_shell.h kdiff3-0.9.95/src-QT4/kdiff3_shell.h
--- kdiff3-0.9.95.orig/src-QT4/kdiff3_shell.h	2008-07-14 16:44:06.000000000 -0400
+++ kdiff3-0.9.95/src-QT4/kdiff3_shell.h	2010-01-10 15:25:43.605508292 -0500
@@ -20,8 +20,6 @@
 #ifndef _KDIFF3SHELL_H_
 #define _KDIFF3SHELL_H_
 
-#include <config-kdiff3.h>
-
 #include <kapplication.h>
 #include <kparts/mainwindow.h>
 
diff -rupN kdiff3-0.9.95.orig/src-QT4/kreplacements/config-kdiff3.h kdiff3-0.9.95/src-QT4/kreplacements/config-kdiff3.h
--- kdiff3-0.9.95.orig/src-QT4/kreplacements/config-kdiff3.h	2008-07-14 16:44:05.000000000 -0400
+++ kdiff3-0.9.95/src-QT4/kreplacements/config-kdiff3.h	1969-12-31 19:00:00.000000000 -0500
@@ -1,2 +0,0 @@
-#include "kreplacements.h"      
- 
diff -rupN kdiff3-0.9.95.orig/src-QT4/optiondialog.cpp kdiff3-0.9.95/src-QT4/optiondialog.cpp
--- kdiff3-0.9.95.orig/src-QT4/optiondialog.cpp	2009-03-03 16:51:08.000000000 -0500
+++ kdiff3-0.9.95/src-QT4/optiondialog.cpp	2010-01-30 04:11:43.772138052 -0500
@@ -35,6 +35,8 @@
 #include <QFrame>
 #include <QVBoxLayout>
 
+#include <QDir>
+
 #include <kapplication.h>
 #include <kcolorbutton.h>
 #include <kfontdialog.h> // For KFontChooser
diff -rupN kdiff3-0.9.95.orig/src-QT4/stable.cpp kdiff3-0.9.95/src-QT4/stable.cpp
--- kdiff3-0.9.95.orig/src-QT4/stable.cpp	2009-01-04 10:44:23.000000000 -0500
+++ kdiff3-0.9.95/src-QT4/stable.cpp	1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-#include "stable.h"
diff -rupN kdiff3-0.9.95.orig/src-QT4/stable.h kdiff3-0.9.95/src-QT4/stable.h
--- kdiff3-0.9.95.orig/src-QT4/stable.h	2008-11-01 12:27:12.000000000 -0400
+++ kdiff3-0.9.95/src-QT4/stable.h	1969-12-31 19:00:00.000000000 -0500
@@ -1,8 +0,0 @@
-#ifndef STABLE_H
-#define STABLE_H
-#include <QtCore>
-#include <QtGui>
-#ifdef _WIN32
-#include <qt_windows.h>
-#endif
-#endif