gentoo auto-resync : 19:09:2024 - 12:11:50

5 files changed, 162 insertions, 6 deletions

diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index 3a3c5ffd341a..a5a36f6f31b1 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -22,10 +22,14 @@ DIST swt-4.31-gtk-linux-x86_64.zip 4039479 BLAKE2B 6f7e434acf57cd03dd5e938b1b1c5
 DIST swt-4.32-gtk-linux-aarch64.zip 3991281 BLAKE2B 99fece9547e801661bb65f699780eb95cb626efd78e1bd79dec15d5fb63e03805ab6c6f75b98648cfad194d800c11cbe6a3c23250f4c4084072aea2aa4cde10c SHA512 adf5d207ba35bfa43fad2c4c64d72a4b56e8830efa0f817b158ad0bd4508eca9c83c43ebebb843c4fb75cb33835a6490b8b0b2a993bfa3507b62fba50345607a
 DIST swt-4.32-gtk-linux-ppc64le.zip 4028301 BLAKE2B 1ed2590ffe01836dc9209b8323db25204c157a829f4af10f20509c30f268c88e89a9e252aebd9a4a0d3337fa20b1a3d76040b768918f7a2f7c8a6313314d14b8 SHA512 713f762fab2d5eea125844912fafdc3eb42bfb76c2caac5612972714e07b66de0e2a71ae29a51c86b2ad76c32761842ad209f8b59c931ea727dc03b2161b40f2
 DIST swt-4.32-gtk-linux-x86_64.zip 4011746 BLAKE2B 5d2784f9a18684d539ea576560bb5fecbbf59960cbd8ce901c9b152df087decb2db28ebf9fbf12c710f6dde71583e9002ca0ac85d5ca7a7ce17286ad1666c5c8 SHA512 f4d511595cccf104cda35c6f314e3689508e18e5da85bb2e8bdd408d9b8d4ab3371e851b3b96ba0f835b3ff0a079c4ed887661e586ab0ce06a52abf69ba243be
+DIST swt-4.33-gtk-linux-aarch64.zip 3929090 BLAKE2B 60cc67c7b197cb31c68622c2d78090a50b4d3eca9c8c5f919b230ebed8f65a588c941f32e89ed0126d5bb5558b664a61661535b158bc7b26928556768f83fb5c SHA512 5a01ffd19c62de4fc1d0df4dae7c93ba8235af7e00713f49cf9cb591843f891bb8151a33dd51bca45c31b068edf65b59a1826cec1a1f3b9d14366d30e7efd430
+DIST swt-4.33-gtk-linux-ppc64le.zip 3966353 BLAKE2B 0ab4a75ac1efdedfcacdd235f45b1b0de04ab762cf64957ca1761e2f6a7e1571e106b26ab08b9ecd600ddf89f2abcd151dcd236c303bfe7d8cfabbce2910b2b4 SHA512 8f54cce4e5ac9e0043c8e3861aeed193f919b7bc4291f5812a568fcf4206cf4875d14d9cd7836235414cbde6a837fe38a2a6380c7d50ca04d3aa366dab733d81
+DIST swt-4.33-gtk-linux-x86_64.zip 3950557 BLAKE2B 6cf4f48e32bcfa40082c08a78dd8d64e9454db3859533696c7cc7cd37639ac7df980d9cfd13abaa80e95e44ad619b96944387363d2fb93d7de34f5f25052bd54 SHA512 3211a5480b886c542f99e29b715b5b1221ba679b572f1de6ca68bdb7b06eec6863c68fbddb9b70d74f13e501c3d76a220c7c8b466031b6c0a25bba5c011f8a63
 EBUILD swt-3.7.2-r4.ebuild 4440 BLAKE2B 6164e475706b71782671978cc34cf5cdf14b8668132fec49bbfaa03753a92794b0258d6ad09e3cf1582ca4207c824b787b62c958501a09afc17a2d3e69ad190d SHA512 a864f326933d855d6194035bc8582f7df201377af6b5bc4e2abdb16b711edf5d72f560f628ff89f5b426e7c2c63a3dbfef0bdf041dc9907ab6f71cc2b26671b6
 EBUILD swt-4.10-r4.ebuild 4269 BLAKE2B 3ef14892698d8df50f090443a8e15f8b0a048b378f5a5a15d9430f3cd2aba36f68d3556444ba43f5e538c5841dc93717ecf91f032bc7cccce98e3a74ca3e12c1 SHA512 79b77fcb263f657fc386b887e1d815165cf87af5bc32ece128eef71845746173cac16cdfb42277e803244d3f507b618c424b65a5e079cbaef57fcaa4932c1070
-EBUILD swt-4.29-r1.ebuild 3457 BLAKE2B ea98a5170abae41c7e18637b127d4ffc9f67e2e92042dc97ee191780672813d94904758463c48cb5402d9d838b5e12d0a47a5c7218c0f424f2a30773445d0d92 SHA512 ed7a98c317bbb259fb9c732631c33a1291ae986bdf158cc0abc0c81cd3b28600747cc8af5d8bfcf8df5f61a7dff3697d1572358ca352cb7ce8eaa64089bf5504
-EBUILD swt-4.30-r2.ebuild 3527 BLAKE2B 0244ca3c7ba1b60277a4ec1a4eaeb53e5f254b0982e49e990a29acaeace91c14d019d7432bccf61598abe8622cb32d4bf035882e53573e0be276c1bcdb59b97c SHA512 d715601364f15c50460bb812f4384a24ecb05275cb833c59e911a292eac009ece65aff95e0fa9425ef04087a6a2311e3772d1a31629b7e4080fd2a2f2d4a0917
+EBUILD swt-4.29-r1.ebuild 3456 BLAKE2B 6d48de8cc8e1d9c034fafe3ca67951bf0c59201229a066566732b6828da068a1f6265e7367c9853da795d0ac25db981a6afb1d4691daa47bd372ec89bc10e5e3 SHA512 9c6902c16813aa36289b4131d5a379ab3e937246a18f486fb3a945f0fc240e67bb37b1a9245903fbda0837524c92f917951a3599c472c222e7f6e3001a90304a
+EBUILD swt-4.30-r2.ebuild 3526 BLAKE2B 7d7d2f4af8b64b169daaff9486311d50324170cfabfa948f0b3029a77ba487fa2953d8c531260a5db1bc8185449ca6126a4693f8cc30cdd5ecdbb572dae896f8 SHA512 0256a8bc0e5b16cf3e50f81cbef51f9ef7b8c91f1e006ceb020d11026d19317459e1148c655eb68e05b75bd8601de8372e7ce6ae38dd695e70465a9b02d8ab07
 EBUILD swt-4.31-r1.ebuild 3597 BLAKE2B 3ebfa0ada9993a92ee67868ee6070b0a4812b455e3e3209e1a00abe4a528c2202be78d413d62123d113edfd22d998d728d2913b4d03296922a01cde4835ce8c8 SHA512 414e93ee4cc2398bb5f7b1b7079a865e48a0d3de4dcd62bba170c2207d4283fe7eace273736335233a6b16848f73890f59646ff763ba311d5aa75ecb5c146870
 EBUILD swt-4.32.ebuild 3597 BLAKE2B 6f6b08425ff52668c342394c50437397eeec8621d766f67d8a90999e2e659919da3837cc987f5166a268016351176406e7bbafa7b74cf59176c276bb5eca5402 SHA512 e9b246638d08f0d415f8412913b9369d9ce257f2a4e43e0741f2e5b989aac31d091d5c4f533a7a6ea50a3ea2cd73ee21728ec7e44a4ed7715aab6fe09a2f554c
-MISC metadata.xml 761 BLAKE2B f70a4d3ff5fcfad5705772396957664e700bd3ffe9580ac141c5faa11e24562b0cbc199a2f49d61d6a2a08058374dc1b7bfd9ae258e4a692e5b3c340f478da25 SHA512 1e8b8ceb30071c8271365a2d515e094c11ab569c4fee7b7f905d5de0a7613518320a1912b2b958d816e04d9876ed75425e16de9a35e1d6be6466888e08a420b3
+EBUILD swt-4.33.ebuild 3600 BLAKE2B 1d51537df59fbe769806327c0215817a1110243611535c3de072785f47c6e4d3216b851a2ed56447deea83a881a1574a5a247bcd2f98a7e1ea6cf65fe9161c39 SHA512 9cd98c933803db37a255875f8c5ad3ccb8fe7103f25118c8715f0983e5683b3a7f97deb307a46c117a9b6f8a984104f934db9a710c070d52449f6cfe8197ca07
+MISC metadata.xml 762 BLAKE2B 6d1ffda9ea96f50b3e4736513ca9a3af4e7e9d3cd59a3f8ff8efcae118d290d141ffa90181fb1669f9a4380c6e4c618d780b459ada909c5dd5aa4f5fc1865b7d SHA512 5c50e0d80478a6af08886d9b65230fc161a000a7ea39d0ffa873114e13fd1fb9bcbcc554df41eebd63ee60dd9ed14e6f19110e71a49bd32adef6c43051c2c380
diff --git a/dev-java/swt/metadata.xml b/dev-java/swt/metadata.xml
index c06386289922..2a7f473b5a30 100644
--- a/dev-java/swt/metadata.xml
+++ b/dev-java/swt/metadata.xml
@@ -12,7 +12,7 @@
 	</longdescription>
 	<upstream>
 		<bugs-to>https://bugs.eclipse.org/bugs/enter_bug.cgi?product=Platform%38component=SWT</bugs-to>
-		<doc>https://wiki.eclipse.org/SWT</doc>
+		<doc>https://wiki.eclipse.org/SWT/</doc>
 		<remote-id type="github">eclipse-platform/eclipse.platform.swt</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/swt/swt-4.29-r1.ebuild b/dev-java/swt/swt-4.29-r1.ebuild
index 6dbc30c768f9..140b2c69263a 100644
--- a/dev-java/swt/swt-4.29-r1.ebuild
+++ b/dev-java/swt/swt-4.29-r1.ebuild
@@ -8,7 +8,7 @@ JAVA_PKG_IUSE="doc source"
 inherit flag-o-matic java-pkg-2 java-pkg-simple toolchain-funcs
 
 MY_PV="${PV/_rc/RC}"
-MY_DMF="https://download.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-202309031000"
+MY_DMF="https://archive.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-202309031000"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="GTK based SWT Library"
diff --git a/dev-java/swt/swt-4.30-r2.ebuild b/dev-java/swt/swt-4.30-r2.ebuild
index 61d849831270..3f0934da1e12 100644
--- a/dev-java/swt/swt-4.30-r2.ebuild
+++ b/dev-java/swt/swt-4.30-r2.ebuild
@@ -8,7 +8,7 @@ JAVA_PKG_IUSE="doc source"
 inherit flag-o-matic java-pkg-2 java-pkg-simple toolchain-funcs
 
 MY_PV="${PV/_rc/RC}"
-MY_DMF="https://download.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-202312010110"
+MY_DMF="https://archive.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-202312010110"
 MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="GTK based SWT Library"
diff --git a/dev-java/swt/swt-4.33.ebuild b/dev-java/swt/swt-4.33.ebuild
new file mode 100644
index 000000000000..444346927d00
--- /dev/null
+++ b/dev-java/swt/swt-4.33.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit flag-o-matic java-pkg-2 java-pkg-simple toolchain-funcs
+
+MY_PV="${PV/_rc/RC}"
+MY_DMF="https://download.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-202409030240"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="GTK based SWT Library"
+HOMEPAGE="https://www.eclipse.org/swt/"
+SRC_URI="
+	amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
+	arm64? ( ${MY_DMF}/${MY_P}-gtk-linux-aarch64.zip )
+	ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64le.zip )"
+S="${WORKDIR}/library"
+
+LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
+SLOT="4.33"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+IUSE="cairo opengl webkit"
+
+BDEPEND="
+	app-arch/unzip
+	virtual/pkgconfig
+"
+COMMON_DEP="
+	app-accessibility/at-spi2-core:2
+	dev-libs/glib
+	x11-libs/gtk+:3
+	x11-libs/libXtst
+	cairo? ( x11-libs/cairo )
+	opengl?	(
+		virtual/glu
+		virtual/opengl
+	)
+	webkit? (
+		net-libs/webkit-gtk:4.1
+	)"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-17:*[-headless-awt]
+	x11-base/xorg-proto
+	x11-libs/libX11
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/libXtst"
+# error: pattern matching in instanceof is not supported in -source 11
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-17:*
+	x11-libs/libX11"
+
+HTML_DOCS=( ../about.html )
+
+JAVA_RESOURCE_DIRS="../resources"
+JAVA_SRC_DIR="../src"
+
+PATCHES=(
+	"${FILESDIR}/swt-4.27-as-needed-and-flag-fixes.patch"
+)
+
+src_unpack() {
+	default
+	unpack "./src.zip"
+}
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+	# .css stuff is essential at least for running net-p2p/biglybt
+	unzip ../swt.jar 'org/eclipse/swt/internal/gtk/*.css' -d resources || die
+	java-pkg_clean
+	cd .. || die
+	mkdir resources src || die "mkdir failed"
+	find org -type f -name '*.java' \
+		| xargs \
+		cp --parent -t src -v \
+		|| die "copying resources failed"
+	find org -type f ! -name '*.java' \
+		| xargs \
+		cp --parent -t resources -v \
+		|| die "copying resources failed"
+	cp version.txt resources || die "adding version.txt failed"
+}
+
+src_compile() {
+	append-cflags -fcommon # https://bugs.gentoo.org/707838
+
+	local JAWTSO="libjawt.so"
+	IFS=":" read -r -a ldpaths <<< $(java-config -g LDPATH)
+
+	for libpath in "${ldpaths[@]}"; do
+		if [[ -f "${libpath}/${JAWTSO}" ]]; then
+			export AWT_LIB_PATH="${libpath}"
+			break
+		# this is a workaround for broken LDPATH in <=openjdk-8.292_p10 and <=dev-java/openjdk-bin-8.292_p10
+		elif [[ -f "${libpath}/$(tc-arch)/${JAWTSO}" ]]; then
+			export AWT_LIB_PATH="${libpath}/$(tc-arch)"
+			break
+		fi
+	done
+
+	if [[ -z "${AWT_LIB_PATH}" ]]; then
+		eerror "${JAWTSO} not found in the JDK being used for compilation!"
+		die "cannot build AWT library"
+	fi
+
+	# Fix the pointer size for AMD64
+	export SWT_PTR_CFLAGS=-DJNI64
+
+	# Bug #461784, g_thread_init is deprecated since glib-2.32.
+	append-cflags -DNO__1g_1thread_1init
+
+	local make="emake -f make_linux.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
+
+	einfo "Building AWT library"
+	export SWT_JAVA_HOME="$(java-config -g JAVA_HOME)"
+	${make} make_awt AWT_LIBS="-L\$(AWT_LIB_PATH) -Wl,-rpath,\$(AWT_LIB_PATH) -ljawt \`pkg-config --libs x11\`"
+
+	einfo "Building SWT library"
+	${make} make_swt
+
+	einfo "Building JAVA-AT-SPI bridge"
+	${make} make_atk
+
+	if use cairo ; then
+		einfo "Building CAIRO support"
+		${make} make_cairo
+	fi
+
+	if use opengl ; then
+		einfo "Building OpenGL component"
+		${make} make_glx
+	fi
+
+	if use webkit ; then
+		einfo "Building WebKit component"
+		${make} make_webkit
+	fi
+
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	java-pkg-simple_src_install
+
+	java-pkg_sointo "/usr/$(get_libdir)/swt"
+	java-pkg_doso *.so
+}