Author: arekm Date: Sun Jul 24 17:19:05 2005 GMT
Module: SOURCES Tag: AC-branch
---- Log message:
- up to 8.4.11
---- Files affected:
SOURCES:
tk-headers_fix.patch (1.4 -> 1.4.2.1) , tk-lib64.patch (1.1 -> 1.1.2.1) ,
tk-soname_fix.patch (1.6 -> 1.6.2.1) , tk-norpath.patch (1.1 -> 1.1.2.1)
---- Diffs:
================================================================
Index: SOURCES/tk-headers_fix.patch
diff -u SOURCES/tk-headers_fix.patch:1.4 SOURCES/tk-headers_fix.patch:1.4.2.1
--- SOURCES/tk-headers_fix.patch:1.4 Thu Jun 12 09:55:55 2003
+++ SOURCES/tk-headers_fix.patch Sun Jul 24 19:18:59 2005
@@ -1,28 +1,30 @@
---- tk8.4.3/unix/Makefile.in.wiget 2003-05-20 20:37:04.000000000 +0200
-+++ tk8.4.3/unix/Makefile.in 2003-06-11 09:15:18.000000000 +0200
-@@ -563,7 +563,13 @@
- fi
- @echo "Installing header files";
- @for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h \
-- $(GENERIC_DIR)/tkPlatDecls.h ; \
-+ $(GENERIC_DIR)/tkPlatDecls.h \
-+ $(GENERIC_DIR)/tkIntXlibDecls.h \
-+ $(GENERIC_DIR)/tkIntDecls.h $(GENERIC_DIR)/tkCanvas.h \
-+ $(UNIX_DIR)/tkUnixPort.h $(GENERIC_DIR)/tkPort.h \
-+ $(GENERIC_DIR)/default.h $(UNIX_DIR)/tkUnixDefault.h \
-+ $(UNIX_DIR)/tkUnixInt.h $(COMPAT_DIR)/limits.h \
-+ $(COMPAT_DIR)/unistd.h $(COMPAT_DIR)/stdlib.h ; \
- do \
- $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
- done;
---- tk8.4.3/generic/tkPort.h.wiget 2002-08-31 08:12:26.000000000 +0200
-+++ tk8.4.3/generic/tkPort.h 2003-06-11 09:13:07.000000000 +0200
+diff -urbB tk8.4.11.org/generic/tkPort.h tk8.4.11/generic/tkPort.h
+--- tk8.4.11.org/generic/tkPort.h 2004-01-01 01:34:56.000000000 +0100
++++ tk8.4.11/generic/tkPort.h 2005-07-24 18:57:49.812194248 +0200
@@ -31,7 +31,7 @@
# elif defined(MAC_OSX_TK)
- # include "../macosx/tkMacOSXPort.h"
+ # include "tkMacOSXPort.h"
# else
-# include "../unix/tkUnixPort.h"
+# include <tkUnixPort.h>
# endif
#endif
+diff -urbB tk8.4.11.org/unix/Makefile.in tk8.4.11/unix/Makefile.in
+--- tk8.4.11.org/unix/Makefile.in 2005-06-29 18:43:10.000000000 +0200
++++ tk8.4.11/unix/Makefile.in 2005-07-24 18:59:07.402398744 +0200
+@@ -666,7 +666,13 @@
+ fi
+ @echo "Installing header files";
+ @for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h \
+- $(GENERIC_DIR)/tkPlatDecls.h $(@[EMAIL PROTECTED]) ; \
++ $(GENERIC_DIR)/tkPlatDecls.h $(@[EMAIL PROTECTED]) \
++ $(GENERIC_DIR)/tkIntXlibDecls.h \
++ $(GENERIC_DIR)/tkIntDecls.h $(GENERIC_DIR)/tkCanvas.h \
++ $(UNIX_DIR)/tkUnixPort.h $(GENERIC_DIR)/tkPort.h \
++ $(GENERIC_DIR)/default.h $(UNIX_DIR)/tkUnixDefault.h \
++ $(UNIX_DIR)/tkUnixInt.h $(COMPAT_DIR)/limits.h \
++ $(COMPAT_DIR)/unistd.h $(COMPAT_DIR)/stdlib.h ; \
+ do \
+ $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
+ done;
================================================================
Index: SOURCES/tk-lib64.patch
diff -u SOURCES/tk-lib64.patch:1.1 SOURCES/tk-lib64.patch:1.1.2.1
--- SOURCES/tk-lib64.patch:1.1 Sun Dec 21 22:40:01 2003
+++ SOURCES/tk-lib64.patch Sun Jul 24 19:18:59 2005
@@ -1,10 +1,11 @@
---- unix/Makefile.in~ 2004-12-21 22:19:36.120774776 +0100
-+++ unix/Makefile.in 2004-12-21 22:26:42.773913640 +0100
-@@ -46,7 +46,7 @@
+diff -urBb tk8.4.11.org/unix/Makefile.in tk8.4.11/unix/Makefile.in
+--- tk8.4.11.org/unix/Makefile.in 2005-06-29 18:43:10.000000000 +0200
++++ tk8.4.11/unix/Makefile.in 2005-07-24 19:05:06.076871936 +0200
+@@ -47,7 +47,7 @@
# Directory from which applications will reference the library of Tcl
# scripts (note: you can set the TK_LIBRARY environment variable at
# run-time to override the compiled-in location):
--TK_LIBRARY = $(prefix)/lib/tk$(VERSION)
+-TK_LIBRARY = @TK_LIBRARY@
+TK_LIBRARY = $(libdir)/tk$(VERSION)
# Path to use at runtime to refer to LIB_INSTALL_DIR:
================================================================
Index: SOURCES/tk-soname_fix.patch
diff -u SOURCES/tk-soname_fix.patch:1.6 SOURCES/tk-soname_fix.patch:1.6.2.1
--- SOURCES/tk-soname_fix.patch:1.6 Sat Mar 6 22:52:06 2004
+++ SOURCES/tk-soname_fix.patch Sun Jul 24 19:18:59 2005
@@ -1,23 +1,26 @@
---- tk8.4.6/unix/configure.in.orig 2004-03-06 22:34:25.000000000 +0100
-+++ tk8.4.6/unix/configure.in 2004-03-06 22:39:05.193655656 +0100
-@@ -363,7 +363,11 @@
- TCL_STUB_FLAGS=""
- fi
- TK_LIB_FILE=libtk${LIB_SUFFIX}
+diff -urbB tk8.4.11.org/unix/configure.in tk8.4.11/unix/configure.in
+--- tk8.4.11.org/unix/configure.in 2005-06-29 18:43:10.000000000 +0200
++++ tk8.4.11/unix/configure.in 2005-07-24 19:16:41.305181168 +0200
+@@ -386,7 +386,12 @@
+
+ # Trick to replace DBGX with TK_DBGX
+ DBGX='${TK_DBGX}'
-eval "TK_LIB_FILE=${TK_LIB_FILE}"
+TK_SOMAJOR=".0"
+TK_SOVERSION="${TK_SOMAJOR}.0"
+eval "TK_LIB_SONAME=${TK_LIB_FILE}${TK_SOMAJOR}"
+eval "TK_LIB_FILE=${TK_LIB_FILE}${TK_SOVERSION}"
+AC_SUBST(TK_LIB_SONAME)
++
- # Note: in the following variable, it's important to use the absolute
- # path name of the Tcl directory rather than "..": this is because
---- tk8.4.6/unix/Makefile.in.orig 2004-03-06 22:34:25.000000000 +0100
-+++ tk8.4.6/unix/Makefile.in 2004-03-06 22:37:05.308880912 +0100
-@@ -404,7 +404,8 @@
+ if test "${SHARED_BUILD}" = "1" -a "${SHLIB_SUFFIX}" != ""; then
+ SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \${TCL_STUB_LIB_SPEC}"
+diff -urbB tk8.4.11.org/unix/Makefile.in tk8.4.11/unix/Makefile.in
+--- tk8.4.11.org/unix/Makefile.in 2005-06-29 18:43:10.000000000 +0200
++++ tk8.4.11/unix/Makefile.in 2005-07-24 19:16:24.424747384 +0200
+@@ -485,7 +485,8 @@
# a shared library or non-shared library for Tk.
- ${LIB_FILE}: ${OBJS}
+ ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} @LIB_RSRC_FILE@
rm -f $@
- @MAKE_LIB@
+ @MAKE_LIB@ -Wl,-soname,@TK_LIB_SONAME@
================================================================
Index: SOURCES/tk-norpath.patch
diff -u SOURCES/tk-norpath.patch:1.1 SOURCES/tk-norpath.patch:1.1.2.1
--- SOURCES/tk-norpath.patch:1.1 Tue Jun 17 21:16:56 2003
+++ SOURCES/tk-norpath.patch Sun Jul 24 19:18:59 2005
@@ -1,6 +1,6 @@
---- tk8.4.3/unix/Makefile.in.orig 2003-06-17 20:19:38.000000000 +0200
-+++ tk8.4.3/unix/Makefile.in 2003-06-17 20:20:03.000000000 +0200
-@@ -241,8 +241,8 @@
+--- tk8.4.11.org/unix/Makefile.in 2005-06-29 18:43:10.000000000 +0200
++++ tk8.4.11/unix/Makefile.in 2005-07-24 19:02:13.439116864 +0200
+@@ -261,8 +261,8 @@
# Additional search flags needed to find the various shared libraries
# at run-time. The first symbol is for use when creating a binary
# with cc, and the second is for use when running ld directly.
@@ -11,14 +11,15 @@
# support for embedded libraries on Darwin / Mac OS X
DYLIB_INSTALL_DIR = ${LIB_RUNTIME_DIR}
---- tk8.4.3/unix/tcl.m4.orig 2003-06-17 20:19:38.000000000 +0200
-+++ tk8.4.3/unix/tcl.m4 2003-06-17 20:21:05.000000000 +0200
-@@ -1685,7 +1685,7 @@
+diff -urBb tk8.4.11.org/unix/tcl.m4 tk8.4.11/unix/tcl.m4
+--- tk8.4.11.org/unix/tcl.m4 2005-06-29 18:43:10.000000000 +0200
++++ tk8.4.11/unix/tcl.m4 2005-07-24 19:03:19.934008104 +0200
+@@ -1847,7 +1847,7 @@
if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then
LIB_SUFFIX=${SHARED_LIB_SUFFIX}
-- MAKE_LIB='${SHLIB_LD} -o [$]@ ${SHLIB_LD_FLAGS} ${OBJS}
${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS}
${LD_SEARCH_FLAGS}'
-+ MAKE_LIB='${SHLIB_LD} -o [$]@ ${SHLIB_LD_FLAGS} ${OBJS}
${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS}'
+- MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${SHLIB_LD_LIBS}
${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
++ MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${SHLIB_LD_LIBS}
${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS}'
INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE)
$(LIB_INSTALL_DIR)/$(LIB_FILE)'
else
LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/tk-headers_fix.patch?r1=1.4&r2=1.4.2.1&f=u
http://cvs.pld-linux.org/SOURCES/tk-lib64.patch?r1=1.1&r2=1.1.2.1&f=u
http://cvs.pld-linux.org/SOURCES/tk-soname_fix.patch?r1=1.6&r2=1.6.2.1&f=u
http://cvs.pld-linux.org/SOURCES/tk-norpath.patch?r1=1.1&r2=1.1.2.1&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
