From 0980befd4d79f8628f7508012f46ab4c2f4665ca Mon Sep 17 00:00:00 2001
From: AlmAck <gluca86@gmail.com>
Date: Sat, 2 Feb 2019 20:34:35 +0100
Subject: [PATCH] tcl tk 8.6.9 [skip-ci]

---
 tcl/PKGBUILD | 11 ++++++-----
 tk/PKGBUILD  | 40 +++++++++++++++++++++-------------------
 2 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/tcl/PKGBUILD b/tcl/PKGBUILD
index e75a49283..8d7f554e1 100644
--- a/tcl/PKGBUILD
+++ b/tcl/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=tcl
-pkgver=8.6.4
-pkgrel=2
+pkgver=8.6.9
+pkgrel=1
 pkgdesc="The Tcl scripting language"
 arch=('x86_64')
 url="http://tcl.sourceforge.net/"
@@ -8,7 +8,7 @@ license=('custom')
 depends=('zlib')
 options=('staticlibs')
 source=("http://downloads.sourceforge.net/sourceforge/tcl/tcl${pkgver}-src.tar.gz")
-sha1sums=('33c5a083a23cf54f15e25a9e787dc39ef3fa0a2b')
+sha1sums=('861c5c8bbce9eda892c5e63b6035e09fad90a25f')
 
 prepare() {
   cd tcl${pkgver}
@@ -38,6 +38,7 @@ package()
   make INSTALL_ROOT=${pkgdir} install install-private-headers
   ln -sf tclsh${pkgver%.*} "${pkgdir}/usr/bin/tclsh"
   ln -sf libtcl${pkgver%.*}.so "${pkgdir}/usr/lib/libtcl.so"
+  install -Dm644 tcl.m4 -t "$pkgdir"/usr/share/aclocal
   
   # install license
   install -Dm644 ../license.terms ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
@@ -47,14 +48,14 @@ package()
       -e "s#${srcdir}/tcl${pkgver}#/usr/include#" \
       -i "${pkgdir}/usr/lib/tclConfig.sh"
 
-  tdbcver=tdbc1.0.3
+  tdbcver=tdbc1.1.0
   sed -e "s#${srcdir}/tcl${pkgver}/unix/pkgs/$tdbcver#/usr/lib/$tdbcver#" \
       -e "s#${srcdir}/tcl${pkgver}/pkgs/$tdbcver/generic#/usr/include#" \
       -e "s#${srcdir}/tcl${pkgver}/pkgs/$tdbcver/library#/usr/lib/tcl${pkgver%.*}#" \
       -e "s#${srcdir}/tcl${pkgver}/pkgs/$tdbcver#/usr/include#" \
       -i "${pkgdir}/usr/lib/$tdbcver/tdbcConfig.sh"
 
-  itclver=itcl4.0.3
+  itclver=itcl4.1.2
   sed -e "s#${srcdir}/tcl${pkgver}/unix/pkgs/$itclver#/usr/lib/$itclver#" \
       -e "s#${srcdir}/tcl${pkgver}/pkgs/$itclver/generic#/usr/include#" \
       -e "s#${srcdir}/tcl${pkgver}/pkgs/$itclver#/usr/include#" \
diff --git a/tk/PKGBUILD b/tk/PKGBUILD
index 8d186969c..cfd8846d4 100644
--- a/tk/PKGBUILD
+++ b/tk/PKGBUILD
@@ -1,7 +1,7 @@
 
 pkgname=tk
-pkgver=8.6.4
-pkgrel=2
+pkgver=8.6.9
+pkgrel=1
 pkgdesc="A windowing toolkit for use with tcl"
 arch=('x86_64')
 url="http://tcl.sourceforge.net/"
@@ -9,33 +9,35 @@ license=('custom')
 depends=("tcl=${pkgver}" 'libxss' 'libxft' 'graphite')
 options=('staticlibs')
 source=("http://downloads.sourceforge.net/sourceforge/tcl/${pkgname}${pkgver}-src.tar.gz")
-sha1sums=('ad24c59ac2e7453d1ed2bad0d7d18a01eabc5226')
+sha1sums=('9220739f077e64e974dfd8999d1de1a3b9355b9d')
 
 build() {
-  cd "${srcdir}/${pkgname}${pkgver}/unix"
-
-  ./configure --prefix=/usr \
-              --mandir=/usr/share/man \
-              --enable-threads \
-              --enable-xft \
-              --enable-64bit
-  
+  cd tk${pkgver}/unix
+  ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads --disable-rpath --enable-64bit
   make
 }
 
-package() {
-  cd "${srcdir}/${pkgname}${pkgver}/unix"
-    
-  make INSTALL_ROOT="${pkgdir}" install install-private-headers
-  ln -sf "wish8.6" "${pkgdir}/usr/bin/wish"
-  ln -sf libtk${pkgver%.*}.so "${pkgdir}/usr/lib/libtk.so"
+check() {
+  cd tk${pkgver}/unix
+#  make test
+}
 
-  # install license
+package() {
+  cd tk${pkgver}/unix
+  make INSTALL_ROOT="${pkgdir}" install install-private-headers
+  ln -sf wish${pkgver%.*} "${pkgdir}/usr/bin/wish"
+  ln -sf libtk${pkgver%.*}.so "${pkgdir}/usr/lib/libtk.so"
   install -Dm644 license.terms "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
+  # install private headers (FS#14388, FS#47616)
+  cd ..
+  for dir in compat generic generic/ttk unix; do
+    install -dm755 "${pkgdir}"/usr/include/tk-private/$dir
+    install -m644 -t "${pkgdir}"/usr/include/tk-private/$dir $dir/*.h
+  done
+
   # remove buildroot traces
   sed -e "s#${srcdir}/tk${pkgver}/unix#/usr/lib#" \
       -e "s#${srcdir}/tk${pkgver}#/usr/include#" \
       -i "${pkgdir}/usr/lib/tkConfig.sh"
 }
-