summaryrefslogtreecommitdiff
path: root/dev-java/swt
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-09-23 10:22:15 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-09-23 10:22:15 +0100
commit8b4ace9c50842c5b83401ea7b179dcab940387e1 (patch)
tree230f3135ceaace633cf93e9838b185c4a6664c2e /dev-java/swt
parent9ee6d97c2883d42f204a533a8bc1f4562df778fb (diff)
gentoo resync : 23.09.2020
Diffstat (limited to 'dev-java/swt')
-rw-r--r--dev-java/swt/Manifest6
-rw-r--r--dev-java/swt/files/as-needed-and-flag-fixes-3.6.patch8
-rw-r--r--dev-java/swt/swt-3.7.2-r3.ebuild37
-rw-r--r--dev-java/swt/swt-4.10.ebuild3
4 files changed, 31 insertions, 23 deletions
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index f8e5acf21950..6f92c213849b 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -1,4 +1,4 @@
-AUX as-needed-and-flag-fixes-3.6.patch 7755 BLAKE2B 8e15b6cba2fa403b63647eab5e9b1ffc293d6db67cac2c2ecdc437cbe540433ef4077a333e9290a36c9615204a8361864b322442be9030e66d4d8bfa1569a8ed SHA512 9c2061b82d0a9a10fc99500ea27192cbf74001ab48254f528f00c15ca28e56de697c3861975691d0f8e4d6079a77236a8389ba07612c98031297e3289f4bf083
+AUX as-needed-and-flag-fixes-3.6.patch 7761 BLAKE2B aed8b1b1060d8e8b762386eb43f498a498a802bc9dd0c01d25def325552aadceedc07852e0ca9da488d9650b12b1c107f82d76248789dc95048e7e10e396100b SHA512 c28571145d6e4dcaa0fef8ff1c4837d3e6f98060ac71f72ac6693102d43ce1dcff94782185272933e10bea37c81fe086de298ae19a5abd36ba12a7cfcf295b51
AUX build.xml 458 BLAKE2B 5e37fe8b8428e23f477c2767a2a96b1dc02aa6a8d4caa70b9f900c84d734f72665bb7cfeb7fd24dd6b54189ef4a242b1a6b9ab9d4d0bb0b370d59b491f09d2bd SHA512 49f3a4cc04d4d9cf0609aa97e01fa409a8f2dbb953ab3a52bc9984799d0bf4092d2a63fe665d8ba6ca0428089984b6ef47bc78900c613373ca1a7b588f6c5525
AUX swt-3.7-manifest 750 BLAKE2B b0182c7e25e66be2443e3dcf0d64be1a92b836b8cd461cd6a92e7b73985a91a0c853fb8a3b784fa1edb70e2261f4a94e7273a505e4b130fcfe7b1c372b41efa1 SHA512 e4f6aa5ce58cdc697c234a2a4be43de0510d3c082a2737627a35df74d378a50edc0f7d3e62221f402eed602fcdc50fa7eff969b12602189fd400e1f1580f0d8f
AUX swt-3.7.2-gio_launch-URI-x86.patch 4287 BLAKE2B 54c55cd48cb4f4d64deae90769aa84b7d2785c070c2e5b3e647037ca986d152b8ea71bb58c0d9749e8efb50fca53ab3fc9dbb4ae4355a86dc2285f253e74e064 SHA512 c82364b7e7bc255ed592a254201346a4159789ddbf486f22c026fdefce3f0d26bc91b42535228050eee4ec9b4e7a840008b60b2c7cb98896d6b8f1d875b5bef7
@@ -21,8 +21,8 @@ DIST swt-4.10-gtk-linux-x86_64.zip 3844306 BLAKE2B 0e0ed21708acce347fd025920ee63
DIST swt-4.2-gtk-linux-ppc64.zip 5935799 BLAKE2B 6b1ca0d25d81134239e56ead673303075b6d9c5f20e4ab07fb7b5b87d54582023d02c28a1d330fd40d647bdbc27823ca7b184837cb974706ee13809ebdfd2db4 SHA512 bedd64099380980a6dbe47b86f4719666366680f7580150f97282c6f6b6acc95822493469e950e8fcbc9c584f6fca9f35a59937551ae8b6e799b188dc3751e9d
DIST swt-4.2-gtk-linux-x86.zip 5561088 BLAKE2B cf8bda6a48d5d8e389c387162bf2aafde5a95c43d76e444a4b79008e1154348d2c99850851b3d0e428890e6b2da1e4bec53a7f9050169ad4866a5a8352e9ed2b SHA512 e3d53bcd0521411c40f4c37719917f3570a17fb3ea5c617560986273fd155b99d9b0790ba27c57da26663d49ebec4c6a8387b41bd01b0ba934b21724ba98e133
DIST swt-4.2-gtk-linux-x86_64.zip 5867140 BLAKE2B 994bf18799297529329637c1b9ebf15638187339b4f56bf8cc1dedfc97c25a1ea4a1664605cac1374fe3d79b321dc450c6129ebef00ddd6f9507f238b7836316 SHA512 56c5ec4ca2ddeed5256dd6ff350dc3911034ecbc414a06ba879f04ab53d6380ca9da9037097f76228ca8182f6076bcd9cc4cb9b01c10766c10048e6576fc5f50
-EBUILD swt-3.7.2-r3.ebuild 4392 BLAKE2B 70df10c87dc15097c330b521eac0348c19778bc9b2abd3868c3b4faa488b1ca6727411df26ea9226173c1d59f94cc2e6137a1e7532ccbb641b1e5eeb0c8b1445 SHA512 83a6562632fe653c556084bf1413fae2be1b8fd0351241e4b5198d317cca2cc753d6798a74fcccbc5c2b50f088ad02ad6989183ca94bcb1d1ef26a8f74f52310
+EBUILD swt-3.7.2-r3.ebuild 4437 BLAKE2B f488c4f50f7019580f29cbbc374d440444a699934193db8f6251d76c2342c5a26a5b65cc7c993ffb90155f771bc9039075b6a202c06d98abbdf7a2ff5959f63a SHA512 afdf8e0de244d457b4aa857bc1f045d0a3aa304158ece0a147c7b20308a27c79b5f614dd7ab0143c4372f7155679019cd972ab28a997cd9fe666f0d2985ea21b
EBUILD swt-3.8.2-r3.ebuild 4240 BLAKE2B 200a47aee302fb32a3fb8000177d036e426d929e20ad5646879e252e10a8537bc87902951f4f2bf4380a430ce8031e576bd36bc3db810bc3ec8bc8db62b10b7b SHA512 15b59cee721bb901ca2e3ca8697c813747f345387bc31fcb397da152c131b7a70fd8f3d740c71bda54bc51f11f9458ed4d41179907f77ee29af8b3c3e2791ba2
-EBUILD swt-4.10.ebuild 4592 BLAKE2B 67488fd6d7b6ad25efcc2aeec388851d6d8e10c7ce067694147d97beb3f55b182fff6c58b8b93d8c0c6900ec2d3169225e965b7c7d973106af4667e9485e8462 SHA512 5adb2848bff4d4a22b319975d59cae88fade7f3e16db1d5b34ac4e2c1c542644ada45695f929421d9339d482bbbee0572ae3001bf6d2d5d99da0e643ed2d7876
+EBUILD swt-4.10.ebuild 4620 BLAKE2B 4a9c169e7ed2c3c9fc124ba5ebca315dd923336e2bb5ec30aa4e73f58222db72495e0d92af1a6939ba9a085df8062b4834033713cd94071135aff910a798a831 SHA512 d9c92cc3bbc5741a942c284a9bf4f63783ce7f495d2db582ee9ce09739a61d4d7bcc868c979d53b405e789dc09983565cf0e82c8563f5eaa4fad811020689bff
EBUILD swt-4.2-r4.ebuild 4489 BLAKE2B ac412f8ae913a503bc5e5264a6f28967bfcab630351c0a571df3f7cd8c45c7847ad5c5d66302ab97f8ff66207d21000c85387c268092b0080bcdb92a7c47a705 SHA512 2629590b0679a5372f1974c7f5644e576497b1282672d3902fa680dfc9d302148b9a3049a23f9de2c0014a65f93a644146ed33ed1f5ca4161307867f9e87ad8f
MISC metadata.xml 518 BLAKE2B a325a8cd71c85886ffabde744769f9edfac99311d30be502937ff560e3cdced76c92a4a90979e0d46950fa2f345d2364d21902ee13fefa4d78477bb829e6298f SHA512 088a1c3b97e2496e801234ef5a99ce14bb259f8065545e4be1af65e6e5639c273a88a77ed50c414e35c20f62e7b5183c721321a0e463ffb990dba05ea271251e
diff --git a/dev-java/swt/files/as-needed-and-flag-fixes-3.6.patch b/dev-java/swt/files/as-needed-and-flag-fixes-3.6.patch
index 16194fdc5f51..fba4a36aaf1c 100644
--- a/dev-java/swt/files/as-needed-and-flag-fixes-3.6.patch
+++ b/dev-java/swt/files/as-needed-and-flag-fixes-3.6.patch
@@ -1,5 +1,5 @@
---- make_linux.mak~ 2010-06-08 17:30:58.000000000 +0000
-+++ make_linux.mak 2010-08-09 22:48:01.515433721 +0000
+--- a/make_linux.mak 2010-06-08 17:30:58.000000000 +0000
++++ b/make_linux.mak 2010-08-09 22:48:01.515433721 +0000
@@ -66,7 +66,7 @@
# Uncomment for Native Stats tool
#NATIVE_STATS = -DNATIVE_STATS
@@ -124,8 +124,8 @@
glx.o: glx.c
$(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c
---- make_freebsd.mak~ 2010-06-08 17:30:58.000000000 +0000
-+++ make_freebsd.mak 2010-08-09 22:50:26.173246263 +0000
+--- a/make_freebsd.mak 2010-06-08 17:30:58.000000000 +0000
++++ b/make_freebsd.mak 2010-08-09 22:50:26.173246263 +0000
@@ -64,7 +64,7 @@
# Uncomment for Native Stats tool
#NATIVE_STATS = -DNATIVE_STATS
diff --git a/dev-java/swt/swt-3.7.2-r3.ebuild b/dev-java/swt/swt-3.7.2-r3.ebuild
index 1da53e158609..24e69a974015 100644
--- a/dev-java/swt/swt-3.7.2-r3.ebuild
+++ b/dev-java/swt/swt-3.7.2-r3.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
+EAPI=7
-inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi
+inherit java-pkg-2 java-ant-2 java-osgi toolchain-funcs
MY_PV="${PV/_rc/RC}"
MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201202080800"
@@ -33,10 +33,12 @@ COMMON_DEPEND="
virtual/glu
virtual/opengl
)"
-DEPEND="${COMMON_DEPEND}
+BDEPEND="
app-arch/unzip
- virtual/jdk:1.8
virtual/pkgconfig
+"
+DEPEND="${COMMON_DEPEND}
+ virtual/jdk:1.8
x11-base/xorg-proto
x11-libs/libX11
x11-libs/libXrender
@@ -48,7 +50,12 @@ RDEPEND="${COMMON_DEPEND}
S="${WORKDIR}"
# JNI libraries don't need SONAME, bug #253756
-QA_SONAME="usr/$(get_libdir)/libswt-.*.so"
+QA_SONAME="usr/lib.*/libswt-.*.so"
+
+PATCHES=(
+ # Fix Makefiles to respect flags and work with --as-needed
+ "${FILESDIR}"/as-needed-and-flag-fixes-3.6.patch
+)
src_unpack() {
local DISTFILE=${A}
@@ -59,18 +66,17 @@ src_unpack() {
rm -rf about_files/ || die
}
-java_prepare() {
+src_prepare() {
# Replace the build.xml to allow compilation without Eclipse tasks
cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml"
mkdir "${S}/src" && mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources"
- # Fix Makefiles to respect flags and work with --as-needed
- epatch "${FILESDIR}"/as-needed-and-flag-fixes-3.6.patch
-
case ${ARCH} in
- ppc|x86) epatch "${FILESDIR}"/${P}-gio_launch-URI-x86.patch ;;
- *) epatch "${FILESDIR}"/${P}-gio_launch-URI.patch ;;
+ ppc|x86) eapply "${FILESDIR}"/${P}-gio_launch-URI-x86.patch ;;
+ *) eapply "${FILESDIR}"/${P}-gio_launch-URI.patch ;;
esac
+
+ default
}
src_compile() {
@@ -131,7 +137,7 @@ src_compile() {
eant compile
einfo "Copying missing files"
- cp -i "${S}/version.txt" "${S}/build/version.txt"
+ cp -i "${S}/version.txt" "${S}/build/version.txt" || die
cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \
"${S}/build/org/eclipse/swt/internal/" || die
@@ -146,13 +152,14 @@ src_install() {
sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die
use cairo || sed -i -e "/ org.eclipse.swt.internal.cairo; x-internal:=true,/d" "MANIFEST_TMP.MF"
- sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF"
+ sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF" || die
use opengl || sed -i -e "/ org.eclipse.swt.internal.opengl.glx; x-internal:=true,/d" "MANIFEST_TMP.MF"
- sed -i -e "/ org.eclipse.swt.internal.webkit; x-internal:=true,/d" "MANIFEST_TMP.MF"
+ sed -i -e "/ org.eclipse.swt.internal.webkit; x-internal:=true,/d" "MANIFEST_TMP.MF" || die
java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"
java-pkg_sointo /usr/$(get_libdir)
java-pkg_doso *.so
- dohtml about.html
+ docinto html
+ dodoc about.html
}
diff --git a/dev-java/swt/swt-4.10.ebuild b/dev-java/swt/swt-4.10.ebuild
index 4b2c5aafc0e2..a029c5bc5084 100644
--- a/dev-java/swt/swt-4.10.ebuild
+++ b/dev-java/swt/swt-4.10.ebuild
@@ -88,7 +88,8 @@ src_compile() {
local AWT_ARCH
local JAWTSO="libjawt.so"
if [[ $(tc-arch) == 'ppc64' ]] ; then
- AWT_ARCH="ppc64"
+ # no big-endian support
+ AWT_ARCH="ppc64le"
else
AWT_ARCH="amd64"
fi