Lucius-Q-User
/
gentoo-bootstrap
forked from andrius/gentoo-bootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

icedtea7: fix build with new versions of freetype.

This commit is contained in:
Andrius Štikonas 2021-12-06 00:50:52 +00:00
parent 0b437e915d
commit 3a53dc1654
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dev-java/icedtea/Manifest
View File

@ -6,6 +6,7 @@ AUX icedtea-jdk-fix-build.patch 2150 BLAKE2B ebfc48db63836bd3f60f946ad2a647ddfa3
AUX icedtea-jdk-musl.patch 4861 BLAKE2B 40028881fd456a7643501aee235e015039ea7e363c094bb0a23cab2faae1e8ae72501d562f6366f1630c3d1d08f7ee31f05bc95e802be7e146976d9087a07358 SHA512 44a35941c80f408d0607e32763b3b6ccee21e1d39886309327d3d74d2900117e4346ef59e77c663fd022fec10ee8f365eeb46c1260014d5765d226ce175ce3c5
AUX icedtea-jdk-no-soname.patch 369 BLAKE2B e44f1f539abd742963664a6f64cdd8aaaa7b108b20535ca0a5a20b0892a083e81b676fd1c71a6b021b2fa1f15404520be388f14ac326ac909f0a11f1aac20864 SHA512 bf4b184e170f7b0ff64ab30d2162784fe2bd5460d1fa31973259f7065fd4c511c46f97724fe2bd72bb94e9006cb568d0e0c87d1a9c90819e65880f8f44830bb1
AUX icedtea.env.sh 1130 BLAKE2B 8ffd3a9c558b9abb9df723efc531496537d7883d676c145411d9a4f02ecd6826c5edec9451ced8187224a9c24b408e6cbad3dc11ebcbe2f69a38b0966cb691c7 SHA512 79c279338cc2790df91c92d8d9b97c007f1a030374066dfacbbb2f9aac754eafba9197b748adcb9fe6fbff16bd998b6536298443028df281d1b12d3b348da66f
AUX icedtea7-jdk-freetype.patch 461 BLAKE2B 4554b7a497aadba6ac5741a076c964c6830819d61fbea9380ddc4a57dca69173e44802b0e329ea0e2e8b8708df9ac75aac1bf2c3c3bd86102ce8974dc5ce800b SHA512 90a396ee1837a1f5c21fe5165c4f9b134a785c448d5d5f31ad22fd37ff46c8147b6c549a1b0deaab69b70804b583940bfbdb547d4fd076233a18ad8a24156ce9
AUX icedtea8-autoconf-config.patch 3529 BLAKE2B 8f3088c7a089199ab3ea6b67db81e69ccb640c84e3abad8376b35c18152eaa469288963faa0032bbbbb32131f3c02a7a83d76497f4993d201bb3cdb50fd71806 SHA512 662d662d0a7a84be2978e921317589f212f3ba3b7629527ba0f1140b5ac4c1024893e0ed176211688ed1a4505968c4befc841ed57ffcdbb9d355c2cb0571b167
AUX icedtea8-disable-systemtap.patch 569 BLAKE2B 8079c590463bb567f4be47f8db0d83ff4953e61e0d96335e10fba743914fb547585b3b90e5fb385344d5718f289d6ee10d149af36f80a23b18d715ed4a950668 SHA512 b544723b37844462a3939738bd16a0341b85e483207e204db289133e57f6a5ef3f6bde73444735c0ca786a57c6e6478f9d026b572fbe051857edddb3725ae724
AUX icedtea8-gcc-triple.patch 731 BLAKE2B 39f4368f1e22e7f036cf40eeb319898d6377b25f71be274758b9ac1b4847e7a8fdddfaa2b97cdeb43e70f659ae3023f0ae0f9d3a8f571a47d1ca3297d446e37c SHA512 b53e03a4d6ce81d301392e3fd43801641859c5cd43897eb7490e7a4ceedd4ccc568b6e4566620aa293f8e5e943401bf1e576ca3e3902960a058577d23c9b9786
@ -40,4 +41,4 @@ DIST icedtea-cacao-c182f119eaad.tar.gz 4485353 BLAKE2B 5c1faa3cbbfea62f819562a01
DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 BLAKE2B 6b1be66ce19f491d49f1591babcd8c088e8e327f828dca3f30b8f8b04c132140f8b9f487ef6d91aed212aebab2c7c3052d79fa3f2d76d3832341d94d48e77089 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7
DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 BLAKE2B 1ca581a02be4cf5c09162687bbc90ec01b58b4910d866d11512cf17a1caff181fdc69e42f7498b2df9deb875ddc6efc6bc2888428f411da94bbc2313ddf5a2c9 SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6
EBUILD icedtea-3.7.0.ebuild 14235 BLAKE2B d3e8de8211eae9cc8d6a0f50545da59d6386b777f63ff54983999a08e420a2ce0cb11c90eda1e44daa48261a8ac562127592c7b7676877ad13dc71192954b6dd SHA512 5c739d5dd29a467c88c77408c716659b0a6a3cd9c0f86c5988e2b06a0a64e775ae61eaa64f10ef7f2c8be07390b500100888776e9a0fa59e1e1f19d95fb91a6f
EBUILD icedtea-7.2.6.9.ebuild 12085 BLAKE2B c392b85759817efe9f53de6eea1051f8b3e9d3671d1b5cc558cb2449830be7e1c53c39ba8a360757dbcf3e43ada82aeb51b56e3bb9e925bbadb406ee965d02f5 SHA512 86643a8bfb678efef4feaad2a9103e64947914d80c2fa14d4fb43ce66a562e0756b64db3d72413e23aa420fa4cf8408b51e51a9928d3a5522b216f09ee4de916
EBUILD icedtea-7.2.6.9.ebuild 12367 BLAKE2B 16b39d076a9062571b271f139d85f1e65c16ada06def47e6bd58d7d007d0873abb25962443e1b4afb975eb31f55a0f02e25acc42969a486a5b68a9cf2300630c SHA512 eacc861a9d6408af6bdb5e80b7d0d1c20b4d3d5f60c3b94e685f52421ce0154c1a68b4a07dddb27250913d822bf734c3b377ab1545de98786a55206716b8209d

11
dev-java/icedtea/files/icedtea7-jdk-freetype.patch Normal file
View File

@ -0,0 +1,11 @@
--- openjdk.orig/jdk/make/common/shared/Defs-versions.gmk 2011-04-11 15:03:04.000000000 +0100
+++ openjdk/jdk/make/common/shared/Defs-versions.gmk 2021-12-06 00:33:27.338540213 +0000
@@ -213,7 +213,7 @@
# Generic
REQUIRED_ANT_VER = 1.7.1
REQUIRED_BOOT_VER = 1.6
-REQUIRED_FREETYPE_VERSION = 2.2.1
+REQUIRED_FREETYPE_VERSION = 2.10.1
REQUIRED_MAKE_VER = 3.81
REQUIRED_UNZIP_VER = 5.12
REQUIRED_ZIP_VER = 2.2

9
dev-java/icedtea/icedtea-7.2.6.9.ebuild
View File

@ -1,4 +1,4 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# $Id$
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
@ -174,6 +174,12 @@ src_unpack() {
ln -s "${FILESDIR}/${PN}-jdk-no-soname.patch" "${S}/patches" || die
ln -s "${FILESDIR}/${PN}-jdk-fix-build.patch" "${S}/patches" || die
ln -s "${FILESDIR}/${PN}-jdk-execinfo.patch" "${S}/patches" || die
ln -s "${FILESDIR}/${PN}${SLOT}-jdk-freetype.patch" "${S}/patches" || die
}
src_prepare() {
default
sed -i 's/REQUIRED_FREETYPE_VERSION = 2.2.1/REQUIRED_FREETYPE_VERSION = 2.10.1/' patches/boot/revert-6973616.patch
}
src_configure() {
@ -197,6 +203,7 @@ src_configure() {
DISTRIBUTION_PATCHES+="patches/${PN}-jdk-no-soname.patch "
DISTRIBUTION_PATCHES+="patches/${PN}-jdk-fix-build.patch "
DISTRIBUTION_PATCHES+="patches/${PN}-jdk-execinfo.patch "
DISTRIBUTION_PATCHES+="patches/${PN}${SLOT}-jdk-freetype.patch "
export DISTRIBUTION_PATCHES