From 407eac41f46936e3f346bb5a964a682e578b4237 Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Sat, 6 Dec 2014 17:37:33 -0500 Subject: d/p/tclConfig_path.patch: 'info library' doesn't give the right directory on Debian and Ubuntu, construct it a different way. --- debian/changelog | 2 ++ debian/patches/series | 1 + debian/patches/tclConfig_path.patch | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+) create mode 100644 debian/patches/tclConfig_path.patch diff --git a/debian/changelog b/debian/changelog index eaa1609..e278185 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ sqlitestudio (2.99.6-0vanir1) unstable; urgency=medium * New upstream release. * Set 2/3 patches as forwarded, and add bug link. + * d/p/tclConfig_path.patch: 'info library' doesn't give the right directory + on Debian and Ubuntu, construct it a different way. -- Unit 193 Fri, 28 Nov 2014 15:47:15 -0500 diff --git a/debian/patches/series b/debian/patches/series index 1bec71b..ec1963f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ cpp4.9_incompatibilities.patch fix_tcl_path.patch disable_rpath.patch +tclConfig_path.patch diff --git a/debian/patches/tclConfig_path.patch b/debian/patches/tclConfig_path.patch new file mode 100644 index 0000000..ed504e5 --- /dev/null +++ b/debian/patches/tclConfig_path.patch @@ -0,0 +1,19 @@ +Description: 'info library' doesn't give the right directory on Debian and Ubuntu, construct it a different way. +Author: Unit 193 +Origin: vendor +Forwarded: no +Last-Update: 2014-11-29 + +Index: sqlitestudio-3.0.0/Plugins/ScriptingTcl/ScriptingTcl.pro +=================================================================== +--- sqlitestudio-3.0.0.orig/Plugins/ScriptingTcl/ScriptingTcl.pro ++++ sqlitestudio-3.0.0/Plugins/ScriptingTcl/ScriptingTcl.pro +@@ -34,7 +34,7 @@ linux: { + #message("Found tclsh: $$TCLSH (version: $$TCL_VERSION)") + + # Find tclConfig.sh +- TCL_CONFIG_DIR = $$system(echo "puts [info library]" | tclsh) ++ TCL_CONFIG_DIR = /usr/lib/$$system(dpkg-architecture -qDEB_HOST_MULTIARCH)/tcl$$TCL_VERSION + TCL_CONFIG = $$TCL_CONFIG_DIR/tclConfig.sh + + # Define other libs required when linking with Tcl -- cgit v1.2.3