[packages/tk] Rediff patches.
arekm
arekm at pld-linux.org
Thu Nov 11 14:57:30 CET 2021
commit a228d93890921ce62f9b98c1da4307caf6320132
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Thu Nov 11 14:55:38 2021 +0100
Rediff patches.
tk-manlnk.patch | 9 +++++----
tk-no_tcl_stub.patch | 9 +++++----
tk-norpath.patch | 18 +++++++++---------
tk-soname_fix.patch | 38 +++++++++++++++++++-------------------
4 files changed, 38 insertions(+), 36 deletions(-)
---
diff --git a/tk-manlnk.patch b/tk-manlnk.patch
index 4771f4d..2b54f65 100644
--- a/tk-manlnk.patch
+++ b/tk-manlnk.patch
@@ -1,7 +1,8 @@
---- tk8.5.9/unix/installManPage.orig 2010-09-02 20:12:14.000000000 +0200
-+++ tk8.5.9/unix/installManPage 2010-10-02 08:49:14.036556463 +0200
-@@ -108,7 +108,7 @@
- chmod 444 $Dir/$First
+diff -urNp -x '*.orig' tk8.6.10.org/unix/installManPage tk8.6.10/unix/installManPage
+--- tk8.6.10.org/unix/installManPage 2019-11-20 20:56:52.000000000 +0100
++++ tk8.6.10/unix/installManPage 2021-11-11 14:54:22.146254062 +0100
+@@ -117,7 +117,7 @@ for Target in $Names; do
+ chmod 644 $Dir/$First
$Gzip $Dir/$First
else
- ln $SymOrLoc$First$Gz $Dir/$Target$Gz
diff --git a/tk-no_tcl_stub.patch b/tk-no_tcl_stub.patch
index 5bce85a..5f49f11 100644
--- a/tk-no_tcl_stub.patch
+++ b/tk-no_tcl_stub.patch
@@ -1,6 +1,7 @@
---- tk8.4.19/unix/configure.in.orig 2008-04-17 17:14:08.000000000 +0200
-+++ tk8.4.19/unix/configure.in 2008-06-02 11:29:43.000000000 +0200
-@@ -417,8 +417,8 @@
+diff -urNp -x '*.orig' tk8.6.10.org/unix/configure.in tk8.6.10/unix/configure.in
+--- tk8.6.10.org/unix/configure.in 2019-11-20 20:56:52.000000000 +0100
++++ tk8.6.10/unix/configure.in 2021-11-11 14:54:56.832920714 +0100
+@@ -659,8 +659,8 @@ eval "TK_LIB_FILE=libtk${LIB_SUFFIX}"
eval "TK_LIB_FILE=${TK_LIB_FILE}"
if test "${SHARED_BUILD}" = "1" -a "${SHLIB_SUFFIX}" != ""; then
@@ -10,4 +11,4 @@
+ TCL_STUB_FLAGS=""
fi
- TK_LIBRARY='$(prefix)/lib/tk$(VERSION)'
+ test -z "$TK_LIBRARY" && TK_LIBRARY='$(prefix)/lib/tk$(VERSION)'
diff --git a/tk-norpath.patch b/tk-norpath.patch
index d667d44..716eff3 100644
--- a/tk-norpath.patch
+++ b/tk-norpath.patch
@@ -1,6 +1,7 @@
---- 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 @@
+diff -urNp -x '*.orig' tk8.6.10.org/unix/Makefile.in tk8.6.10/unix/Makefile.in
+--- tk8.6.10.org/unix/Makefile.in 2019-11-20 20:56:52.000000000 +0100
++++ tk8.6.10/unix/Makefile.in 2021-11-11 14:54:40.539587388 +0100
+@@ -280,8 +280,8 @@ TK_SHLIB_LD_EXTRAS = @TK_SHLIB_LD_EXTRAS
# 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,16 +12,15 @@
# support for embedded libraries on Darwin / Mac OS X
DYLIB_INSTALL_DIR = ${LIB_RUNTIME_DIR}
-
---- tcl8.5.13/unix/tcl.m4.orig 2012-11-28 21:29:42.223960573 +0100
-+++ tcl8.5.13/unix/tcl.m4 2012-11-28 21:31:03.440627511 +0100
-@@ -2048,7 +2048,7 @@ dnl # preprocessing tests use only CPPFL
+diff -urNp -x '*.orig' tk8.6.10.org/unix/tcl.m4 tk8.6.10/unix/tcl.m4
+--- tk8.6.10.org/unix/tcl.m4 2021-11-11 14:54:40.359587388 +0100
++++ tk8.6.10/unix/tcl.m4 2021-11-11 14:54:40.539587388 +0100
+@@ -2030,7 +2030,7 @@ dnl # preprocessing tests use only CPPFL
AS_IF([test "${SHARED_BUILD}" = 1 -a "${SHLIB_SUFFIX}" != ""], [
LIB_SUFFIX=${SHARED_LIB_SUFFIX}
- 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}'
AS_IF([test "${SHLIB_SUFFIX}" = ".dll"], [
- INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)"'
+ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)";if test -f $(LIB_FILE).a; then $(INSTALL_DATA) $(LIB_FILE).a "$(LIB_INSTALL_DIR)"; fi;'
DLL_INSTALL_DIR="\$(BIN_INSTALL_DIR)"
-
diff --git a/tk-soname_fix.patch b/tk-soname_fix.patch
index d2e8d7b..13246b5 100644
--- a/tk-soname_fix.patch
+++ b/tk-soname_fix.patch
@@ -1,9 +1,22 @@
-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 @@
+diff -urNp -x '*.orig' tk8.6.10.org/unix/Makefile.in tk8.6.10/unix/Makefile.in
+--- tk8.6.10.org/unix/Makefile.in 2021-11-11 14:55:11.069587375 +0100
++++ tk8.6.10/unix/Makefile.in 2021-11-11 14:55:11.256254042 +0100
+@@ -588,7 +588,8 @@ doc: $(TOP_DIR)/doc/man.macros
+ # a shared library or non-shared library for Tk.
+ ${LIB_FILE}: ${STUB_LIB_FILE} @LIB_RSRC_FILE@ ${OBJS}
+ rm -f $@
+- @MAKE_LIB@
++ @MAKE_LIB@ -Wl,-soname, at TK_LIB_SONAME@
++ -ln -sf ${TK_LIB_FILE} libtk${VERSION}@SHLIB_SUFFIX@
+
+ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
+ @if test "x${LIB_FILE}" = "xlibtk${MAJOR_VERSION}.${MINOR_VERSION}.dll"; then \
+diff -urNp -x '*.orig' tk8.6.10.org/unix/configure.in tk8.6.10/unix/configure.in
+--- tk8.6.10.org/unix/configure.in 2021-11-11 14:55:11.069587375 +0100
++++ tk8.6.10/unix/configure.in 2021-11-11 14:55:11.256254042 +0100
+@@ -656,7 +656,11 @@ eval "TK_LIB_FILE=libtk${LIB_SUFFIX}"
# tkConfig.sh needs a version of the _LIB_SUFFIX that has been eval'ed
- # since on some platforms TK_LIB_FILE contains shell escapes.
+ # since on some platforms TK_LIB_FILE contains shell escapes.
-eval "TK_LIB_FILE=${TK_LIB_FILE}"
+TK_SOMAJOR=".0"
@@ -13,17 +26,4 @@ diff -urN tk8.5a3.org/unix/configure.in tk8.5a3/unix/configure.in
+AC_SUBST(TK_LIB_SONAME)
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} ${STUB_LIB_FILE} @LIB_RSRC_FILE@
- rm -f $@
-- @MAKE_LIB@
-+ @MAKE_LIB@ -Wl,-soname, at TK_LIB_SONAME@
-+ -ln -sf ${TK_LIB_FILE} libtk${VERSION}@SHLIB_SUFFIX@
-
- ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
- rm -f $@
+ SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \${TCL_LIB_SPEC}"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/tk.git/commitdiff/a228d93890921ce62f9b98c1da4307caf6320132
More information about the pld-cvs-commit
mailing list