From 8ba493f5439ffec0ed21707f660602b7bd80bbbf Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 3 Feb 2023 21:11:18 +0000 Subject: gentoo auto-resync : 03:02:2023 - 21:11:18 --- media-gfx/graphite2/Manifest | 3 + .../files/graphite2-1.3.14-fix-nodefaultlibs.patch | 26 +++++ .../files/graphite2-1.3.5-fix-gcc-linking.patch | 17 +++ .../graphite2/graphite2-1.3.14_p20210810-r3.ebuild | 125 +++++++++++++++++++++ 4 files changed, 171 insertions(+) create mode 100644 media-gfx/graphite2/files/graphite2-1.3.14-fix-nodefaultlibs.patch create mode 100644 media-gfx/graphite2/files/graphite2-1.3.5-fix-gcc-linking.patch create mode 100644 media-gfx/graphite2/graphite2-1.3.14_p20210810-r3.ebuild (limited to 'media-gfx/graphite2') diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest index f3d70ca680be..25e295020a22 100644 --- a/media-gfx/graphite2/Manifest +++ b/media-gfx/graphite2/Manifest @@ -1,7 +1,10 @@ AUX graphite2-1.3.14-fix-cmake-files-libdir.patch 637 BLAKE2B 5bf2dfae7cf3af8a99a5095f618d3625d6f0f3b07f714c1101ac77058aa5ab969115cf2ce6a6164666488183fb5482d3f8b6fd8dea4df3ca1ecba9adb02788f2 SHA512 55805cecf9cde48079a81c8ffd93503dd9302f28140b640971ddee29e7a7da38840c826af072b5780372b56c0f0269cbda802e3e233139f086f5194cd8eb33a5 AUX graphite2-1.3.14-fix-nodefaultlibs-deux.patch 4840 BLAKE2B fc543571ccc0c14c241eb36662c8eea9f3f28b2979c9936a7af60920ff0d951bb8a36ef5075881a25e3ed8e73781b538df5b7da97344ba36229f2defa3d928cd SHA512 3a0215f484ca9341e81194c2f5f73c9eb64f1322de5c3bb0e3d8615e7b7f1e4c9044c2db3855f3a68c04db9f1476d3f0115545925cb3f5f8082e5189ee9c2b6c +AUX graphite2-1.3.14-fix-nodefaultlibs.patch 1029 BLAKE2B ba35d7c4a6200626035bac940749740cdda89b5c8cf3c37428578214de8ba647331b454ab75d92a4d333d702a39e335c716010299a2ca2dd07a678d8d08eea93 SHA512 5ddcec369ea8bc8e7ea935d3cecc936a148cf275314008b6993574f18c77a3bf7689fd551ac119f82b15ddf365b23ad168726facd5ba78bd611b196b2cf614a2 AUX graphite2-1.3.14-no-libtool-file.patch 2336 BLAKE2B a349e721264de1477aee5aa3e62d264b26c4665383fbe564de7b3a0420b77fcf8ce90a65a650fc9e2144969a2f00abe7ff7c9ebe6f53c7b2fdc3271fbd55f6ce SHA512 3553e237808bf981cf35e9fa8de7b77fa1ce87c72733c806df8e523ea624a0e5e2ad87a0b4cfb9330e7cace0fb016c2c729085de2d21e959790955fd370f378e +AUX graphite2-1.3.5-fix-gcc-linking.patch 580 BLAKE2B 7ab4d1848e0b0fdbd682fc81747a426c9bee7e2d0f72991dc963c955ba910035c6246d88f7eaded9c4a742a10470fd304ab2dd3fb1750795b8b9791ccfc0cfb8 SHA512 1e01c764f72204f30c916dcdc4f5bc7a4757d73275bb2007bf0c1f2e9898f138aa6c0581addc587e125cf6cbf9d5db725cb3d8a69875978a14ab316d2d561467 AUX graphite2-1.3.5-includes-libs-perl.patch 836 BLAKE2B 0429d214ff7fd9b903e1d3bcaf0af3e6b29a0269581390f64950e42e41280e482fc9cfda9bfe24ef166eb6c24d21377a15fca4264fec69d902d8ba18810bdb01 SHA512 26ab6dda13d758a5e4237c8b5d207d3c5111afbb11b2c3984cd742913c3c7932559b23b5ea9f774f1c6373eb0f761a9400dccc95876740b3cd06c44084a10965 DIST graphite2-1.3.14_p20210810.tar.gz 6656693 BLAKE2B 63a7d96b58f2779d8a4a353e1a986212b884fdf780fedcb83b22dcef2f7678d44c88c14ece2d09dc745df505a4a3825ce61d7c84bd05fd4e98c23d6e86e9326d SHA512 be54c1386578970cf65c1860336a113268181753c1e2a139e37ceeafcfa76e3162086879c54094d70cd0d36ad5852a95390aaa69572d875921e9481f1ae508ff EBUILD graphite2-1.3.14_p20210810-r2.ebuild 3032 BLAKE2B a247b15f51be2e871396ea037c55d1085053781f518e62d23fd2f251cb25296eaf0ad187a864701812d2dce90a480fb44be55cad27982a131a14c570fbe2f8a0 SHA512 90a54f29e5a12fdfc87b6afb1c90e793c9d3dbc75f9171358f024c2e64c01af59cb23cf46fa28b1f7e390b2629c374fd5ec6379064b2456dda0069046d761d51 +EBUILD graphite2-1.3.14_p20210810-r3.ebuild 3145 BLAKE2B 97382f67bc420d5c500b910c58cc79001cb2fbd6389fb48dfbfe59c48d4c360211676bfd1cf5e24df6e35d7762fe73ccb445d1ee6687dac3ce8fb138a681ddeb SHA512 65a359911161ca92e5684e77c2866b3d9997ae6e0ca0ff951ca710f32e4bb75f85d221eeec9ac251b985d7ba128dae8f0c3571317f9f440bf727c1c495d426da MISC metadata.xml 393 BLAKE2B 27dcc3bcbc5a0ec32bb751ec3bb8788c2c85d5d7743f0243749a88ace9b5a3faaa10adc84731dbec3e37208efef41e3d4124de57005345927e848a7cbca6b098 SHA512 1086491557aff2d6f3552829550db85332c809d20ec1e3517bfa311fdfb2a5386cc4b624481b4fd7db7e48ab39bb5d76e048461352b74cdecf89d904ef52590b diff --git a/media-gfx/graphite2/files/graphite2-1.3.14-fix-nodefaultlibs.patch b/media-gfx/graphite2/files/graphite2-1.3.14-fix-nodefaultlibs.patch new file mode 100644 index 000000000000..c55f67c44f55 --- /dev/null +++ b/media-gfx/graphite2/files/graphite2-1.3.14-fix-nodefaultlibs.patch @@ -0,0 +1,26 @@ +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -125,7 +125,7 @@ + LINK_FLAGS "-nostdlib++ ${GRAPHITE_LINK_FLAGS}") + else() + set_target_properties(graphite2 PROPERTIES +- LINK_FLAGS "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}") ++ LINK_FLAGS "${GRAPHITE_LINK_FLAGS}") + + if (GRAPHITE2_SANITIZERS) + target_link_libraries(graphite2 c gcc_s) +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -51,9 +51,9 @@ + LINK_FLAGS "-nostdlib++ ${GRAPHITE_LINK_FLAGS}") + else() + set_target_properties(graphite2-base PROPERTIES +- LINK_FLAGS "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}") ++ LINK_FLAGS "${GRAPHITE_LINK_FLAGS}") + set_target_properties(graphite2-file PROPERTIES +- LINK_FLAGS "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}") ++ LINK_FLAGS "${GRAPHITE_LINK_FLAGS}") + endif() + + set_target_properties(graphite2-base PROPERTIES + diff --git a/media-gfx/graphite2/files/graphite2-1.3.5-fix-gcc-linking.patch b/media-gfx/graphite2/files/graphite2-1.3.5-fix-gcc-linking.patch new file mode 100644 index 000000000000..e4413d1f9a61 --- /dev/null +++ b/media-gfx/graphite2/files/graphite2-1.3.5-fix-gcc-linking.patch @@ -0,0 +1,17 @@ +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -127,12 +127,7 @@ + set_target_properties(graphite2 PROPERTIES + LINK_FLAGS "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}") + +- if (GRAPHITE2_SANITIZERS) +- target_link_libraries(graphite2 c gcc_s) +- else() +- target_link_libraries(graphite2 c gcc) +- endif() +- ++ target_link_libraries(graphite2 c gcc_s) + if (BUILD_SHARED_LIBS) + nolib_test(stdc++ $) + endif () + diff --git a/media-gfx/graphite2/graphite2-1.3.14_p20210810-r3.ebuild b/media-gfx/graphite2/graphite2-1.3.14_p20210810-r3.ebuild new file mode 100644 index 000000000000..bd53468cf978 --- /dev/null +++ b/media-gfx/graphite2/graphite2-1.3.14_p20210810-r3.ebuild @@ -0,0 +1,125 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +COMMIT=80c52493ef42e6fe605a69dcddd2a691cd8a1380 +GENTOO_DEPEND_ON_PERL="no" +PYTHON_COMPAT=( python3_{9..10} ) +inherit perl-module python-any-r1 cmake-multilib + +DESCRIPTION="Library providing rendering capabilities for complex non-Roman writing systems" +HOMEPAGE="https://scripts.sil.org/cms/scripts/page.php?site_id=projects&item_id=graphite_home" +SRC_URI="https://github.com/silnrsi/graphite/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/graphite-${COMMIT}" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="perl test" +RESTRICT="!test? ( test )" + +RDEPEND="perl? ( dev-lang/perl:= )" +DEPEND="${RDEPEND} + test? ( dev-libs/glib:2 ) +" +BDEPEND=" + perl? ( + dev-lang/perl + dev-perl/Locale-Maketext-Lexicon + dev-perl/Module-Build + ) + test? ( + ${PYTHON_DEPS} + $(python_gen_any_dep 'dev-python/fonttools[${PYTHON_USEDEP}]') + media-libs/fontconfig + perl? ( virtual/perl-Test-Simple ) + ) +" + +PATCHES=( + "${FILESDIR}/${PN}-1.3.5-includes-libs-perl.patch" + "${FILESDIR}/${PN}-1.3.14-fix-cmake-files-libdir.patch" + "${FILESDIR}/${PN}-1.3.14-no-libtool-file.patch" + "${FILESDIR}/${PN}-1.3.14-fix-nodefaultlibs-deux.patch" + "${FILESDIR}/${PN}-1.3.14-fix-nodefaultlibs.patch" + "${FILESDIR}/${PN}-1.3.5-fix-gcc-linking.patch" +) + +pkg_setup() { + use perl && perl_set_version + use test && python-any-r1_pkg_setup +} + +python_check_deps() { + python_has_version "dev-python/fonttools[${PYTHON_USEDEP}]" +} + +src_prepare() { + cmake_src_prepare + use test || cmake_comment_add_subdirectory tests +} + +multilib_src_configure() { + local mycmakeargs=( + # Renamed VM_MACHINE_TYPE to GRAPHITE2_VM_TYPE + -DGRAPHITE2_VM_TYPE=direct + ) + # https://sourceforge.net/p/silgraphite/bugs/49/ + [[ ${CHOST} == powerpc*-apple* ]] && mycmakeargs+=( + -DGRAPHITE2_NSEGCACHE:BOOL=ON + ) + + if use elibc_musl ; then + # bug #829690 + if use ppc || use x86 ; then + sed -e 's:${GRAPHITE_LINK_FLAGS}:-lssp_nonshared &:' \ + -i "${S}"/src/CMakeLists.txt || die + fi + fi + + cmake_src_configure + + # fix perl linking + if multilib_is_native_abi && use perl; then + # we rely on the fact that cmake_src_configure sets BUILD_DIR + sed -e "s:@BUILD_DIR@:\"${BUILD_DIR}/src\":" \ + -i "${S}"/contrib/perl/Build.PL || die + fi +} + +src_compile() { + cmake-multilib_src_compile + if use perl; then + cd contrib/perl || die + perl-module_src_configure + perl-module_src_compile + fi +} + +multilib_src_test() { + if multilib_is_native_abi; then + cmake_src_test + else + einfo "Cannot test since python is not multilib." + fi +} + +src_test() { + cmake-multilib_src_test + if use perl; then + # Perl tests fail due to missing POD coverage... + perl_rm_files "contrib/perl/t/pod.t" "contrib/perl/t/pod-coverage.t" + cd contrib/perl || die + perl-module_src_test + fi +} + +src_install() { + cmake-multilib_src_install + if use perl; then + cd contrib/perl || die + perl-module_src_install + perl_delete_localpod + fi +} -- cgit v1.2.3