update: cmake, freetds, qtkeychain, tiff, zstd

7 files changed, 11 insertions, 59 deletions

diff --git a/src/cmake-1-fixes.patch b/src/cmake-1-fixes.patch
index 346cb8c..1eab973 100644
--- a/src/cmake-1-fixes.patch
+++ b/src/cmake-1-fixes.patch
@@ -28,7 +28,7 @@ diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGen
 index 1111111..2222222 100644
 --- a/Source/CPack/cmCPackNSISGenerator.cxx
 +++ b/Source/CPack/cmCPackNSISGenerator.cxx
-@@ -374,7 +374,9 @@ int cmCPackNSISGenerator::InitializeInternal()
+@@ -411,7 +411,9 @@ int cmCPackNSISGenerator::InitializeInternal()
    }
  #endif
  
diff --git a/src/cmake.mk b/src/cmake.mk
index d1a6e33..f4365d4 100644
--- a/src/cmake.mk
+++ b/src/cmake.mk
@@ -3,8 +3,8 @@
 PKG             := cmake
 $(PKG)_WEBSITE  := https://www.cmake.org/
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.19.1
-$(PKG)_CHECKSUM := 1d266ea3a76ef650cdcf16c782a317cb4a7aa461617ee941e389cb48738a3aba
+$(PKG)_VERSION  := 3.19.2
+$(PKG)_CHECKSUM := e3e0fd3b23b7fb13e1a856581078e0776ffa2df4e9d3164039c36d3315e0c7f0
 $(PKG)_SUBDIR   := cmake-$($(PKG)_VERSION)
 $(PKG)_FILE     := cmake-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://www.cmake.org/files/v$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
diff --git a/src/freetds.mk b/src/freetds.mk
index a3bb9e0..eec6042 100644
--- a/src/freetds.mk
+++ b/src/freetds.mk
@@ -4,8 +4,8 @@ PKG             := freetds
 $(PKG)_WEBSITE  := https://www.freetds.org/
 $(PKG)_DESCR    := FreeTDS
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.2.12
-$(PKG)_CHECKSUM := faf4d99666111d418ce2e7c63dcdc2699cd95689e4e9e9ed875f42c36ea40c0f
+$(PKG)_VERSION  := 1.2.18
+$(PKG)_CHECKSUM := 10d47e60986cfc51f8170fa9eaba43114eebdde0ba6e6b1c4813d86f021aaadd
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := https://www.freetds.org/files/stable/$($(PKG)_FILE)
diff --git a/src/qtkeychain.mk b/src/qtkeychain.mk
index 0aba938..122d1b3 100644
--- a/src/qtkeychain.mk
+++ b/src/qtkeychain.mk
@@ -4,8 +4,8 @@ PKG             := qtkeychain
 $(PKG)_WEBSITE  := https://github.com/frankosterfeld/qtkeychain
 $(PKG)_DESCR    := QtKeychain
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.9.1
-$(PKG)_CHECKSUM := 9c2762d9d0759a65cdb80106d547db83c6e9fdea66f1973c6e9014f867c6f28e
+$(PKG)_VERSION  := 0.12.0
+$(PKG)_CHECKSUM := cc547d58c1402f6724d3ff89e4ca83389d9e2bdcfd9ae3d695fcdffa50a625a8
 $(PKG)_GH_CONF  := frankosterfeld/qtkeychain/tags,v
 $(PKG)_DEPS     := cc qttools
 
diff --git a/src/tiff.mk b/src/tiff.mk
index b897e5c..09cd5c2 100644
--- a/src/tiff.mk
+++ b/src/tiff.mk
@@ -4,8 +4,8 @@ PKG             := tiff
 $(PKG)_WEBSITE  := http://simplesystems.org/libtiff/
 $(PKG)_DESCR    := LibTIFF
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 4.1.0
-$(PKG)_CHECKSUM := 5d29f32517dadb6dbcd1255ea5bbc93a2b54b94fbf83653b4d65c7d6775b8634
+$(PKG)_VERSION  := 4.2.0
+$(PKG)_CHECKSUM := eb0484e568ead8fa23b513e9b0041df7e327f4ee2d22db5a533929dfc19633cb
 $(PKG)_SUBDIR   := tiff-$($(PKG)_VERSION)
 $(PKG)_FILE     := tiff-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://download.osgeo.org/libtiff/$($(PKG)_FILE)
diff --git a/src/zstd-1-fixes.patch b/src/zstd-1-fixes.patch
deleted file mode 100644
index 9afb65b..0000000
--- a/src/zstd-1-fixes.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-This file is part of MXE. See LICENSE.md for licensing information.
-
-Contains ad hoc patches for cross building.
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Tony Theodore <tonyt@logyst.com>
-Date: Tue, 2 Jun 2020 18:18:40 +1000
-Subject: [PATCH 1/2] Install pkg-config file on MINGW also
-
-Mingw follows unix conventions and often expects pkg-config files to be present.
-
-see: https://github.com/facebook/zstd/pull/2183
-
-diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt
-index 1111111..2222222 100644
---- a/build/cmake/lib/CMakeLists.txt
-+++ b/build/cmake/lib/CMakeLists.txt
-@@ -134,7 +134,7 @@ if (ZSTD_BUILD_STATIC)
-             OUTPUT_NAME ${STATIC_LIBRARY_BASE_NAME})
- endif ()
- 
--if (UNIX)
-+if (UNIX OR MINGW)
-     # pkg-config
-     set(PREFIX "${CMAKE_INSTALL_PREFIX}")
-     set(LIBDIR "${CMAKE_INSTALL_LIBDIR}")
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Tony Theodore <tonyt@logyst.com>
-Date: Tue, 2 Jun 2020 19:23:40 +1000
-Subject: [PATCH 2/2] Install runtime components (i.e. DLLs) to BINDIR
-
-The convention on windows-based systems (including mingw and cygwin) is to install DLLs in a `.../bin` directory. These [cmake target types](https://cmake.org/cmake/help/latest/command/install.html#installing-targets) handle the various shared, static, and import libraries across systems in a predictable way.
-
-see: https://github.com/facebook/zstd/pull/2185
-
-diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt
-index 1111111..2222222 100644
---- a/build/cmake/lib/CMakeLists.txt
-+++ b/build/cmake/lib/CMakeLists.txt
-@@ -163,6 +163,7 @@ install(TARGETS ${library_targets}
-     INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
-     ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-     LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-+    RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
-     )
- 
- # uninstall target
diff --git a/src/zstd.mk b/src/zstd.mk
index 14a3d6f..6f9b670 100644
--- a/src/zstd.mk
+++ b/src/zstd.mk
@@ -4,8 +4,8 @@ PKG             := zstd
 $(PKG)_WEBSITE  := https://github.com/facebook/zstd
 $(PKG)_DESCR    := Zstandard is a fast lossless compression algorithm
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.4.5
-$(PKG)_CHECKSUM := 734d1f565c42f691f8420c8d06783ad818060fc390dee43ae0a89f86d0a4f8c2
+$(PKG)_VERSION  := 1.4.8
+$(PKG)_CHECKSUM := f176f0626cb797022fbf257c3c644d71c1c747bb74c32201f9203654da35e9fa
 $(PKG)_GH_CONF  := facebook/zstd/tags,v
 $(PKG)_TARGETS  := $(BUILD) $(MXE_TARGETS)
 $(PKG)_DEPS     := cc