summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO15
-rw-r--r--.gitignore4
-rw-r--r--004-use-system-zlib.mingw.patch15
-rw-r--r--007-install.mingw.patch5
-rw-r--r--009-fix-using-gnu-print.patch26
-rw-r--r--PKGBUILD42
6 files changed, 50 insertions, 57 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2449d05b9e12..781460b0d2e2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mingw-w64-tcl
pkgdesc = The Tcl scripting language (mingw-w64)
- pkgver = 8.6.9
+ pkgver = 8.6.11
pkgrel = 1
url = http://tcl.sourceforge.net
arch = any
@@ -12,24 +12,21 @@ pkgbase = mingw-w64-tcl
options = staticlibs
options = !strip
options = !buildflags
- source = http://downloads.sourceforge.net/sourceforge/tcl/tcl8.6.9-src.tar.gz
+ source = http://downloads.sourceforge.net/sourceforge/tcl/tcl8.6.11-src.tar.gz
source = 001-fix-relocation.patch
source = 002-fix-forbidden-colon-in-paths.mingw.patch
source = 004-use-system-zlib.mingw.patch
source = 005-no-xc.mingw.patch
- source = 006-proper-implib-name.mingw.patch
source = 007-install.mingw.patch
source = 008-tcl-8.5.14-hidden.patch
source = 009-fix-using-gnu-print.patch
- sha256sums = ad0cd2de2c87b9ba8086b43957a0de3eb2eb565c7159d5f53ccbba3feb915f4e
+ sha256sums = 8c0486668586672c5693d7d95817cb05a18c5ecca2f40e2836b9578064088258
sha256sums = cfcf9b3816f8bb063b514ac7f63a5ba73108f27e16fdf8e8312dc5f0683083f6
sha256sums = 70bf0d8e84985f4e8ee63447ad37d5e50376eaf35ace51112761cacbbd596c4c
- sha256sums = 01bf81675bb189314be5e024f58d20aafb3d2a35c1d2c4353045bbebd1e7a926
+ sha256sums = 2d7581ad118c01afcebd762051eb74fe31511e8b40505554068f126bcd8d5d9f
sha256sums = 2b0f41f6704aa964dbfafa0a65dd5ce0ab97e82ff5cbbe2a95a2e8d644cc5550
- sha256sums = 5c0162fbb018c03b3e4b907bd0098ab5282314bc212e3929a0416126637e1350
- sha256sums = f1833c3164229b017417d2ab2ce4cb066252fc1ad256de2313f0239481c7cc37
+ sha256sums = 61d3430f82ee60000eab28758eba9663a747b1e79082758cb59e624aead6c517
sha256sums = 3ec2702efb1be6873d6ffd2ffb357637588f835f8817ae65cf0373020fcc7359
- sha256sums = e49a314ff0262e487f15fa1cb6253e22e25e8b18dad0b057d600e833efa947a7
+ sha256sums = 894afd1d97c25a2f7b21981810026450d44677a46ba07a32c4025783d027c6d7
pkgname = mingw-w64-tcl
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..1893dc88dc8c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+/src
+/pkg
+*.gz
+*.zst \ No newline at end of file
diff --git a/004-use-system-zlib.mingw.patch b/004-use-system-zlib.mingw.patch
index c7dc2103bf1a..e74b9b2a68f0 100644
--- a/004-use-system-zlib.mingw.patch
+++ b/004-use-system-zlib.mingw.patch
@@ -23,9 +23,9 @@ diff -Naur tcl8.6.5-orig/win/Makefile.in tcl8.6.5/win/Makefile.in
--- tcl8.6.5-orig/win/Makefile.in 2016-03-01 04:59:35.000000000 +0300
+++ tcl8.6.5/win/Makefile.in 2016-03-03 08:47:47.129571100 +0300
@@ -146,9 +146,8 @@
- REG_LIB_FILE = @LIBPREFIX@tclreg$(REGVER)${LIBSUFFIX}
- TEST_DLL_FILE = tcltest$(VER)${DLLSUFFIX}
- TEST_LIB_FILE = @LIBPREFIX@tcltest$(VER)${LIBSUFFIX}
+ package ifneeded registry 1.3.4 [list load [file normalize ${REG_DLL_FILE}] registry]
+ TEST_LOAD_FACILITIES = package ifneeded Tcltest ${VERSION}@TCL_PATCH_LEVEL@ [list load [file normalize ${TEST_DLL_FILE}] Tcltest];\
+ $(TEST_LOAD_PRMS)
-ZLIB_DLL_FILE = zlib1.dll
-SHARED_LIBRARIES = $(TCL_DLL_FILE) @ZLIB_DLL_FILE@
@@ -42,15 +42,6 @@ diff -Naur tcl8.6.5-orig/win/Makefile.in tcl8.6.5/win/Makefile.in
RMDIR = rm -rf
MKDIR = mkdir -p
-@@ -446,7 +445,7 @@
- @MAKE_STUB_LIB@ ${STUB_OBJS}
- @POST_MAKE_LIB@
-
--${TCL_DLL_FILE}: ${TCL_OBJS} tcl.$(RES) @ZLIB_DLL_FILE@
-+${TCL_DLL_FILE}: ${TCL_OBJS} tcl.$(RES)
- @$(RM) ${TCL_DLL_FILE} $(TCL_LIB_FILE)
- @MAKE_DLL@ ${TCL_OBJS} tcl.$(RES) $(SHLIB_LD_LIBS)
- @VC_MANIFEST_EMBED_DLL@
@@ -466,14 +465,6 @@
@$(RM) ${TEST_DLL_FILE} ${TEST_LIB_FILE}
@MAKE_DLL@ ${TCLTEST_OBJS} $(TCL_STUB_LIB_FILE) $(SHLIB_LD_LIBS)
diff --git a/007-install.mingw.patch b/007-install.mingw.patch
index 15a9bad6789f..1ef369d5a25e 100644
--- a/007-install.mingw.patch
+++ b/007-install.mingw.patch
@@ -20,9 +20,8 @@ diff -Naur tcl8.6.5-orig/win/Makefile.in tcl8.6.5/win/Makefile.in
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_DATA_DIR = ${INSTALL} -d -m 755
+
- CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${TCL_SHLIB_CFLAGS} \
---I"${ZLIB_DIR_NATIVE}" -I"${GENERIC_DIR_NATIVE}" -DTCL_TOMMATH \
-+-I"${GENERIC_DIR_NATIVE}" -DTCL_TOMMATH \
+ CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
+ -I"${ZLIB_DIR_NATIVE}" -I"${GENERIC_DIR_NATIVE}" -DTCL_TOMMATH \
-DMP_PREC=4 -I"${TOMMATH_DIR_NATIVE}" -I"${WIN_DIR_NATIVE}" \
${AC_FLAGS} ${COMPILE_DEBUG_FLAGS} ${NO_DEPRECATED_FLAGS}
diff --git a/009-fix-using-gnu-print.patch b/009-fix-using-gnu-print.patch
index a350ebacbf84..f59438ece84c 100644
--- a/009-fix-using-gnu-print.patch
+++ b/009-fix-using-gnu-print.patch
@@ -1,15 +1,13 @@
-diff -Naur tcl8.6.5-orig/win/tclWinInt.h tcl8.6.5/win/tclWinInt.h
---- tcl8.6.5-orig/win/tclWinInt.h 2016-02-25 23:12:38.000000000 +0300
-+++ tcl8.6.5/win/tclWinInt.h 2016-03-03 08:47:51.129171100 +0300
-@@ -45,7 +45,11 @@
- #endif
+diff -Naur tcl8.6.5-orig/win/Makefile.in tcl8.6.5/win/Makefile.in
+--- tcl8.6.11-orig/win/Makefile.in
++++ tcl8.6.11/win/Makefile.in
++++ #<buffer Makefile.in>
+@@ -85,7 +85,7 @@
+ #CFLAGS = $(CFLAGS_DEBUG)
+ #CFLAGS = $(CFLAGS_OPTIMIZE)
+ #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
+-CFLAGS = @CFLAGS@ @CFLAGS_DEFAULT@ -D_ATL_XP_TARGETING=1 -D__USE_MINGW_ANSI_STDIO=0 -DMP_FIXED_CUTOFFS -DMP_NO_STDINT
++CFLAGS = @CFLAGS@ @CFLAGS_DEFAULT@ -D_ATL_XP_TARGETING=1 -DMP_FIXED_CUTOFFS -DMP_NO_STDINT
- #ifdef _WIN64
-+# ifdef __USE_MINGW_ANSI_STDIO
-+# define TCL_I_MODIFIER "I64"
-+# else
- # define TCL_I_MODIFIER "I"
-+# endif
- #else
- # define TCL_I_MODIFIER ""
- #endif
+ # To compile without backward compatibility and deprecated code uncomment the
+ # following
diff --git a/PKGBUILD b/PKGBUILD
index 05de69dbbf7a..5cdcb311dca1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,7 @@
+# Maintainer: xlwz <xlwzforever@outlook.com>
+
pkgname=mingw-w64-tcl
-pkgver=8.6.9
+pkgver=8.6.11
pkgrel=1
pkgdesc="The Tcl scripting language (mingw-w64)"
arch=('any')
@@ -13,19 +15,17 @@ source=("http://downloads.sourceforge.net/sourceforge/tcl/tcl${pkgver}-src.tar.g
"002-fix-forbidden-colon-in-paths.mingw.patch"
"004-use-system-zlib.mingw.patch"
"005-no-xc.mingw.patch"
- "006-proper-implib-name.mingw.patch"
"007-install.mingw.patch"
"008-tcl-8.5.14-hidden.patch"
"009-fix-using-gnu-print.patch")
-sha256sums=('ad0cd2de2c87b9ba8086b43957a0de3eb2eb565c7159d5f53ccbba3feb915f4e'
+sha256sums=('8c0486668586672c5693d7d95817cb05a18c5ecca2f40e2836b9578064088258'
'cfcf9b3816f8bb063b514ac7f63a5ba73108f27e16fdf8e8312dc5f0683083f6'
'70bf0d8e84985f4e8ee63447ad37d5e50376eaf35ace51112761cacbbd596c4c'
- '01bf81675bb189314be5e024f58d20aafb3d2a35c1d2c4353045bbebd1e7a926'
+ '2d7581ad118c01afcebd762051eb74fe31511e8b40505554068f126bcd8d5d9f'
'2b0f41f6704aa964dbfafa0a65dd5ce0ab97e82ff5cbbe2a95a2e8d644cc5550'
- '5c0162fbb018c03b3e4b907bd0098ab5282314bc212e3929a0416126637e1350'
- 'f1833c3164229b017417d2ab2ce4cb066252fc1ad256de2313f0239481c7cc37'
+ '61d3430f82ee60000eab28758eba9663a747b1e79082758cb59e624aead6c517'
'3ec2702efb1be6873d6ffd2ffb357637588f835f8817ae65cf0373020fcc7359'
- 'e49a314ff0262e487f15fa1cb6253e22e25e8b18dad0b057d600e833efa947a7')
+ '894afd1d97c25a2f7b21981810026450d44677a46ba07a32c4025783d027c6d7')
_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
@@ -36,7 +36,6 @@ prepare() {
patch -Np1 -i "${srcdir}/002-fix-forbidden-colon-in-paths.mingw.patch"
patch -Np1 -i "${srcdir}/004-use-system-zlib.mingw.patch"
patch -Np1 -i "${srcdir}/005-no-xc.mingw.patch"
- patch -Np1 -i "${srcdir}/006-proper-implib-name.mingw.patch"
patch -Np1 -i "${srcdir}/007-install.mingw.patch"
patch -Np1 -i "${srcdir}/008-tcl-8.5.14-hidden.patch"
patch -Np1 -i "${srcdir}/009-fix-using-gnu-print.patch"
@@ -56,13 +55,16 @@ build() {
pushd "${srcdir}/${pkgname}-${pkgver}-build-${_arch}"
[ "${_arch}" = 'x86_64-w64-mingw32' ] && enable64bit='--enable-64bit'
${_arch}-configure \
- --enable-threads $enable64bit ../tcl${pkgver}/win
+ --enable-threads $enable64bit ../tcl${pkgver}/win
make
popd
done
}
package() {
+ local _odbc_ver=1.1.2
+ local _itcl_ver=4.2.1
+
for _arch in ${_architectures}; do
cd "${srcdir}/${pkgname}-${pkgver}-build-${_arch}"
make -j1 install INSTALL_ROOT="$pkgdir"
@@ -75,16 +77,15 @@ package() {
sed -e "s#${srcdir}/tcl${pkgver}/win#/usr/lib#" \
-e "s#${srcdir}/tcl${pkgver}#/usr/${_arch}/include/tcl-private#" \
-i "${pkgdir}/usr/${_arch}/lib/tclConfig.sh"
- sed -e "s#${srcdir}/tcl${pkgver}/win/pkgs/tdbc1.1.0#/usr/${_arch}/lib/tdbc1.1.0#" \
- -e "s#${srcdir}/tcl${pkgver}/pkgs/tdbc1.1.0/generic#/usr/${_arch}/include#" \
- -e "s#${srcdir}/tcl${pkgver}/pkgs/tdbc1.1.0/library#/usr/${_arch}/lib/tcl${pkgver%.*}#" \
- -e "s#${srcdir}/tcl${pkgver}/pkgs/tdbc1.1.0#/usr/${_arch}/include#" \
- -i "${pkgdir}/usr/${_arch}/lib/tdbc1.1.0/tdbcConfig.sh"
- sed -e "s#${srcdir}/tcl${pkgver}/win/pkgs/itcl4.1.2#/usr/${_arch}/lib/itcl4.1.2#" \
- -e "s#${srcdir}/tcl${pkgver}/pkgs/itcl4.1.2/generic#/usr/${_arch}/include/tcl-private#" \
- -e "s#${srcdir}/tcl${pkgver}/pkgs/itcl4.1.2#/usr/${_arch}/include/tcl-private#" \
- -i "${pkgdir}/usr/${_arch}/lib/itcl4.1.2/itclConfig.sh"
- mv "$pkgdir/usr/${_arch}/lib/libtcl86.a" "$pkgdir/usr/${_arch}/lib/libtcl86.dll.a"
+ sed -e "s#${srcdir}/tcl${pkgver}/win/pkgs/tdbc${_odbc_ver}#/usr/${_arch}/lib/tdbc${_odbc_ver}#" \
+ -e "s#${srcdir}/tcl${pkgver}/pkgs/tdbc${_odbc_ver}/generic#/usr/${_arch}/include#" \
+ -e "s#${srcdir}/tcl${pkgver}/pkgs/tdbc${_odbc_ver}/library#/usr/${_arch}/lib/tcl${pkgver%.*}#" \
+ -e "s#${srcdir}/tcl${pkgver}/pkgs/tdbc${_odbc_ver}#/usr/${_arch}/include#" \
+ -i "${pkgdir}/usr/${_arch}/lib/tdbc${_odbc_ver}/tdbcConfig.sh"
+ sed -e "s#${srcdir}/tcl${pkgver}/win/pkgs/itcl${_itcl_ver}#/usr/${_arch}/lib/itcl${_itcl_ver}#" \
+ -e "s#${srcdir}/tcl${pkgver}/pkgs/itcl${_itcl_ver}/generic#/usr/${_arch}/include/tcl-private#" \
+ -e "s#${srcdir}/tcl${pkgver}/pkgs/itcl${_itcl_ver}#/usr/${_arch}/include/tcl-private#" \
+ -i "${pkgdir}/usr/${_arch}/lib/itcl${_itcl_ver}/itclConfig.sh"
ln -s "/usr/${_arch}/lib/libtcl86.dll.a" "$pkgdir/usr/${_arch}/lib/libtcl.dll.a"
ln -s /usr/${_arch}/lib/tclConfig.sh "${pkgdir}/usr/${_arch}/lib/tcl${pkgver%.*.*}/tclConfig.sh"
mkdir -p "${pkgdir}/usr/${_arch}/include/tcl-private/"{generic,win}
@@ -102,6 +103,9 @@ package() {
mv ${pkgdir}/usr/${_arch}/bin/sqlite3_analyzer{,.sh}
done
+
+ cd "${srcdir}/tcl${pkgver}"
+ install -Dm644 license.terms "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
# vim:set ts=2 sw=2 et: