blob: e13bf69b231ebbbd7aaa925c2dc8c9713e6b606e [file] [log] [blame]
Brad Bishop19323692019-04-05 15:28:33 -04001From 5539442e5f5442606071afc5cf02642314ad13bb Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Wed, 17 Aug 2011 22:52:35 +0200
4Subject: [PATCH] tk 8.5.8: import from OE rev
5
Patrick Williamsb48b7b42016-08-17 15:04:38 -05006Patch by Sergei Golovan allows to find tclConfig.sh in /usr/share/tcltk/tcl8.5
7and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian
8installation.
9
Brad Bishop19323692019-04-05 15:28:33 -040010---
Patrick Williams520786c2023-06-25 16:20:36 -050011Upstream-Status: Pending
12
Brad Bishop19323692019-04-05 15:28:33 -040013 unix/configure | 1 +
14 unix/tcl.m4 | 2 ++
15 2 files changed, 3 insertions(+)
16
17Index: a/unix/configure
18===================================================================
19--- a/unix/configure.orig
20+++ b/unix/configure
Brad Bishope42b3e32020-01-15 22:08:42 -050021@@ -1431,6 +1431,7 @@ echo "$as_me: error: ${with_tclconfig} d
Brad Bishop316dfdd2018-06-25 12:45:53 -040022 `ls -d /usr/local/lib 2>/dev/null` \
Brad Bishop19323692019-04-05 15:28:33 -040023 `ls -d /usr/contrib/lib 2>/dev/null` \
Brad Bishop316dfdd2018-06-25 12:45:53 -040024 `ls -d /usr/pkg/lib 2>/dev/null` \
Brad Bishop19323692019-04-05 15:28:33 -040025+ `ls -d /usr/share/tcltk/tcl8.6 2>/dev/null` \
Brad Bishope42b3e32020-01-15 22:08:42 -050026 `ls -d /usr/lib/tcl8.6 2>/dev/null` \
Patrick Williamsb48b7b42016-08-17 15:04:38 -050027 `ls -d /usr/lib 2>/dev/null` \
Brad Bishop316dfdd2018-06-25 12:45:53 -040028 `ls -d /usr/lib64 2>/dev/null` \
Brad Bishop19323692019-04-05 15:28:33 -040029Index: a/unix/tcl.m4
30===================================================================
31--- a/unix/tcl.m4.orig
32+++ b/unix/tcl.m4
Brad Bishope42b3e32020-01-15 22:08:42 -050033@@ -93,6 +93,7 @@ AC_DEFUN([SC_PATH_TCLCONFIG], [
Brad Bishop316dfdd2018-06-25 12:45:53 -040034 `ls -d /usr/local/lib 2>/dev/null` \
Brad Bishop19323692019-04-05 15:28:33 -040035 `ls -d /usr/contrib/lib 2>/dev/null` \
Brad Bishop316dfdd2018-06-25 12:45:53 -040036 `ls -d /usr/pkg/lib 2>/dev/null` \
Brad Bishop19323692019-04-05 15:28:33 -040037+ `ls -d /usr/share/tcltk/tcl8.6 2>/dev/null` \
Brad Bishope42b3e32020-01-15 22:08:42 -050038 `ls -d /usr/lib/tcl8.6 2>/dev/null` \
Patrick Williamsb48b7b42016-08-17 15:04:38 -050039 `ls -d /usr/lib 2>/dev/null` \
Brad Bishop316dfdd2018-06-25 12:45:53 -040040 `ls -d /usr/lib64 2>/dev/null` \
Brad Bishope42b3e32020-01-15 22:08:42 -050041@@ -226,6 +227,7 @@ AC_DEFUN([SC_PATH_TKCONFIG], [
Patrick Williamsb48b7b42016-08-17 15:04:38 -050042 `ls -d /usr/local/lib 2>/dev/null` \
43 `ls -d /usr/contrib/lib 2>/dev/null` \
Brad Bishop19323692019-04-05 15:28:33 -040044 `ls -d /usr/pkg/lib 2>/dev/null` \
Brad Bishope42b3e32020-01-15 22:08:42 -050045+ `ls -d /usr/share/tcltk/tcl8.6 2>/dev/null` \
46 `ls -d /usr/lib/tk8.6 2>/dev/null` \
Patrick Williamsb48b7b42016-08-17 15:04:38 -050047 `ls -d /usr/lib 2>/dev/null` \
Brad Bishop316dfdd2018-06-25 12:45:53 -040048 `ls -d /usr/lib64 2>/dev/null` \