From 61bac180c27fa568bd70f391523814b6f1a174d0 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Fri, 22 Sep 2017 23:48:13 +0200 Subject: update: fontconfig, freetds, freetype, gdb, harfbuzz --- src/fontconfig.mk | 4 +-- src/freetds.mk | 4 +-- src/freetype-1-fixes.patch | 71 ---------------------------------------------- src/freetype.mk | 4 +-- src/gdb.mk | 4 +-- src/harfbuzz.mk | 4 +-- 6 files changed, 10 insertions(+), 81 deletions(-) delete mode 100644 src/freetype-1-fixes.patch diff --git a/src/fontconfig.mk b/src/fontconfig.mk index 4dc6100..b955463 100644 --- a/src/fontconfig.mk +++ b/src/fontconfig.mk @@ -3,8 +3,8 @@ PKG := fontconfig $(PKG)_WEBSITE := https://fontconfig.org/ $(PKG)_IGNORE := -$(PKG)_VERSION := 2.12.4 -$(PKG)_CHECKSUM := 668293fcc4b3c59765cdee5cee05941091c0879edcc24dfec5455ef83912e45c +$(PKG)_VERSION := 2.12.6 +$(PKG)_CHECKSUM := cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017 $(PKG)_SUBDIR := fontconfig-$($(PKG)_VERSION) $(PKG)_FILE := fontconfig-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := https://fontconfig.org/release/$($(PKG)_FILE) diff --git a/src/freetds.mk b/src/freetds.mk index 74fd016..30ef368 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.54 -$(PKG)_CHECKSUM := 20c44e4a29e75eb94f2332a43c24ebc3bd85ffadebd9702338672f11700d529a +$(PKG)_VERSION := 1.00.62 +$(PKG)_CHECKSUM := 3a369aa00078f87dd3765006f772bfcf813bc46462d35fe6abf38d4b9dcca181 $(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/freetype-1-fixes.patch b/src/freetype-1-fixes.patch deleted file mode 100644 index ee4604b..0000000 --- a/src/freetype-1-fixes.patch +++ /dev/null @@ -1,71 +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 -Date: Tue, 20 Jun 2017 19:34:02 +1000 -Subject: [PATCH] fix PKG_CONFIG program in freetype-config for cross-compiling - -Taken from: -https://savannah.nongnu.org/bugs/index.php?51274 - -diff --git a/builds/unix/freetype-config.in b/builds/unix/freetype-config.in -index 1111111..2222222 100644 ---- a/builds/unix/freetype-config.in -+++ b/builds/unix/freetype-config.in -@@ -14,7 +14,7 @@ export LC_ALL - - - # if `pkg-config' is available, use values from `freetype2.pc' --pkg-config --version >/dev/null 2>&1 -+%PKG_CONFIG% --version >/dev/null 2>&1 - if test $? -eq 0 ; then - # note that option `--variable' is not affected by the - # PKG_CONFIG_SYSROOT_DIR environment variable -@@ -23,17 +23,17 @@ if test $? -eq 0 ; then - export PKG_CONFIG_SYSROOT_DIR - fi - -- prefix=`pkg-config --variable prefix freetype2` -- exec_prefix=`pkg-config --variable exec_prefix freetype2` -+ prefix=`%PKG_CONFIG% --variable prefix freetype2` -+ exec_prefix=`%PKG_CONFIG% --variable exec_prefix freetype2` - -- includedir=`pkg-config --variable includedir freetype2` -- libdir=`pkg-config --variable libdir freetype2` -+ includedir=`%PKG_CONFIG% --variable includedir freetype2` -+ libdir=`%PKG_CONFIG% --variable libdir freetype2` - -- version=`pkg-config --modversion freetype2` -+ version=`%PKG_CONFIG% --modversion freetype2` - -- cflags=`pkg-config --cflags freetype2` -- dynamic_libs=`pkg-config --libs freetype2` -- static_libs=`pkg-config --static --libs freetype2` -+ cflags=`%PKG_CONFIG% --cflags freetype2` -+ dynamic_libs=`%PKG_CONFIG% --libs freetype2` -+ static_libs=`%PKG_CONFIG% --static --libs freetype2` - else - prefix="%prefix%" - exec_prefix="%exec_prefix%" -diff --git a/builds/unix/unix-def.in b/builds/unix/unix-def.in -index 1111111..2222222 100644 ---- a/builds/unix/unix-def.in -+++ b/builds/unix/unix-def.in -@@ -62,6 +62,7 @@ version_info := @version_info@ - - # Variables needed for `freetype-config' and `freetype.pc'. - # -+PKG_CONFIG := @PKG_CONFIG@ - REQUIRES_PRIVATE := @REQUIRES_PRIVATE@ - LIBS_PRIVATE := @LIBS_PRIVATE@ - LIBSSTATIC_CONFIG := @LIBSSTATIC_CONFIG@ -@@ -102,6 +103,7 @@ NO_OUTPUT := 2> /dev/null - $(OBJ_BUILD)/freetype-config: $(TOP_DIR)/builds/unix/freetype-config.in - rm -f $@ $@.tmp - sed -e 's|%LIBSSTATIC_CONFIG%|$(LIBSSTATIC_CONFIG)|' \ -+ -e 's|%PKG_CONFIG%|$(PKG_CONFIG)|' \ - -e 's|%build_libtool_libs%|$(build_libtool_libs)|' \ - -e 's|%exec_prefix%|$(exec_prefix)|' \ - -e 's|%ft_version%|$(ft_version)|' \ diff --git a/src/freetype.mk b/src/freetype.mk index b2e7d26..eeb5f3a 100644 --- a/src/freetype.mk +++ b/src/freetype.mk @@ -3,8 +3,8 @@ PKG := freetype $(PKG)_WEBSITE := https://www.freetype.org/ $(PKG)_IGNORE := -$(PKG)_VERSION := 2.8 -$(PKG)_CHECKSUM := a3c603ed84c3c2495f9c9331fe6bba3bb0ee65e06ec331e0a0fb52158291b40b +$(PKG)_VERSION := 2.8.1 +$(PKG)_CHECKSUM := e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78 $(PKG)_SUBDIR := freetype-$($(PKG)_VERSION) $(PKG)_FILE := freetype-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/freetype/freetype2/$(shell echo '$($(PKG)_VERSION)' | cut -d . -f 1,2,3)/$($(PKG)_FILE) diff --git a/src/gdb.mk b/src/gdb.mk index 0527b1c..0daeae7 100644 --- a/src/gdb.mk +++ b/src/gdb.mk @@ -2,8 +2,8 @@ PKG := gdb $(PKG)_WEBSITE := https://www.gnu.org/software/gdb/ -$(PKG)_VERSION := 8.0 -$(PKG)_CHECKSUM := f6a24ffe4917e67014ef9273eb8b547cb96a13e5ca74895b06d683b391f3f4ee +$(PKG)_VERSION := 8.0.1 +$(PKG)_CHECKSUM := 3dbd5f93e36ba2815ad0efab030dcd0c7b211d7b353a40a53f4c02d7d56295e3 $(PKG)_SUBDIR := gdb-$($(PKG)_VERSION) $(PKG)_FILE := gdb-$($(PKG)_VERSION).tar.xz $(PKG)_URL := https://ftp.gnu.org/gnu/$(PKG)/$($(PKG)_FILE) diff --git a/src/harfbuzz.mk b/src/harfbuzz.mk index 858bbbc..2996d33 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.5.0 -$(PKG)_CHECKSUM := c088ec363be8d03f7708feb76dd22d5f102678e67d6ce63b02496ca0beb64ac1 +$(PKG)_VERSION := 1.5.1 +$(PKG)_CHECKSUM := 56838dfdad2729b8866763c82d623354d138a4d99d9ffb710c7d377b5cfc7c51 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := https://www.freedesktop.org/software/$(PKG)/release/$($(PKG)_FILE) -- cgit v0.12