From 394d23ad0ea9e449ba7bd06d4d6385ceb0912189 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sun, 24 Feb 2019 18:05:59 +0100 Subject: [PATCH] update: gsoap, lzma, pcre --- src/gsoap-1-fixes.patch | 2 +- src/gsoap.mk | 4 +-- src/lzma-1-fixes.patch | 42 +++++++++++++++++++++++ src/lzma-1-include-stdio.h.patch | 26 -------------- src/lzma-2-mystring-include-windows.patch | 27 --------------- src/lzma.mk | 4 +-- src/pcre.mk | 4 +-- 7 files changed, 49 insertions(+), 60 deletions(-) create mode 100644 src/lzma-1-fixes.patch delete mode 100644 src/lzma-1-include-stdio.h.patch delete mode 100644 src/lzma-2-mystring-include-windows.patch diff --git a/src/gsoap-1-fixes.patch b/src/gsoap-1-fixes.patch index bdee8610..ee1ac8a9 100644 --- a/src/gsoap-1-fixes.patch +++ b/src/gsoap-1-fixes.patch @@ -103,7 +103,7 @@ diff --git a/gsoap/stdsoap2.h b/gsoap/stdsoap2.h index 1111111..2222222 100644 --- a/gsoap/stdsoap2.h +++ b/gsoap/stdsoap2.h -@@ -3655,6 +3655,12 @@ SOAP_FMAC1 int SOAP_FMAC2 soap_putsetcookies(struct soap *soap); +@@ -3638,6 +3638,12 @@ SOAP_FMAC1 int SOAP_FMAC2 soap_putsetcookies(struct soap *soap); SOAP_FMAC1 int SOAP_FMAC2 soap_putcookies(struct soap *soap, const char *domain, const char *path, int secure); #endif diff --git a/src/gsoap.mk b/src/gsoap.mk index f4a28452..dbf84873 100644 --- a/src/gsoap.mk +++ b/src/gsoap.mk @@ -4,8 +4,8 @@ PKG := gsoap $(PKG)_WEBSITE := https://www.genivia.com/dev.html $(PKG)_DESCR := gSOAP $(PKG)_IGNORE := -$(PKG)_VERSION := 2.8.79 -$(PKG)_CHECKSUM := a1c36371598177950829f78c697768bc0227fe851e4172f8bfbee1e37c939cc1 +$(PKG)_VERSION := 2.8.80 +$(PKG)_CHECKSUM := 69c84300529057e701020433934930d6972e008ef7df1ed8b77b0a37529c51a9 $(PKG)_SUBDIR := gsoap-$(call SHORT_PKG_VERSION,$(PKG)) $(PKG)_FILE := gsoap_$($(PKG)_VERSION).zip $(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/gsoap2/gsoap-$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) diff --git a/src/lzma-1-fixes.patch b/src/lzma-1-fixes.patch new file mode 100644 index 00000000..75030463 --- /dev/null +++ b/src/lzma-1-fixes.patch @@ -0,0 +1,42 @@ +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 Nagaev +Date: Sun, 30 Aug 2015 14:26:24 +0200 +Subject: [PATCH 1/2] include stdio.h + + +diff --git a/CPP/7zip/Common/FileStreams.cpp b/CPP/7zip/Common/FileStreams.cpp +index 1111111..2222222 100644 +--- a/CPP/7zip/Common/FileStreams.cpp ++++ b/CPP/7zip/Common/FileStreams.cpp +@@ -1,6 +1,7 @@ + // FileStreams.cpp + + #include "StdAfx.h" ++#include + + #ifndef _WIN32 + #include + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Sun, 30 Aug 2015 14:46:10 +0200 +Subject: [PATCH 2/2] MyString: include windows.h + +Functions CharUpperA, CharPrev etc + +diff --git a/CPP/Common/MyString.h b/CPP/Common/MyString.h +index 1111111..2222222 100644 +--- a/CPP/Common/MyString.h ++++ b/CPP/Common/MyString.h +@@ -4,6 +4,7 @@ + #define __COMMON_STRING_H + + #include ++#include + + #ifndef _WIN32 + #include diff --git a/src/lzma-1-include-stdio.h.patch b/src/lzma-1-include-stdio.h.patch deleted file mode 100644 index f560fc46..00000000 --- a/src/lzma-1-include-stdio.h.patch +++ /dev/null @@ -1,26 +0,0 @@ -This file is part of MXE. See LICENSE.md for licensing information. - -From dd3c0c213571d2ff8acbb3b19966cfa4d6bff3cc Mon Sep 17 00:00:00 2001 -From: Boris Nagaev -Date: Sun, 30 Aug 2015 14:26:24 +0200 -Subject: [PATCH] include stdio.h - ---- - CPP/7zip/Common/FileStreams.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/CPP/7zip/Common/FileStreams.cpp b/CPP/7zip/Common/FileStreams.cpp -index de49911..7609c56 100755 ---- a/CPP/7zip/Common/FileStreams.cpp -+++ b/CPP/7zip/Common/FileStreams.cpp -@@ -1,6 +1,7 @@ - // FileStreams.cpp - - #include "StdAfx.h" -+#include - - #ifndef _WIN32 - #include --- -1.7.10.4 - diff --git a/src/lzma-2-mystring-include-windows.patch b/src/lzma-2-mystring-include-windows.patch deleted file mode 100644 index f58783c8..00000000 --- a/src/lzma-2-mystring-include-windows.patch +++ /dev/null @@ -1,27 +0,0 @@ -This file is part of MXE. See LICENSE.md for licensing information. - -From 7798a70fa69dc4994cc25f82ec3e9b2b368d50fe Mon Sep 17 00:00:00 2001 -From: Boris Nagaev -Date: Sun, 30 Aug 2015 14:46:10 +0200 -Subject: [PATCH] MyString: include windows.h - -Functions CharUpperA, CharPrev etc ---- - CPP/Common/MyString.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/CPP/Common/MyString.h b/CPP/Common/MyString.h -index 7db8a37..297986f 100755 ---- a/CPP/Common/MyString.h -+++ b/CPP/Common/MyString.h -@@ -4,6 +4,7 @@ - #define __COMMON_STRING_H - - #include -+#include - - #include "MyVector.h" - --- -1.7.10.4 - diff --git a/src/lzma.mk b/src/lzma.mk index b388d0f1..1a264444 100644 --- a/src/lzma.mk +++ b/src/lzma.mk @@ -4,8 +4,8 @@ PKG := lzma $(PKG)_WEBSITE := https://www.7-zip.org/sdk.html $(PKG)_DESCR := LZMA SDK $(PKG)_IGNORE := -$(PKG)_VERSION := 1806 -$(PKG)_CHECKSUM := 01f8f7afe35b88d652fec3efd02a7ad282d3045d00cbbc3b961cdd2a37489a55 +$(PKG)_VERSION := 1900 +$(PKG)_CHECKSUM := 00f569e624b3d9ed89cf8d40136662c4c5207eaceb92a70b1044c77f84234bad $(PKG)_SUBDIR := . $(PKG)_FILE := lzma$(subst .,,$($(PKG)_VERSION)).7z $(PKG)_URL := https://www.7-zip.org/a/$($(PKG)_FILE) diff --git a/src/pcre.mk b/src/pcre.mk index 1caa10b1..ac3b8c4c 100644 --- a/src/pcre.mk +++ b/src/pcre.mk @@ -4,8 +4,8 @@ PKG := pcre $(PKG)_WEBSITE := https://www.pcre.org/ $(PKG)_DESCR := PCRE $(PKG)_IGNORE := -$(PKG)_VERSION := 8.42 -$(PKG)_CHECKSUM := 2cd04b7c887808be030254e8d77de11d3fe9d4505c39d4b15d2664ffe8bf9301 +$(PKG)_VERSION := 8.43 +$(PKG)_CHECKSUM := 91e762520003013834ac1adb4a938d53b22a216341c061b0cf05603b290faf6b $(PKG)_SUBDIR := pcre-$($(PKG)_VERSION) $(PKG)_FILE := pcre-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := https://ftp.pcre.org/pub/pcre/$($(PKG)_FILE)