Mercurial > mxe-octave
changeset 4994:39f8e075e817
Update fribidi to v0.19.7 (bug #55769).
* src/fribidi.mk: Update version, checksum and url.
* src/fribidi-1-fixes.patch: Remove file.
* dist-files.mk: Update src file list.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Sat, 23 Feb 2019 11:38:48 +0100 |
| parents | 7e89d17a530c |
| children | b203c57d51ac |
| files | dist-files.mk src/fribidi-1-fixes.patch src/fribidi.mk |
| diffstat | 3 files changed, 3 insertions(+), 42 deletions(-) [+] |
line wrap: on
line diff
--- a/dist-files.mk Sat Feb 23 11:35:53 2019 +0100 +++ b/dist-files.mk Sat Feb 23 11:38:48 2019 +0100 @@ -100,7 +100,6 @@ freeimage.mk \ freetds.mk \ freetype.mk \ - fribidi-1-fixes.patch \ fribidi.mk \ ftgl-1-gl-m4.patch \ ftgl.mk \
--- a/src/fribidi-1-fixes.patch Sat Feb 23 11:35:53 2019 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -From c4dc7b368af33821eca1be8a4ec88929b44f3d06 Mon Sep 17 00:00:00 2001 -From: Mark Brand <mabrand@mabrand.nl> -Date: Tue, 17 Jul 2012 10:07:07 +0200 -Subject: [PATCH] only include glib.h - - -diff --git a/charset/fribidi-char-sets.c b/charset/fribidi-char-sets.c -index 5d45e74..e596dee 100644 ---- a/charset/fribidi-char-sets.c -+++ b/charset/fribidi-char-sets.c -@@ -114,7 +114,7 @@ static FriBidiCharSetHandler char_sets[FRIBIDI_CHAR_SETS_NUM + 1] = { - }; - - #if FRIBIDI_USE_GLIB+0 --# include <glib/gstrfuncs.h> -+# include <glib.h> - # define fribidi_strcasecmp g_ascii_strcasecmp - #else /* !FRIBIDI_USE_GLIB */ - static char -diff --git a/lib/mem.h b/lib/mem.h -index c875e0b..031fcc3 100644 ---- a/lib/mem.h -+++ b/lib/mem.h -@@ -42,7 +42,7 @@ - #if FRIBIDI_USE_GLIB+0 - - #ifndef __FRIBIDI_DOC --# include <glib/gmem.h> -+# include <glib.h> - #endif /* !__FRIBIDI_DOC */ - - #define FriBidiMemChunk GMemChunk --- -1.7.10.4 -
--- a/src/fribidi.mk Sat Feb 23 11:35:53 2019 +0100 +++ b/src/fribidi.mk Sat Feb 23 11:38:48 2019 +0100 @@ -3,11 +3,11 @@ PKG := fribidi $(PKG)_IGNORE := -$(PKG)_VERSION := 0.19.4 -$(PKG)_CHECKSUM := 23d1adf1e929a3fb159345d509918ad109e925ad +$(PKG)_VERSION := 0.19.7 +$(PKG)_CHECKSUM := e470e078eafe6c065708def3e037c129c0d7367d $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 -$(PKG)_URL := http://fribidi.org/download/$($(PKG)_FILE) +$(PKG)_URL := https://github.com/fribidi/fribidi/releases/download/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := glib define $(PKG)_UPDATE