summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/apr.mk17
-rw-r--r--src/freetds.mk4
-rw-r--r--src/gcc.mk4
-rw-r--r--src/libiconv-1-fixes.patch45
-rw-r--r--src/libiconv.mk4
-rw-r--r--src/libmysqlclient-1-fixes.patch20
-rw-r--r--src/postgresql-1-fixes.patch149
-rw-r--r--src/postgresql-2-autoconf-min-version.patch29
-rw-r--r--src/postgresql-3-mingw-errno.patch152
-rw-r--r--src/postgresql.mk5
-rw-r--r--src/qtsparkle-1-fixes.patch20
-rw-r--r--src/qtsparkle-test.cpp17
-rw-r--r--src/qtsparkle.mk48
-rw-r--r--src/qtsparkle_qt4.mk49
-rw-r--r--src/vmime.mk4
-rw-r--r--src/wget.mk4
16 files changed, 144 insertions, 427 deletions
diff --git a/src/apr.mk b/src/apr.mk
index d2d845b..08b9bf2 100644
--- a/src/apr.mk
+++ b/src/apr.mk
@@ -19,18 +19,23 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD
- cp -Rp '$(1)' '$(1).native'
- cd '$(1).native' && ./configure
- cd '$(1).native' && $(MAKE) tools/gen_test_char \
- CFLAGS='-DNEED_ENHANCED_ESCAPES'
- cd '$(1)' && ./configure \
+ # native build for gen_test_char
+ mkdir '$(BUILD_DIR).native'
+ cd '$(BUILD_DIR).native' && '$(SOURCE_DIR)/configure'
+ $(MAKE) -C '$(BUILD_DIR).native' tools/gen_test_char \
+ CFLAGS='-DNEED_ENHANCED_ESCAPES' -j '$(JOBS)'
+
+ # cross build
+ cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/configure' \
$(MXE_CONFIGURE_OPTS) \
ac_cv_sizeof_off_t=4 \
ac_cv_sizeof_pid_t=4 \
ac_cv_sizeof_size_t=4 \
ac_cv_sizeof_ssize_t=4 \
+ $(if $(POSIX_THREADS),apr_cv_mutex_robust_shared=yes) \
CFLAGS=-D_WIN32_WINNT=0x0500
- $(MAKE) -C '$(1)' -j 1 install GEN_TEST_CHAR='$(1).native/tools/gen_test_char'
+ $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' GEN_TEST_CHAR='$(BUILD_DIR).native/tools/gen_test_char'
+ $(MAKE) -C '$(BUILD_DIR)' -j 1 install
ln -sf '$(PREFIX)/$(TARGET)/bin/apr-1-config' '$(PREFIX)/bin/$(TARGET)-apr-1-config'
endef
diff --git a/src/freetds.mk b/src/freetds.mk
index 2b04500..bb94de7 100644
--- a/src/freetds.mk
+++ b/src/freetds.mk
@@ -4,8 +4,8 @@ PKG := freetds
$(PKG)_WEBSITE := http://www.freetds.org/
$(PKG)_DESCR := FreeTDS
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 1.00.23
-$(PKG)_CHECKSUM := 1be0cedc4ad026c28633c6587e84e35844dfa4e05e6779eae6d475572a64d36f
+$(PKG)_VERSION := 1.00.26
+$(PKG)_CHECKSUM := 25950873df171d866614546a4e18adfbfd211077acb6dc04fed49917d7c75017
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2
$(PKG)_URL := ftp://ftp.freetds.org/pub/$(PKG)/stable/$($(PKG)_FILE)
diff --git a/src/gcc.mk b/src/gcc.mk
index 31e8d28..5186555 100644
--- a/src/gcc.mk
+++ b/src/gcc.mk
@@ -37,6 +37,7 @@ define $(PKG)_CONFIGURE
--without-x \
--disable-win32-registry \
--enable-threads=$(MXE_GCC_THREADS) \
+ $(MXE_GCC_EXCEPTION_OPTS) \
--enable-libgomp \
--with-gmp='$(PREFIX)/$(BUILD)' \
--with-isl='$(PREFIX)/$(BUILD)' \
@@ -45,7 +46,8 @@ define $(PKG)_CONFIGURE
--with-as='$(PREFIX)/bin/$(TARGET)-as' \
--with-ld='$(PREFIX)/bin/$(TARGET)-ld' \
--with-nm='$(PREFIX)/bin/$(TARGET)-nm' \
- $(shell [ `uname -s` == Darwin ] && echo "LDFLAGS='-Wl,-no_pie'")
+ $(shell [ `uname -s` == Darwin ] && echo "LDFLAGS='-Wl,-no_pie'") \
+ $($(PKG)_CONFIGURE_OPTS)
endef
define $(PKG)_BUILD_mingw-w64
diff --git a/src/libiconv-1-fixes.patch b/src/libiconv-1-fixes.patch
deleted file mode 100644
index a825f72..0000000
--- a/src/libiconv-1-fixes.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-This file is part of MXE. See LICENSE.md for licensing information.
-
-Contains ad hoc patches for cross building.
-
-From 47345f5dcfb91da8afed7c4e6c29faa2056db447 Mon Sep 17 00:00:00 2001
-From: MXE
-Date: Fri, 7 Jun 2013 17:44:24 +1000
-Subject: [PATCH] remove gets since c++11 removed it
- https://lists.gnu.org/archive/html/bug-gnulib/2012-03/msg00186.html
-
-
-diff --git a/srclib/stdio.in.h b/srclib/stdio.in.h
-index 473c84c..dfb59eb 100644
---- a/srclib/stdio.in.h
-+++ b/srclib/stdio.in.h
-@@ -679,22 +679,11 @@ _GL_WARN_ON_USE (getline, "getline is unportable - "
- # endif
- #endif
-
--#if @GNULIB_GETS@
--# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
--# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
--# undef gets
--# define gets rpl_gets
--# endif
--_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1)));
--_GL_CXXALIAS_RPL (gets, char *, (char *s));
--# else
--_GL_CXXALIAS_SYS (gets, char *, (char *s));
--# undef gets
--# endif
--_GL_CXXALIASWARN (gets);
- /* It is very rare that the developer ever has full control of stdin,
-- so any use of gets warrants an unconditional warning. Assume it is
-- always declared, since it is required by C89. */
-+ so any use of gets warrants an unconditional warning; besides, C11
-+ removed it. */
-+#undef gets
-+#if HAVE_RAW_DECL_GETS
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- #endif
-
---
-1.8.2.3
-
diff --git a/src/libiconv.mk b/src/libiconv.mk
index f026c8b..e53fc81 100644
--- a/src/libiconv.mk
+++ b/src/libiconv.mk
@@ -3,8 +3,8 @@
PKG := libiconv
$(PKG)_WEBSITE := https://www.gnu.org/software/libiconv/
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 1.14
-$(PKG)_CHECKSUM := 72b24ded17d687193c3366d0ebe7cde1e6b18f0df8c55438ac95be39e8a30613
+$(PKG)_VERSION := 1.15
+$(PKG)_CHECKSUM := ccf536620a45458d26ba83887a983b96827001e92a13847b45e4925cc8913178
$(PKG)_SUBDIR := libiconv-$($(PKG)_VERSION)
$(PKG)_FILE := libiconv-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := http://ftp.gnu.org/pub/gnu/libiconv/$($(PKG)_FILE)
diff --git a/src/libmysqlclient-1-fixes.patch b/src/libmysqlclient-1-fixes.patch
index 6b83ceb..121de67 100644
--- a/src/libmysqlclient-1-fixes.patch
+++ b/src/libmysqlclient-1-fixes.patch
@@ -450,3 +450,23 @@ index 1111111..2222222 100644
#include "mysys_priv.h"
#include <process.h>
#include <signal.h>
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Tony Theodore <tonyt@logyst.com>
+Date: Wed, 8 Feb 2017 11:51:42 +1100
+Subject: [PATCH] only define localtime_r and gmtime_r when pthreads isn't used
+
+
+diff --git a/include/my_global.h b/include/my_global.h
+index 1111111..2222222 100644
+--- a/include/my_global.h
++++ b/include/my_global.h
+@@ -629,7 +629,7 @@ enum loglevel {
+ };
+
+
+-#ifdef _WIN32
++#if defined(_WIN32) && !defined(_POSIX_THREAD_SAFE_FUNCTIONS)
+ /****************************************************************************
+ ** Replacements for localtime_r and gmtime_r
+ ****************************************************************************/
diff --git a/src/postgresql-1-fixes.patch b/src/postgresql-1-fixes.patch
deleted file mode 100644
index 6a1e3f7..0000000
--- a/src/postgresql-1-fixes.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-This file is part of MXE. See LICENSE.md for licensing information.
-
-Contains ad hoc patches for cross building.
-
-From a92f8ef8826f38edfe010752badc5c280f5b9605 Mon Sep 17 00:00:00 2001
-From: "a@a.org" <a@a.org>
-Date: Mon, 24 Oct 2011 14:02:33 +0200
-Subject: [PATCH 1/4] use unix style names for openssl on mingw-cross-env
-
-
-diff --git a/configure.in b/configure.in
-index 2f8bb3d..441b42b 100644
---- a/configure.in
-+++ b/configure.in
-@@ -926,13 +926,8 @@ fi
-
- if test "$with_openssl" = yes ; then
- dnl Order matters!
-- if test "$PORTNAME" != "win32"; then
-- AC_CHECK_LIB(crypto, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])])
-- AC_CHECK_LIB(ssl, SSL_library_init, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])])
-- else
-- AC_SEARCH_LIBS(CRYPTO_new_ex_data, eay32 crypto, [], [AC_MSG_ERROR([library 'eay32' or 'crypto' is required for OpenSSL])])
-- AC_SEARCH_LIBS(SSL_library_init, ssleay32 ssl, [], [AC_MSG_ERROR([library 'ssleay32' or 'ssl' is required for OpenSSL])])
-- fi
-+ AC_CHECK_LIB(crypto, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])])
-+ AC_CHECK_LIB(ssl, SSL_library_init, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])])
- fi
-
- if test "$with_pam" = yes ; then
---
-1.9.1
-
-
-From 6bbf26ce1f6c0bbd6fc53db1152b1132795b2850 Mon Sep 17 00:00:00 2001
-From: "a@a.org" <a@a.org>
-Date: Mon, 24 Oct 2011 14:09:38 +0200
-Subject: [PATCH 2/4] do not check autoconf version
-
-
-diff --git a/configure.in b/configure.in
-index 441b42b..1257071 100644
---- a/configure.in
-+++ b/configure.in
-@@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
-
- AC_INIT([PostgreSQL], [9.2.4], [pgsql-bugs@postgresql.org])
-
--m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.63], [], [m4_fatal([Autoconf version 2.63 is required.
--Untested combinations of 'autoconf' and PostgreSQL versions are not
--recommended. You can remove the check from 'configure.in' but it is then
--your responsibility whether the result works or not.])])
- AC_COPYRIGHT([Copyright (c) 1996-2012, PostgreSQL Global Development Group])
- AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
- AC_CONFIG_AUX_DIR(config)
---
-1.9.1
-
-
-From e7cdd570742aa958d5b45c6971253d9a0ac8ecf4 Mon Sep 17 00:00:00 2001
-From: Timothy Gu <timothygu99@gmail.com>
-Date: Tue, 1 Jul 2014 14:27:21 -0700
-Subject: [PATCH 3/4] Fix shared lib install location
-
-Signed-off-by: Timothy Gu <timothygu99@gmail.com>
-
-diff --git a/src/Makefile.shlib b/src/Makefile.shlib
-index 294d10f..3acdd81 100644
---- a/src/Makefile.shlib
-+++ b/src/Makefile.shlib
-@@ -293,6 +293,7 @@ endif
- ifeq ($(PORTNAME), win32)
- ifdef SO_MAJOR_VERSION
- shlib = lib$(NAME)$(DLSUFFIX)
-+ stlib = lib$(NAME)$(DLSUFFIX).a
- endif
- haslibarule = yes
- endif
-@@ -447,14 +448,16 @@ ifeq ($(PORTNAME), darwin)
- endif
-
- ifeq ($(enable_shared), yes)
--install-lib-shared: $(shlib) installdirs-lib
-+install-lib-shared: $(shlib)
-+ifeq (, $(filter $(PORTNAME), win32 cygwin))
-+install-lib-shared: installdirs-lib
-+endif # not win32 or cygwin
- ifdef soname
- # we don't install $(shlib) on AIX
- # (see http://archives.postgresql.org/message-id/52EF20B2E3209443BC37736D00C3C1380A6E79FE@EXADV1.host.magwien.gv.at)
- ifneq ($(PORTNAME), aix)
-+ifeq (, $(filter $(PORTNAME), win32 cygwin))
- $(INSTALL_SHLIB) $< '$(DESTDIR)$(libdir)/$(shlib)'
--ifneq ($(PORTNAME), cygwin)
--ifneq ($(PORTNAME), win32)
- ifneq ($(shlib), $(shlib_major))
- cd '$(DESTDIR)$(libdir)' && \
- rm -f $(shlib_major) && \
-@@ -465,8 +468,9 @@ ifneq ($(shlib), $(shlib_bare))
- rm -f $(shlib_bare) && \
- $(LN_S) $(shlib) $(shlib_bare)
- endif
--endif # not win32
--endif # not cygwin
-+else # win32 or cygwin
-+ $(INSTALL_SHLIB) $< '$(DESTDIR)$(bindir)/$(shlib)'
-+endif # not win32 or cygwin
- endif # not aix
- else # no soname
- $(INSTALL_SHLIB) $< '$(DESTDIR)$(pkglibdir)/$(shlib)'
---
-1.9.1
-
-
-From 49f1ebdd0a4523f77b889b7dfbd5d34c2e11dab1 Mon Sep 17 00:00:00 2001
-From: Timothy Gu <timothygu99@gmail.com>
-Date: Tue, 1 Jul 2014 14:41:44 -0700
-Subject: [PATCH 4/4] Don't build shared lib on win32 if --disable-shared is
- set
-
-Signed-off-by: Timothy Gu <timothygu99@gmail.com>
-
-diff --git a/src/Makefile.shlib b/src/Makefile.shlib
-index 3acdd81..68084cd 100644
---- a/src/Makefile.shlib
-+++ b/src/Makefile.shlib
-@@ -291,11 +291,15 @@ ifeq ($(PORTNAME), cygwin)
- endif
-
- ifeq ($(PORTNAME), win32)
-- ifdef SO_MAJOR_VERSION
-- shlib = lib$(NAME)$(DLSUFFIX)
-- stlib = lib$(NAME)$(DLSUFFIX).a
-+ ifeq ($(enable_shared), yes)
-+ ifdef SO_MAJOR_VERSION
-+ shlib = lib$(NAME)$(DLSUFFIX)
-+ stlib = lib$(NAME)$(DLSUFFIX).a
-+ endif
-+ haslibarule = yes
-+ else
-+ shlib =
- endif
-- haslibarule = yes
- endif
-
-
---
-1.9.1
-
diff --git a/src/postgresql-2-autoconf-min-version.patch b/src/postgresql-2-autoconf-min-version.patch
deleted file mode 100644
index f61f7fe..0000000
--- a/src/postgresql-2-autoconf-min-version.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-This file is part of MXE. See LICENSE.md for licensing information.
-
-Contains ad hoc patches for cross building.
-see https://github.com/mxe/mxe/issues/672
-
-From b18fec680ef90c65247d998e3f68e7574d45e83e Mon Sep 17 00:00:00 2001
-From: "Avi Halachmi (:avih)" <avihpit@yahoo.com>
-Date: Fri, 24 Apr 2015 07:25:04 +0300
-Subject: [PATCH] autoconf: require minimum version 2.50
-
----
- configure.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configure.in b/configure.in
-index 1257071..24f91cd 100644
---- a/configure.in
-+++ b/configure.in
-@@ -17,6 +17,7 @@ dnl Read the Autoconf manual for details.
- dnl
- m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
-
-+AC_PREREQ(2.63)
- AC_INIT([PostgreSQL], [9.2.4], [pgsql-bugs@postgresql.org])
-
- AC_COPYRIGHT([Copyright (c) 1996-2012, PostgreSQL Global Development Group])
---
-1.9.1
-
diff --git a/src/postgresql-3-mingw-errno.patch b/src/postgresql-3-mingw-errno.patch
deleted file mode 100644
index ae3bfe0..0000000
--- a/src/postgresql-3-mingw-errno.patch
+++ /dev/null
@@ -1,152 +0,0 @@
---- postgresql-9.2.4/src/interfaces/libpq/fe-connect.c.orig 2013-08-15 09:08:59.850609595 -0500
-+++ postgresql-9.2.4/src/interfaces/libpq/fe-connect.c 2013-08-15 09:42:59.001463906 -0500
-@@ -1778,10 +1778,16 @@
- if (connect(conn->sock, addr_cur->ai_addr,
- addr_cur->ai_addrlen) < 0)
- {
-+#ifndef WIN32
- if (SOCK_ERRNO == EINPROGRESS ||
- SOCK_ERRNO == EWOULDBLOCK ||
- SOCK_ERRNO == EINTR ||
-+#else
-+ if (SOCK_ERRNO == WSAEINPROGRESS ||
-+ SOCK_ERRNO == WSAEWOULDBLOCK ||
-+ SOCK_ERRNO == WSAEINTR ||
- SOCK_ERRNO == 0)
-+#endif
- {
- /*
- * This is fine - we're in non-blocking mode, and
---- postgresql-9.2.4/src/interfaces/libpq/fe-misc.c.orig 2013-04-01 13:20:36.000000000 -0500
-+++ postgresql-9.2.4/src/interfaces/libpq/fe-misc.c 2013-08-15 10:08:03.190928760 -0500
-@@ -656,7 +656,11 @@
- conn->inBufSize - conn->inEnd);
- if (nread < 0)
- {
-+#ifndef WIN32
- if (SOCK_ERRNO == EINTR)
-+#else
-+ if (SOCK_ERRNO == WSAEINTR)
-+#endif
- goto retry3;
- /* Some systems return EAGAIN/EWOULDBLOCK for no data */
- #ifdef EAGAIN
-@@ -664,12 +668,20 @@
- return someread;
- #endif
- #if defined(EWOULDBLOCK) && (!defined(EAGAIN) || (EWOULDBLOCK != EAGAIN))
-+#ifndef WIN32
- if (SOCK_ERRNO == EWOULDBLOCK)
-+#else
-+ if (SOCK_ERRNO == WSAEWOULDBLOCK)
-+#endif
- return someread;
- #endif
- /* We might get ECONNRESET here if using TCP and backend died */
- #ifdef ECONNRESET
-+#ifndef WIN32
- if (SOCK_ERRNO == ECONNRESET)
-+#else
-+ if (SOCK_ERRNO == WSAECONNRESET)
-+#endif
- goto definitelyFailed;
- #endif
- /* pqsecure_read set the error message for us */
-@@ -749,7 +761,11 @@
- conn->inBufSize - conn->inEnd);
- if (nread < 0)
- {
-+#ifndef WIN32
- if (SOCK_ERRNO == EINTR)
-+#else
-+ if (SOCK_ERRNO == WSAEINTR)
-+#endif
- goto retry4;
- /* Some systems return EAGAIN/EWOULDBLOCK for no data */
- #ifdef EAGAIN
-@@ -757,12 +773,20 @@
- return 0;
- #endif
- #if defined(EWOULDBLOCK) && (!defined(EAGAIN) || (EWOULDBLOCK != EAGAIN))
-+#ifndef WIN32
- if (SOCK_ERRNO == EWOULDBLOCK)
-+#else
-+ if (SOCK_ERRNO == WSAEWOULDBLOCK)
-+#endif
- return 0;
- #endif
- /* We might get ECONNRESET here if using TCP and backend died */
- #ifdef ECONNRESET
-+#ifndef WIN32
- if (SOCK_ERRNO == ECONNRESET)
-+#else
-+ if (SOCK_ERRNO == WSAECONNRESET)
-+#endif
- goto definitelyFailed;
- #endif
- /* pqsecure_read set the error message for us */
-@@ -838,10 +862,18 @@
- break;
- #endif
- #if defined(EWOULDBLOCK) && (!defined(EAGAIN) || (EWOULDBLOCK != EAGAIN))
-+#ifndef WIN32
- case EWOULDBLOCK:
-+#else
-+ case WSAEWOULDBLOCK:
-+#endif
- break;
- #endif
-+#ifndef WIN32
- case EINTR:
-+#else
-+ case WSAEINTR:
-+#endif
- continue;
-
- default:
---- postgresql-9.2.4/src/interfaces/libpq/fe-secure.c.orig 2013-08-15 10:10:44.039355056 -0500
-+++ postgresql-9.2.4/src/interfaces/libpq/fe-secure.c 2013-08-15 10:22:57.767650717 -0500
-@@ -433,12 +433,20 @@
- #if defined(EWOULDBLOCK) && (!defined(EAGAIN) || (EWOULDBLOCK != EAGAIN))
- case EWOULDBLOCK:
- #endif
-+#ifndef WIN32
- case EINTR:
-+#else
-+ case WSAEWOULDBLOCK:
-+ case WSAEINTR:
-+#endif
- /* no error message, caller is expected to retry */
- break;
-
- #ifdef ECONNRESET
- case ECONNRESET:
-+#ifdef WIN32
-+ case WSAECONNRESET:
-+#endif
- printfPQExpBuffer(&conn->errorMessage,
- libpq_gettext(
- "server closed the connection unexpectedly\n"
-@@ -617,7 +625,12 @@
- #if defined(EWOULDBLOCK) && (!defined(EAGAIN) || (EWOULDBLOCK != EAGAIN))
- case EWOULDBLOCK:
- #endif
-+#ifndef WIN32
- case EINTR:
-+#else
-+ case WSAEWOULDBLOCK:
-+ case WSAEINTR:
-+#endif
- /* no error message, caller is expected to retry */
- break;
-
-@@ -629,6 +642,9 @@
- #ifdef ECONNRESET
- case ECONNRESET:
- #endif
-+#ifdef WIN32
-+ case WSAECONNRESET:
-+#endif
- printfPQExpBuffer(&conn->errorMessage,
- libpq_gettext(
- "server closed the connection unexpectedly\n"
diff --git a/src/postgresql.mk b/src/postgresql.mk
index e0ad874..ad345ea 100644
--- a/src/postgresql.mk
+++ b/src/postgresql.mk
@@ -4,8 +4,8 @@ PKG := postgresql
$(PKG)_WEBSITE := http://www.postgresql.org/
$(PKG)_DESCR := PostgreSQL
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 9.2.4
-$(PKG)_CHECKSUM := d97dd918a88a4449225998f46aafa85216a3f89163a3411830d6890507ffae93
+$(PKG)_VERSION := 9.6.2
+$(PKG)_CHECKSUM := 0187b5184be1c09034e74e44761505e52357248451b0c854dddec6c231fe50c9
$(PKG)_SUBDIR := postgresql-$($(PKG)_VERSION)
$(PKG)_FILE := postgresql-$($(PKG)_VERSION).tar.bz2
$(PKG)_URL := http://ftp.postgresql.org/pub/source/v$($(PKG)_VERSION)/$($(PKG)_FILE)
@@ -46,6 +46,7 @@ define $(PKG)_BUILD
LIBS="-lsecur32 `'$(TARGET)-pkg-config' openssl pthreads --libs`" \
ac_cv_func_getaddrinfo=no
+ $(MAKE) -C '$(1)'/src/common -j '$(JOBS)'
# enable_thread_safety means "build internal pthreads" on windows
# disable it and link mingw-w64 pthreads to and avoid name conflicts
$(MAKE) -C '$(1)'/src/interfaces/libpq -j '$(JOBS)' \
diff --git a/src/qtsparkle-1-fixes.patch b/src/qtsparkle-1-fixes.patch
new file mode 100644
index 0000000..e7ea4d5
--- /dev/null
+++ b/src/qtsparkle-1-fixes.patch
@@ -0,0 +1,20 @@
+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: Pavel Vatagin <pavelvat@gmail.com>
+Date: Sat, 28 Jan 2017 03:05:58 +0300
+Subject: [PATCH] disable build exampleapp
+
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1111111..2222222 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -34,4 +34,4 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+
+ add_subdirectory(src)
+-add_subdirectory(exampleapp)
++#add_subdirectory(exampleapp)
diff --git a/src/qtsparkle-test.cpp b/src/qtsparkle-test.cpp
new file mode 100644
index 0000000..0594294
--- /dev/null
+++ b/src/qtsparkle-test.cpp
@@ -0,0 +1,17 @@
+/*
+ * This file is part of MXE. See LICENSE.md for licensing information.
+ */
+
+#include <qtsparkle-qt5/Updater>
+#include <QWidget>
+#include <QUrl>
+
+int main()
+{
+ QWidget w;
+ qtsparkle::Updater* updater = new qtsparkle::Updater(
+ QUrl("http://www.example.com/sparkle.xml"), &w);
+ updater->SetVersion("1.0");
+
+ return 0;
+}
diff --git a/src/qtsparkle.mk b/src/qtsparkle.mk
new file mode 100644
index 0000000..2216e0e
--- /dev/null
+++ b/src/qtsparkle.mk
@@ -0,0 +1,48 @@
+# This file is part of MXE. See LICENSE.md for licensing information.
+
+PKG := qtsparkle
+$(PKG)_WEBSITE := https://github.com/davidsansome/qtsparkle
+$(PKG)_DESCR := Qt auto-updater lib
+$(PKG)_IGNORE :=
+$(PKG)_VERSION := 4c852e57061d7928573afdf88f04f89d85167477
+$(PKG)_CHECKSUM := 6b8500de51c6a8dd402663fed99bced0588e5be50cfe8474f6d3b46f92025934
+$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL := https://github.com/davidsansome/$(PKG)/archive/$($(PKG)_VERSION).tar.gz
+$(PKG)_DEPS := gcc qttools
+
+define $(PKG)_UPDATE
+ $(call MXE_GET_GITHUB_TAGS, davidsansome/qtsparkle)
+endef
+
+define $(PKG)_BUILD_COMMON
+ cd '$(BUILD_DIR)' && $(TARGET)-cmake '$(SOURCE_DIR)' \
+ -DBUILD_WITH_QT4=@qtsparkle_use_qt4@
+ $(MAKE) -C '$(BUILD_DIR)' -j $(JOBS)
+ $(MAKE) -C '$(BUILD_DIR)' -j 1 install
+
+ # create pkg-config file
+ $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib/pkgconfig'
+ (echo 'prefix=$(PREFIX)/$(TARGET)'; \
+ echo 'exec_prefix=$${prefix}'; \
+ echo 'libdir=$${exec_prefix}/lib'; \
+ echo 'includedir=$${prefix}/include'; \
+ echo ''; \
+ echo 'Name: $(PKG)'; \
+ echo 'Version: '; \
+ echo 'Description: Qt auto-updater lib'; \
+ echo 'Requires: @qtsparkle_pc_requires@'; \
+ echo 'Libs: -L$${libdir} -lqtsparkle@qtsparkle_version_suffix@'; \
+ echo 'Cflags: -I$${includedir}') \
+ > '$(PREFIX)/$(TARGET)/lib/pkgconfig/qtsparkle@qtsparkle_version_suffix@.pc'
+
+ $(TARGET)-g++ \
+ -W -Wall -Werror -std=c++11 -pedantic \
+ '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
+ `$(TARGET)-pkg-config qtsparkle@qtsparkle_version_suffix@ --cflags --libs`
+endef
+
+$(PKG)_BUILD = $(subst @qtsparkle_use_qt4@,OFF, \
+ $(subst @qtsparkle_version_suffix@,-qt5, \
+ $(subst @qtsparkle_pc_requires@,Qt5Core Qt5Network Qt5Widgets, \
+ $($(PKG)_BUILD_COMMON))))
diff --git a/src/qtsparkle_qt4.mk b/src/qtsparkle_qt4.mk
index bf5d2eb..c46ee6e 100644
--- a/src/qtsparkle_qt4.mk
+++ b/src/qtsparkle_qt4.mk
@@ -1,43 +1,22 @@
# This file is part of MXE. See LICENSE.md for licensing information.
PKG := qtsparkle_qt4
-$(PKG)_WEBSITE := https://github.com/davidsansome/qtsparkle
-$(PKG)_DESCR := qtsparkle
-$(PKG)_IGNORE :=
-$(PKG)_VERSION := 8882e6ef86cdb79db7932307309d005411fd0c20
-$(PKG)_CHECKSUM := 86f6f010356e05e6efb956b5643ce587ffbbae45e8e7dc1b25b4b1dcf865b5f3
-$(PKG)_SUBDIR := qtsparkle-$($(PKG)_VERSION)
-$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL := https://github.com/davidsansome/qtsparkle/archive/$($(PKG)_VERSION).tar.gz
+$(PKG)_WEBSITE = $(qtsparkle_WEBSITE)
+$(PKG)_DESCR = $(qtsparkle_DESCR)
+$(PKG)_IGNORE = $(qtsparkle_IGNORE)
+$(PKG)_VERSION = $(qtsparkle_VERSION)
+$(PKG)_CHECKSUM = $(qtsparkle_CHECKSUM)
+$(PKG)_SUBDIR = $(qtsparkle_SUBDIR)
+$(PKG)_FILE = $(qtsparkle_FILE)
+$(PKG)_URL = $(qtsparkle_URL)
+$(PKG)_PATCHES = $(realpath $(sort $(wildcard $(addsuffix /qtsparkle-[0-9]*.patch, $(TOP_DIR)/src))))
$(PKG)_DEPS := gcc qt
define $(PKG)_UPDATE
- $(call MXE_GET_GITHUB_TAGS, davidsansome/qtsparkle)
+ echo $(qtsparkle_VERSION)
endef
-define $(PKG)_BUILD
- mkdir '$(1).build'
- cd '$(1).build' && '$(TARGET)-cmake' '$(1)'
- $(MAKE) -C '$(1).build' -j '$(JOBS)'
- $(MAKE) -C '$(1).build' -j 1 install
-
- # create pkg-config file
- $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib/pkgconfig'
- (echo 'prefix=$(PREFIX)/$(TARGET)'; \
- echo 'exec_prefix=$${prefix}'; \
- echo 'libdir=$${exec_prefix}/lib'; \
- echo 'includedir=$${prefix}/include'; \
- echo ''; \
- echo 'Name: $(PKG)'; \
- echo 'Version: '; \
- echo 'Description: $(PKG)'; \
- echo 'Requires: QtCore QtGui QtNetwork QtXml'; \
- echo 'Libs: -L$${libdir} -lqtsparkle'; \
- echo 'Cflags: -I$${includedir}';) \
- > '$(PREFIX)/$(TARGET)/lib/pkgconfig/$(PKG).pc'
-
- $(TARGET)-g++ \
- -W -Wall -Werror -ansi -pedantic \
- '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
- `$(TARGET)-pkg-config $(PKG) --cflags --libs`
-endef
+$(PKG)_BUILD = $(subst @qtsparkle_use_qt4@,ON, \
+ $(subst @qtsparkle_version_suffix@,, \
+ $(subst @qtsparkle_pc_requires@,QtCore QtGui QtNetwork QtXml, \
+ $(qtsparkle_BUILD_COMMON))))
diff --git a/src/vmime.mk b/src/vmime.mk
index a3d705a..c152742 100644
--- a/src/vmime.mk
+++ b/src/vmime.mk
@@ -4,8 +4,8 @@ PKG := vmime
$(PKG)_WEBSITE := http://www.vmime.org/
$(PKG)_DESCR := VMime
$(PKG)_IGNORE :=
-$(PKG)_VERSION := ec5f437
-$(PKG)_CHECKSUM := aa4994af003e5949c86fe3a46639c919a886fd56182419f45c3d309ae4cac14a
+$(PKG)_VERSION := 3cfcdca
+$(PKG)_CHECKSUM := 45d2c1dcf3945939ec921c9292769faf4bf38a8fbe9c276b3bc387b4625a1841
$(PKG)_SUBDIR := kisli-vmime-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := https://github.com/kisli/vmime/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE)
diff --git a/src/wget.mk b/src/wget.mk
index 629ae65..689a277 100644
--- a/src/wget.mk
+++ b/src/wget.mk
@@ -2,8 +2,8 @@
PKG := wget
$(PKG)_WEBSITE := https://www.gnu.org/software/wget/
-$(PKG)_VERSION := 1.18
-$(PKG)_CHECKSUM := b5b55b75726c04c06fe253daec9329a6f1a3c0c1878e3ea76ebfebc139ea9cc1
+$(PKG)_VERSION := 1.19.1
+$(PKG)_CHECKSUM := 0c950b9671881222a4d385b013c9604e98a8025d1988529dfca0e93617744cd2
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := http://ftp.gnu.org/gnu/$(PKG)/$($(PKG)_FILE)
generated by cgit v0.12 at 2024-07-05 07:04:07 (GMT)