Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 1 | From 5539442e5f5442606071afc5cf02642314ad13bb Mon Sep 17 00:00:00 2001 |
| 2 | From: Koen Kooi <koen@dominion.thruhere.net> |
| 3 | Date: Wed, 17 Aug 2011 22:52:35 +0200 |
| 4 | Subject: [PATCH] tk 8.5.8: import from OE rev |
| 5 | |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 6 | Patch by Sergei Golovan allows to find tclConfig.sh in /usr/share/tcltk/tcl8.5 |
| 7 | and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian |
| 8 | installation. |
| 9 | |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 10 | --- |
Patrick Williams | 520786c | 2023-06-25 16:20:36 -0500 | [diff] [blame] | 11 | Upstream-Status: Pending |
| 12 | |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 13 | unix/configure | 1 + |
| 14 | unix/tcl.m4 | 2 ++ |
| 15 | 2 files changed, 3 insertions(+) |
| 16 | |
| 17 | Index: a/unix/configure |
| 18 | =================================================================== |
| 19 | --- a/unix/configure.orig |
| 20 | +++ b/unix/configure |
Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 21 | @@ -1431,6 +1431,7 @@ echo "$as_me: error: ${with_tclconfig} d |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 22 | `ls -d /usr/local/lib 2>/dev/null` \ |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 23 | `ls -d /usr/contrib/lib 2>/dev/null` \ |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 24 | `ls -d /usr/pkg/lib 2>/dev/null` \ |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 25 | + `ls -d /usr/share/tcltk/tcl8.6 2>/dev/null` \ |
Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 26 | `ls -d /usr/lib/tcl8.6 2>/dev/null` \ |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 27 | `ls -d /usr/lib 2>/dev/null` \ |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 28 | `ls -d /usr/lib64 2>/dev/null` \ |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 29 | Index: a/unix/tcl.m4 |
| 30 | =================================================================== |
| 31 | --- a/unix/tcl.m4.orig |
| 32 | +++ b/unix/tcl.m4 |
Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 33 | @@ -93,6 +93,7 @@ AC_DEFUN([SC_PATH_TCLCONFIG], [ |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 34 | `ls -d /usr/local/lib 2>/dev/null` \ |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 35 | `ls -d /usr/contrib/lib 2>/dev/null` \ |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 36 | `ls -d /usr/pkg/lib 2>/dev/null` \ |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 37 | + `ls -d /usr/share/tcltk/tcl8.6 2>/dev/null` \ |
Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 38 | `ls -d /usr/lib/tcl8.6 2>/dev/null` \ |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 39 | `ls -d /usr/lib 2>/dev/null` \ |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 40 | `ls -d /usr/lib64 2>/dev/null` \ |
Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 41 | @@ -226,6 +227,7 @@ AC_DEFUN([SC_PATH_TKCONFIG], [ |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 42 | `ls -d /usr/local/lib 2>/dev/null` \ |
| 43 | `ls -d /usr/contrib/lib 2>/dev/null` \ |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 44 | `ls -d /usr/pkg/lib 2>/dev/null` \ |
Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 45 | + `ls -d /usr/share/tcltk/tcl8.6 2>/dev/null` \ |
| 46 | `ls -d /usr/lib/tk8.6 2>/dev/null` \ |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 47 | `ls -d /usr/lib 2>/dev/null` \ |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 48 | `ls -d /usr/lib64 2>/dev/null` \ |