From aaf798083f7605166430807208c76d402e6f9779 Mon Sep 17 00:00:00 2001
From: jenglish <jenglish@flightlab.com>
Date: Fri, 21 Mar 2008 21:49:10 +0000
Subject: Keep ttkStubLib.o in libtkstub instead of libtk. [Bug 1920030]

---
 ChangeLog                |  5 +++++
 generic/tk.decls         | 11 ++---------
 generic/ttk/ttkStubLib.c |  7 ++++---
 unix/Makefile.in         |  4 ++--
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2cb1bac..4e64393 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-21  Joe English  <jenglish@users.sourceforge.net>
+
+	* generic/tk.decls, generic/ttk/ttkStubLib.c, unix/Makefile.in:
+	Keep ttkStubLib.o in libtkstub instead of libtk. [Bug 1920030]
+
 2008-03-20  Donal K. Fellows  <dkf@users.sf.net>
 
 	* tests/wm.test: Rewrote so that tests clean up after themselves
diff --git a/generic/tk.decls b/generic/tk.decls
index 12f4afa..050742c 100644
--- a/generic/tk.decls
+++ b/generic/tk.decls
@@ -11,7 +11,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # 
-# RCS: @(#) $Id: tk.decls,v 1.36 2008/03/19 16:57:21 das Exp $
+# RCS: @(#) $Id: tk.decls,v 1.37 2008/03/21 21:49:12 jenglish Exp $
 
 library tk
 
@@ -1159,11 +1159,7 @@ export {
 }
 export {
     CONST char *Tk_PkgInitStubsCheck(Tcl_Interp *interp, CONST char *version,
-	int exact)
-}
-export {
-    const char *TtkInitializeStubs(Tcl_Interp *, const char *version,
-    int epoch, int revision)
+	int exact);
 }
 
 # Global variables that need to be exported from the tcl shared library.
@@ -1183,6 +1179,3 @@ export {
 export {
     TkIntXlibStubs *tkIntXlibStubsPtr           (fool checkstubs)
 }
-export {
-    TtkStubs *ttkStubsPtr                       (fool checkstubs)
-}
diff --git a/generic/ttk/ttkStubLib.c b/generic/ttk/ttkStubLib.c
index 697107a..11b1698 100644
--- a/generic/ttk/ttkStubLib.c
+++ b/generic/ttk/ttkStubLib.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ttkStubLib.c,v 1.3 2008/03/19 16:57:22 das Exp $
+ * $Id: ttkStubLib.c,v 1.4 2008/03/21 21:49:12 jenglish Exp $
  * SOURCE: tk/generic/tkStubLib.c, version 1.9 2004/03/17
  */
 
@@ -8,7 +8,8 @@
 #define USE_TTK_STUBS 1
 #include "ttkTheme.h"
 
-const TtkStubs *ttkStubsPtr = NULL;
+MODULE_SCOPE const TtkStubs *ttkStubsPtr;
+const TtkStubs *ttkStubsPtr;
 
 /*
  *----------------------------------------------------------------------
@@ -25,7 +26,7 @@ const TtkStubs *ttkStubsPtr = NULL;
  *	Sets the stub table pointer.
  *
  */
-const char *
+MODULE_SCOPE const char *
 TtkInitializeStubs(
     Tcl_Interp *interp, const char *version, int epoch, int revision)
 {
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 4f4dfd4..96df504 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -5,7 +5,7 @@
 # "autoconf" program (constructs like "@foo@" will get replaced in the
 # actual Makefile.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.142 2008/03/19 17:21:47 das Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.143 2008/03/21 21:49:12 jenglish Exp $
 
 # Current Tk version;  used in various names.
 
@@ -370,7 +370,7 @@ TTK_OBJS = \
 	ttkPanedwindow.o ttkProgress.o ttkScale.o ttkScrollbar.o ttkScroll.o \
 	ttkSeparator.o ttkSquare.o ttkState.o \
 	ttkTagSet.o ttkTheme.o ttkTrace.o ttkTrack.o ttkTreeview.o \
-	ttkWidget.o ttkStubInit.o ttkStubLib.o
+	ttkWidget.o ttkStubInit.o
 
 STUB_OBJS = tkStubInit.o tkStubLib.o
 
-- 
cgit v0.12