diff options
author | Bradley Sepos <[email protected]> | 2017-12-27 19:13:28 -0500 |
---|---|---|
committer | Bradley Sepos <[email protected]> | 2017-12-27 19:13:28 -0500 |
commit | 5452ab68c3d87250ea582a04d01bfc897001d80e (patch) | |
tree | 6c4a3969de52155690053547e7bb45a757aca6a7 | |
parent | 97dd7d2a6830ab3cf952c308b9b1830a7c0fb5c2 (diff) |
Revert "contrib: Fix issues with fribidi."
This reverts commit 97dd7d2a6830ab3cf952c308b9b1830a7c0fb5c2.
-rw-r--r-- | contrib/fribidi/A02-remove-horrible-hack.patch | 18 | ||||
-rw-r--r-- | contrib/fribidi/A03-no-doc.patch | 12 |
2 files changed, 0 insertions, 30 deletions
diff --git a/contrib/fribidi/A02-remove-horrible-hack.patch b/contrib/fribidi/A02-remove-horrible-hack.patch deleted file mode 100644 index 16280a0f4..000000000 --- a/contrib/fribidi/A02-remove-horrible-hack.patch +++ /dev/null @@ -1,18 +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:43:06.000000000 -0500 -@@ -36,13 +36,7 @@ - $(srcdir)/ltmain.sh \ - $(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. -+ $(srcdir)/ChangeLog - - # 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 - |