Refreshed patches

1 files changed, 10 insertions, 10 deletions

diff --git a/debian/patches/0003-Use-readline-for-interactive-input.-This-adds-comman.patch b/debian/patches/0003-Use-readline-for-interactive-input.-This-adds-comman.patch
index 406b0d0..bbd301d 100644
--- a/debian/patches/0003-Use-readline-for-interactive-input.-This-adds-comman.patch
+++ b/debian/patches/0003-Use-readline-for-interactive-input.-This-adds-comman.patch
@@ -11,19 +11,19 @@ Subject: Use readline for interactive input. This adds 'command line
  create mode 100644 cmake/modules/FindReadline.cmake
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 716d486..8b5f237 100644
+index cc5e26e..1e9a7bc 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -18,6 +18,8 @@ cmake_minimum_required (VERSION 3.9)
  
- project(STA VERSION 2.0.16)
+ project(STA VERSION 2.0.17)
  
 +set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules CACHE STRING "CMake module path")
 +
  set(CMAKE_VERBOSE_MAKEFILE ON)
  set(CMAKE_CXX_STANDARD 11)
  set(CMAKE_CXX_STANDARD_REQUIRED ON)
-@@ -562,6 +564,7 @@ get_filename_component(TCL_HEADER_DIR "${TCL_HEADER}" PATH)
+@@ -563,6 +565,7 @@ get_filename_component(TCL_HEADER_DIR "${TCL_HEADER}" PATH)
  
  find_package(FLEX)
  find_package(BISON)
@@ -31,7 +31,7 @@ index 716d486..8b5f237 100644
  
  # LibertyExpr scan/parse.
  bison_target(LibertyExprParser liberty/LibertyExprParse.yy ${STA_HOME}/liberty/LibertyExprParse.cc
-@@ -706,6 +709,8 @@ if (ZLIB_FOUND)
+@@ -707,6 +710,8 @@ if (ZLIB_FOUND)
    target_link_libraries(sta ${ZLIB_LIBRARIES})
  endif()
  
@@ -41,7 +41,7 @@ index 716d486..8b5f237 100644
  
  # g++ std::thread apparently still needs -pthreads.
 diff --git a/app/StaMain.cc b/app/StaMain.cc
-index 0ee8fde..81eb933 100644
+index 2d96ae2..f4199c7 100644
 --- a/app/StaMain.cc
 +++ b/app/StaMain.cc
 @@ -16,6 +16,8 @@
@@ -66,9 +66,9 @@ index 0ee8fde..81eb933 100644
  // "Arguments" passed to staTclAppInit.
  static int sta_argc;
  static char **sta_argv;
-@@ -34,6 +42,8 @@ static SwigInitFunc sta_swig_init;
- 
- static const char *init_filename = "[file join $env(HOME) .sta]";
+@@ -33,6 +41,8 @@ static const char *sta_init_filename;
+ static const char **sta_tcl_inits;
+ static SwigInitFunc sta_swig_init;
  
 +static bool ended = 0;
 +
@@ -89,7 +89,7 @@ index 0ee8fde..81eb933 100644
 @@ -50,9 +64,31 @@ staMain(Sta *sta,
    sta->setThreadCount(thread_count);
  
-   staSetupAppInit(argc, argv, swig_init, tcl_inits);
+   staSetupAppInit(argc, argv, init_filename, swig_init, tcl_inits);
 -  // Set argc to 1 so Tcl_Main doesn't source any files.
 -  // Tcl_Main never returns.
 -  Tcl_Main(1, argv, staTclAppInit);
@@ -121,7 +121,7 @@ index 0ee8fde..81eb933 100644
  }
  
  int
-@@ -215,6 +251,106 @@ evalTclInit(Tcl_Interp *interp,
+@@ -220,6 +256,106 @@ evalTclInit(Tcl_Interp *interp,
    delete [] unencoded;
  }