update to 8.6.9.1

2 files changed, 18 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 33899632fe1e..d8b2e38f41d8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-tk
 	pkgdesc = A windowing toolkit for use with tcl (mingw-w64)
-	pkgver = 8.6.8
+	pkgver = 8.6.9.1
 	pkgrel = 1
 	url = http://tcl.sourceforge.io
 	arch = any
@@ -12,13 +12,13 @@ pkgbase = mingw-w64-tk
 	options = staticlibs
 	options = !strip
 	options = !buildflags
-	source = http://downloads.sourceforge.net/sourceforge/tcl/tk8.6.8-src.tar.gz
+	source = http://downloads.sourceforge.net/sourceforge/tcl/tk8.6.9.1-src.tar.gz
 	source = tk-prevent-tclStubsPtr-segfault.patch
 	source = tk-install-man.patch
 	source = tk-implib-name.patch
 	source = tk-fix-forbidden-colon-in-paths.patch
 	source = tk-dont-link-shared-with-static-libgcc.patch
-	sha256sums = 49e7bca08dde95195a27f594f7c850b088be357a7c7096e44e1158c7a5fd7b33
+	sha256sums = 8fcbcd958a8fd727e279f4cac00971eee2ce271dc741650b1fc33375fb74ebb4
 	sha256sums = 0029fde6782ce7635e9957412d3e36a7e76d304399d57d64a42818f93e705621
 	sha256sums = 8516749dd73c084ece7b9df6d1ba5708e652e8ba39cad59120c7f909f61747f0
 	sha256sums = 441f2f5bdf1ee2bf6697569365207d554130bd5a2bac01e10a6e1a37738d8006
diff --git a/PKGBUILD b/PKGBUILD
index 39246264084d..6b6634035b4e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,7 @@
 pkgname=mingw-w64-tk
-pkgver=8.6.8
+_basever=8.6.9
+_patch=.1
+pkgver=${_basever}${_patch}
 pkgrel=1
 pkgdesc="A windowing toolkit for use with tcl (mingw-w64)"
 arch=(any)
@@ -14,7 +16,7 @@ source=("http://downloads.sourceforge.net/sourceforge/tcl/tk${pkgver}-src.tar.gz
         "tk-implib-name.patch"
         "tk-fix-forbidden-colon-in-paths.patch"
         "tk-dont-link-shared-with-static-libgcc.patch")
-sha256sums=('49e7bca08dde95195a27f594f7c850b088be357a7c7096e44e1158c7a5fd7b33'
+sha256sums=('8fcbcd958a8fd727e279f4cac00971eee2ce271dc741650b1fc33375fb74ebb4'
             '0029fde6782ce7635e9957412d3e36a7e76d304399d57d64a42818f93e705621'
             '8516749dd73c084ece7b9df6d1ba5708e652e8ba39cad59120c7f909f61747f0'
             '441f2f5bdf1ee2bf6697569365207d554130bd5a2bac01e10a6e1a37738d8006'
@@ -24,7 +26,7 @@ sha256sums=('49e7bca08dde95195a27f594f7c850b088be357a7c7096e44e1158c7a5fd7b33'
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 prepare() {
-  cd "${srcdir}/tk${pkgver}"
+  cd "${srcdir}/tk${_basever}"
   patch -Np1 -i "${srcdir}/tk-prevent-tclStubsPtr-segfault.patch"
   patch -Np1 -i "${srcdir}/tk-install-man.patch"
   patch -Np1 -i "${srcdir}/tk-implib-name.patch"
@@ -36,7 +38,7 @@ prepare() {
 build() {
   local enable64bit=
   [[ "${_arch}" = 'x86_64-w64-mingw32' ]] && enable64bit='--enable-64bit'
-  cd "${srcdir}/tk${pkgver}/win"
+  cd "${srcdir}/tk${_basever}/win"
   for _arch in ${_architectures}; do
     mkdir -p build-${_arch} && pushd build-${_arch}
     ${_arch}-configure \
@@ -53,29 +55,29 @@ package() {
   fi
 
 	for _arch in ${_architectures}; do
-    cd "${srcdir}/tk${pkgver}/win/build-${_arch}"
+    cd "${srcdir}/tk${_basever}/win/build-${_arch}"
     make -j1 install INSTALL_ROOT="$pkgdir"
   cp "${pkgdir}/usr/${_arch}/bin/wish86${debug_suffix}.exe" "${pkgdir}/usr/${_arch}/bin/wish.exe"
   find "${pkgdir}/usr/${_arch}" -name '*.def' -o -name '*.exp' | xargs -rtl1 rm
   find "${pkgdir}/usr/${_arch}" -name '*.sh' -o -name '*.dll' -o -name '*.exe' | xargs -rtl1 chmod 755
 
   ln -s "${pkgdir}/usr/${_arch}/lib/libtk86${debug_suffix}.dll.a" "${pkgdir}/usr/${_arch}/lib/libtk.dll.a"
-  mkdir -p "${pkgdir}/usr/${_arch}/include/tk${pkgver%.*}/tk-private/"{generic/ttk,win}
+  mkdir -p "${pkgdir}/usr/${_arch}/include/tk${_basever%.*}/tk-private/"{generic/ttk,win}
 
-  cd ${srcdir}/tk${pkgver}
-  find generic win -name "*.h" -exec cp -p '{}' "${pkgdir}/usr/${_arch}"/include/tk${pkgver%.*}/tk-private/'{}' ';'
+  cd ${srcdir}/tk${_basever}
+  find generic win -name "*.h" -exec cp -p '{}' "${pkgdir}/usr/${_arch}"/include/tk${_basever%.*}/tk-private/'{}' ';'
   ( cd "${pkgdir}/usr/${_arch}/include"
     for header in *.h ; do
-      cp -f ${header} ${pkgdir}/usr/${_arch}/include/tk${pkgver%.*}/tk-private/generic/
+      cp -f ${header} ${pkgdir}/usr/${_arch}/include/tk${_basever%.*}/tk-private/generic/
     done
   )
   chmod a-x "${pkgdir}/usr/${_arch}/lib/"*/pkgIndex.tcl
 
-  local _libver=${pkgver%.*}
+  local _libver=${_basever%.*}
   _libver=${_libver//./}
   sed -i \
     -e "s|^\(TK_BUILD_LIB_SPEC\)='.*|\1='-Wl,/usr/${_arch}/lib/libtk${_libver}.dll.a'|" \
-    -e "s|^\(TK_SRC_DIR\)='.*'|\1='/usr/${_arch}/include/tk${pkgver%.*}/tk-private'|" \
+    -e "s|^\(TK_SRC_DIR\)='.*'|\1='/usr/${_arch}/include/tk${_basever%.*}/tk-private'|" \
     -e "s|^\(TK_BUILD_STUB_LIB_SPEC\)='.*|\1='-Wl,/usr/${_arch}/lib/libtkstub${_libver}.a'|" \
     -e "s|^\(TK_BUILD_STUB_LIB_PATH\)='.*|\1='/usr/${_arch}/lib/libtkstub${_libver}.a'|" \
     -e "s|^\(TK_STUB_LIB_SPEC\)='.*|\1='-L/usr/${_arch}/lib -ltkstub${_libver}'|" \
@@ -84,8 +86,8 @@ package() {
   # Add missing entry to tkConfig.sh
   echo "# String to pass to the compiler so that an extension can" >> ${pkgdir}/usr/${_arch}/lib/tkConfig.sh
   echo "# find installed Tcl headers." >> ${pkgdir}/usr/${_arch}/lib/tkConfig.sh
-  echo "TK_INCLUDE_SPEC='-I/usr/${_arch}/include/tk${pkgver%.*}'" >> ${pkgdir}/usr/${_arch}/lib/tkConfig.sh
+  echo "TK_INCLUDE_SPEC='-I/usr/${_arch}/include/tk${_basever%.*}'" >> ${pkgdir}/usr/${_arch}/lib/tkConfig.sh
 
-  rm "${pkgdir}/usr/${_arch}/lib/tk${pkgver%.*}/tkAppInit.c"
+  rm "${pkgdir}/usr/${_arch}/lib/tk${_basever%.*}/tkAppInit.c"
   done
 }