From c4f9b0c551e11e111818c74932357effd4b33999 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 30 Dec 2018 11:22:23 +0000 Subject: dev-libs/fribidi : import from gentoo, cherry pick a debian patch to remove HAVE_CONFIG_H from public API --- dev-libs/fribidi/Manifest | 1 + dev-libs/fribidi/files/no-config-h.diff | 211 ++++++++++++++++++++++++++++ dev-libs/fribidi/fribidi-1.0.5-r1337.ebuild | 37 +++++ 3 files changed, 249 insertions(+) create mode 100644 dev-libs/fribidi/Manifest create mode 100644 dev-libs/fribidi/files/no-config-h.diff create mode 100644 dev-libs/fribidi/fribidi-1.0.5-r1337.ebuild diff --git a/dev-libs/fribidi/Manifest b/dev-libs/fribidi/Manifest new file mode 100644 index 00000000..f2468fa8 --- /dev/null +++ b/dev-libs/fribidi/Manifest @@ -0,0 +1 @@ +DIST fribidi-1.0.5.tar.bz2 2082617 BLAKE2B 99b088a37600d1b3e556b4dd978cafb04af0fea9c7db8ed9b0aa90d6a6a60f8ca312c214151ce386d2d61ae382d6ff0e6ae240bd44dfde28eb8c25a5c5f4cd1e SHA512 c8fb32468be4c461832d586d6c6af65fad1cfe9d5b2fed405f247d6974425ccedeb21ad11609fbcabc3ae5d635d78d88c12d201a4d19ef997e9497054afcdeb2 diff --git a/dev-libs/fribidi/files/no-config-h.diff b/dev-libs/fribidi/files/no-config-h.diff new file mode 100644 index 00000000..394c6787 --- /dev/null +++ b/dev-libs/fribidi/files/no-config-h.diff @@ -0,0 +1,211 @@ +Description: Removed HAVE_CONFIG_H from public API +Origin: commit:b534ab2642f694c3106d5bc8d0a8beae60bf60d3 +Author: Dov Grobgeld +Date: Sat Aug 18 20:37:22 2018 +0300 + +diff --git a/bin/fribidi-benchmark.c b/bin/fribidi-benchmark.c +index e5fc9c0..07ac336 100644 +--- a/bin/fribidi-benchmark.c ++++ b/bin/fribidi-benchmark.c +@@ -33,6 +33,11 @@ + #include + + #include ++ ++#ifdef HAVE_CONFIG_H ++# include ++#endif ++ + #ifdef STDC_HEADERS + # include + # include +diff --git a/bin/fribidi-main.c b/bin/fribidi-main.c +index cd359a9..33e1630 100644 +--- a/bin/fribidi-main.c ++++ b/bin/fribidi-main.c +@@ -33,6 +33,11 @@ + #include + + #include ++ ++#ifdef HAVE_CONFIG_H ++# include ++#endif ++ + #ifdef STDC_HEADERS + # include + # include +diff --git a/gen.tab/gen-arabic-shaping-tab.c b/gen.tab/gen-arabic-shaping-tab.c +index e613768..369501c 100644 +--- a/gen.tab/gen-arabic-shaping-tab.c ++++ b/gen.tab/gen-arabic-shaping-tab.c +@@ -30,6 +30,10 @@ + #include + + #include ++#ifdef HAVE_CONFIG_H ++# include ++#endif ++ + #ifdef STDC_HEADERS + # include + # include +diff --git a/gen.tab/gen-bidi-type-tab.c b/gen.tab/gen-bidi-type-tab.c +index a0a61ef..05b1d16 100644 +--- a/gen.tab/gen-bidi-type-tab.c ++++ b/gen.tab/gen-bidi-type-tab.c +@@ -30,6 +30,10 @@ + #include + + #include ++#ifdef HAVE_CONFIG_H ++# include ++#endif ++ + #ifdef STDC_HEADERS + # include + # include +diff --git a/gen.tab/gen-brackets-tab.c b/gen.tab/gen-brackets-tab.c +index 8c1f1df..cd99e01 100644 +--- a/gen.tab/gen-brackets-tab.c ++++ b/gen.tab/gen-brackets-tab.c +@@ -32,6 +32,10 @@ + #include + + #include ++#ifdef HAVE_CONFIG_H ++# include ++#endif ++ + #ifdef STDC_HEADERS + # include + # include +diff --git a/gen.tab/gen-brackets-type-tab.c b/gen.tab/gen-brackets-type-tab.c +index 221db07..9ec60cc 100644 +--- a/gen.tab/gen-brackets-type-tab.c ++++ b/gen.tab/gen-brackets-type-tab.c +@@ -32,6 +32,10 @@ + #include + + #include ++#ifdef HAVE_CONFIG_H ++# include ++#endif ++ + #ifdef STDC_HEADERS + # include + # include +diff --git a/gen.tab/gen-joining-type-tab.c b/gen.tab/gen-joining-type-tab.c +index 07c0953..29ab3ed 100644 +--- a/gen.tab/gen-joining-type-tab.c ++++ b/gen.tab/gen-joining-type-tab.c +@@ -30,6 +30,10 @@ + #include + + #include ++#ifdef HAVE_CONFIG_H ++# include ++#endif ++ + #ifdef STDC_HEADERS + # include + # include +diff --git a/gen.tab/gen-mirroring-tab.c b/gen.tab/gen-mirroring-tab.c +index 21d33cf..e19be91 100644 +--- a/gen.tab/gen-mirroring-tab.c ++++ b/gen.tab/gen-mirroring-tab.c +@@ -30,6 +30,10 @@ + #include + + #include ++#ifdef HAVE_CONFIG_H ++# include ++#endif ++ + #ifdef STDC_HEADERS + # include + # include +diff --git a/gen.tab/gen-unicode-version.c b/gen.tab/gen-unicode-version.c +index 4291551..35306ca 100644 +--- a/gen.tab/gen-unicode-version.c ++++ b/gen.tab/gen-unicode-version.c +@@ -28,6 +28,10 @@ + #include + + #include ++#ifdef HAVE_CONFIG_H ++# include ++#endif ++ + #ifdef STDC_HEADERS + # include + # include +diff --git a/lib/bidi-types.h b/lib/bidi-types.h +index 385ef05..86f3d02 100644 +--- a/lib/bidi-types.h ++++ b/lib/bidi-types.h +@@ -27,7 +27,7 @@ + #ifndef _BIDI_TYPES_H + #define _BIDI_TYPES_H + +-#include "common.h" ++#include "fribidi-common.h" + + #include + #include +diff --git a/lib/fribidi-arabic.c b/lib/fribidi-arabic.c +index dbfdc09..e12074c 100644 +--- a/lib/fribidi-arabic.c ++++ b/lib/fribidi-arabic.c +@@ -27,6 +27,10 @@ + + #include "common.h" + ++#ifdef HAVE_CONFIG_H ++# include ++#endif ++ + #ifdef HAVE_STDLIB_H + # include + #endif +diff --git a/lib/fribidi-types.h b/lib/fribidi-types.h +index 9f1746f..90238b4 100644 +--- a/lib/fribidi-types.h ++++ b/lib/fribidi-types.h +@@ -27,10 +27,6 @@ + #ifndef _FRIBIDI_TYPES_H + #define _FRIBIDI_TYPES_H + +-#ifdef HAVE_CONFIG_H +-# include +-#endif +- + #include "fribidi-common.h" + + #include "fribidi-begindecls.h" +diff --git a/lib/joining-types.h b/lib/joining-types.h +index 94b9fe3..6e11fa1 100644 +--- a/lib/joining-types.h ++++ b/lib/joining-types.h +@@ -27,7 +27,7 @@ + #ifndef _JOINING_TYPES_H + #define _JOINING_TYPES_H + +-#include "common.h" ++#include "fribidi-common.h" + + #include + #include +diff --git a/lib/run.h b/lib/run.h +index 8c4e259..44ddfec 100644 +--- a/lib/run.h ++++ b/lib/run.h +@@ -29,7 +29,7 @@ + #ifndef _RUN_H + #define _RUN_H + +-#include "common.h" ++#include "fribidi-common.h" + + #include + diff --git a/dev-libs/fribidi/fribidi-1.0.5-r1337.ebuild b/dev-libs/fribidi/fribidi-1.0.5-r1337.ebuild new file mode 100644 index 00000000..e74d2302 --- /dev/null +++ b/dev-libs/fribidi/fribidi-1.0.5-r1337.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit multilib-minimal + +DESCRIPTION="A free implementation of the unicode bidirectional algorithm" +HOMEPAGE="https://fribidi.org/" +SRC_URI="https://github.com/fribidi/fribidi/releases/download/v${PV}/${P}.tar.bz2" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +IUSE="static-libs" + +RDEPEND="" +DEPEND="${RDEPEND} + virtual/pkgconfig[${MULTILIB_USEDEP}]" + +DOCS=( AUTHORS NEWS README ChangeLog THANKS ) + +PATCHES=( "${FILESDIR}"/no-config-h.diff ) + +multilib_src_configure() { + local myeconfargs=( + --enable-shared + $(use_enable static-libs static) + --disable-debug + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -name '*.la' -delete || die +} -- cgit v1.2.3