contrib: Update to fribidi 1.0.5.

6 files changed, 17 insertions, 62 deletions

diff --git a/contrib/fribidi/A00-disable-tests.patch b/contrib/fribidi/A00-disable-tests.patch
deleted file mode 100644
index 9c5f0be0d..000000000
--- a/contrib/fribidi/A00-disable-tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -u fribidi-0.19.7/bin/Makefile.am.orig fribidi-0.19.7/bin/Makefile.am
---- fribidi-0.19.7/bin/Makefile.am.orig	2012-08-27 15:30:17.000000000 -0400
-+++ fribidi-0.19.7/bin/Makefile.am	2015-09-17 22:57:45.000000000 -0400
-@@ -1,6 +1,6 @@
- bin_PROGRAMS = fribidi
- 
--noinst_PROGRAMS = fribidi-benchmark fribidi-bidi-types
-+noinst_PROGRAMS = fribidi-bidi-types
- if FRIBIDI_CHARSETS
- noinst_PROGRAMS += fribidi-caprtl2utf8
- endif
diff --git a/contrib/fribidi/A00-no-doc-test.patch b/contrib/fribidi/A00-no-doc-test.patch
new file mode 100644
index 000000000..0a01a8111
--- /dev/null
+++ b/contrib/fribidi/A00-no-doc-test.patch
@@ -0,0 +1,12 @@
+diff -ur fribidi-1.0.5.orig/Makefile.am fribidi-1.0.5/Makefile.am
+--- fribidi-1.0.5.orig/Makefile.am	2018-07-22 17:09:31.000000000 -0400
++++ fribidi-1.0.5/Makefile.am	2019-02-21 11:38:35.000000000 -0500
+@@ -4,7 +4,7 @@
+ ACLOCAL_AMFLAGS = -I m4
+ 
+ ## The order of subdirs is important, don't change without a reason.
+-SUBDIRS = gen.tab lib bin doc test
++SUBDIRS = gen.tab lib bin
+ 
+ EXTRA_DIST = autogen.sh ChangeLog.old \
+ 	meson.build meson_options.txt bin/meson.build doc/meson.build \
diff --git a/contrib/fribidi/A01-bootstrap-quote.patch b/contrib/fribidi/A01-bootstrap-quote.patch
deleted file mode 100644
index 4bbb10457..000000000
--- a/contrib/fribidi/A01-bootstrap-quote.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u fribidi-0.19.7/bootstrap.orig fribidi-0.19.7/bootstrap
---- fribidi-0.19.7/bootstrap.orig	2012-08-27 15:30:17.000000000 -0400
-+++ fribidi-0.19.7/bootstrap	2017-09-06 13:59:20.000000000 -0400
-@@ -144,7 +144,7 @@
- fi # !AUTOCONF
- 
- # move to build dir
--cd $OLDDIR
-+cd "$OLDDIR"
- 
- # configure
- if test -n "$CONFIG"; then
diff --git a/contrib/fribidi/A02-remove-horrible-hack.patch b/contrib/fribidi/A02-remove-horrible-hack.patch
deleted file mode 100644
index 54c6839cd..000000000
--- a/contrib/fribidi/A02-remove-horrible-hack.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur fribidi-0.19.7.orig/Makefile.am fribidi-0.19.7/Makefile.am
---- fribidi-0.19.7.orig/Makefile.am	2015-08-06 16:55:02.000000000 -0400
-+++ fribidi-0.19.7/Makefile.am	2017-12-27 19:44:48.000000000 -0500
-@@ -37,12 +37,7 @@
- 		$(srcdir)/missing \
- 		$(srcdir)/mkinstalldirs \
- 		$(srcdir)/ChangeLog \
--		`find "$(srcdir)" -type f -name Makefile.in -print` \
--		`$(srcdir)/bootstrap --write-configure`
--# The last line above is a horrible hack.
--# GNU Coding Standards recommends that `make maintainer-clean' should not 
--# remove the configure script.
--# We instead make configure call bootstrap.
-+		`find "$(srcdir)" -type f -name Makefile.in -print`
- 
- # Indent all C source and header files, using indent(1):
- 
diff --git a/contrib/fribidi/A03-no-doc.patch b/contrib/fribidi/A03-no-doc.patch
deleted file mode 100644
index 838e5f7d7..000000000
--- a/contrib/fribidi/A03-no-doc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur fribidi-0.19.7.orig/Makefile.am fribidi-0.19.7/Makefile.am
---- fribidi-0.19.7.orig/Makefile.am	2015-08-06 16:55:02.000000000 -0400
-+++ fribidi-0.19.7/Makefile.am	2017-12-27 17:53:09.000000000 -0500
-@@ -11,7 +11,7 @@
- ACLOCAL_AMFLAGS = -I m4
- 
- ## The order of subdirs is important, don't change without a reason.
--SUBDIRS = gen.tab charset lib bin doc test
-+SUBDIRS = gen.tab charset lib bin test
- 
- EXTRA_DIST = bootstrap ChangeLog.old
- 
diff --git a/contrib/fribidi/module.defs b/contrib/fribidi/module.defs
index 01db6a1c2..a37a173c1 100644
--- a/contrib/fribidi/module.defs
+++ b/contrib/fribidi/module.defs
@@ -5,17 +5,12 @@ endif
 $(eval $(call import.MODULE.defs,FRIBIDI,fribidi))
 $(eval $(call import.CONTRIB.defs,FRIBIDI))
 
-FRIBIDI.FETCH.url      = https://download.handbrake.fr/handbrake/contrib/fribidi-0.19.7.tar.gz
-FRIBIDI.FETCH.url     += https://github.com/fribidi/fribidi/archive/0.19.7.tar.gz
-FRIBIDI.FETCH.sha256   = 3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8
-FRIBIDI.FETCH.basename = fribidi-0.19.7.tar.gz
+FRIBIDI.FETCH.url      = https://download.handbrake.fr/handbrake/contrib/fribidi-1.0.5.tar.gz
+FRIBIDI.FETCH.url     += https://github.com/fribidi/fribidi/archive/v1.0.5.tar.gz
+FRIBIDI.FETCH.sha256   = aee3a93d081c293eaca9157700f17dc780a0b6674bc911decc5aaa43aec9abd7
+FRIBIDI.FETCH.basename = fribidi-1.0.5.tar.gz
 
-FRIBIDI.CONFIGURE.bootstrap = ./bootstrap;
-
-ifeq (1,$(BUILD.cross))
-    # force host system compiler for gen.tab, otherwise cross-compiling fails
-    FRIBIDI.CONFIGURE.bootstrap = ./bootstrap; sed -i.bak '/@CC@/s//gcc/' gen.tab/Makefile.in;
-endif
+FRIBIDI.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache configure; autoreconf -I m4 -fiv;
 
 ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
     FRIBIDI.CONFIGURE.extra = --with-glib=no