From 56a46e8796556438bef7b0e3664dd03a52af98ba Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sat, 18 Apr 2020 23:49:55 +0200 Subject: [PATCH] update: gettext, harfbuzz, wavpack --- src/gettext-1.patch | 101 +++++++------------------------------------- src/gettext.mk | 4 +- src/harfbuzz.mk | 4 +- src/wavpack.mk | 4 +- 4 files changed, 21 insertions(+), 92 deletions(-) diff --git a/src/gettext-1.patch b/src/gettext-1.patch index c2d8b6e7..620128f5 100644 --- a/src/gettext-1.patch +++ b/src/gettext-1.patch @@ -1,80 +1,10 @@ # This file is part of MXE. See LICENSE.md for licensing information. -From 41eb83cf4aa73f0ac4e70173562f11a17a1d0298 Mon Sep 17 00:00:00 2001 -From: Bruno Haible -Date: Sun, 12 May 2019 23:26:04 +0200 -Subject: [PATCH 1/3] build: Fix "make install" failure with --disable-shared - on glibc systems. - -Reported by Gabor Z. Papp . - -This is a regression from 2018-11-25. - -* gettext-tools/configure.ac (PRELOADABLE_LIBINTL): Set to false if ---disable-shared was specified. - -diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac -index cf1dd734d..fdf75c1ad 100644 ---- a/gettext-tools/configure.ac -+++ b/gettext-tools/configure.ac -@@ -119,7 +119,7 @@ AM_CONDITIONAL([USE_INCLUDED_LIBINTL], [test $USE_INCLUDED_LIBINTL = yes]) - AM_CONDITIONAL([BUILD_INCLUDED_LIBINTL], [test $BUILD_INCLUDED_LIBINTL = yes]) - AM_CONDITIONAL([PACKAGE_IS_GETTEXT_TOOLS], [true]) - AM_CONDITIONAL([PRELOADABLE_LIBINTL], -- [test $USE_INCLUDED_LIBINTL = no && test $GLIBC2 = yes]) -+ [test $USE_INCLUDED_LIBINTL = no && test $GLIBC2 = yes && test "$enable_shared" = yes]) - - dnl This line internationalizes the bison generated parsers. - BISON_I18N --- -2.20.1 - -From 767946e1c31506ecbb082240d3ea87818c777fdd Mon Sep 17 00:00:00 2001 -From: Bruno Haible -Date: Sat, 18 May 2019 17:25:10 +0200 -Subject: [PATCH 2/3] libasprintf: Avoid compilation error on mingw with - -D__USE_MINGW_ANSI_STDIO=1. - -* gettext-runtime/libasprintf/lib-asprintf.c (asprintf, vasprintf): Don't define -on mingw when __USE_MINGW_ANSI_STDIO is non-zero. - -(cherry picked from commit ca6f6cfbb4c78c063f2a50bb758edfc95c9d64a2) - -diff --git a/gettext-runtime/libasprintf/lib-asprintf.c b/gettext-runtime/libasprintf/lib-asprintf.c -index 54649659b..c2fe4ed16 100644 ---- a/gettext-runtime/libasprintf/lib-asprintf.c -+++ b/gettext-runtime/libasprintf/lib-asprintf.c -@@ -1,5 +1,5 @@ - /* Library functions for class autosprintf. -- Copyright (C) 2002-2003, 2006, 2018 Free Software Foundation, Inc. -+ Copyright (C) 2002-2003, 2006, 2018-2019 Free Software Foundation, Inc. - Written by Bruno Haible , 2002. - - This program is free software: you can redistribute it and/or modify -@@ -40,10 +40,13 @@ - #include "asprintf.c" - - /* Define the same functions also without the 'libasprintf_' prefix, -- for binary backward-compatibility. */ -+ for binary backward-compatibility. -+ But don't redefine functions already defined by mingw. */ -+#if !(defined __MINGW32__ && __USE_MINGW_ANSI_STDIO) - #undef asprintf - #undef vasprintf - #include "vasprintf.c" - #include "asprintf.c" -+#endif - - #endif --- -2.20.1 - - -From 546f164e95baa8be680a9f0b446a053e637f4488 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 18 May 2019 18:01:31 +0200 -Subject: [PATCH 3/3] build: Avoid trouble on mingw caused by mingw's *printf +Subject: [PATCH 1/1] build: Avoid trouble on mingw caused by mingw's *printf functions. Reported by Michele Locati @@ -88,12 +18,12 @@ to 0. (cherry picked from commit 45500ab1765581d6a3b7d2e6a6c2595466de70af) diff --git a/gettext-runtime/intl/Makefile.am b/gettext-runtime/intl/Makefile.am -index 9f6e576f1..4b0e70f66 100644 +index 1111111..2222222 100644 --- a/gettext-runtime/intl/Makefile.am +++ b/gettext-runtime/intl/Makefile.am -@@ -52,6 +52,15 @@ AM_CPPFLAGS = \ - -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \ - -DLIBDIR=\"$(libdir)\" -DBUILDING_LIBINTL -DBUILDING_DLL -DIN_LIBINTL +@@ -61,6 +61,15 @@ if WOE32 + AM_CPPFLAGS += -D__USE_MINGW_ANSI_STDIO=0 + endif +if WOE32 +# On mingw, disable the declarations of *printf functions as aliases to the @@ -108,13 +38,15 @@ index 9f6e576f1..4b0e70f66 100644 AM_CPPFLAGS += \ -DENABLE_RELOCATABLE=1 -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\" -DNO_XMALLOC \ diff --git a/gettext-runtime/libasprintf/Makefile.am b/gettext-runtime/libasprintf/Makefile.am -index 4189ef1a1..be78f6835 100644 +index 1111111..2222222 100644 --- a/gettext-runtime/libasprintf/Makefile.am +++ b/gettext-runtime/libasprintf/Makefile.am -@@ -26,6 +26,15 @@ RM = rm -f - - DEFS = -DIN_LIBASPRINTF @DEFS@ +@@ -35,6 +35,17 @@ if WOE32 + DEFS += -D__USE_MINGW_ANSI_STDIO=0 + endif ++DEFS = -DIN_LIBASPRINTF @DEFS@ ++ +if WOE32 +# On mingw, disable the declarations of *printf functions as aliases to the +# corresponding __mingw_*printf functions, because @@ -128,11 +60,11 @@ index 4189ef1a1..be78f6835 100644 # Library include file. diff --git a/libtextstyle/lib/Makefile.am b/libtextstyle/lib/Makefile.am -index 9f2cb0e17..32b1a7c4f 100644 +index 1111111..2222222 100644 --- a/libtextstyle/lib/Makefile.am +++ b/libtextstyle/lib/Makefile.am -@@ -48,6 +48,13 @@ if INCLUDED_LIBXML - AM_CPPFLAGS += -DLIBXML_STATIC +@@ -56,6 +56,13 @@ if WOE32 + AM_CPPFLAGS += -D__USE_MINGW_ANSI_STDIO=0 endif +if WOE32 @@ -145,6 +77,3 @@ index 9f2cb0e17..32b1a7c4f 100644 # Rules generated and collected by gnulib-tool. include Makefile.gnulib --- -2.20.1 - diff --git a/src/gettext.mk b/src/gettext.mk index 96066fe3..3874190d 100644 --- a/src/gettext.mk +++ b/src/gettext.mk @@ -3,8 +3,8 @@ PKG := gettext $(PKG)_WEBSITE := https://www.gnu.org/software/gettext/ $(PKG)_IGNORE := -$(PKG)_VERSION := 0.20.1 -$(PKG)_CHECKSUM := 53f02fbbec9e798b0faaf7c73272f83608e835c6288dd58be6c9bb54624a3800 +$(PKG)_VERSION := 0.20.2 +$(PKG)_CHECKSUM := b22b818e644c37f6e3d1643a1943c32c3a9bff726d601e53047d2682019ceaba $(PKG)_SUBDIR := gettext-$($(PKG)_VERSION) $(PKG)_FILE := gettext-$($(PKG)_VERSION).tar.xz $(PKG)_URL := https://ftp.gnu.org/gnu/gettext/$($(PKG)_FILE) diff --git a/src/harfbuzz.mk b/src/harfbuzz.mk index b8bf9d55..4882ceb5 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 := 2.6.4 -$(PKG)_CHECKSUM := 8745f0a6e3f233e961fdfec6882a9b03171603eb60ec9169fe8ba58f288fc5fd +$(PKG)_VERSION := 2.6.5 +$(PKG)_CHECKSUM := 4a70f6c78205726d63088b6baea3690c84fbf7747930c3e5aa13686fc4bdbef3 $(PKG)_GH_CONF := harfbuzz/harfbuzz/releases $(PKG)_DEPS := cc cairo freetype-bootstrap glib icu4c diff --git a/src/wavpack.mk b/src/wavpack.mk index fd332e16..386f9395 100644 --- a/src/wavpack.mk +++ b/src/wavpack.mk @@ -4,8 +4,8 @@ PKG := wavpack $(PKG)_WEBSITE := http://www.wavpack.com/ $(PKG)_DESCR := WavPack $(PKG)_IGNORE := -$(PKG)_VERSION := 5.2.0 -$(PKG)_CHECKSUM := 3c238cc4362523ac2432652af15861796fe7de9ae08f1ef7f3c690bad7494e18 +$(PKG)_VERSION := 5.3.0 +$(PKG)_CHECKSUM := b6f00b3a2185a1d2df6cf8d893ec60fd645d2eb90db7428a617fd27c9e8a6a01 $(PKG)_SUBDIR := wavpack-$($(PKG)_VERSION) $(PKG)_FILE := wavpack-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://www.wavpack.com/$($(PKG)_FILE)