r43888 - /packages/kwwidgets/trunk/debian/patches/50_all_patches.diff

domibel at users.alioth.debian.org domibel at users.alioth.debian.org
Sun Sep 11 02:57:29 UTC 2011 

Author: domibel
Date: Sun Sep 11 02:57:28 2011
New Revision: 43888

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=43888
Log:
Patch for vtk5.8

Modified:
    packages/kwwidgets/trunk/debian/patches/50_all_patches.diff

Modified: packages/kwwidgets/trunk/debian/patches/50_all_patches.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/kwwidgets/trunk/debian/patches/50_all_patches.diff?rev=43888&op=diff
==============================================================================
--- packages/kwwidgets/trunk/debian/patches/50_all_patches.diff (original)
+++ packages/kwwidgets/trunk/debian/patches/50_all_patches.diff Sun Sep 11 02:57:28 2011
@@ -6,8 +6,8 @@
 
 Index: kwwidgets-1.0.0~cvs20100930/CMakeLists.txt
 ===================================================================
---- kwwidgets-1.0.0~cvs20100930.orig/CMakeLists.txt	2010-10-24 16:49:11.455397188 -0400
-+++ kwwidgets-1.0.0~cvs20100930/CMakeLists.txt	2010-10-24 16:58:47.899470518 -0400
+--- kwwidgets-1.0.0~cvs20100930.orig/CMakeLists.txt	2011-09-05 19:43:25.000000000 -0400
++++ kwwidgets-1.0.0~cvs20100930/CMakeLists.txt	2011-09-05 19:44:14.000000000 -0400
 @@ -104,7 +104,7 @@
  endif(NOT KWWidgets_INSTALL_BIN_DIR)
  
@@ -26,7 +26,17 @@
      CACHE INTERNAL "")
  endif(NOT KWWidgets_INSTALL_PACKAGE_DIR)
  
-@@ -669,6 +669,13 @@
+@@ -277,6 +277,9 @@
+   if(NOT VTK_USE_TK)
+     message(FATAL_ERROR "Please set VTK_USE_TK to ON in VTK for KWWidgets_BUILD_VTK_WIDGETS to be ON as well.")
+   endif(NOT VTK_USE_TK)
++  if(VTK_TCL_INCLUDE_DIR)
++    include_directories("${VTK_TCL_INCLUDE_DIR}" "${VTK_TK_INCLUDE_DIR}")
++  endif(VTK_TCL_INCLUDE_DIR)
+   set(KWWidgets_SRCS ${KWWidgets_SRCS}
+     vtkKWColorPresetMenu.cxx
+     vtkKWColorTransferFunctionEditor.cxx
+@@ -669,6 +672,13 @@
      target_link_libraries(KWWidgetsPythonD ${VTK_PYTHON_LIBRARIES})
    endif(WIN32 OR APPLE)
  
@@ -40,7 +50,7 @@
    if(NOT KWWidgets_INSTALL_NO_LIBRARIES)
      install_targets(
        ${KWWidgets_INSTALL_LIB_DIR}
-@@ -781,6 +788,11 @@
+@@ -781,6 +791,11 @@
    endif(HTML_HELP_INCLUDE_PATH AND HTML_HELP_LIBRARY)
  endif(WIN32)
  
@@ -52,7 +62,7 @@
  # link ApplicationServices.framework on OSX for vtkKWClipboardHelper 
  if(APPLE)
    target_link_libraries (KWWidgets "-framework ApplicationServices")
-@@ -806,6 +818,13 @@
+@@ -806,6 +821,13 @@
    target_link_libraries(KWWidgets ${TKTREECTRL_LIBS})
  endif(TKTREECTRL_LIBS)
  
@@ -66,7 +76,7 @@
  if(NOT KWWidgets_INSTALL_NO_LIBRARIES)
    install_targets(
      ${KWWidgets_INSTALL_LIB_DIR}
-@@ -899,3 +918,25 @@
+@@ -899,3 +921,25 @@
      endif(NOT SQUISH_FOUND)
    endif(KWWidgets_USE_Squish)
  endif(BUILD_TESTING AND KWWidgets_BUILD_TESTING)
@@ -94,8 +104,8 @@
 +
 Index: kwwidgets-1.0.0~cvs20100930/Utilities/CMakeLists.txt
 ===================================================================
---- kwwidgets-1.0.0~cvs20100930.orig/Utilities/CMakeLists.txt	2010-10-24 16:49:11.463397524 -0400
-+++ kwwidgets-1.0.0~cvs20100930/Utilities/CMakeLists.txt	2010-10-24 16:49:11.000000000 -0400
+--- kwwidgets-1.0.0~cvs20100930.orig/Utilities/CMakeLists.txt	2011-09-05 19:43:25.000000000 -0400
++++ kwwidgets-1.0.0~cvs20100930/Utilities/CMakeLists.txt	2011-09-05 19:43:25.000000000 -0400
 @@ -1,5 +1,5 @@
 -add_executable(KWConvertImageToHeader KWConvertImageToHeader.cxx)
 -target_link_libraries(KWConvertImageToHeader ${KWWidgets_LIBRARIES})
@@ -106,8 +116,8 @@
    Doxygen
 Index: kwwidgets-1.0.0~cvs20100930/Utilities/Doxygen/CMakeLists.txt
 ===================================================================
---- kwwidgets-1.0.0~cvs20100930.orig/Utilities/Doxygen/CMakeLists.txt	2010-10-24 16:49:11.471398170 -0400
-+++ kwwidgets-1.0.0~cvs20100930/Utilities/Doxygen/CMakeLists.txt	2010-10-24 16:49:11.000000000 -0400
+--- kwwidgets-1.0.0~cvs20100930.orig/Utilities/Doxygen/CMakeLists.txt	2011-09-05 19:43:25.000000000 -0400
++++ kwwidgets-1.0.0~cvs20100930/Utilities/Doxygen/CMakeLists.txt	2011-09-05 19:43:25.000000000 -0400
 @@ -7,7 +7,7 @@
  if (BUILD_DOCUMENTATION)
  
@@ -132,8 +142,8 @@
      ${CMAKE_CURRENT_BINARY_DIR}/doc_makeall.sh)
 Index: kwwidgets-1.0.0~cvs20100930/Wrapping/Tcl/CMakeLists.txt
 ===================================================================
---- kwwidgets-1.0.0~cvs20100930.orig/Wrapping/Tcl/CMakeLists.txt	2010-10-24 16:49:11.447397787 -0400
-+++ kwwidgets-1.0.0~cvs20100930/Wrapping/Tcl/CMakeLists.txt	2010-10-24 16:49:11.000000000 -0400
+--- kwwidgets-1.0.0~cvs20100930.orig/Wrapping/Tcl/CMakeLists.txt	2011-09-05 19:43:25.000000000 -0400
++++ kwwidgets-1.0.0~cvs20100930/Wrapping/Tcl/CMakeLists.txt	2011-09-05 19:43:25.000000000 -0400
 @@ -47,8 +47,8 @@
    ${KWWidgets_BINARY_DIR}/Wrapping/Tcl/Install/Hide/pkgIndex.tcl
    @ONLY IMMEDIATE)
@@ -147,8 +157,8 @@
  # Install kits
 Index: kwwidgets-1.0.0~cvs20100930/Utilities/Doxygen/doxyfile.in
 ===================================================================
---- kwwidgets-1.0.0~cvs20100930.orig/Utilities/Doxygen/doxyfile.in	2010-10-24 16:49:11.479397516 -0400
-+++ kwwidgets-1.0.0~cvs20100930/Utilities/Doxygen/doxyfile.in	2010-10-24 16:49:11.000000000 -0400
+--- kwwidgets-1.0.0~cvs20100930.orig/Utilities/Doxygen/doxyfile.in	2011-09-05 19:43:25.000000000 -0400
++++ kwwidgets-1.0.0~cvs20100930/Utilities/Doxygen/doxyfile.in	2011-09-05 19:43:25.000000000 -0400
 @@ -1,166 +1,307 @@
 -# -------------------------------------------------------------------------
 -# doxyfile for KWWidgets
@@ -625,7 +635,7 @@
 Index: kwwidgets-1.0.0~cvs20100930/CMake/FindMySQL.cmake
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ kwwidgets-1.0.0~cvs20100930/CMake/FindMySQL.cmake	2010-10-24 16:49:11.000000000 -0400
++++ kwwidgets-1.0.0~cvs20100930/CMake/FindMySQL.cmake	2011-09-05 19:43:25.000000000 -0400
 @@ -0,0 +1,68 @@
 +#
 +# Find the MySQL client includes and library
@@ -697,8 +707,8 @@
 +
 Index: kwwidgets-1.0.0~cvs20100930/CMake/KWWidgetsPathsMacros.cmake
 ===================================================================
---- kwwidgets-1.0.0~cvs20100930.orig/CMake/KWWidgetsPathsMacros.cmake	2010-10-24 16:49:11.495397055 -0400
-+++ kwwidgets-1.0.0~cvs20100930/CMake/KWWidgetsPathsMacros.cmake	2010-10-24 16:49:11.000000000 -0400
+--- kwwidgets-1.0.0~cvs20100930.orig/CMake/KWWidgetsPathsMacros.cmake	2011-09-05 19:43:25.000000000 -0400
++++ kwwidgets-1.0.0~cvs20100930/CMake/KWWidgetsPathsMacros.cmake	2011-09-05 19:43:25.000000000 -0400
 @@ -489,7 +489,7 @@
  
    if(VTK_USE_MYSQL)

More information about the debian-science-commits mailing list