From 70904d83504e5c6950b77f1306e14c136691e595 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Wed, 18 Jul 2018 00:19:41 +0200
Subject: [PATCH] update: gnutls, harfbuzz, libpng, qtkeychain

---
 src/gnutls.mk                |  4 ++--
 src/harfbuzz.mk              |  4 ++--
 src/libpng.mk                |  4 ++--
 src/qtkeychain-1-fixes.patch | 39 ------------------------------------
 src/qtkeychain.mk            |  4 ++--
 5 files changed, 8 insertions(+), 47 deletions(-)
 delete mode 100644 src/qtkeychain-1-fixes.patch

diff --git a/src/gnutls.mk b/src/gnutls.mk
index f6db7378..f8198d64 100644
--- a/src/gnutls.mk
+++ b/src/gnutls.mk
@@ -3,8 +3,8 @@
 PKG             := gnutls
 $(PKG)_WEBSITE  := https://www.gnu.org/software/gnutls/
 $(PKG)_DESCR    := GnuTLS
-$(PKG)_VERSION  := 3.5.18
-$(PKG)_CHECKSUM := ae2248d9e78747cf9c469dde81ff8f90b56838b707a0637f3f7d4eee90e80234
+$(PKG)_VERSION  := 3.5.19
+$(PKG)_CHECKSUM := 1936eb64f03aaefd6eb16cef0567457777618573826b94d03376bb6a4afadc44
 $(PKG)_SUBDIR   := gnutls-$($(PKG)_VERSION)
 $(PKG)_FILE     := gnutls-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := https://gnupg.org/ftp/gcrypt/gnutls/v3.5/$($(PKG)_FILE)
diff --git a/src/harfbuzz.mk b/src/harfbuzz.mk
index 5627cee3..6d5c6a2a 100644
--- a/src/harfbuzz.mk
+++ b/src/harfbuzz.mk
@@ -4,8 +4,8 @@ PKG             := harfbuzz
 $(PKG)_WEBSITE  := https://wiki.freedesktop.org/www/Software/HarfBuzz/
 $(PKG)_DESCR    := HarfBuzz
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.8.3
-$(PKG)_CHECKSUM := 2ac2ad1ca26253bfe7f437adcd034c84dad0e7c2c0fe008d6051b754fa987a9e
+$(PKG)_VERSION  := 1.8.4
+$(PKG)_CHECKSUM := 3c592f86fa0da69e2e0e98cae9f5d5b61def3bb7948aa00ca45748f27fa545fd
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := https://www.freedesktop.org/software/$(PKG)/release/$($(PKG)_FILE)
diff --git a/src/libpng.mk b/src/libpng.mk
index e73d79f1..67bdada8 100644
--- a/src/libpng.mk
+++ b/src/libpng.mk
@@ -3,8 +3,8 @@
 PKG             := libpng
 $(PKG)_WEBSITE  := http://www.libpng.org/
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.6.34
-$(PKG)_CHECKSUM := 2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6
+$(PKG)_VERSION  := 1.6.35
+$(PKG)_CHECKSUM := 23912ec8c9584917ed9b09c5023465d71709dce089be503c7867fec68a93bcd7
 $(PKG)_SUBDIR   := libpng-$($(PKG)_VERSION)
 $(PKG)_FILE     := libpng-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := https://$(SOURCEFORGE_MIRROR)/project/libpng/libpng16/$($(PKG)_VERSION)/$($(PKG)_FILE)
diff --git a/src/qtkeychain-1-fixes.patch b/src/qtkeychain-1-fixes.patch
deleted file mode 100644
index 318973f8..00000000
--- a/src/qtkeychain-1-fixes.patch
+++ /dev/null
@@ -1,39 +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: Boris Pek <tehnick-8@yandex.ru>
-Date: Fri, 28 Jun 2018 01:43:09 +0300
-Subject: [PATCH 1/1] Make build of test application optional
-
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1111111..2222222 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -18,9 +18,11 @@ include(ECMSetupVersion)
- include(ECMGeneratePriFile)
- 
- option(BUILD_WITH_QT4 "Build qtkeychain with Qt4 no matter if Qt5 was found" OFF)
-+option(BUILD_TEST_APPLICATION "Build test application" ON)
- option(BUILD_TRANSLATIONS "Build translations" ON)
- option(QTKEYCHAIN_STATIC "Build static library" OFF)
- 
-+
- if(CMAKE_SYSTEM_NAME STREQUAL Android)
-     set(ANDROID 1)
- endif()
-@@ -224,8 +226,10 @@ install(TARGETS ${QTKEYCHAIN_TARGET_NAME}
-   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
- )
- 
--add_executable( testclient testclient.cpp )
--target_link_libraries( testclient ${QTKEYCHAIN_TARGET_NAME})
-+if(BUILD_TEST_APPLICATION)
-+    add_executable( testclient testclient.cpp )
-+    target_link_libraries( testclient ${QTKEYCHAIN_TARGET_NAME})
-+endif()
- 
- 
- ###
diff --git a/src/qtkeychain.mk b/src/qtkeychain.mk
index 94749083..62434274 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.8.0
-$(PKG)_CHECKSUM := b492f603197538bc04b2714105b1ab2b327a9a98d400d53d9a7cb70edd2db12f
+$(PKG)_VERSION  := 0.9.0
+$(PKG)_CHECKSUM := 0935e5eb67fbed0b2db5e74ea8cbd667c6be6eed3767f212eac6ac318ab8a6fc
 $(PKG)_GH_CONF  := frankosterfeld/qtkeychain/tags,v
 $(PKG)_DEPS     := cc qttools