diff options
Diffstat (limited to 'media-libs/harfbuzz')
| -rw-r--r-- | media-libs/harfbuzz/Manifest | 5 | ||||
| -rw-r--r-- | media-libs/harfbuzz/files/harfbuzz-2.6.1-gcc-9.patch | 14 | ||||
| -rw-r--r-- | media-libs/harfbuzz/harfbuzz-2.6.5.ebuild | 2 | ||||
| -rw-r--r-- | media-libs/harfbuzz/harfbuzz-2.6.6.ebuild | 111 |
4 files changed, 115 insertions, 17 deletions
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest index 001011051372..4135f2450a2e 100644 --- a/media-libs/harfbuzz/Manifest +++ b/media-libs/harfbuzz/Manifest @@ -1,7 +1,8 @@ -AUX harfbuzz-2.6.1-gcc-9.patch 468 BLAKE2B 5f0b42d7a834f5b59c79adcbc2fb67e9aa1fa97fb6e6e135c7c88d20780d0a75ad8784c5ed3473cad8a1bb5f1c6f3c8475e7984e555eef1720ac9de387f95b83 SHA512 8dec55d5cb97c3aae2e6885cddc06db9629e6e5336ffc1b3cc263c8ad88e499833570210868dfb6e42c0dbf0326f239d1ac4ee1914f6f84712d1f93350da1912 DIST harfbuzz-2.6.4.tar.xz 5967468 BLAKE2B 24d215324a408a724f47a901c4a56605144d15373518bd52643ece83705d0c63582a80635ecef6a6d8d2f5f39c750076d553fb39aaa8c0dd41702ee910c32f24 SHA512 d8664bb64fda11ff7646693070637e3827f8b3d1de50e11ecf108ce4d19c878b26b2ba4cff278da6e6cc0cb431e1630d9eaa7c32a9bebb9655a7aa8dabf7114f DIST harfbuzz-2.6.5.tar.xz 8510596 BLAKE2B e495fbba7e0cb58918afeb6beb3ebcf936be896ca606cef27dcbfb9b5f10add144f7fcaa50dec35a9f909d7e87deebadb7c9e6bbbadcbd799effd96076786cde SHA512 ae66211f9b4233c1da4b22b703ab4912f684390294c5c88113e6c927d5aeda8960da3ff607a7c7be5968d9fbb5a95b1f6933070d0aab2aa442a3ec8a112cd16f +DIST harfbuzz-2.6.6.tar.xz 8530984 BLAKE2B 59ddbffdd6d7af44a1564079e8313cd24a5811cae2de46a632ebf7ec3e76b3c600d159b8be0e52cc1a776c9975955d0e888ce69c304467b3eaef41f09b2be493 SHA512 b0b6323b893a3540e36e2358cc7e7d27c98aa14f1debe65cd8eaf817a55752ea4f22369e37e195abefd03bbc787f178d1b64f167237683ac208b9a65b0ae09c8 EBUILD harfbuzz-2.6.4.ebuild 3031 BLAKE2B 6dc0820449927f7323cedcdb16c843b7d548695f53bb40aa1a57a994897e6cc79d86cd4205c67796a5d3ab07ae7dc42ac215bdf9e33ebb2a62f7e9f33aaf3d73 SHA512 163e5e15ab58531d6ed13484315435a35ae8227366f9f8074519384cfee804aa76d1fd14184efb67ed38aadcf0ff1a7f86faf73d42dc756e5d55b14c8c52f0e3 -EBUILD harfbuzz-2.6.5.ebuild 3044 BLAKE2B df15ff0e57d48fdc44db6816a0272a17896cd2eddd4cc0e44c81d5c1b51935b4f8bdba3467458191e747d4438cb30f85013984aabff42d54295f854caced5fb4 SHA512 f8367c08012cba2e08ae349932b59bfb203572d09391e58ddcdc266c3edd22c74ca68e5cd1a933996161453ed6eb8aa4ee39fb4b82f201725a0bcc73eb0806d4 +EBUILD harfbuzz-2.6.5.ebuild 3041 BLAKE2B aaf6b49d40236c3423fa960a38418e881e1e7e1553729f2007758c330cfc64c2817038632be9b7a0dd7e0b070d4bebf3a341edc8727acd16669cadb0b8bccd1b SHA512 275c8ccac579d4e58f45f634a44eca38f24471f7435c7df2aff85d1ed01470d544e7917346415ca939fb646c69197429c288df98065bd40db8c588f0ec2f7129 +EBUILD harfbuzz-2.6.6.ebuild 3044 BLAKE2B df15ff0e57d48fdc44db6816a0272a17896cd2eddd4cc0e44c81d5c1b51935b4f8bdba3467458191e747d4438cb30f85013984aabff42d54295f854caced5fb4 SHA512 f8367c08012cba2e08ae349932b59bfb203572d09391e58ddcdc266c3edd22c74ca68e5cd1a933996161453ed6eb8aa4ee39fb4b82f201725a0bcc73eb0806d4 EBUILD harfbuzz-9999.ebuild 3044 BLAKE2B df15ff0e57d48fdc44db6816a0272a17896cd2eddd4cc0e44c81d5c1b51935b4f8bdba3467458191e747d4438cb30f85013984aabff42d54295f854caced5fb4 SHA512 f8367c08012cba2e08ae349932b59bfb203572d09391e58ddcdc266c3edd22c74ca68e5cd1a933996161453ed6eb8aa4ee39fb4b82f201725a0bcc73eb0806d4 MISC metadata.xml 739 BLAKE2B df7724d5cef26b569f76d41c808f99a1ecf44631f0bae96fbc2a9b4f5981061b55c60d69b1b64d966897f223a3d3b5cc4325a3ac780599ed76591fc2044b4988 SHA512 192f7abc191044f267bddb4db7d91f9b78926f4a361802f607bfe4635d7cf63398c289bc52009ad4d3bc6f92684cafd8b40e48f1e0f8cdaef9a4e27f538e7dbd diff --git a/media-libs/harfbuzz/files/harfbuzz-2.6.1-gcc-9.patch b/media-libs/harfbuzz/files/harfbuzz-2.6.1-gcc-9.patch deleted file mode 100644 index c16fedd6d9d6..000000000000 --- a/media-libs/harfbuzz/files/harfbuzz-2.6.1-gcc-9.patch +++ /dev/null @@ -1,14 +0,0 @@ -Fix build failure on gcc-9. It's a slightly less invasive -version of upstream's commit 2dce85ed06a8cc7ca -("[icu] Remove HB_ICU_STMT (#1993)") ---- a/src/hb-icu.cc -+++ b/src/hb-icu.cc -@@ -53,7 +53,7 @@ - - /* ICU doesn't do-while(0) around their statements. Ugh! - * https://unicode-org.atlassian.net/browse/CLDR-13027 */ --#define HB_ICU_STMT(S) do { S } while (0) -+#define HB_ICU_STMT(S) do { S; } while (0) - - hb_script_t - hb_icu_script_to_script (UScriptCode script) diff --git a/media-libs/harfbuzz/harfbuzz-2.6.5.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.5.ebuild index 085525d97eed..12dfabc26074 100644 --- a/media-libs/harfbuzz/harfbuzz-2.6.5.ebuild +++ b/media-libs/harfbuzz/harfbuzz-2.6.5.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then inherit git-r3 autotools else SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="Old-MIT ISC icu" diff --git a/media-libs/harfbuzz/harfbuzz-2.6.6.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.6.ebuild new file mode 100644 index 000000000000..085525d97eed --- /dev/null +++ b/media-libs/harfbuzz/harfbuzz-2.6.6.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils + +DESCRIPTION="An OpenType text shaping engine" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz" + +if [[ ${PV} = 9999 ]] ; then + EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git" + inherit git-r3 autotools +else + SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +LICENSE="Old-MIT ISC icu" +SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416 + +IUSE="+cairo debug +glib +graphite icu +introspection static-libs test +truetype" +RESTRICT="!test? ( test )" +REQUIRED_USE="introspection? ( glib )" + +RDEPEND=" + cairo? ( x11-libs/cairo:= ) + glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] ) + graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] ) + icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] ) + introspection? ( >=dev-libs/gobject-introspection-1.34:= ) + truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND} + test? ( ${PYTHON_DEPS} ) +" +BDEPEND=" + dev-util/gtk-doc-am + virtual/pkgconfig +" +# eautoreconf requires gobject-introspection-common +# ragel needed if regenerating *.hh files from *.rl +if [[ ${PV} = 9999 ]] ; then + DEPEND+=" + >=dev-libs/gobject-introspection-common-1.34 + dev-util/ragel + " +fi + +pkg_setup() { + use test && python-any-r1_pkg_setup + if ! use debug ; then + append-cppflags -DHB_NDEBUG + fi +} + +src_prepare() { + default + + xdg_environment_reset + + if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then + # on Darwin/Solaris we need to link with g++, like automake defaults + # to, but overridden by upstream because on Linux this is not + # necessary, bug #449126 + sed -i \ + -e 's/\<LINK\>/CXXLINK/' \ + src/Makefile.am || die + sed -i \ + -e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \ + src/Makefile.in || die + sed -i \ + -e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \ + test/api/Makefile.in || die + fi + + [[ ${PV} == 9999 ]] && eautoreconf + elibtoolize # for Solaris + + # bug 618772 + append-cxxflags -std=c++14 +} + +multilib_src_configure() { + # harfbuzz-gobject only used for instrospection, bug #535852 + local myeconfargs=( + --without-coretext + --without-fontconfig #609300 + --without-uniscribe + $(use_enable static-libs static) + $(multilib_native_use_with cairo) + $(use_with glib) + $(use_with introspection gobject) + $(use_with graphite graphite2) + $(use_with icu) + $(multilib_native_use_enable introspection) + $(use_with truetype freetype) + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" + + if multilib_is_native_abi; then + ln -s "${S}"/docs/html docs/html || die + fi +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -type f -name "*.la" -delete || die +} |