Merge pull request #2230 from CL-Jeremy/patch-1

Update FriBidi to v1.0.5

src/fribidi-1-fixes.patch

@@ -1,36 +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: Mark Brand <mabrand@mabrand.nl>
-Date: Tue, 17 Jul 2012 10:07:07 +0200
-Subject: [PATCH 1/1] only include glib.h
-
-
-diff --git a/charset/fribidi-char-sets.c b/charset/fribidi-char-sets.c
-index 1111111..2222222 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 1111111..2222222 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

src/fribidi.mk

@@ -4,27 +4,18 @@ PKG             := fribidi
 $(PKG)_WEBSITE  := https://fribidi.org/
 $(PKG)_DESCR    := FriBidi
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.19.6
-$(PKG)_CHECKSUM := cba8b7423c817e5adf50d28ec9079d14eafcec9127b9e8c8f1960c5ad585e17d
-$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_VERSION  := 1.0.5
+$(PKG)_CHECKSUM := 6a64f2a687f5c4f203a46fa659f43dd43d1f8b845df8d723107e8a7e6158e4ce
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
-$(PKG)_URL      := https://fribidi.org/download/$($(PKG)_FILE)
-$(PKG)_DEPS     := cc glib
-
-define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://fribidi.org/download/?C=M;O=D' | \
-    $(SED) -n 's,.*<a href="fribidi-\([0-9][^"]*\)\.tar.*,\1,p' | \
-    head -1
-endef
+$(PKG)_URL      := https://github.com/fribidi/fribidi/releases/download/v$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_DEPS     := cc
 
 define $(PKG)_BUILD
-    $(if $(BUILD_STATIC),\
-        $(SED) -i 's/__declspec(dllimport)//' '$(1)/lib/fribidi-common.h')
     cd '$(1)' && ./configure \
         $(MXE_CONFIGURE_OPTS) \
         --disable-debug \
         --disable-deprecated \
-        --enable-charsets \
-        --with-glib
+        $(if $(BUILD_STATIC), \
+            --enable-static )
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= dist_man_MANS=
 endef