[gentoo-commits] gentoo-x86 commit in sci-libs/plplot/files: plplot-5.9.10-itcltk.patch plplot-5.9.10-haru.patch plplot-5.9.10-tcltk.patch plplot-5.9.10-tcl86.patch

[Sebastien Fabbro (bicatali)]

bicatali    13/11/05 23:56:14

  Added:                plplot-5.9.10-itcltk.patch plplot-5.9.10-haru.patch
                        plplot-5.9.10-tcltk.patch plplot-5.9.10-tcl86.patch
  Log:
  Fixed tcl/tk binding upgrade (bug #489728), add shared lib soversion slot, use BUILD_DIR instead of CMAKE_BUILD_DIR, fixed calling libharu headers
  
  (Portage version: 2.2.7-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)

Revision  Changes    Path
1.1                  sci-libs/plplot/files/plplot-5.9.10-itcltk.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/plplot/files/plplot-5.9.10-itcltk.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/plplot/files/plplot-5.9.10-itcltk.patch?rev=1.1&content-type=text/plain

Index: plplot-5.9.10-itcltk.patch
===================================================================
--- bindings/tk/tkMain.c.orig
+++ bindings/tk/tkMain.c
@@ -85,11 +85,6 @@
 
 // From tclIntDecls.h
 
-#ifndef Tcl_Import_TCL_DECLARED
-EXTERN int Tcl_Import _ANSI_ARGS_( ( Tcl_Interp * interp,
-                                     Tcl_Namespace * nsPtr, char * pattern,
-                                     int allowOverwrite ) );
-#endif
 
 #ifndef Tcl_GetGlobalNamespace_TCL_DECLARE
 EXTERN Tcl_Namespace * Tcl_GetGlobalNamespace _ANSI_ARGS_( (
--- cmake/modules/tcl-related.cmake.orig	2013-10-31 08:57:07.044160099 -0700
+++ cmake/modules/tcl-related.cmake	2013-10-31 08:57:37.854350228 -0700
@@ -94,7 +94,7 @@
           message(STATUS "Looking for itcl.h - found")
           message(STATUS "Looking for itcl library")
 	get_filename_component(TCL_LIBRARY_PATH ${TCL_LIBRARY} PATH)
-          set(itcl_library_versions 3.4 3.3 3.2 3.1 3.0 2.1 2.0)
+          set(itcl_library_versions 4.0.0 3.4 3.3 3.2 3.1 3.0 2.1 2.0)
           foreach(version ${itcl_library_versions})
             find_library(ITCL_LIBRARY itcl${version} PATHS ${TCL_LIBRARY_PATH}
               PATH_SUFFIXES itcl${version})
@@ -153,7 +153,7 @@
       if(ITK_INCLUDE_PATH)
         message(STATUS "Looking for itk.h - found")
         message(STATUS "Looking for itk library")
-        set(itk_library_versions 3.4 3.3 3.2 3.1 3.0 2.1 2.0)
+        set(itk_library_versions 4.0.0 3.4 3.3 3.2 3.1 3.0 2.1 2.0)
         foreach(version ${itk_library_versions})
           find_library(ITK_LIBRARY itk${version}
             PATH_SUFFIXES itk${version})



1.1                  sci-libs/plplot/files/plplot-5.9.10-haru.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/plplot/files/plplot-5.9.10-haru.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/plplot/files/plplot-5.9.10-haru.patch?rev=1.1&content-type=text/plain

Index: plplot-5.9.10-haru.patch
===================================================================
get hpdf header in /usr/include - applied upstream in trunk
bicatali nov 2013

--- cmake/modules/Findhpdf.cmake.orig	2013-11-05 14:44:16.088810181 -0800
+++ cmake/modules/Findhpdf.cmake	2013-11-05 14:44:23.264854503 -0800
@@ -8,7 +8,12 @@
 #  hpdf_LIBRARY_DIRS, the directory where libhpdf (either shared or static)
 #  is found.
 
-find_path(hpdf_INCLUDE_DIR hpdf/hpdf.h /usr/local/include /usr/include)
+# Give preference to header found in hpdf subdirectory (which is the
+# result of a build and install of upstream libharu), then if not
+# found look for the case of no such subdirectory (which is how the
+# Debian system version of libharu headers is installed).
+find_path(hpdf_INCLUDE_DIR hpdf.h PATHS /usr/local/include /usr/include PATH_SUFFIXES hpdf)
+find_path(hpdf_INCLUDE_DIR hpdf.h PATHS /usr/local/include /usr/include)
 
 if(hpdf_INCLUDE_DIR)
   find_library(hpdf_LIBRARY
--- drivers/pdf.c.orig	2013-11-05 14:55:58.928226651 -0800
+++ drivers/pdf.c	2013-11-05 14:56:10.534299828 -0800
@@ -38,7 +38,7 @@
 #include <math.h>
 #include <setjmp.h>
 
-#include "hpdf/hpdf.h"
+#include "hpdf.h"
 
 // PLplot header files
 #define DEBUG



1.1                  sci-libs/plplot/files/plplot-5.9.10-tcltk.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/plplot/files/plplot-5.9.10-tcltk.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/plplot/files/plplot-5.9.10-tcltk.patch?rev=1.1&content-type=text/plain

Index: plplot-5.9.10-tcltk.patch
===================================================================
Allow itcl and itk 4.0.0, applied upstream in trunk
bicatali nov 2013

--- cmake/modules/tcl-related.cmake.orig	2013-11-05 11:31:42.436587456 -0800
+++ cmake/modules/tcl-related.cmake	2013-11-05 11:31:54.411661141 -0800
@@ -85,16 +85,16 @@
 	OUTPUT_VARIABLE AVAILABLE_ITCL)
       if(AVAILABLE_ITCL)
         execute_process(
-	COMMAND ${TCL_TCLSH} GetITCL_Version.tcl
-	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/cmake/modules
-	OUTPUT_VARIABLE itcl_library_versions)
+	  COMMAND ${TCL_TCLSH} GetITCL_Version.tcl
+	  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/cmake/modules
+	  OUTPUT_VARIABLE itcl_library_versions)
         message(STATUS "Looking for itcl.h")
         find_path(ITCL_INCLUDE_PATH itcl.h ${TCL_INCLUDE_PATH})
         if(ITCL_INCLUDE_PATH)
           message(STATUS "Looking for itcl.h - found")
           message(STATUS "Looking for itcl library")
-	get_filename_component(TCL_LIBRARY_PATH ${TCL_LIBRARY} PATH)
-          set(itcl_library_versions 3.4 3.3 3.2 3.1 3.0 2.1 2.0)
+          get_filename_component(TCL_LIBRARY_PATH ${TCL_LIBRARY} PATH)
+          set(itcl_library_versions 4.0.0 3.4 3.3 3.2 3.1 3.0 2.1 2.0)
           foreach(version ${itcl_library_versions})
             find_library(ITCL_LIBRARY itcl${version} PATHS ${TCL_LIBRARY_PATH}
               PATH_SUFFIXES itcl${version})
@@ -132,13 +132,21 @@
     else(ENABLE_itcl)
       set(MKTCLINDEX_ARGS "-tcl")
     endif(ENABLE_itcl)
+
     if(ENABLE_tk AND NOT X11_FOUND)
       message(STATUS "WARNING: X11 not found, disabling Tk interface code")
       set(ENABLE_tk OFF CACHE BOOL "Enable Tk interface code" FORCE)
     endif(ENABLE_tk AND NOT X11_FOUND)
     if(ENABLE_tk)
+      get_filename_component(TK_LIBRARY_PATH ${TK_LIBRARY} PATH)
+      if(NOT ${TK_LIBRARY_PATH} STREQUAL ${TCL_LIBRARY_PATH})
+	message(STATUS "TCL_LIBRARY_PATH = ${TCL_LIBRARY_PATH}")
+	message(STATUS "TK_LIBRARY_PATH = ${TK_LIBRARY_PATH}")
+	message(STATUS "WARNING: the Tcl and Tk library locations are inconsistent so those libraries are likely not compatible")
+      endif(NOT ${TK_LIBRARY_PATH} STREQUAL ${TCL_LIBRARY_PATH})
+    endif(ENABLE_tk)
+    if(ENABLE_tk)
       set(TK_INCLUDE_PATH ${TK_INCLUDE_PATH} ${X11_INCLUDE_DIR})
-      set(TK_LIBRARY ${TK_LIBRARY})
       message(STATUS "TK_INCLUDE_PATH = ${TK_INCLUDE_PATH}")
       message(STATUS "TK_LIBRARY = ${TK_LIBRARY}")
     else(ENABLE_tk)
@@ -153,9 +161,9 @@
       if(ITK_INCLUDE_PATH)
         message(STATUS "Looking for itk.h - found")
         message(STATUS "Looking for itk library")
-        set(itk_library_versions 3.4 3.3 3.2 3.1 3.0 2.1 2.0)
+        set(itk_library_versions 4.0.0 3.4 3.3 3.2 3.1 3.0 2.1 2.0)
         foreach(version ${itk_library_versions})
-          find_library(ITK_LIBRARY itk${version}
+          find_library(ITK_LIBRARY itk${version} PATHS ${TCL_LIBRARY_PATH}
             PATH_SUFFIXES itk${version})
         endforeach(version ${itk_library_versions})
         if(ITK_LIBRARY)
--- bindings/tk/tkMain.c.orig	2013-11-05 11:34:29.219602234 -0800
+++ bindings/tk/tkMain.c	2013-11-05 11:34:48.394718925 -0800
@@ -1,4 +1,4 @@
-// $Id: plplot-5.9.10-tcltk.patch,v 1.1 2013/11/05 23:56:14 bicatali Exp $
+// $Id: plplot-5.9.10-tcltk.patch,v 1.1 2013/11/05 23:56:14 bicatali Exp $
 //
 // Modified version of tkMain.c, from Tk 3.6.
 // Maurice LeBrun
@@ -85,7 +85,8 @@
 
 // From tclIntDecls.h
 
-#ifndef Tcl_Import_TCL_DECLARED
+//#ifndef Tcl_Import_TCL_DECLARED
+#if 0
 EXTERN int Tcl_Import _ANSI_ARGS_( ( Tcl_Interp * interp,
                                      Tcl_Namespace * nsPtr, char * pattern,
                                      int allowOverwrite ) );



1.1                  sci-libs/plplot/files/plplot-5.9.10-tcl86.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/plplot/files/plplot-5.9.10-tcl86.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/plplot/files/plplot-5.9.10-tcl86.patch?rev=1.1&content-type=text/plain

Index: plplot-5.9.10-tcl86.patch
===================================================================
Upgrade to tcl-8.6 - not applied upstream
bicatali nov 2013  

--- drivers/ntk.c.orig	2013-11-05 14:30:01.105432771 -0800
+++ drivers/ntk.c	2013-11-05 14:29:42.632317282 -0800
@@ -115,7 +115,7 @@
         //
         sprintf( scmd, "send %s {%s}", rem_interp, cmd ); // mess! make it more efficient
         if ( Tcl_Eval( interp, scmd ) != TCL_OK )
-            fprintf( stderr, "%s\n", interp->result );
+            fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) );
     }
 }
 
@@ -264,7 +264,7 @@
         sprintf( cmd, "send %s \"set client [tk appname]; wm deiconify .\"", rem_interp );
         if ( Tcl_Eval( interp, cmd ) != TCL_OK )
         {
-            fprintf( stderr, "%s\n", interp->result );
+            fprintf( stderr, "%s\n", Tcl_GetStringResult(interp) );
             plexit( "No such tk server." );
         }
     }
@@ -301,7 +301,7 @@
     // Set up device parameters
 
     Tcl_Eval( interp, "tk scaling" ); // pixels per mm
-    ppm = (PLFLT) atof( interp->result ) / ( 25.4 / 72. );
+    ppm = (PLFLT) atof( Tcl_GetStringResult(interp) ) / ( 25.4 / 72. );
     plP_setpxl( ppm, ppm );
     plP_setphy( xmin, xmax * scale, ymin, ymax * scale );
 }
@@ -371,11 +371,11 @@
         {
             tk_cmd( "update" );
             tk_cmd( "info exists keypress" );
-            sscanf( interp->result, "%d", &st );
+            sscanf( Tcl_GetStringResult(interp), "%d", &st );
         }
 
         tk_cmd( "set keypress" );
-        sscanf( interp->result, "%d", &key );
+        sscanf( Tcl_GetStringResult(interp), "%d", &key );
 //fprintf(stderr,"\n%d\n", key);fflush(stderr);
         tk_cmd( "unset keypress" );
         st = 0;
@@ -433,7 +433,7 @@
         {
             tk_cmd( "update" );
             tk_cmd( "winfo exists $plf.f2.c$ccanv" );
-            sscanf( interp->result, "%d", &st );
+            sscanf( Tcl_GetStringResult(interp), "%d", &st );
         }
         st = 0;
         // this give a "Segmentation fault", even after checking for the canvas!
@@ -450,16 +450,16 @@
     {
         tk_cmd( "update" );
         tk_cmd( "info exists xloc" );
-        sscanf( interp->result, "%d", &st );
+        sscanf( Tcl_GetStringResult(interp), "%d", &st );
     }
     tk_cmd( "set xloc" );
-    sscanf( interp->result, "%d", &gin.pX );
+    sscanf( Tcl_GetStringResult(interp), "%d", &gin.pX );
     tk_cmd( "set yloc" );
-    sscanf( interp->result, "%d", &gin.pY );
+    sscanf( Tcl_GetStringResult(interp), "%d", &gin.pY );
     tk_cmd( "set bloc" );
-    sscanf( interp->result, "%d", &gin.button );
+    sscanf( Tcl_GetStringResult(interp), "%d", &gin.button );
     tk_cmd( "set sloc" );
-    sscanf( interp->result, "%d", &gin.state );
+    sscanf( Tcl_GetStringResult(interp), "%d", &gin.state );
 
     gin.dX = (PLFLT) gin.pX / xmax;
     gin.dY = 1. - (PLFLT) gin.pY / ymax;