[Pkg-octave-commit] rev 752 - in trunk/packages/octaviz/debian: .
patches
Thomas Weber
thomas-guest at costa.debian.org
Sun Sep 24 16:42:53 UTC 2006
Author: thomas-guest
Date: 2006-09-24 16:42:52 +0000 (Sun, 24 Sep 2006)
New Revision: 752
Added:
trunk/packages/octaviz/debian/patches/50-cast-pointer.patch
trunk/packages/octaviz/debian/patches/50-exclude-unbuildable-headers.patch
trunk/packages/octaviz/debian/patches/50-out-of-tree-build.patch
trunk/packages/octaviz/debian/patches/50-unescape-strings-for-gcc.patch
trunk/packages/octaviz/debian/patches/60-liboctaviz-version-independent.patch
Removed:
trunk/packages/octaviz/debian/patches/40-cast-pointer-long.patch
trunk/packages/octaviz/debian/patches/50-liboctaviz-version-independent.patch
trunk/packages/octaviz/debian/patches/60-texinfo-docstring.patch
Modified:
trunk/packages/octaviz/debian/changelog
trunk/packages/octaviz/debian/compat
trunk/packages/octaviz/debian/control
trunk/packages/octaviz/debian/rules
Log:
Go for VTK 5 (and debhelper compat level 5)
Adapt patches and rename the changed ones (that is: all of them)
All 50- patches should go upstream
Modified: trunk/packages/octaviz/debian/changelog
===================================================================
--- trunk/packages/octaviz/debian/changelog 2006-09-17 14:57:39 UTC (rev 751)
+++ trunk/packages/octaviz/debian/changelog 2006-09-24 16:42:52 UTC (rev 752)
@@ -1,3 +1,25 @@
+octaviz (0.4.0+cvs20060921-1) unstable; urgency=low
+
+ [ Thomas Weber ]
+ * Package cvs snapshot, allowing us to use VTK 5 (Closes: #385519)
+ * Switch to VTK 5 and depend on a version where #388736 is fixed
+ * Use debhelper version 5
+ * Dropped patches:
+ - 40-cast-pointer-long.patch: partially applied upstream
+ - 60-texinfo-docstring.patch: expanded for VTK 5 and renamed
+ into 50-unescape-strings-for-gcc.patch
+ * Adapted patch:
+ - 50-liboctaviz-version-independent.patch renamed into
+ 60-liboctaviz-version-independent.patch (patch ordering) and adapted for
+ new patches.
+ * New patches:
+ - 50-exclude-unbuildable-headers.patch: Exclude new classes in VTK 5, that
+ can't be used with Octaviz
+ - 50-out-of-tree-build.patch: copy necessary files for an out-of-tree
+ build
+
+ --
+
octaviz (0.4.0-27) unstable; urgency=low
[ Thomas Weber ]
Modified: trunk/packages/octaviz/debian/compat
===================================================================
--- trunk/packages/octaviz/debian/compat 2006-09-17 14:57:39 UTC (rev 751)
+++ trunk/packages/octaviz/debian/compat 2006-09-24 16:42:52 UTC (rev 752)
@@ -1 +1 @@
-4
+5
Modified: trunk/packages/octaviz/debian/control
===================================================================
--- trunk/packages/octaviz/debian/control 2006-09-17 14:57:39 UTC (rev 751)
+++ trunk/packages/octaviz/debian/control 2006-09-24 16:42:52 UTC (rev 752)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>
Uploaders: Rafael Laboissiere <rafael at debian.org>
-Build-Depends: debhelper (>= 4.0.0), cmake, libvtk4-dev (>= 4.4.2-9),
+Build-Depends: debhelper (>= 5.0.0), cmake, libvtk5-dev (>= 5.0.1-4),
octave2.1-headers (>= 2.1.72-9), lesstif2-dev, cdbs
Standards-Version: 3.7.2
Deleted: trunk/packages/octaviz/debian/patches/40-cast-pointer-long.patch
Copied: trunk/packages/octaviz/debian/patches/50-cast-pointer.patch (from rev 751, trunk/packages/octaviz/debian/patches/40-cast-pointer-long.patch)
===================================================================
--- trunk/packages/octaviz/debian/patches/50-cast-pointer.patch (rev 0)
+++ trunk/packages/octaviz/debian/patches/50-cast-pointer.patch 2006-09-24 16:42:52 UTC (rev 752)
@@ -0,0 +1,12 @@
+diff -Nur octaviz/Common/octaviz.cc octaviz.new/Common/octaviz.cc
+--- octaviz/Common/octaviz.cc 2006-09-23 09:00:45.182130000 +0000
++++ octaviz.new/Common/octaviz.cc 2006-09-23 09:20:46.557234014 +0000
+@@ -180,7 +180,7 @@
+
+ unsigned int vtk_object::uint_value (bool req_int, bool frc_str_conv ) const
+ {
+- return reinterpret_cast<unsigned int>(vtk_pointer);
++ return reinterpret_cast<uintptr_t>(vtk_pointer);
+ }
+
+ octave_uint64 vtk_object::uint64_scalar_value (void) const
Added: trunk/packages/octaviz/debian/patches/50-exclude-unbuildable-headers.patch
===================================================================
--- trunk/packages/octaviz/debian/patches/50-exclude-unbuildable-headers.patch (rev 0)
+++ trunk/packages/octaviz/debian/patches/50-exclude-unbuildable-headers.patch 2006-09-24 16:42:52 UTC (rev 752)
@@ -0,0 +1,20 @@
+diff -Nur octaviz/CMakeLists.txt octaviz.new/CMakeLists.txt
+--- octaviz/CMakeLists.txt 2006-09-23 09:00:45.182130000 +0000
++++ octaviz.new/CMakeLists.txt 2006-09-23 09:29:45.844761790 +0000
+@@ -82,7 +82,15 @@
+
+ INCLUDE(${VTK_KITS_DIR}/vtk${kit}Kit.cmake)
+ INCLUDE(${VTK_KITS_DIR}/vtk${kit}Kit.cmake)
+-
++
++ # what we don't want or can't build;
++ # this is an ugly hack[TM] and should be fixed by e.g.
++ # including a list of not-to-be-built-functions shipped with
++ # Octaviz
++ SET(VTK_CLASS_WRAP_EXCLUDE_vtkLongLongArray 1)
++ SET(VTK_CLASS_WRAP_EXCLUDE_vtkSignedCharArray 1)
++ SET(VTK_CLASS_WRAP_EXCLUDE_vtkUnsignedLongLongArray 1)
++
+ SET(all_oct)
+ FOREACH(class ${VTK_${ukit}_CLASSES})
+ IF(NOT VTK_CLASS_WRAP_EXCLUDE_${class})
Deleted: trunk/packages/octaviz/debian/patches/50-liboctaviz-version-independent.patch
Added: trunk/packages/octaviz/debian/patches/50-out-of-tree-build.patch
===================================================================
--- trunk/packages/octaviz/debian/patches/50-out-of-tree-build.patch (rev 0)
+++ trunk/packages/octaviz/debian/patches/50-out-of-tree-build.patch 2006-09-24 16:42:52 UTC (rev 752)
@@ -0,0 +1,52 @@
+diff -Nur octaviz/Common/CMakeLists.txt octaviz.new/Common/CMakeLists.txt
+--- octaviz/Common/CMakeLists.txt 2006-09-23 09:00:45.182130000 +0000
++++ octaviz.new/Common/CMakeLists.txt 2006-09-23 09:30:57.710623424 +0000
+@@ -1,5 +1,31 @@
+ SET(KIT_WRAP_DEPS)
+
++# files we need after vtkWrapOctave has been built
++# => we copy them, so we can do out-of-tree builds
++CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/OctavizCommon.h
++ ${CMAKE_CURRENT_BINARY_DIR}/OctavizCommon.h
++ COPYONLY)
++CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/octaviz.h
++ ${CMAKE_CURRENT_BINARY_DIR}/octaviz.h
++ COPYONLY)
++CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/vtkInitializeInteractor.cc
++ ${CMAKE_CURRENT_BINARY_DIR}/vtkInitializeInteractor.cc
++ COPYONLY)
++CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/vtkRaiseWindow.cc
++ ${CMAKE_CURRENT_BINARY_DIR}/vtkRaiseWindow.cc
++ COPYONLY)
++CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/vtk_get_pointer.cc
++ ${CMAKE_CURRENT_BINARY_DIR}/vtk_get_pointer.cc
++ COPYONLY)
++# FIXME: not sure about these ones
++CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/vtk_init.cc
++ ${CMAKE_CURRENT_BINARY_DIR}/vtk_init.cc
++ COPYONLY)
++CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/vtk_print_ref_table.cc
++ ${CMAKE_CURRENT_BINARY_DIR}/vtk_print_ref_table.cc
++ COPYONLY)
++
++
+ OCTAVE_WRAP_VTK(Common COMMON "${KIT_WRAP_DEPS}")
+ EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "-p OCTINCLUDEDIR" OUTPUT_VARIABLE OCT_INC_DIR)
+ EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "-p OCTLIBDIR" OUTPUT_VARIABLE OCT_LIB_DIR)
+@@ -27,4 +53,4 @@
+ STRING(REGEX REPLACE "${CMAKE_INSTALL_PREFIX}" "" OUT_MTCH ${OCT_LIB_DIR})
+ INSTALL_TARGETS(${OUT_MTCH} octaviz)
+
+-
+\ No newline at end of file
++
+diff -Nur octaviz/Wrapping/CMakeLists.txt octaviz.new/Wrapping/CMakeLists.txt
+--- octaviz/Wrapping/CMakeLists.txt 2006-09-23 09:00:45.188129000 +0000
++++ octaviz.new/Wrapping/CMakeLists.txt 2006-09-23 09:30:57.710623424 +0000
+@@ -1 +1,6 @@
+ ADD_EXECUTABLE(vtkWrapOctave vtkWrapOctave.c vtkParse.tab.c)
++
++# We need the hints file after we have built vtkWrapOctave
++CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/hints
++ ${CMAKE_CURRENT_BINARY_DIR}/hints
++ COPYONLY)
Copied: trunk/packages/octaviz/debian/patches/50-unescape-strings-for-gcc.patch (from rev 751, trunk/packages/octaviz/debian/patches/60-texinfo-docstring.patch)
===================================================================
--- trunk/packages/octaviz/debian/patches/50-unescape-strings-for-gcc.patch (rev 0)
+++ trunk/packages/octaviz/debian/patches/50-unescape-strings-for-gcc.patch 2006-09-24 16:42:52 UTC (rev 752)
@@ -0,0 +1,103 @@
+diff -Nur octaviz/Wrapping/vtkWrapOctave.c octaviz.new/Wrapping/vtkWrapOctave.c
+--- octaviz/Wrapping/vtkWrapOctave.c 2006-09-23 09:00:45.189128000 +0000
++++ octaviz.new/Wrapping/vtkWrapOctave.c 2006-09-23 09:25:55.784176595 +0000
+@@ -57,6 +57,16 @@
+ j++;
+ } else
+ {
++ // double escape everything that is escaped;
++ // gcc doesn't like things like \$, \frac, \sum, ...
++ // in strings; luckily, this happens only in
++ // the 'Descriptions:' field
++ if (wrappedFunctions[i]->Comment[j] == '\\')
++ {
++ fprintf(fp, "\\\\");
++ j++;
++ }
++
+ fprintf(fp,"%c",wrappedFunctions[i]->Comment[j++]);
+ }
+ }
+@@ -576,6 +586,7 @@
+ void vtkParseOutput(FILE *fp, FileInfo *data)
+ {
+ int i,j;
++ int in_example;
+
+ fprintf(fp,"// Octave wrapper for %s object\n//\n",data->ClassName);
+
+@@ -623,19 +634,62 @@
+ /* Make the function that is callable from octave */
+ /* Add class description into the function. */
+ /* This will displayed as help in octave */
+- fprintf(fp,"\nDEFUN_DLD ( %s, args, nargout, \n \"%s \\n\\\n \\n\\\n ",data->ClassName,data->ClassName);
++ fprintf(fp,"\nDEFUN_DLD ( %s, args, nargout, \n", data->ClassName);
++ fprintf(fp," \"-*- texinfo -*-\\n\\\n");
++ fprintf(fp,"@deftypefn {Built-in Function} {} %s\\n\\\n\\n\\\n", data->ClassName);
+ i = 0;
++ in_example = 0;
+ if ( data->Description != NULL )
+ while ( data->Description[i] != 0 )
+ {
+ if ( data->Description[i] == '"' ) fprintf(fp,"\\");
+-
++
++ /* Curly braces are special characters in Texinfo. Quote them. */
++ if ( data->Description[i] == '{' || data->Description[i] == '}' )
++ fprintf(fp,"@");
++
++ /* Replace `\code [...] \endcode' constructs by the texinfo equivalent
++ @example [..] @end example' */
++ if (strncmp (data->Description + i, "\\code", 5) == 0) {
++ fprintf(fp,"@example");
++ in_example = 1;
++ i += 5;
++ }
++ if (strncmp (data->Description + i, "\\endcode", 8) == 0) {
++ fprintf(fp,"@end example");
++ in_example = 0;
++ i += 8;
++ }
++ /* Skip emphasis markup. This could be replaced by @emph,
++ but it is trick because @emph needs a bracketed argument */
++ if (strncmp (data->Description + i, "\\em", 3) == 0) {
++ i += 3;
++ }
++ /* Unscape \sum macro */
++ if (strncmp (data->Description + i, "\\sum", 4) == 0) {
++ i += 1;
++ }
++
++ /* Unscape \pre macro -- this will probably look like shit in the final .oct files */
++ if (strncmp (data->Description + i, "\\pre", 4) == 0) {
++ i += 1;
++ }
++
++ /* Unscape \post macro -- this will probably look like shit in the final .oct files */
++ if (strncmp (data->Description + i, "\\post", 5) == 0) {
++ i += 1;
++ }
++
+ if ( data->Description[i] == '\n' )
+ {
+ /* Don't want the last newline */
+ if ( i + 2 < strlen(data->Description) )
+ {
+- fprintf(fp,"\\n\\\n ");
++ fprintf(fp,"\\n\\\n");
++ /* Eat spaces at beginning of lines */
++ if (in_example != 1)
++ while (data->Description[i + 1] == ' ')
++ i++;
+ }
+ i++;
+ } else
+@@ -643,7 +697,7 @@
+ fprintf(fp,"%c",data->Description[i++]);
+ }
+ }
+- fprintf(fp,"\")\n{\n" );
++ fprintf(fp,"\\n\\\n at end deftypefn\")\n{\n" );
+ fprintf(fp," octave_value retval;\n" );
+
+ /* This associative map holds help for each method (if avaliable) */
Copied: trunk/packages/octaviz/debian/patches/60-liboctaviz-version-independent.patch (from rev 751, trunk/packages/octaviz/debian/patches/50-liboctaviz-version-independent.patch)
===================================================================
--- trunk/packages/octaviz/debian/patches/60-liboctaviz-version-independent.patch (rev 0)
+++ trunk/packages/octaviz/debian/patches/60-liboctaviz-version-independent.patch 2006-09-24 16:42:52 UTC (rev 752)
@@ -0,0 +1,29 @@
+diff -Nur octaviz/CMakeLists.txt octaviz.new/CMakeLists.txt
+--- octaviz/CMakeLists.txt 2006-09-23 09:33:39.978442042 +0000
++++ octaviz.new/CMakeLists.txt 2006-09-23 09:43:31.062930566 +0000
+@@ -101,7 +101,7 @@
+ # ADD_CUSTOM_TARGET(vtk${kit}.cc ALL cat ${all_ccs} > vtk${kit}.cc)
+
+ SET(oct_flags -I${VTK_${ukit}_HEADER_DIR} -I../Common)
+- SET(oct_link_flags -L${X11_LIBRARY_DIR} -lX11 -lXt -L${VTK_LIBRARY_DIRS} -lvtkCommon -lvtk${kit} -lvtkFiltering -lvtkGraphics)
++ SET(oct_link_flags -L${X11_LIBRARY_DIR} -lX11 -lXt -L${VTK_LIBRARY_DIRS} -lvtkCommon -lvtk${kit} -lvtkFiltering -lvtkGraphics -Wl,-rpath=/usr/lib/octaviz)
+ # ADD_CUSTOM_TARGET(vtk${kit}.oct ALL sleep 0\; mkoctfile ${oct_flags} ${oct_link_flags} -L../Common -loctaviz vtk${kit}.cc)
+
+ # Precompiled headers
+diff -Nur octaviz/Common/CMakeLists.txt octaviz.new/Common/CMakeLists.txt
+--- octaviz/Common/CMakeLists.txt 2006-09-23 09:33:39.997438040 +0000
++++ octaviz.new/Common/CMakeLists.txt 2006-09-23 09:48:01.441993568 +0000
+@@ -47,10 +47,10 @@
+ INSTALL_PROGRAMS(${OCT_INST_DIR}/octaviz ${all_oct})
+ #MESSAGE(${all_oct})
+
+-# Get octave lib install directory
+-EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "-p OCTLIBDIR" OUTPUT_VARIABLE OCT_LIB_DIR)
++# Get general lib install directory
++EXEC_PROGRAM(${OCTAVE_CONFIG} ARGS "-p LIBDIR" OUTPUT_VARIABLE OCT_LIB_DIR)
+ # Remove prefix from octave lib install dir
+ STRING(REGEX REPLACE "${CMAKE_INSTALL_PREFIX}" "" OUT_MTCH ${OCT_LIB_DIR})
+-INSTALL_TARGETS(${OUT_MTCH} octaviz)
++INSTALL_TARGETS(${OUT_MTCH}/octaviz octaviz)
+
+
Deleted: trunk/packages/octaviz/debian/patches/60-texinfo-docstring.patch
Modified: trunk/packages/octaviz/debian/rules
===================================================================
--- trunk/packages/octaviz/debian/rules 2006-09-17 14:57:39 UTC (rev 751)
+++ trunk/packages/octaviz/debian/rules 2006-09-24 16:42:52 UTC (rev 752)
@@ -29,7 +29,7 @@
ls -l /usr/bin/oct*
ls -l /etc/alternatives/oct*
/bin/sh debian/check-symlink.sh
- cmake -DCMAKE_SKIP_RPATH:BOOL=YES .
+ cmake -DCMAKE_SKIP_RPATH:BOOL=YES -DVTK_DIR:STRING=/usr/lib/vtk .
touch cmake-stamp
build: build-stamp
@@ -69,3 +69,5 @@
octave-depends
.PHONY: build
+
+.NOTPARALLEL:
More information about the Pkg-octave-commit
mailing list