SOURCES: tk-headers_fix.patch, tk-lib64.patch, tk-norpath.patch, t...

arekm arekm at pld-linux.org
Sat Jun 18 00:03:33 CEST 2005 

Author: arekm                        Date: Fri Jun 17 22:03:33 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up to a3

---- Files affected:
SOURCES:
   tk-headers_fix.patch (1.6 -> 1.7) , tk-lib64.patch (1.1 -> 1.2) , tk-norpath.patch (1.1 -> 1.2) , tk-soname_fix.patch (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SOURCES/tk-headers_fix.patch
diff -u SOURCES/tk-headers_fix.patch:1.6 SOURCES/tk-headers_fix.patch:1.7
--- SOURCES/tk-headers_fix.patch:1.6	Mon Apr  4 14:24:21 2005
+++ SOURCES/tk-headers_fix.patch	Sat Jun 18 00:03:28 2005
@@ -1,18 +1,18 @@
---- 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 @@
+diff -urN tk8.5a3.org/unix/Makefile.in tk8.5a3/unix/Makefile.in
+--- tk8.5a3.org/unix/Makefile.in	2005-06-04 23:00:25.000000000 +0200
++++ tk8.5a3/unix/Makefile.in	2005-06-17 23:54:19.497558856 +0200
+@@ -677,7 +677,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 \
-+ 		; \
+-		$(GENERIC_DIR)/tkPlatDecls.h $(@TK_WINDOWINGSYSTEM at _HDRS) ; \
++		$(GENERIC_DIR)/tkPlatDecls.h $(@TK_WINDOWINGSYSTEM at _HDRS) \
++		$(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 \
++		; \
  	    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.2
--- SOURCES/tk-lib64.patch:1.1	Sun Dec 21 22:40:01 2003
+++ SOURCES/tk-lib64.patch	Sat Jun 18 00:03:28 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 -urN tk8.5a3.org/unix/Makefile.in tk8.5a3/unix/Makefile.in
+--- tk8.5a3.org/unix/Makefile.in	2005-06-04 23:00:25.000000000 +0200
++++ tk8.5a3/unix/Makefile.in	2005-06-17 23:59:45.195045312 +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-norpath.patch
diff -u SOURCES/tk-norpath.patch:1.1 SOURCES/tk-norpath.patch:1.2
--- SOURCES/tk-norpath.patch:1.1	Tue Jun 17 21:16:56 2003
+++ SOURCES/tk-norpath.patch	Sat Jun 18 00:03:28 2005
@@ -1,6 +1,7 @@
---- 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 @@
+diff -urN tk8.5a3.org/unix/Makefile.in tk8.5a3/unix/Makefile.in
+--- tk8.5a3.org/unix/Makefile.in	2005-06-04 23:00:25.000000000 +0200
++++ tk8.5a3/unix/Makefile.in	2005-06-17 23:57:52.837126312 +0200
+@@ -262,8 +262,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 +12,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 -urN tk8.5a3.org/unix/tcl.m4 tk8.5a3/unix/tcl.m4
+--- tk8.5a3.org/unix/tcl.m4	2005-06-04 23:00:25.000000000 +0200
++++ tk8.5a3/unix/tcl.m4	2005-06-17 23:58:21.994693688 +0200
+@@ -1909,7 +1909,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}

================================================================
Index: SOURCES/tk-soname_fix.patch
diff -u SOURCES/tk-soname_fix.patch:1.6 SOURCES/tk-soname_fix.patch:1.7
--- SOURCES/tk-soname_fix.patch:1.6	Sat Mar  6 22:52:06 2004
+++ SOURCES/tk-soname_fix.patch	Sat Jun 18 00:03:28 2005
@@ -1,9 +1,10 @@
---- 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 -urN tk8.5a3.org/unix/configure.in tk8.5a3/unix/configure.in
+--- tk8.5a3.org/unix/configure.in	2005-06-04 23:00:25.000000000 +0200
++++ tk8.5a3/unix/configure.in	2005-06-17 23:56:37.902518104 +0200
+@@ -428,7 +428,11 @@
+ # tkConfig.sh needs a version of the _LIB_SUFFIX that has been eval'ed
+ # since on some platforms TK_LIB_FILE contains shell escapes. 
+ 
 -eval "TK_LIB_FILE=${TK_LIB_FILE}"
 +TK_SOMAJOR=".0"
 +TK_SOVERSION="${TK_SOMAJOR}.0"
@@ -11,13 +12,14 @@
 +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 -urN tk8.5a3.org/unix/Makefile.in tk8.5a3/unix/Makefile.in
+--- tk8.5a3.org/unix/Makefile.in	2005-06-04 23:00:25.000000000 +0200
++++ tk8.5a3/unix/Makefile.in	2005-06-17 23:56:37.903517952 +0200
+@@ -496,7 +496,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, at TK_LIB_SONAME@
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/tk-headers_fix.patch?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SOURCES/tk-lib64.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/tk-norpath.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/tk-soname_fix.patch?r1=1.6&r2=1.7&f=u

More information about the pld-cvs-commit mailing list