diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-30 12:37:28 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-30 12:37:28 +0100 |
| commit | be9d77d3ac6af8f4ead98d89706f356b65578c93 (patch) | |
| tree | f82923fbca262493e83dd1382e561a2fae24cc46 /dev-java/swt | |
| parent | 7ec0832ab5dafbf70de83e0c2f3ee740416a0950 (diff) | |
| parent | 6faaec2b812feecd9c8751b8a19004da4a17ea5b (diff) | |
Merge branch 'edge' into next
Diffstat (limited to 'dev-java/swt')
| -rw-r--r-- | dev-java/swt/Manifest | 2 | ||||
| -rw-r--r-- | dev-java/swt/swt-4.10.ebuild | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest index 37e4ecd732af..ea7b85cc5d09 100644 --- a/dev-java/swt/Manifest +++ b/dev-java/swt/Manifest @@ -23,6 +23,6 @@ DIST swt-4.2-gtk-linux-x86.zip 5561088 BLAKE2B cf8bda6a48d5d8e389c387162bf2aafde DIST swt-4.2-gtk-linux-x86_64.zip 5867140 BLAKE2B 994bf18799297529329637c1b9ebf15638187339b4f56bf8cc1dedfc97c25a1ea4a1664605cac1374fe3d79b321dc450c6129ebef00ddd6f9507f238b7836316 SHA512 56c5ec4ca2ddeed5256dd6ff350dc3911034ecbc414a06ba879f04ab53d6380ca9da9037097f76228ca8182f6076bcd9cc4cb9b01c10766c10048e6576fc5f50 EBUILD swt-3.7.2-r2.ebuild 4599 BLAKE2B 40622f45bbed4e5ccd75088e29aa1715faceaa3ff4823609ee832ef068ebc4d08c921f5b8f7e2a656c46f3f69ba7c8edb32c1defea7cc4c3f723f5765e60b1dc SHA512 9a97b882c2f18f0e9dc552a5dde1476fe360ef478741735601e6aa5cb847aad35b71c3f258644b9ca2cc1b1649e0838cd44ef7278f3f02682afc0f7c9d24da8c EBUILD swt-3.8.2-r2.ebuild 4437 BLAKE2B 19f84cd5506ca1306754a26f601d9a1a18b6e3f3091e7f38fb768db833621c741502794417ab7099a1edec0546ba6c79785c918bb26aa0acfb3bdc5dc788b860 SHA512 c4e25e86c66d29d74d5bc100d97214b3742369ab7bbf96f38fd95ed28c7c03838f3260dcd45f755c90a07ba4f0f0a066702f7f8b2396e66569fe6f513770ab28 -EBUILD swt-4.10.ebuild 4442 BLAKE2B 1c5ee9e7fda684687e298d1dede32fb468d279a3b0340308b490c39472dc05df04141fa874788b6c9463456bda9eb4125cabc95462eee53ed44f02ce1bc04558 SHA512 e07398f920e59fac400b0aac2cae521ef1bad900cb18969b780ce8706a0cd23c303e16b56c7b82334118ba258dfb69c6f7f03b11623c2a7e5781e9cc10f79fa3 +EBUILD swt-4.10.ebuild 4534 BLAKE2B e331f67fa0516ad79467543694f22ee36ee2621200ecb30b84abf493ddce28d5ba10a20195a42e9a32271ae86f578555ad31b730e3140ff83d7e1f642ef5d853 SHA512 13ae51af08ac1653a8ca5c226cb7b69e8f9d64b50a311b74e30b90f3d30376d486e132299e2de8853efc4074d422419b71d65ac53c1f5777c98198e2367b5dfa EBUILD swt-4.2-r3.ebuild 4682 BLAKE2B 1e47fc517f3eba4ff626129f5b4810dba8930da995aa03788806d324192443e56570c280e3e732f4a58b6b3aad125574b22e8d024de11b56cced051675cb382c SHA512 15ffbb9e0cdaca5bc782327052d049efce05686d2a27ab84f44c9388e82a2f83ce42adab9e2c8110580b7572b18b111d5dcdf5ab601021cc2a321a84ffeca130 MISC metadata.xml 518 BLAKE2B a325a8cd71c85886ffabde744769f9edfac99311d30be502937ff560e3cdced76c92a4a90979e0d46950fa2f345d2364d21902ee13fefa4d78477bb829e6298f SHA512 088a1c3b97e2496e801234ef5a99ce14bb259f8065545e4be1af65e6e5639c273a88a77ed50c414e35c20f62e7b5183c721321a0e463ffb990dba05ea271251e diff --git a/dev-java/swt/swt-4.10.ebuild b/dev-java/swt/swt-4.10.ebuild index f7fa9be7233a..4559e6bb888c 100644 --- a/dev-java/swt/swt-4.10.ebuild +++ b/dev-java/swt/swt-4.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -96,6 +96,8 @@ src_compile() { export AWT_LIB_PATH="${JAVA_HOME}/jre/bin" elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)" + elif [[ -f "${JAVA_HOME}/lib/${JAWTSO}" ]] ; then + export AWT_LIB_PATH="${JAVA_HOME}/lib" else eerror "${JAWTSO} not found in the JDK being used for compilation!" die "cannot build AWT library" |