gentoo resync : 22.12.2021

4 files changed, 48 insertions, 4 deletions

diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index 11f97522ae8a..c0f5c5d5fb32 100644
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@@ -1,4 +1,6 @@
+AUX graphite2-1.3.14-fix-cmake-files-libdir.patch 637 BLAKE2B 5bf2dfae7cf3af8a99a5095f618d3625d6f0f3b07f714c1101ac77058aa5ab969115cf2ce6a6164666488183fb5482d3f8b6fd8dea4df3ca1ecba9adb02788f2 SHA512 55805cecf9cde48079a81c8ffd93503dd9302f28140b640971ddee29e7a7da38840c826af072b5780372b56c0f0269cbda802e3e233139f086f5194cd8eb33a5
 AUX graphite2-1.3.5-includes-libs-perl.patch 836 BLAKE2B 0429d214ff7fd9b903e1d3bcaf0af3e6b29a0269581390f64950e42e41280e482fc9cfda9bfe24ef166eb6c24d21377a15fca4264fec69d902d8ba18810bdb01 SHA512 26ab6dda13d758a5e4237c8b5d207d3c5111afbb11b2c3984cd742913c3c7932559b23b5ea9f774f1c6373eb0f761a9400dccc95876740b3cd06c44084a10965
+AUX graphite2-1.35-fix-gcc-linking.patch 697 BLAKE2B 3f4f181477e5f2f5db85f0b5c76dfb2b471c41cb42bfce9a4663fc8aab7035371690077c45cff580c6a700a65466f866944e34127b307f6ef44035f47a65fabd SHA512 f8a8481f5e8e0178e38e8b8dff2e2b1d2f3143d1f1eca6b3b2ea15ea087651dff150fae8166ceaf18eb3995bb480f09e185ddf89b4ad6e352e1085d4655c71b7
 DIST graphite2-1.3.14.tgz 6630061 BLAKE2B 72bf6736aaa8476a89e44ef53c5b6c94f45d815fe1a451ba6b3696bfe023971210975dee4a9c8cb3042f36442e4efecf5baf171ef4230ad2b10694a89865f918 SHA512 14b5eb2ba8158b8b62ffa7fb142100a0af1de0f0c45b2673801b636714a106b46fcd423b05c722d963c9543fafcf10fec811975308211a54f20a3ba322d7b295
-EBUILD graphite2-1.3.14.ebuild 2708 BLAKE2B 1d605d46854dcca980e3caf2b516340a64b8e360ece6d1eae8971845f397cc1723a886fcda134707abebc295882898535affcc38a72a1af6851f724f3779f4c5 SHA512 f5678dd86f300c802ab7798e90e418fd9e4bd530adb1c1ba5556b370974a89833c74c5a16e577dd95cd4e1cf82447171253a20a143c83223b7acb6e9191fd9fe
+EBUILD graphite2-1.3.14-r1.ebuild 2991 BLAKE2B 18853295573eddc23ee6d327b4e64589ff9c2bd9215404d3a4f1779bf028658f148fc4dd7062bba612add101b47c2b68a36ca28554681357d8bb5e5410d11168 SHA512 ee7aacf9557277a5345cd8367fc014cb224624c2313962ae8f3e645adeb2fdd67333f8c93a3116a2695f71283127175c8ba8b187fec1966e15666011d268cff5
 MISC metadata.xml 337 BLAKE2B a406b2f1af9217abda601c1a860904b7897c5646bc145befae7e87038a42e6b60f5290cb7258469de61761b67f74e12eef1e5a632aad219978d021e045eaa6da SHA512 1d7d7bc940d89cad512580d43120946e028c7866f844dbbc9242b0c29bdb1058f181c38eb63bdd50007afb0e95adade98e5a5f234964c1e1dfb8d15bda961c2f
diff --git a/media-gfx/graphite2/files/graphite2-1.3.14-fix-cmake-files-libdir.patch b/media-gfx/graphite2/files/graphite2-1.3.14-fix-cmake-files-libdir.patch
new file mode 100644
index 000000000000..d4ae9846dce4
--- /dev/null
+++ b/media-gfx/graphite2/files/graphite2-1.3.14-fix-cmake-files-libdir.patch
@@ -0,0 +1,13 @@
+Fix CMake install path. Noticed as part of the SSP patch (which we handle in
+the ebuild instead).
+
+https://git.alpinelinux.org/aports/tree/main/graphite2/cmake.patch?h=3.15-stable
+https://bugs.gentoo.org/829690
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -156,4 +152,4 @@ endif()
+ 
+ 
+ install(TARGETS graphite2 EXPORT graphite2 LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX} PUBLIC_HEADER DESTINATION include/graphite2 RUNTIME DESTINATION bin)
+-install(EXPORT graphite2 DESTINATION share/graphite2 NAMESPACE gr2_)
++install(EXPORT graphite2 DESTINATION lib${LIB_SUFFIX}/cmake/graphite2 NAMESPACE gr2_)
diff --git a/media-gfx/graphite2/files/graphite2-1.35-fix-gcc-linking.patch b/media-gfx/graphite2/files/graphite2-1.35-fix-gcc-linking.patch
new file mode 100644
index 000000000000..b162ca9aa6f9
--- /dev/null
+++ b/media-gfx/graphite2/files/graphite2-1.35-fix-gcc-linking.patch
@@ -0,0 +1,18 @@
+https://src.fedoraproject.org/rpms/graphite2/raw/41fb7c104c8f9293254abaa91bbda1daafb458cd/f/graphite-arm-nodefaultlibs.patch
+https://bugs.gentoo.org/829690
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -120,11 +120,7 @@
+     if (${CMAKE_CXX_COMPILER} MATCHES  ".*mingw.*")
+         target_link_libraries(graphite2 kernel32 msvcr90 mingw32 gcc user32)
+     else (${CMAKE_CXX_COMPILER} MATCHES  ".*mingw.*")
+-        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)
+     endif()
+     include(Graphite)
+     if (BUILD_SHARED_LIBS)
+
diff --git a/media-gfx/graphite2/graphite2-1.3.14.ebuild b/media-gfx/graphite2/graphite2-1.3.14-r1.ebuild
index 3f1a3d4d8c22..1aae2996d981 100644
--- a/media-gfx/graphite2/graphite2-1.3.14.ebuild
+++ b/media-gfx/graphite2/graphite2-1.3.14-r1.ebuild
@@ -20,7 +20,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="perl? ( dev-lang/perl:= )"
 DEPEND="
-	perl? ( dev-lang/perl )
+	perl? ( dev-lang/perl:= )
 	test? ( dev-libs/glib:2 )
 "
 BDEPEND="
@@ -37,7 +37,11 @@ BDEPEND="
 	)
 "
 
-PATCHES=( "${FILESDIR}/${PN}-1.3.5-includes-libs-perl.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.5-includes-libs-perl.patch"
+	"${FILESDIR}/${PN}-1.35-fix-gcc-linking.patch"
+	"${FILESDIR}/${PN}-1.3.14-fix-cmake-files-libdir.patch"
+)
 
 pkg_setup() {
 	use perl && perl_set_version
@@ -45,7 +49,7 @@ pkg_setup() {
 }
 
 python_check_deps() {
-	has_version "dev-python/fonttools[${PYTHON_USEDEP}]"
+	has_version -b "dev-python/fonttools[${PYTHON_USEDEP}]"
 }
 
 src_prepare() {
@@ -67,6 +71,13 @@ multilib_src_configure() {
 		-DGRAPHITE2_NSEGCACHE:BOOL=ON
 	)
 
+	if use elibc_musl ; then
+		# bug #829690
+		if use ppc || use x86 ; then
+			sed -i -e 's:${GRAPHITE_LINK_FLAGS}:-lssp_shared &:' "${S}"/src/CMakeLists.txt || die
+		fi
+	fi
+
 	cmake_src_configure
 
 	# fix perl linking