diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-07-06 08:06:16 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-07-06 08:06:16 +0100 |
commit | 4187bba080530c5ca1c7dae9c233e88f3fc8f535 (patch) | |
tree | b6f535e053876097ced1b6bda14a4da890c730d4 /dev-java | |
parent | 2a8d2f71d1d9963368e0ef3d641d75979a689d12 (diff) |
gentoo auto-resync : 06:07:2024 - 08:06:15
Diffstat (limited to 'dev-java')
29 files changed, 90 insertions, 228 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz Binary files differindex 36f041c259ae..f266b5e2003a 100644 --- a/dev-java/Manifest.gz +++ b/dev-java/Manifest.gz diff --git a/dev-java/injection-api/Manifest b/dev-java/injection-api/Manifest index f3d18595fb5d..a87b89e26fdf 100644 --- a/dev-java/injection-api/Manifest +++ b/dev-java/injection-api/Manifest @@ -1,3 +1,3 @@ -DIST injection-api-2.0.1.tar.gz 15277 BLAKE2B e1a575ce9705636e0e176e63684c3c4ddd3e7932f2fcf36af86e00e4ebb9888151d64019dea8339c80951d40d3f588bcb6857943c2e3a501e68ad7702a73c643 SHA512 21037c1b9b9687210663ee32b40c7ab897a27812591e38af2f840421488029d1b90f0528570940499142a7ec21ebd1f0fc4506872d9667a066b4ce84d38428e5 -EBUILD injection-api-2.0.1.ebuild 888 BLAKE2B d01330a05cea9504ae38dfd739f1cf08e9a77203ff7410172a826ac9cc62da70ae6ba976b618a45e46d2adc68ec3f670596936f44412bb55c92471fd1ff3fd9b SHA512 ec639e16b337aec31508501ee67d31aa0968eb9d3689e1e9b8e0d25ae0b5c8947f25839c3f3917b7291dfd3fe4c2821e0471fe40a4f7e7bb4501380d3cb3b942 -MISC metadata.xml 309 BLAKE2B 46b50966c86b4944fdfc31a17697afd2829665f5ee5cdf2c25449c04e42fd529ed66e18beba65c388b0de9dd5ee6962ef400a59981c7869f27c5a1190f751ca0 SHA512 67295ffb8287cd8065adae08efd325cc06b12bc3068142c29aec1c34dbdf3e6eb0ef93fb8177a22e2951afa562049753588d29eaa011cc277dda1b2d06b22c50 +DIST injection-api-2.0.1.tar.gz 15280 BLAKE2B 786c4748eb58bb3f37ed2c8189ec44eb76a77d5e6d6cbb6c54da0ecfd6bbd757b138567dfd4c64d8a5caa69e34ea630e457d84dbfbd3de5ccc58dae7fdef810a SHA512 2d1e182a6520819235c2c8b193b3af916a6533e899f42ea2040977d841f32b3cec256b7566862483c6bee3f727136219d54a025c3dea026c906668e5b9fb3517 +EBUILD injection-api-2.0.1.ebuild 893 BLAKE2B 35aaa1a05f5bbc410619e3619d99bdc463d12b5f8f9d51c7bad0ab02054a1324fb630e546c1ffe1d45cd21e6938f703e733d36d597cab96542c9797b68b20d11 SHA512 0f6330d5f5ae45c0c7af8d3be8d916783d419f5f0541b664f907fc40e988c9648617e8246f0dbccbbd143e8d5ca53caa9d34c7930a4c653cca962c4d3b8111c9 +MISC metadata.xml 299 BLAKE2B 401bf0cf6046162e8a0953589a8b57382f8edf2c40f952442344971f515167e596f7605060fbcab0f751919d22bbe96b95dc17448c26d633e4f5e799304f4707 SHA512 614380d0fc721eca3dfa965acb96bf0e42ef992578965a7be9b735abf0885afdd869cbf5c4461a999280f7843ed622dfb211b28d5278d4170fd7c6bd744de232 diff --git a/dev-java/injection-api/injection-api-2.0.1.ebuild b/dev-java/injection-api/injection-api-2.0.1.ebuild index 149141f12301..58a262fd17cc 100644 --- a/dev-java/injection-api/injection-api-2.0.1.ebuild +++ b/dev-java/injection-api/injection-api-2.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Skeleton command: @@ -13,7 +13,8 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="Jakarta Dependency Injection" HOMEPAGE="https://jakarta.ee/specifications/dependency-injection/" -SRC_URI="https://github.com/eclipse-ee4j/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/jakartaee/inject/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/inject-${PV}" LICENSE="Apache-2.0" SLOT="0" @@ -24,6 +25,4 @@ RDEPEND=">=virtual/jre-1.8:*" DOCS=( {CONTRIBUTING,NOTICE}.md ) -S="${WORKDIR}/${P}" - JAVA_SRC_DIR="src/main/java" diff --git a/dev-java/injection-api/metadata.xml b/dev-java/injection-api/metadata.xml index 4c37da7799c7..2139e80c1616 100644 --- a/dev-java/injection-api/metadata.xml +++ b/dev-java/injection-api/metadata.xml @@ -5,6 +5,6 @@ <email>java@gentoo.org</email> </maintainer> <upstream> - <remote-id type="github">eclipse-ee4j/injection-api</remote-id> + <remote-id type="github">jakartaee/inject</remote-id> </upstream> </pkgmetadata> diff --git a/dev-java/openjfx/Manifest b/dev-java/openjfx/Manifest index b1ad49e49a8d..0b832e836567 100644 --- a/dev-java/openjfx/Manifest +++ b/dev-java/openjfx/Manifest @@ -1,34 +1,36 @@ AUX 11/0001-c99.patch 940 BLAKE2B a7373ca3c6348ae0d179842995f6a753c2c4c4cea2f99504dbc82d3676f276e0de89aab72d1d40b1978ff318966a12ecaafb186b0b974c3116522b82733481ad SHA512 8b95a6a49e72f1885f70cd520422092151b0776303b12d0dd6f6ff91acf849e3d7d28f78ab5af53dcea83f6dd93c06b1382d25b402dd7c51bcff6581b10783c1 AUX 11/0002-c99.patch 733 BLAKE2B c45e98d374f34a705997bea00bf947e3ff1d78c425f69883e4f42508b1f612f87e6ed97be164573ab3d1063faf4a4f911faa45843614449a34de0b3674338b47 SHA512 c25521cb97982034c0cbb3f82e3e7a0ce5ff189a611f4d5cb9a4fb38fb002621cc982534e972804356886256860feffca0ed0c689c1d713a75ac0d5b9e17c513 AUX 11/0003-c99.patch 876 BLAKE2B 259143a4c4783caab50ff07174079f65cab5a42c1595d27d1f021483fcb8f1b70d7ad6287acc05d86be344498b5470f6aec6632e24696b453b87000366fa646a SHA512 911f019a62be6c419787b9c5e5bf709778c1cda6d0f747948e1e0bb5e251d4ea141cea525ffe37942dcb31e5e0ebbc0d9651ab4eb6219055fe90d162db9ed546 -AUX 11/11.0.9_p0-version.patch 691 BLAKE2B 33cfcd3c615e9dec14e2df985b48dc85b895d12ff127ffc3df08b670ad1bcc3790efec63c68b639288c44f7cf5da8dcb2de72195df24c049692df109b20e42ac SHA512 472bb5debb929d4191b2dc2bd0b2e2370f3c93671e581fe42616e4ed6fc3e4a34638a90f04ed756acb5e10d404694267cd861ecf698c7c926cd4c6fe6d6fe8ba -AUX 11/disable-architecture-verification.patch 1288 BLAKE2B 2c228eedfbc9b8642d26c7b92580172b83d492735bd59301fc2506f4a2ab77c002220d728fb2fa57e251c760e77cc224c54e831b15a594186750138336b78c3c SHA512 6d66b16833c61532521666d888cfb1a495c9f2b6bda87e0519ecb907b0c1bb99a267cb059a4ed8428edeb44a34ae6bcfac0c7ca6bd880ba6f08161e851e36252 +AUX 11/11.0.9_p0-version.patch 575 BLAKE2B a0e5fea02c84bb4a43c4e4add8ae95910f81092f0caf90eb6283ff3e0474195e9922c120797ad9c1117f7f1bcdef03ca24e3cbdb584596c87ff3607a0e7289b5 SHA512 ab6bd58ed060ded912018c59d98ef2fcc2098b787826e89092512acab49eb933cd93310bedf9d07e2eeb55d20cd0f3ac2951382360f69215c6a166ed5860d79c +AUX 11/disable-architecture-verification.patch 1142 BLAKE2B 00b7d66203cc4eeaca81b3c29f561f6d81a9d04b1b3f1973a0d3bf36146ce58975f39170aaa9ddd5da05b63a5ef45042abd37f8bf1c3742c264fe8cfdbd7c053 SHA512 6f8b26e8501196c368310b17464b3f5205a84395b5d67092a75ff14bb29a97dfa33ba6a8e81fc7e2cbb5244456232cb5217533de5eb5029229c8d592e4dfedab AUX 11/disable-buildSrc-tests.patch 534 BLAKE2B d1cb4da89602fa9a48e5509586d1909d10b9d62e167bdd4d57b9615f2896704dd0ee925d14a86753bf53182f85fc9c21f195c3f044a0c6d38c960ee4f5494332 SHA512 ffbc3d671cea448ffddd8d92e4a4031a941008c067d5a7acb358fb82ed217c9388ef1916aa04cf4693ff2a83e0bdcf3fc5bdc919196a6231d57c8341e44ddede -AUX 11/don-t-force-msse-11.0.11.patch 4577 BLAKE2B 7ced8b5b81a144cafc557d026fbbe8242356021dd473ae06debab4150beb6ce28ba94ebbc3503942d931e8ea653671b985f5cb2010375aee67ab50f98fb12fd6 SHA512 5df3760c80c721c71b30c44d61ddd60ab06899ccf1b74ed0e168a5c5f0db5a28ab181f0d0d58dbe05ebfb579efa1f7989ac015de8604e747667889ef258a452f -AUX 11/don-t-force-msse.patch 4621 BLAKE2B e715f5e8a7aa9c7e6637baa4e90169e0cd63e2d42f1ad76305f4cb13c9cae43d1464fef9dabfc4d4f530261db40650a05347f55065af3e152255845c2168f64d SHA512 5d0c72493e9be638c1fbff26531b51a485f9eac1aeb286e2b6b9a8674d866dab7b736a9959c9ee231f96cbe1c11838a77f64a8db3a993e5c4a2059b4202cefc2 +AUX 11/don-t-force-msse-11.0.11.patch 2902 BLAKE2B 93f09d09a0a923cc234bb6292c41311dfdb3eb3fc591141569a51064e779f04e4509dc90f4f58762d0a20c18fd5ba7ad6f2a3927d266a6c99895af737b1e37d5 SHA512 288c00485ac31ab0dfccae2dbd29f897217c220dddb2c6e9347e91a3faea6a21f978ac849190d5fc915e0a65bda955b1aeff0d6deb8ddff1bf6dc67ab3f16fe5 +AUX 11/don-t-force-msse.patch 2934 BLAKE2B 700557e10a2c68fce614847d5725cecac93b1b2c94dcbce86ce9637ac5c276e04d3e5f6b625f8cd116cc8107b9b15a4a154936d8cfdc198329a5436b7f33a73e SHA512 d7a491d1515e9b100c61b7e3a15b702a0215dd90ba4c6ca5d32b914763467c0aa6d03dcea731c97c87858a138d765216d3c3a4c350e196e79fd72f7087eb684a AUX 11/ffmpeg5.patch 840 BLAKE2B 957f1ee06f9cae7de78e68f45051653f3b91d7c5e36d9b94de399db2ff94037457d9e163840bac9a4e896a54b25e508ad2a946658a64647ec1afac3778fbbcb7 SHA512 bd9346c84f8e42c16bd3d9dd9afa8e70a5d94056ca7127421869de41acd81be5ebb5603810cf8738008b9b4f9459e6c7cc057c905ced14b650f77905a302a442 AUX 11/glibc-compatibility.patch 547 BLAKE2B e63e83d708765dc7ad5013ff3a5bf0885fa426290e4fa164684739c15e7c15652c41256b98e9720c35682193086ec19c0225dd202fabc9bd9c9f99fb0fd6d5ff SHA512 abb08198b94e38fe8fb16229f506e2cad78869ed9c4fcabe22490a87884b1851373ee4a92ae4d7dbecaf3fc9a784911d932fad2457b0611a102e63a983113981 -AUX 11/gstreamer-CVE-2021-3522.patch 1347 BLAKE2B 90684659ce6e199c599cc287c02cafecb8311d4c0d7c926bdb8a7cd8b725053225013dcdd3fd3cbd2d12ea99a8f810af041f48320df2eac8c74ed1f253b9deb2 SHA512 5d29de9cc019c1b74e17a9885e9742b110ef7b7b8d866a4d42556b434316c030dd235bc276e132ed621bfb67fbcf299a113a5b95eb71b57565bdb1cc4c5338f2 -AUX 11/respect-cc.patch 638 BLAKE2B 30aac53bc44a2ffe63f8cd425156baabd7c115c1752b55acf16632e668b7511161ae05b6a3732c2626f037652de0f8cef60084e11a692b651bd77007be70e05a SHA512 df30ee8b5f2b930c8cecb66ccec742da5d9114645929d5522f9f540eeddbc784b73513cd8da820f3b6c4e81282b9692b654d9c0b284c6f507a787885b9d8f132 -AUX 11/respect-user-cflags-11.0.11.patch 8591 BLAKE2B 918563c92d309da47c61198a4349f97f1b44213b6776478f930d824ec9d54e93edb6b98fd8e135c7d9d1e18aa6352afcd741a3b73ba811f1a0976c448746d2e4 SHA512 ded33c5b41f076afd771eb88019525126dea7ab182f98dd05e58aa6802d1eb9fced712c5165d0b3b50bd3770e952cc1db3403693f16d68d0af091ce96e351baa -AUX 11/respect-user-cflags.patch 8609 BLAKE2B 865e8c2b10cc24c7ce45a4d6b039a1e852902f702fee06102273565f22ed870391f5f072c59db51fa48077516a8072b41252fdce961cde20581d8f520eb67afe SHA512 ab77752add6fe7b708d7e7eb94cad722b6016d50bc3ba40505107db0e70e642dfd7d48550cba344ee2e88bf2ea7f55d58140f5eeb7b025c112b87be0ce71e74c +AUX 11/gstreamer-CVE-2021-3522.patch 1145 BLAKE2B d6c039f7f0f50f9e8268f20f629263c1c0f9b32f8f04127c84ca3ceea6f526b0c33af262264719a8a0a6211d63af289438bd2b6b989039fb95917d36d6078a99 SHA512 dc5490ec85f8a957a039874eea0195517c131770799d73c2fa848e5a458cbf1580ee839734780e1605aeef94c7ff5c687614e847a4cbd80cb54d7fe5d495263f +AUX 11/missing-casts.patch 1526 BLAKE2B 53b559ef7e63a6b7d85263ec363a809eb046b5d9ada9a8d9f9ec2449fbb8050777d8178af6933e6511eab5447ab8deaf4952dd6ff7fd2a14471eeb206cd19736 SHA512 5faf70b0a3e114fdc0288d1b14da2a53aa002066b5c80481ea64cfe6526f3c4f3af516f275bb3eacf3714ca3c708b21985685461cb91078cede6644f071e7f83 +AUX 11/respect-cc.patch 549 BLAKE2B e452f103ed0f9db154536f8e8b8fcd06bb984ec57879bc6201c84022d4eb871dc3091c4b5a1690528629369eb03e002dff369376648b9ebf608c2b065b170f2b SHA512 96f24bc5da1ed867f869e937cf150a2e3e0278f1255256b2c1598e81524752eb5cbe841499a5b83aeec54d6674f4a45268df5f110ef915335131605525544396 +AUX 11/respect-user-cflags-11.0.11.patch 7274 BLAKE2B 6aa0fd1991c56788a03b204d49ac2690cc9ab77205300598028613e619884d59c7f690fa29b00369bab5692546ca71f6e40a33c11cc77cddc3416946f235cd2c SHA512 48e16f120e7ee94c4ec4be4e66982b738160c9ad89c71d4c6bf39270c663c7b0d17b1f81af27fab28d6714d3fe242688d6bec37427e118aa2ce9b9019201b4ea +AUX 11/respect-user-cflags.patch 7292 BLAKE2B 3db1d6d11e7682562152994572580adaa20f28fa34a6c5a7cc99a036e7e9a34c3e6501999eb1c5163434afa71cac97e52e49fb4241d6e63ad0c4ff5b81b4d001 SHA512 10783d95e8f1c74f565a7d4b3318fb094db8e0816a2e19a26b0323cfaca502be591af35ae42ca8c1bb2f9433d5f80eb21b6d27e89845841afb59068112beae0a AUX 11/strip-blank-elements-flags.patch 1016 BLAKE2B ca9d4a8c471469943878e00f2989bc143ceafc88f3c0173444199cd5d873ecb1a0ed1ea415c2ea910d3a6ee9eed5232ec0722009c5c94c75793490e35ab11509 SHA512 ad8b87c56e9b782db4b72d47e7a900278b991b1facb4926bd4b951d6237b47476ac1552e5a0f52084ac2f6f5175b687130bc6ed9ada70cee18b52f56042b6b28 -AUX 11/use-system-swt-jar.patch 608 BLAKE2B b0083c54f5f42e6c0069812913c800c9366073e34a401187e90c498ee9cb67b619baa87b7d140cda5a1330076c3b04ff3114898cd264cd51ec4b99498acfd894 SHA512 a700c33639603a26d21b89a4f8a9299cdf42cf7f7a0dc082ec9cd4c9c2235184add1685b05d2a62f3a52bd2251b4c133476e5944471092a2c0c269c973d2604f -AUX 11/wno-error-11.0.11.patch 1974 BLAKE2B 67172eaee34729fbc90e3eba1a9aee421ffdaa60411a6a8f86f8a7fa08969cfef3119f70eb2f69a5c2340716f5f46e9b323b708756358d5a705a17b7ff16ba63 SHA512 3ecfbf76a6dc58c2075b31bab259e17e835395f34895c779b6d70efc9348243de55731ae29fccf4c4312dc331f4b4de76088591ee5d090023954f90bb55c35a6 -AUX 11/wno-error.patch 1894 BLAKE2B 8b4380c97942cc542164ab1673eb4e5701ae17aab7b6673c3b01518fdce91d2daac1e52dd5d7dad09b619093d0b4a153f0aadf060c32ffab19428ab2f307661c SHA512 0d808836b0f52e911ea6172b3c573cfea84035611ce797da7cf58b5eaa51d8c4ef536eb21d3a0c2139311e3c7ba702f13dc96b9e1d3b6cefaaca88188e409f3b -AUX 8/0000-Fix-wait-call-in-PosixPlatform.patch 461 BLAKE2B 10c76c946063e35f935348cd6374b08bb2e2d032ab616bffc09ada63e6795e1887033b13a13bd7d467624b112c0e8523d0eb3f83208f1613eefc7e376b3ee1a5 SHA512 7354f81ea1b8246a9a0ae43aa8ffda9e24ef2cd91ca4a5ac499e5f16fbda1248d3ea4ee41580b76f884b0b41233e31b577a1ba8031772c1bbf86a39345f436dd +AUX 11/use-system-swt-jar.patch 464 BLAKE2B d48819fa2c32050c252533904addb5e038bd7749b4d81cf1dc21a87545a7b1bb70a4553c5c8deb8afced817f30303a2fd0a79d208615bf5dbf13ac81a148a396 SHA512 7e231d1d95382e7ea7f8ba92e965d09711e83bded5a1f20574510a0bd01eb3a00945a179b839605bf57c14027e02864ffe422886a0d417bf73654038ee0ec847 +AUX 11/wno-error-11.0.11.patch 1797 BLAKE2B c63eb61a9d87643034f9c091d50085c8c4d7ba46e544be64b5a065596202b5a2e31a3d8a3b1c6d5bec0c54077c29be5ecdeae9a12cb13b331c776d5127471563 SHA512 90379e6621fe7b4c9d7e6e035c44cd3f0da96a097c0831f0ccb5e973dbe8721e9443d32ec5b93c63b06fc49e587134e51ec2785cc84caf901341400954146e52 +AUX 11/wno-error.patch 1717 BLAKE2B 5cb0b8e78608c469a8710b0a62a366db74cbf02db980a817f0179b57e5c4f42107e2986fc10e7463059605ead914d26bde70dd50846bf20de9764c8211b817cd SHA512 12ebbf9a83aa3128bdcc103e578741c28889d78976d9640574a04aabbedd6b2d64ce43ba6d9cdfa2b147aa428621d803cb82a1505d89c602fa2068926b3a70a1 +AUX 8/0000-Fix-wait-call-in-PosixPlatform.patch 389 BLAKE2B 3ce56ba70cdaeb0d5190649fc33991e83fc9f558d5ae00dd10af0bf8c3f1b9ebb7a5145f66317b5830eddcbe62f18899ff9c8b0aec0c4ac9320940772bb4455f SHA512 9b74f685ecb03b2776fa0a954882818da4eb529670b2719dddd087328982431cbd940576ac41dbc0a7b957b246c432f4d595d4a7d56b871bdc6b4be73dbd8ef7 AUX 8/0001-Change-Lucene.patch 3008 BLAKE2B 9174e6ecd11b52b15281072195a32e798c833604e9d7ff5bfcf224710be0662a1b6d2d1040f29a053c157f470c4403737b6c05f0cc3debbc682b495b7ff96d27 SHA512 0b5371cfbdb5830649a060f1964830d774d267c38842f077e96e5fd841729f5802c1142874bdf255e9d0bd74c81f704374f9b6a27d883a0ef516f14e586971b6 -AUX 8/0003-fix-cast-between-incompatible-function-types.patch 3383 BLAKE2B 5a0f93db8a64d61874321908d50f7ed049df4f1000a710763384149614ffbb3c7012aecd3b53c89e9fae647746bff934560a91d7637ba3e3c8e95d50ccfd467e SHA512 cfaa6695ffaacc866016d2a78201490ba79ff8a00debf3ef9c793cc910e118f9720b29f54ac172c5f5c010f9a06f7a9cbe10817f3231ccad5435fe3bb5ef9341 +AUX 8/0003-fix-cast-between-incompatible-function-types.patch 2849 BLAKE2B 102e5d452e403f54707e7d394d987f83683c6664831a43900e68e6e05df5d642cc4bf04a40553e047ff855e728aedc91fab394aec3236648132c1029c1d2bd02 SHA512 7d1a4727749d36107fbe5104a9c5849d17d2305f3ba3fb352475c5d93bd55652d87ecdf642f1f54548da53df8535752dafae62848c307a1e08c9dc7ac5c36579 AUX 8/0004-Fix-Compilation-Flags.patch 1126 BLAKE2B 0f3d17a5ce7c501c55c7af0c39c48eda76812052ebdf0ec315663d71faf8d7435c8a88ca7b28900e512bbe6c6e4ebb7a580aa34ab6f0a1031cabd62180fa4701 SHA512 56a83b8aeae1f2767d1013e1ccab8acc0bbce172148b80c9c6121784f7ea35cc69f5d4a924f74720fe3d5b98bc6128a6db75c6f950a72b17202e5b9078e94d9e -AUX 8/0005-don-t-include-xlocale.h.patch 886 BLAKE2B e55a1695618136442f50bb7c57e0928d8a70154d54cdffcb65a5bc8923a967eabcce74f00c7cbf75f1a583a685fac136b3c0433e096df4809c925f80c7d540fc SHA512 a7959a25c3102c022c16cd259152b64f3edbad9085d93d5146cdaa891db1a3e573afcbc47a1ecfc1b338876fd1cac25d22633001cd3357c254f4c6701e8aa531 +AUX 8/0005-don-t-include-xlocale.h.patch 547 BLAKE2B fe25adc5c17bbedcc434f1cdb2de95a625453737207225bc55ca7ade4a9fdefb442b3577fae9363c563bb2c8c91e1d1afaf8297877b78bcdfd4c5881aac2ab21 SHA512 1f5df3be86557fae486345a5d19826aeec19c9c18afdbc5ecd52e19d5ee8fcc8a41023a5dc18500844dda70109e78b063b719f4924fbde26bf2914824b4b3c3b AUX 8/06-disable-architecture-verification.patch 950 BLAKE2B 7cb4a1bb01d347203c3640c541ceb9d1a88b4e1ce6ba4300153e6b66ee010f96c6c392c86e56049283d49a1a28d2a7818f038481143ef1f0afada7999bc46fb0 SHA512 ee8c18fb10eeabe75cfc1d4894fff21ae9d2b0d34e1ffc596a6e58a8fad6159df9ac2fe13d2bdcbd061295a804c56dd4f98f81696bbe6b3318ed427aaffd08d0 AUX 8/10-javadoc-locale.patch 768 BLAKE2B e674c8c613eb518dd5de7b6cb253d7f0d6dafd0e8a5f3ae9b619c99b9a87ec0e565f4908aabba8f996d960c2c6fe7010457da5a5bd3c6a9313e9e83843e9df05 SHA512 b97de0f5bcd1a8dcfab8e39694d02c7cdc20619efd5bb1d5fc5928a47e1495e3682ba0474ae064a1db42b9f79d0caab5214747214bacb512ed657773ce510aef -AUX 8/99-sysdeps.patch 1467 BLAKE2B afb49b067754e93ea3309b10217fd67589f3838a3772f425fac5f3c985cbca8f305bdedd7b9792059e62046d05687e9652047ff83eff01fe52dd3f5fe5ad86e3 SHA512 26d4ca4cc9c860c5d8d1ca9f2d6a13821498bb0f9a709b46b9e1d6fb04d90e74efb35093c1d084099d71343f158a122a2936297883294bc743a65ae81fff4b74 -AUX 8/Wno-error.patch 3491 BLAKE2B 6f39fe018b8cb3e89d77ee937bba38907115bac7736b44d7da9955a9276d81b4757d64b291256178ee18a33c8e1c837423a57b0026d3eba0225ac7331f8eb629 SHA512 0efd318a36ab69b119b4824c229d89e64205d58d21d2dd44f97d80e3df87e1899ba4e8b7e35e535c0c76ee3f748f750fbee717681d644270333421e0c6dd39e0 -AUX 8/disable-online-repos.patch 1886 BLAKE2B 2959fd2d324a66430ada639890de5563c987dfea4878d21666df54d0e107f021dfd47e6c29da44c23b934603f543f839f16af67c9e35526990cf11b6092c0455 SHA512 ce377c6fc25157e4e8b7ebc7a030411cef1c9fe0f8051ec4b02c8c6fa0505adc4ae3ed3a62a562019652b4d9d6279d168c0df1acc5a2a36272fea6fe114aea83 -AUX 8/don-t-force-msse.patch 2416 BLAKE2B 20380651c8c05b116aa936776a96b4fab390dce4e054fb75c902a51987a9c7ed9be09d8a419863c7d693e4363c274df65ea3d2fca459379ea3099613590e5e80 SHA512 5a94ed21a7d7ffc55c69f8d956351a0ba162d7ceb7ede5c85e53f39a4c48cd7fc4fea9665d2c60dfe2942250b2fd3be92b79bc47d8ee340a514bb35271ef295c -AUX 8/fxpackager-don-t-include-obsolete-sys-sysctl.h.patch 842 BLAKE2B 7c7b5d5291f51dbedba6b836b3adf863533cc1cac53b17ae39e0c045a0d902a622f71339dd31614c6a0a9ca43528f973a037c0e645b9010c90b721c5d468e259 SHA512 ea2f6b9171ba8c19e92b0972e06ac7774bcce3dfd1e76ce845f387670da3894cbb4236fcef4587f1ed4889cf49c777a4e443eea7578fca06ab03a4387bb293f7 -AUX 8/respect_flags.patch 7804 BLAKE2B d3f539e74e75a3ce3ac1cf3ac47d92e1facb6d63f178429f6e729b7c6b98465b8dec12ec408a5794faa637c715831fba9f549566d889adba01e45ee2bb54f2f1 SHA512 d091f5d605729c5d2015930af3a5e005c343d3d9833dfec626b0e39bb66c8a260e0d034a44d03731b0284f8facc138d2648013651e09f48c6142ba2b56abd9e4 +AUX 8/99-sysdeps.patch 1307 BLAKE2B 02b0cf0c699465fe62d06a68ac6d2748ebb4c37d09258f79b5ec3cfab78df9ba749d51bb8681af16be094d21aeb6bdb38d883b789fe96eba6a25217fcf0f6f26 SHA512 cb596afa453e0693a432a0df4df144a25af1fcc6bd9430334675ddf5854af8b8c627b4f13dbf26cf9a733c4710d57fb2720e767ed16817e2ee291942a2608732 +AUX 8/Wno-error.patch 2646 BLAKE2B 503c534f0ef9f059dd868f47d27b6ff679e1d72bdfa06a82d18f80bb1fd5309e01ad48eccd57d2b57cff3b610f0723c4d1f9ae425313bf5fcdf2f40f0f9c3da1 SHA512 2c005b474d9af88fc7e2d3596542e122477e8990e29f14f08f9b94a1795ac27c8ff49a3cb6ef3530c7f7301eed7ad1ac5034693359070f9140a7b5ffe4270ee5 +AUX 8/disable-online-repos.patch 1815 BLAKE2B 8fbe9cfdc64130ad8dda4c4f6ecc9f3e76b55b9a2c9edb438681deca36c2165737151e7e0368231423b19eaeefb6f9db5ed6a738e0537ddffad3f65dcb4bf3d0 SHA512 c1962cc926c494447a24c33476d408c515407ed8e718009332a1aae9746e63d9aa64d02ee1775825fbc932ff3a193ecc9152c630e767255cf96923b15a368e14 +AUX 8/don-t-force-msse.patch 1546 BLAKE2B 140bf81762414587b0d5ee8db4e3db078054f983f73e8c5c9e13507412442979840b90621520933d25a195507a3a58355eb8598b71e254387defaf02531bf25f SHA512 326fc60089f1ba8f2116b887cbe95bfcd19d0dde2ca2609df5c68cc2e98a8d0536e332489ee7d12bca1fac5254774c0ac4e0610f16218df1600cd717085a9020 +AUX 8/fxpackager-don-t-include-obsolete-sys-sysctl.h.patch 553 BLAKE2B ca3e9848e329fae0844366923175066c90d8b9a138efdd5cfe35569a8e68408136fbb473809b31e111fd2d04dc7e8cc34fa63794bb743f4988bc7515f9c4a8ad SHA512 3e67e2eb3f21ac5a5da5dcd42f253b85d1ea0bd1eb01cdbb05eab480872660fc738222ea6bc9f59b5e0508e5aa1c4240bde675574f195cd54a94e1df160d915f +AUX 8/missing-casts.patch 1129 BLAKE2B b2ccf76c5fb9119355f96158dcf08b1dd33a9b5d77af2626da0d7d586e346329c574a8cb5362c98935ca8daea5da29d2956218e73f5d3b5947609900ec509b4e SHA512 e405a701a7d3670b271d696996fcc675490e7a3d4f7ef5f3b76eae1416951ac4cf15b709098c4acdae5dec4bde543882060300abf67a1c42c39b272271a2af6d +AUX 8/respect_flags.patch 6279 BLAKE2B c54e38b9f3ea5b0bf6863c3f973809985f6a5476bf45cf977d9ec90d14d95a3773c07ec8a601b3efc0c78873bae154507b4c3be6ec1a49f4e05ca0a7a6583fe4 SHA512 4a0edb91537b4641d50f29b3cb9eb8906e6c3a10401cb165e98e6e684956b6f0788a40cdb65912345a9ead0407788b9b3dcc2b6daf09795edd81f759a8586ca0 DIST ST4-4.0.8.jar 239543 BLAKE2B 72d257c6d0f1b3bde0afce805128dd38d8520b2073377bbb995fed3b4e18a3ea69d508d6d7554755ec68bf50940082b896ed89998a5178272d24376404b389c5 SHA512 9877289297cd5b15ad464a19467699387f57c510fe8a476e07e9d2334bd11933f9bdb9c6caa4972d4d4c84b56740c6d885cd39300dd7ce35b7c5bde536238086 DIST antlr4-4.7.2-complete.jar 2079769 BLAKE2B 9407e5096b5943702a1375f568957f35486a80f122bc59c5ec8e899f59214c43ee4ece551d9078de14b7707d85f9306ae99953981c755a1e1205d83412010738 SHA512 e788d28796c8925a158f0a09048590bdcf6730d46dcb8a12b362cbcc80a7ceb76374b2675987c953faecd3cf4a847b1571485a71081a84684170d25d05176a11 DIST gradle-4.10.3-bin.zip 78422006 BLAKE2B f565e591751acb5b05c261b3d8dbc8e07f76b48c73516f6cb1b2846ebf0bbf38000b9a61790e9b3055bddd9f9846d61979d187f4a30c317a1de98546891d9d2d SHA512 fd3f4cfbd5262cc8514b7fb3e303ef46b9ca4b22901f1fe848ec4679f8d6bc283bde12ec584437624f0acf5486e5663966ad0736bf8ab341ac3e2667f514ceec @@ -41,6 +43,6 @@ DIST lucene-sandbox-7.1.0.jar 182914 BLAKE2B 70c795f84d8f0908abe47db77f632eeb657 DIST openjfx-11.0.11_p1.tar.bz2 65017753 BLAKE2B ea5834e469bb0bd3a70595a91cc298f6091bc45de4c471ee9d0bcd45700ab3966a3396781ace2666bf94decd1219a83f01b277116cf23baeb6dd34a1a0f44191 SHA512 a1f94b3166aca50344f8af77ec2a5f52be1b0abc1c65fd3ff97f98017377ab772262502af00ad8cd4a6c44281ea459aff43a9cb7e30a1c35b822da8fb39b94fb DIST openjfx-8.1000-backports.tar.bz2 9142182 BLAKE2B 58ea420ec015c49d2755105a3d11675a92ecab337c7bda5a1ad72e84d0b35f04ed4252cee24da89b1e7b1b5b8b8b9fea7db93364434800246b87827b21970cc3 SHA512 077392368947cb9da1b5c7e14b641d6edcddd9821eb4f16dbea33e8986568211e93799aca29e70b490c8ef2125d69f8372abd1b1ce428a95420f62ff15c414d6 DIST openjfx-8.1000.tar.bz2 62286455 BLAKE2B c9a714a618d9ae02768dae6128756d64b2b6299a36a6ad9828bf2213dc641cbbcaa2d3f3e0b4913bb60893419a2d5c730ca2db88f759bbd94b3e83112199278c SHA512 6049730b72e569939fed3d62b46a409e949b4c2309f4355253c8c891799c7fb5138e20aa217454fbbd78b1dd99c254b34b3fe6c9cbb35854bd8656993655bf32 -EBUILD openjfx-11.0.11_p1-r3.ebuild 6800 BLAKE2B 2d28577272cd1d8527485a3472c2bf7ccde5f72b4b65973e1addcf67324eff502483353a2611fa1f428cdd6416082c53017b14007bd35ead6ff693b48097e092 SHA512 d7dc44eacffd7b005798fb75da20d18ac787bfa15e01c35a0495477ecc2ac14c0cf3afc7aafa5f4f7e53257392b5804cb6844af87baca17fbc3f73610fbce1cf -EBUILD openjfx-8.1000-r2.ebuild 5582 BLAKE2B 0071331e7290b18814249581f7733a01f5ce312656e623da110c7774db335f7a09178c6cbb46c5102a35545e3e890d6b98937c9ba552f2845fa0d86990d3daa6 SHA512 4af920664da56da987c1a031b6797817e9432a7d717245c9669fd3a63bf92a3f0b0b56b96394dc7ded612dfacdb8fc1c5d1df082152e75fd179ca7f5961e7c49 +EBUILD openjfx-11.0.11_p1-r3.ebuild 6838 BLAKE2B 50a2486103e455d17ee3a2ec099aa611147f04e68e4f489fcb67827751047841618edadd2fa53fb1252dd623ca4b0f95227d10f70e9e75bc98b133685903e54d SHA512 2c5b1fcbbd2a7b4b5d549b90a2d63f2c7d56978d3cf42b82722b0a692ee92c9ec356ac9415d33efb3d75b2b91a7021053ec479540406e1d4f277aeee032e2a57 +EBUILD openjfx-8.1000-r2.ebuild 5619 BLAKE2B 5dcbbc0da052aaa2d716e4d67a60a29653f0c9e838f0eaf9c43265e05c0ddbdf4af9c64611c959a6b74fa21d3b0bd1186a7121b82ea12a631fae3bedf8a4cd95 SHA512 7efe616da70a54eb59d058265f94a2b65d71d6fe261202885643b825c6ba366c0e240cac0677b9236dd2926d93a15d56e94eab683c34b2922b1517e3c994ffd0 MISC metadata.xml 567 BLAKE2B d892bbd4cccfad57f17203e63e0cde8b8b8ccdda71de101f0fbd4fdf95a2490e43a7e50bac91a69956f125712b6af9d4a9f5bd586ad968af0d6586f5b6f4b6c8 SHA512 5884a9a487485c39816b58552e8b39c10474a3aebb0929845b3940d228a7d41080cc0515521d11b88533fcb34f94fef2742a9e39787146d02e46a9b594102912 diff --git a/dev-java/openjfx/files/11/11.0.9_p0-version.patch b/dev-java/openjfx/files/11/11.0.9_p0-version.patch index fbcbb3890499..558423e3ab6d 100644 --- a/dev-java/openjfx/files/11/11.0.9_p0-version.patch +++ b/dev-java/openjfx/files/11/11.0.9_p0-version.patch @@ -7,9 +7,8 @@ 8252067: Change JavaFX release version in 11-dev to 11.0.9 Reviewed-by: kcr -diff -r 38425dc30b9a -r c0fe72db97a8 build.properties ---- a/build.properties Thu Aug 20 10:24:03 2020 +0200 -+++ b/build.properties Thu Aug 20 14:48:02 2020 +0200 +--- a/build.properties ++++ b/build.properties @@ -41,7 +41,7 @@ # UPDATE THE FOLLOWING VALUES FOR A NEW RELEASE jfx.release.major.version=11 diff --git a/dev-java/openjfx/files/11/disable-architecture-verification.patch b/dev-java/openjfx/files/11/disable-architecture-verification.patch index 9e5a3fc3b750..3cddae50595c 100644 --- a/dev-java/openjfx/files/11/disable-architecture-verification.patch +++ b/dev-java/openjfx/files/11/disable-architecture-verification.patch @@ -3,12 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org> Date: Sat, 19 Sep 2020 18:38:05 -0700 Subject: [PATCH] disable architecture verification ---- - build.gradle | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/build.gradle b/build.gradle -index 66a4b3c..f66ee01 100644 --- a/build.gradle +++ b/build.gradle @@ -302,6 +302,7 @@ ext.MAVEN_GROUP_ID = "org.openjfx" diff --git a/dev-java/openjfx/files/11/don-t-force-msse-11.0.11.patch b/dev-java/openjfx/files/11/don-t-force-msse-11.0.11.patch index aa04c15aa778..be635a2d6367 100644 --- a/dev-java/openjfx/files/11/don-t-force-msse-11.0.11.patch +++ b/dev-java/openjfx/files/11/don-t-force-msse-11.0.11.patch @@ -3,17 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org> Date: Sat, 19 Sep 2020 18:30:58 -0700 Subject: [PATCH] don't force -msse ---- - .../src/main/native/gstreamer/projects/linux/avplugin/Makefile | 1 - - .../main/native/gstreamer/projects/linux/fxplugins/Makefile | 1 - - .../src/main/native/gstreamer/projects/mac/fxplugins/Makefile | 3 +-- - .../main/native/gstreamer/projects/mac/gstreamer-lite/Makefile | 3 +-- - .../src/main/native/jfxmedia/projects/linux/Makefile | 1 - - .../src/main/native/jfxmedia/projects/mac/Makefile | 3 +-- - 6 files changed, 3 insertions(+), 9 deletions(-) - -diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile -index 682f1da..6222e29 100644 --- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile +++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile @@ -24,7 +24,6 @@ CFLAGS = -fPIC \ @@ -24,8 +13,6 @@ index 682f1da..6222e29 100644 -fbuiltin \ -DHAVE_STDINT_H \ -DLINUX \ -diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile -index c2cd04d..bb815fe 100644 --- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile +++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile @@ -21,7 +21,6 @@ CFLAGS = -fPIC \ @@ -36,8 +23,6 @@ index c2cd04d..bb815fe 100644 -fbuiltin \ -DHAVE_STDINT_H \ -DLINUX \ -diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile -index 9f80434..659ab1c 100644 --- a/modules/javafx.media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile +++ b/modules/javafx.media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile @@ -30,8 +30,7 @@ CFLAGS += -fPIC \ @@ -50,8 +35,6 @@ index 9f80434..659ab1c 100644 ifeq ($(BUILD_TYPE), Release) CFLAGS += -Os -diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile -index 2020404..34bdf42 100644 --- a/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile +++ b/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile @@ -51,8 +51,7 @@ CFLAGS += -fPIC \ @@ -64,8 +47,6 @@ index 2020404..34bdf42 100644 ifeq ($(BUILD_TYPE), Release) CFLAGS += -Os -diff --git a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile -index aaef98e..f5b06c6 100644 --- a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile +++ b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile @@ -42,7 +42,6 @@ ifdef HOST_COMPILE @@ -76,8 +57,6 @@ index aaef98e..f5b06c6 100644 -DGSTREAMER_LITE PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0) -diff --git a/modules/javafx.media/src/main/native/jfxmedia/projects/mac/Makefile b/modules/javafx.media/src/main/native/jfxmedia/projects/mac/Makefile -index 5ffd9ea..a7b3ddb 100644 --- a/modules/javafx.media/src/main/native/jfxmedia/projects/mac/Makefile +++ b/modules/javafx.media/src/main/native/jfxmedia/projects/mac/Makefile @@ -30,8 +30,7 @@ CFLAGS += -pipe \ diff --git a/dev-java/openjfx/files/11/don-t-force-msse.patch b/dev-java/openjfx/files/11/don-t-force-msse.patch index f3d62c8e26f2..b3f1e4fee774 100644 --- a/dev-java/openjfx/files/11/don-t-force-msse.patch +++ b/dev-java/openjfx/files/11/don-t-force-msse.patch @@ -3,17 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org> Date: Sat, 19 Sep 2020 18:30:58 -0700 Subject: [PATCH] don't force -msse ---- - .../src/main/native/gstreamer/projects/linux/avplugin/Makefile | 1 - - .../main/native/gstreamer/projects/linux/fxplugins/Makefile | 1 - - .../src/main/native/gstreamer/projects/mac/fxplugins/Makefile | 3 +-- - .../main/native/gstreamer/projects/mac/gstreamer-lite/Makefile | 3 +-- - .../src/main/native/jfxmedia/projects/linux/Makefile | 1 - - .../src/main/native/jfxmedia/projects/mac/Makefile | 3 +-- - 6 files changed, 3 insertions(+), 9 deletions(-) - -diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile -index f27b9479..4e229f20 100644 --- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile +++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile @@ -23,7 +23,6 @@ CFLAGS := -fPIC \ @@ -24,8 +13,6 @@ index f27b9479..4e229f20 100644 -fbuiltin \ -DHAVE_STDINT_H \ -DLINUX \ -diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile -index 627865f9..a4d99299 100644 --- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile +++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile @@ -20,7 +20,6 @@ CFLAGS := -fPIC \ @@ -36,8 +23,6 @@ index 627865f9..a4d99299 100644 -fbuiltin \ -DHAVE_STDINT_H \ -DLINUX \ -diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile -index 9f80434d..659ab1c1 100644 --- a/modules/javafx.media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile +++ b/modules/javafx.media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile @@ -30,8 +30,7 @@ CFLAGS += -fPIC \ @@ -50,8 +35,6 @@ index 9f80434d..659ab1c1 100644 ifeq ($(BUILD_TYPE), Release) CFLAGS += -Os -diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile -index 2020404c..34bdf42c 100644 --- a/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile +++ b/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile @@ -51,8 +51,7 @@ CFLAGS += -fPIC \ @@ -64,8 +47,6 @@ index 2020404c..34bdf42c 100644 ifeq ($(BUILD_TYPE), Release) CFLAGS += -Os -diff --git a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile -index c9500236..175be13e 100644 --- a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile +++ b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile @@ -43,7 +43,6 @@ ifdef HOST_COMPILE @@ -76,8 +57,6 @@ index c9500236..175be13e 100644 -DGSTREAMER_LITE PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0) -diff --git a/modules/javafx.media/src/main/native/jfxmedia/projects/mac/Makefile b/modules/javafx.media/src/main/native/jfxmedia/projects/mac/Makefile -index 5ffd9eac..a7b3ddbb 100644 --- a/modules/javafx.media/src/main/native/jfxmedia/projects/mac/Makefile +++ b/modules/javafx.media/src/main/native/jfxmedia/projects/mac/Makefile @@ -30,8 +30,7 @@ CFLAGS += -pipe \ diff --git a/dev-java/openjfx/files/11/gstreamer-CVE-2021-3522.patch b/dev-java/openjfx/files/11/gstreamer-CVE-2021-3522.patch index 600f1cb84640..ffcc0cb10f20 100644 --- a/dev-java/openjfx/files/11/gstreamer-CVE-2021-3522.patch +++ b/dev-java/openjfx/files/11/gstreamer-CVE-2021-3522.patch @@ -9,12 +9,6 @@ enough data left to read the frame size. Closes https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/issues/876 Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1066> ---- - gst-libs/gst/tag/id3v2frames.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gst-libs/gst/tag/id3v2frames.c b/gst-libs/gst/tag/id3v2frames.c -index 8e9f78254..f39659bf7 100644 --- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/tag/id3v2frames.c +++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/tag/id3v2frames.c @@ -109,7 +109,7 @@ id3v2_parse_frame (ID3TagsWorking * work) diff --git a/dev-java/openjfx/files/11/missing-casts.patch b/dev-java/openjfx/files/11/missing-casts.patch new file mode 100644 index 000000000000..82e3f3b4f78b --- /dev/null +++ b/dev-java/openjfx/files/11/missing-casts.patch @@ -0,0 +1,31 @@ +--- a/modules/javafx.graphics/src/main/native-font/pango.c ++++ b/modules/javafx.graphics/src/main/native-font/pango.c +@@ -243,7 +243,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(FcConfigAppFontAddFile) + if (text) { + // rc = (jboolean)FcConfigAppFontAddFile(arg0, text); + if (fp) { +- rc = (jboolean)((jboolean (*)(void *, const char *))fp)(arg0, text); ++ rc = (jboolean)((jboolean (*)(void *, const char *))fp)((void *)(intptr_t)arg0, text); + } + (*env)->ReleaseStringUTFChars(env, arg1, text); + } +@@ -402,7 +402,7 @@ JNIEXPORT jlong JNICALL OS_NATIVE(g_1utf8_1strlen) + (JNIEnv *env, jclass that, jlong str, jlong pos) + { + if (!str) return 0; +- return (jlong)g_utf8_strlen((const gchar *)str, (const gchar *)pos); ++ return (jlong)g_utf8_strlen((const gchar *)str, (gssize)(const gchar *)pos); + } + + JNIEXPORT jlong JNICALL OS_NATIVE(g_1utf16_1to_1utf8) +--- a/modules/javafx.graphics/src/main/native-prism-es2/x11/X11GLContext.c ++++ b/modules/javafx.graphics/src/main/native-prism-es2/x11/X11GLContext.c +@@ -275,7 +275,7 @@ JNIEXPORT jlong JNICALL Java_com_sun_prism_es2_X11GLContext_nInitialize + dlsym(RTLD_DEFAULT, "glXSwapIntervalSGI"); + + if (ctxInfo->glXSwapIntervalSGI == NULL) { +- ctxInfo->glXSwapIntervalSGI = glXGetProcAddress("glXSwapIntervalSGI"); ++ ctxInfo->glXSwapIntervalSGI = (PFNGLXSWAPINTERVALSGIPROC)glXGetProcAddress("glXSwapIntervalSGI"); + } + + } diff --git a/dev-java/openjfx/files/11/respect-cc.patch b/dev-java/openjfx/files/11/respect-cc.patch index 85b742f3a630..a1b9bf106e24 100644 --- a/dev-java/openjfx/files/11/respect-cc.patch +++ b/dev-java/openjfx/files/11/respect-cc.patch @@ -1,5 +1,3 @@ -diff --git a/buildSrc/linux.gradle b/buildSrc/linux.gradle -index 2295566..ce54c3f 100644 --- a/buildSrc/linux.gradle +++ b/buildSrc/linux.gradle @@ -214,8 +214,8 @@ setupTools("linux_freetype_tools", diff --git a/dev-java/openjfx/files/11/respect-user-cflags-11.0.11.patch b/dev-java/openjfx/files/11/respect-user-cflags-11.0.11.patch index 458305608903..4564a0502cd3 100644 --- a/dev-java/openjfx/files/11/respect-user-cflags-11.0.11.patch +++ b/dev-java/openjfx/files/11/respect-user-cflags-11.0.11.patch @@ -3,16 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org> Date: Sat, 1 Jun 2019 00:12:55 -0700 Subject: [PATCH] respect user cflags ---- - buildSrc/linux.gradle | 7 ++++++- - .../gstreamer/projects/linux/avplugin/Makefile | 16 ++++++---------- - .../gstreamer/projects/linux/fxplugins/Makefile | 17 ++++++----------- - .../projects/linux/gstreamer-lite/Makefile | 16 ++++++---------- - .../native/jfxmedia/projects/linux/Makefile | 16 ++++++---------- - 5 files changed, 30 insertions(+), 42 deletions(-) - -diff --git a/buildSrc/linux.gradle b/buildSrc/linux.gradle -index 7a7cbc72..6705a0f3 100644 --- a/buildSrc/linux.gradle +++ b/buildSrc/linux.gradle @@ -44,8 +44,11 @@ LINUX.library = { name -> return "lib${name}.so" as String } @@ -45,8 +35,6 @@ index 7a7cbc72..6705a0f3 100644 LINUX.iio.lib = "javafx_iio" LINUX.prismES2 = [:] -diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile -index 450b55d3..f27b9479 100644 --- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile +++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile @@ -17,7 +17,7 @@ TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so @@ -89,8 +77,6 @@ index 450b55d3..f27b9479 100644 ifneq ($(strip $(LIBAV_DIR)),) INCLUDES += -I$(LIBAV_DIR)/include -diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile -index 1e58d4d3..627865f9 100644 --- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile +++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile @@ -14,7 +14,7 @@ DIRLIST = progressbuffer \ @@ -132,8 +118,6 @@ index 1e58d4d3..627865f9 100644 ifeq ($(ARCH), x32) CFLAGS += -m32 -diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile -index 5baa30a1..ddf0e521 100644 --- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile +++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile @@ -37,7 +37,7 @@ DIRLIST = gstreamer/gst \ @@ -174,8 +158,6 @@ index 5baa30a1..ddf0e521 100644 ifeq ($(ARCH), x32) CFLAGS += -m32 -diff --git a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile -index ecbd859f..5881cf53 100644 --- a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile +++ b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile @@ -17,7 +17,7 @@ DIRLIST = jni \ diff --git a/dev-java/openjfx/files/11/respect-user-cflags.patch b/dev-java/openjfx/files/11/respect-user-cflags.patch index 6ffb039467c3..d1483a2a1303 100644 --- a/dev-java/openjfx/files/11/respect-user-cflags.patch +++ b/dev-java/openjfx/files/11/respect-user-cflags.patch @@ -3,16 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org> Date: Sat, 1 Jun 2019 00:12:55 -0700 Subject: [PATCH] respect user cflags ---- - buildSrc/linux.gradle | 7 ++++++- - .../gstreamer/projects/linux/avplugin/Makefile | 16 ++++++---------- - .../gstreamer/projects/linux/fxplugins/Makefile | 17 ++++++----------- - .../projects/linux/gstreamer-lite/Makefile | 16 ++++++---------- - .../native/jfxmedia/projects/linux/Makefile | 16 ++++++---------- - 5 files changed, 30 insertions(+), 42 deletions(-) - -diff --git a/buildSrc/linux.gradle b/buildSrc/linux.gradle -index 7a7cbc72..6705a0f3 100644 --- a/buildSrc/linux.gradle +++ b/buildSrc/linux.gradle @@ -44,8 +44,11 @@ LINUX.library = { name -> return "lib${name}.so" as String } @@ -45,8 +35,6 @@ index 7a7cbc72..6705a0f3 100644 LINUX.iio.lib = "javafx_iio" LINUX.prismES2 = [:] -diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile -index 450b55d3..f27b9479 100644 --- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile +++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile @@ -17,7 +17,7 @@ TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so @@ -89,8 +77,6 @@ index 450b55d3..f27b9479 100644 ifneq ($(strip $(LIBAV_DIR)),) INCLUDES += -I$(LIBAV_DIR)/include -diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile -index 1e58d4d3..627865f9 100644 --- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile +++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile @@ -14,7 +14,7 @@ DIRLIST = progressbuffer \ @@ -132,8 +118,6 @@ index 1e58d4d3..627865f9 100644 ifeq ($(ARCH), x32) CFLAGS += -m32 -diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile -index 5baa30a1..ddf0e521 100644 --- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile +++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile @@ -37,7 +37,7 @@ DIRLIST = gstreamer/gst \ @@ -174,8 +158,6 @@ index 5baa30a1..ddf0e521 100644 ifeq ($(ARCH), x32) CFLAGS += -m32 -diff --git a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile -index ecbd859f..5881cf53 100644 --- a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile +++ b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile @@ -17,7 +17,7 @@ DIRLIST = jni \ diff --git a/dev-java/openjfx/files/11/use-system-swt-jar.patch b/dev-java/openjfx/files/11/use-system-swt-jar.patch index 34b4245bf0a0..39e2980f0147 100644 --- a/dev-java/openjfx/files/11/use-system-swt-jar.patch +++ b/dev-java/openjfx/files/11/use-system-swt-jar.patch @@ -3,12 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org> Date: Sat, 1 Jun 2019 00:36:04 -0700 Subject: [PATCH] use system swt jar ---- - build.gradle | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/build.gradle b/build.gradle -index 1e414b7..3d967bb 100644 --- a/build.gradle +++ b/build.gradle @@ -2477,7 +2477,7 @@ project(":swt") { diff --git a/dev-java/openjfx/files/11/wno-error-11.0.11.patch b/dev-java/openjfx/files/11/wno-error-11.0.11.patch index 639b3c117889..184f8775a5f6 100644 --- a/dev-java/openjfx/files/11/wno-error-11.0.11.patch +++ b/dev-java/openjfx/files/11/wno-error-11.0.11.patch @@ -3,12 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org> Date: Wed, 17 Nov 2021 19:52:13 -0800 Subject: [PATCH] no -Werror ---- - buildSrc/linux.gradle | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/buildSrc/linux.gradle b/buildSrc/linux.gradle -index 00a3bca..2295566 100644 --- a/buildSrc/linux.gradle +++ b/buildSrc/linux.gradle @@ -231,7 +231,7 @@ FileTree ft_gtk = fileTree("${project(":graphics").projectDir}/src/main/native-g diff --git a/dev-java/openjfx/files/11/wno-error.patch b/dev-java/openjfx/files/11/wno-error.patch index eb354c6f9fad..4c8dd6e8f247 100644 --- a/dev-java/openjfx/files/11/wno-error.patch +++ b/dev-java/openjfx/files/11/wno-error.patch @@ -3,12 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org> Date: Thu, 19 Mar 2020 09:50:22 -0700 Subject: [PATCH] remove werror ---- - buildSrc/linux.gradle | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/buildSrc/linux.gradle b/buildSrc/linux.gradle -index 7a7cbc7..6955155 100644 --- a/buildSrc/linux.gradle +++ b/buildSrc/linux.gradle @@ -223,7 +223,7 @@ FileTree ft_gtk = fileTree("${project(":graphics").projectDir}/src/main/native-g diff --git a/dev-java/openjfx/files/8/0000-Fix-wait-call-in-PosixPlatform.patch b/dev-java/openjfx/files/8/0000-Fix-wait-call-in-PosixPlatform.patch index fee211fd8770..4a482240dc6b 100644 --- a/dev-java/openjfx/files/8/0000-Fix-wait-call-in-PosixPlatform.patch +++ b/dev-java/openjfx/files/8/0000-Fix-wait-call-in-PosixPlatform.patch @@ -1,5 +1,5 @@ ---- rt-8u202-b02/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp 2018-10-29 16:26:04.000000000 +0100 -+++ rt-8u202-b02-patched/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp 2018-11-27 15:34:52.170181958 +0100 +--- rt-8u202-b02/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp ++++ rt-8u202-b02-patched/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp @@ -232,10 +232,7 @@ pid_t wpid = 0; diff --git a/dev-java/openjfx/files/8/0003-fix-cast-between-incompatible-function-types.patch b/dev-java/openjfx/files/8/0003-fix-cast-between-incompatible-function-types.patch index 011e952b9440..7095841498a1 100644 --- a/dev-java/openjfx/files/8/0003-fix-cast-between-incompatible-function-types.patch +++ b/dev-java/openjfx/files/8/0003-fix-cast-between-incompatible-function-types.patch @@ -3,13 +3,6 @@ From: Mat Booth <mat.booth@redhat.com> Date: Thu, 21 Jun 2018 15:57:01 +0100 Subject: [PATCH 4/4] fix cast between incompatible function types ---- - modules/graphics/src/main/native-glass/gtk/glass_dnd.cpp | 8 ++++++-- - .../src/main/native-glass/gtk/glass_window_ime.cpp | 9 +++------ - 2 files changed, 9 insertions(+), 8 deletions(-) - -diff --git a/modules/graphics/src/main/native-glass/gtk/glass_dnd.cpp b/modules/graphics/src/main/native-glass/gtk/glass_dnd.cpp -index f85b1dae..3b9225f7 100644 --- a/modules/graphics/src/main/native-glass/gtk/glass_dnd.cpp +++ b/modules/graphics/src/main/native-glass/gtk/glass_dnd.cpp @@ -556,7 +556,7 @@ static GdkDragContext *get_drag_context() { @@ -41,8 +34,6 @@ index f85b1dae..3b9225f7 100644 } } } -diff --git a/modules/graphics/src/main/native-glass/gtk/glass_window_ime.cpp b/modules/graphics/src/main/native-glass/gtk/glass_window_ime.cpp -index 82e54d11..51af2a6a 100644 --- a/modules/graphics/src/main/native-glass/gtk/glass_window_ime.cpp +++ b/modules/graphics/src/main/native-glass/gtk/glass_window_ime.cpp @@ -122,15 +122,12 @@ bool WindowContextBase::filterIME(GdkEvent * event) { diff --git a/dev-java/openjfx/files/8/0005-don-t-include-xlocale.h.patch b/dev-java/openjfx/files/8/0005-don-t-include-xlocale.h.patch index 883c3da57e72..cabb36eefe54 100644 --- a/dev-java/openjfx/files/8/0005-don-t-include-xlocale.h.patch +++ b/dev-java/openjfx/files/8/0005-don-t-include-xlocale.h.patch @@ -3,12 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org> Date: Thu, 30 May 2019 12:07:30 -0700 Subject: [PATCH] don't include xlocale.h ---- - .../gstreamer/3rd_party/glib/glib-2.56.1/glib/gstrfuncs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/glib/gstrfuncs.c b/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/glib/gstrfuncs.c -index 72dc1301..32669789 100644 --- a/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/glib/gstrfuncs.c +++ b/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/glib/gstrfuncs.c @@ -39,7 +39,7 @@ diff --git a/dev-java/openjfx/files/8/99-sysdeps.patch b/dev-java/openjfx/files/8/99-sysdeps.patch index 367d9392d95e..abcdbab67ef3 100644 --- a/dev-java/openjfx/files/8/99-sysdeps.patch +++ b/dev-java/openjfx/files/8/99-sysdeps.patch @@ -1,5 +1,3 @@ -diff --git a/build.gradle b/build.gradle -index 0914d7d..6bd9e78 100644 --- a/build.gradle +++ b/build.gradle @@ -1309,6 +1309,7 @@ project(":graphics") { @@ -10,8 +8,6 @@ index 0914d7d..6bd9e78 100644 } // Create a single "native" task which will depend on all the individual native tasks for graphics -diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle -index 25f88d1..642450d 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -82,10 +82,13 @@ getConfigurations().create("antlr3"); diff --git a/dev-java/openjfx/files/8/Wno-error.patch b/dev-java/openjfx/files/8/Wno-error.patch index edc9389ee9ce..771da0707088 100644 --- a/dev-java/openjfx/files/8/Wno-error.patch +++ b/dev-java/openjfx/files/8/Wno-error.patch @@ -3,18 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org> Date: Sun, 26 Apr 2020 21:15:36 -0700 Subject: [PATCH] Wno-error ---- - buildSrc/armv5sf.gradle | 1 - - buildSrc/armv6hf.gradle | 1 - - buildSrc/armv6sf.gradle | 1 - - buildSrc/armv7hf.gradle | 1 - - buildSrc/armv7sf.gradle | 1 - - buildSrc/linux.gradle | 6 +++--- - buildSrc/x86egl.gradle | 1 - - 7 files changed, 3 insertions(+), 9 deletions(-) - -diff --git a/buildSrc/armv5sf.gradle b/buildSrc/armv5sf.gradle -index ee154182..bee6003e 100644 --- a/buildSrc/armv5sf.gradle +++ b/buildSrc/armv5sf.gradle @@ -135,7 +135,6 @@ def dfbLFlags = ["-ldl"] @@ -25,8 +13,6 @@ index ee154182..bee6003e 100644 "-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten(); def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten() def glassCFlags = ["-ffast-math"] -diff --git a/buildSrc/armv6hf.gradle b/buildSrc/armv6hf.gradle -index dfdff237..0f090f23 100644 --- a/buildSrc/armv6hf.gradle +++ b/buildSrc/armv6hf.gradle @@ -131,7 +131,6 @@ def extraLFlags = [ @@ -37,8 +23,6 @@ index dfdff237..0f090f23 100644 "-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten(); def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten() -diff --git a/buildSrc/armv6sf.gradle b/buildSrc/armv6sf.gradle -index ee6615f0..6ebbdd90 100644 --- a/buildSrc/armv6sf.gradle +++ b/buildSrc/armv6sf.gradle @@ -135,7 +135,6 @@ def dfbLFlags = ["-ldl"] @@ -49,8 +33,6 @@ index ee6615f0..6ebbdd90 100644 "-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten(); def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten() def glassCFlags = ["-ffast-math"] -diff --git a/buildSrc/armv7hf.gradle b/buildSrc/armv7hf.gradle -index e75bf8a9..092be817 100644 --- a/buildSrc/armv7hf.gradle +++ b/buildSrc/armv7hf.gradle @@ -131,7 +131,6 @@ def extraLFlags = [ @@ -61,8 +43,6 @@ index e75bf8a9..092be817 100644 "-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten(); def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten() -diff --git a/buildSrc/armv7sf.gradle b/buildSrc/armv7sf.gradle -index 0bb8a530..38e98303 100644 --- a/buildSrc/armv7sf.gradle +++ b/buildSrc/armv7sf.gradle @@ -135,7 +135,6 @@ def dfbLFlags = ["-ldl"] @@ -73,8 +53,6 @@ index 0bb8a530..38e98303 100644 "-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten(); def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten() def glassCFlags = ["-ffast-math"] -diff --git a/buildSrc/x86egl.gradle b/buildSrc/x86egl.gradle -index 6bf6196b..ff24207d 100644 --- a/buildSrc/x86egl.gradle +++ b/buildSrc/x86egl.gradle @@ -118,7 +118,6 @@ def extraLFlags = [ diff --git a/dev-java/openjfx/files/8/disable-online-repos.patch b/dev-java/openjfx/files/8/disable-online-repos.patch index 6b0afe4bf070..6dd2db128e90 100644 --- a/dev-java/openjfx/files/8/disable-online-repos.patch +++ b/dev-java/openjfx/files/8/disable-online-repos.patch @@ -1,5 +1,3 @@ -diff --git a/build.gradle b/build.gradle -index df82f63..3f920b6 100644 --- a/build.gradle +++ b/build.gradle @@ -1135,17 +1135,17 @@ allprojects { diff --git a/dev-java/openjfx/files/8/don-t-force-msse.patch b/dev-java/openjfx/files/8/don-t-force-msse.patch index 2f5d56718cca..6cdb19e5a002 100644 --- a/dev-java/openjfx/files/8/don-t-force-msse.patch +++ b/dev-java/openjfx/files/8/don-t-force-msse.patch @@ -3,15 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org> Date: Sun, 26 Apr 2020 20:57:39 -0700 Subject: [PATCH] don't force msse ---- - .../main/native/gstreamer/projects/linux/avplugin/Makefile | 1 - - .../native/gstreamer/projects/linux/fxplugins/Makefile | 1 - - .../media/src/main/native/jfxmedia/projects/linux/Makefile | 1 - - modules/web/src/main/native/Tools/Scripts/webkitdirs.pm | 7 ------- - 4 files changed, 10 deletions(-) - -diff --git a/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile -index df9f7f21..f82f0537 100644 --- a/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile +++ b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile @@ -28,7 +28,6 @@ CFLAGS = -fPIC \ @@ -22,8 +13,6 @@ index df9f7f21..f82f0537 100644 -fbuiltin \ -DHAVE_STDINT_H \ -DLINUX \ -diff --git a/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile -index fd3847d0..3887ac6d 100644 --- a/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile +++ b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile @@ -25,7 +25,6 @@ CFLAGS = -fPIC \ @@ -34,8 +23,6 @@ index fd3847d0..3887ac6d 100644 -fbuiltin \ -DHAVE_STDINT_H \ -DLINUX \ -diff --git a/modules/media/src/main/native/jfxmedia/projects/linux/Makefile b/modules/media/src/main/native/jfxmedia/projects/linux/Makefile -index 3d089501..10fad68f 100644 --- a/modules/media/src/main/native/jfxmedia/projects/linux/Makefile +++ b/modules/media/src/main/native/jfxmedia/projects/linux/Makefile @@ -44,7 +44,6 @@ ifdef HOST_COMPILE diff --git a/dev-java/openjfx/files/8/fxpackager-don-t-include-obsolete-sys-sysctl.h.patch b/dev-java/openjfx/files/8/fxpackager-don-t-include-obsolete-sys-sysctl.h.patch index a01dd05494fe..6fd0a9852012 100644 --- a/dev-java/openjfx/files/8/fxpackager-don-t-include-obsolete-sys-sysctl.h.patch +++ b/dev-java/openjfx/files/8/fxpackager-don-t-include-obsolete-sys-sysctl.h.patch @@ -3,12 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org> Date: Fri, 18 Sep 2020 21:43:57 -0700 Subject: [PATCH] fxpackager: don't include obsolete sys/sysctl.h ---- - .../fxpackager/src/main/native/library/common/PosixPlatform.cpp | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp b/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp -index 5ea3bc6..b5d167b 100644 --- a/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp +++ b/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp @@ -43,7 +43,6 @@ diff --git a/dev-java/openjfx/files/8/missing-casts.patch b/dev-java/openjfx/files/8/missing-casts.patch new file mode 100644 index 000000000000..c3d45f4f07df --- /dev/null +++ b/dev-java/openjfx/files/8/missing-casts.patch @@ -0,0 +1,22 @@ +--- a/modules/graphics/src/main/native-font/pango.c ++++ b/modules/graphics/src/main/native-font/pango.c +@@ -225,7 +225,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(FcConfigAppFontAddFile) + if (text) { + // rc = (jboolean)FcConfigAppFontAddFile(arg0, text); + if (fp) { +- rc = (jboolean)((jboolean (*)(void *, const char *))fp)(arg0, text); ++ rc = (jboolean)((jboolean (*)(void *, const char *))fp)((void *)(intptr_t)arg0, text); + } + (*env)->ReleaseStringUTFChars(env, arg1, text); + } +--- a/modules/graphics/src/main/native-prism-es2/x11/X11GLContext.c ++++ b/modules/graphics/src/main/native-prism-es2/x11/X11GLContext.c +@@ -275,7 +275,7 @@ JNIEXPORT jlong JNICALL Java_com_sun_prism_es2_X11GLContext_nInitialize + dlsym(RTLD_DEFAULT, "glXSwapIntervalSGI"); + + if (ctxInfo->glXSwapIntervalSGI == NULL) { +- ctxInfo->glXSwapIntervalSGI = glXGetProcAddress("glXSwapIntervalSGI"); ++ ctxInfo->glXSwapIntervalSGI = (PFNGLXSWAPINTERVALSGIPROC)glXGetProcAddress("glXSwapIntervalSGI"); + } + + } diff --git a/dev-java/openjfx/files/8/respect_flags.patch b/dev-java/openjfx/files/8/respect_flags.patch index 2a1b7701b9c4..b8a0975965a8 100644 --- a/dev-java/openjfx/files/8/respect_flags.patch +++ b/dev-java/openjfx/files/8/respect_flags.patch @@ -3,17 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org> Date: Thu, 25 Mar 2021 10:06:49 -0700 Subject: [PATCH] respect flags ---- - buildSrc/linux.gradle | 4 ++++ - .../gstreamer/projects/linux/avplugin/Makefile | 16 ++++++---------- - .../gstreamer/projects/linux/fxplugins/Makefile | 17 ++++++----------- - .../gstreamer/projects/linux/glib-lite/Makefile | 11 +++-------- - .../projects/linux/gstreamer-lite/Makefile | 16 ++++++---------- - .../gstreamer/projects/linux/libffi/Makefile | 6 ------ - 6 files changed, 25 insertions(+), 45 deletions(-) - -diff --git a/buildSrc/linux.gradle b/buildSrc/linux.gradle -index a8886c16..e2397a54 100644 --- a/buildSrc/linux.gradle +++ b/buildSrc/linux.gradle @@ -46,6 +46,9 @@ def commonFlags = [ @@ -34,8 +23,6 @@ index a8886c16..e2397a54 100644 def toolchainDir if (hasProperty('toolchainDir')) { -diff --git a/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile -index f82f0537..01e069b1 100644 --- a/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile +++ b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile @@ -22,7 +22,7 @@ TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so @@ -78,8 +65,6 @@ index f82f0537..01e069b1 100644 ifneq ($(strip $(LIBAV_DIR)),) INCLUDES += -I$(LIBAV_DIR)/include -diff --git a/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile -index 3887ac6d..99c82718 100644 --- a/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile +++ b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile @@ -19,7 +19,7 @@ DIRLIST = progressbuffer \ @@ -121,8 +106,6 @@ index 3887ac6d..99c82718 100644 ifeq ($(ARCH), x32) CFLAGS += -m32 -diff --git a/modules/media/src/main/native/gstreamer/projects/linux/glib-lite/Makefile b/modules/media/src/main/native/gstreamer/projects/linux/glib-lite/Makefile -index c5b4b0a6..b0e6d6f9 100644 --- a/modules/media/src/main/native/gstreamer/projects/linux/glib-lite/Makefile +++ b/modules/media/src/main/native/gstreamer/projects/linux/glib-lite/Makefile @@ -40,20 +40,15 @@ CFLAGS += -fPIC \ @@ -149,8 +132,6 @@ index c5b4b0a6..b0e6d6f9 100644 ifeq ($(ARCH), x32) CFLAGS += -m32 -diff --git a/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile b/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile -index 8634b559..109375f5 100644 --- a/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile +++ b/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile @@ -41,7 +41,7 @@ DIRLIST = gstreamer/gst \ @@ -191,8 +172,6 @@ index 8634b559..109375f5 100644 ifeq ($(ARCH), x32) CFLAGS += -m32 -diff --git a/modules/media/src/main/native/gstreamer/projects/linux/libffi/Makefile b/modules/media/src/main/native/gstreamer/projects/linux/libffi/Makefile -index 62f1b802..54e0a63b 100644 --- a/modules/media/src/main/native/gstreamer/projects/linux/libffi/Makefile +++ b/modules/media/src/main/native/gstreamer/projects/linux/libffi/Makefile @@ -20,12 +20,6 @@ CFLAGS += -c \ diff --git a/dev-java/openjfx/openjfx-11.0.11_p1-r3.ebuild b/dev-java/openjfx/openjfx-11.0.11_p1-r3.ebuild index 55962035a564..7f64ad304cdd 100644 --- a/dev-java/openjfx/openjfx-11.0.11_p1-r3.ebuild +++ b/dev-java/openjfx/openjfx-11.0.11_p1-r3.ebuild @@ -83,6 +83,7 @@ PATCHES=( "${FILESDIR}"/11/ffmpeg5.patch "${FILESDIR}"/11/respect-cc.patch "${FILESDIR}"/11/strip-blank-elements-flags.patch + "${FILESDIR}"/11/missing-casts.patch ) egradle() { diff --git a/dev-java/openjfx/openjfx-8.1000-r2.ebuild b/dev-java/openjfx/openjfx-8.1000-r2.ebuild index ef27aefdb985..303971b7904b 100644 --- a/dev-java/openjfx/openjfx-8.1000-r2.ebuild +++ b/dev-java/openjfx/openjfx-8.1000-r2.ebuild @@ -67,6 +67,7 @@ PATCHES=( "${FILESDIR}"/8/Wno-error.patch "${FILESDIR}"/8/don-t-force-msse.patch "${FILESDIR}"/8/fxpackager-don-t-include-obsolete-sys-sysctl.h.patch + "${FILESDIR}"/8/missing-casts.patch ) egradle() { |