commit: 8d42b1b9df04df9e73a3af3b58876030dd788317 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Wed Sep 10 13:25:33 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Sep 19 09:38:04 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d42b1b9
dev-java/swt: add 4.37 Bug: https://bugs.gentoo.org/963048 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Part-of: https://github.com/gentoo/gentoo/pull/43839 Closes: https://github.com/gentoo/gentoo/pull/43839 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-java/swt/Manifest | 4 + .../files/swt-4.37-as-needed-and-flag-fixes.patch | 81 +++++++++++ dev-java/swt/swt-4.37.ebuild | 152 +++++++++++++++++++++ 3 files changed, 237 insertions(+) diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest index 1c1b6c0dadef..7e9170db047f 100644 --- a/dev-java/swt/Manifest +++ b/dev-java/swt/Manifest @@ -7,3 +7,7 @@ DIST swt-4.35-gtk-linux-aarch64.zip 4018321 BLAKE2B 68fc537bd53749c466d9ac05d6ba DIST swt-4.35-gtk-linux-ppc64le.zip 4058559 BLAKE2B 9f03afb45142673a8c9d00313e4acb70ef51bf99d16204c9341b4f04be96a8cc328400981e45c10a3d16d0ad685da1cbabe0f8f80bd3579b830dfd9e4ba55261 SHA512 b16b806e3d959a46dd2ef0afde149ef233e1edc9c7de870e6b0a2bb76f92cddbedee084215b4d02560938a9f3a4728ef031cf45d82019b8f90b011ec96be9402 DIST swt-4.35-gtk-linux-riscv64.zip 4030257 BLAKE2B 3905cb5c0f58502224e38720d6fd79f9832617cb4f21464aba1436671bcace1c7a65a29d182e7be49652874a1f4227249876cd7a12992f2635b5acb20a7de888 SHA512 931e43674c7bbf24da09a65adb248b347874129cef42ac5aac736cbd0217d82566ad2ee57fc4836965b1810a68da7f8eedadf8d4fb919c4867c686a686cf89df DIST swt-4.35-gtk-linux-x86_64.zip 4132915 BLAKE2B 33356b78cfb91f553862a682b205c3118560f15b839543dd28617f63b784e73ba6a160cbc1b6a465d68bdfed02b5a0b26b2714268805a04ce6385dcad287169f SHA512 086932992b9e79ed980d30d770d1d0706352ba15c0ac1924602bedbb7c3b2259a6a8e9047533bb03fc01e903d3596bb420aedc07ed32d7e8d01520d8f3d67a41 +DIST swt-4.37-gtk-linux-aarch64.zip 3988879 BLAKE2B 4cffdf1653178b7abe3f9a7c9a0bcbf0d41a0410f24c8d5213fd4f5890341da0e1fc073c6a0a2133eb562683ef851885f5810c6cc7447d51dc40f47378a6a827 SHA512 d253bd7e9fe06696cc34e08a12c7ac46f305fc0370a71631d2da199d561f7dfbcf189d69a1c8269055a00b00d84849dff87b3a9548853e18f8811059ac64e6c6 +DIST swt-4.37-gtk-linux-ppc64le.zip 4029217 BLAKE2B fc928746f9a813bb9d25eb3f0f51b039521e4e79ba221528a6f37be11f2b99b62c5f3a3c691580b0668f604f3346d252c84aa80cee5b2c1818dfff4bd8c7907a SHA512 ee7e5abf31aa73e094d4cbe67a5d210547577e95296bd466d31572d02988df369789b0ad8a44b0a8c4bfc84469bb4e3eee0981c6b97477a15fd7447d0d985350 +DIST swt-4.37-gtk-linux-riscv64.zip 4000988 BLAKE2B a3ccb69f608b85ddd4e9afa237016820953a31da5864f9eb3a956b0d227e57e06181833a6701bdca8767c8e911e5c93143a06844cf564688abb3922038d67d0e SHA512 f36b2d047c83475dc76bb2821c1af5eecb62f4cdaa2edc10f5953eb14bf21b03b73af32fe818a17156e8eee8fcb6d7564b992c3b3a445e7385a5b4c86e2ec73c +DIST swt-4.37-gtk-linux-x86_64.zip 4103684 BLAKE2B b44268fc17de27148284bf6d3f53f75fa7608b98401486a40b78ca4783109a0c08dbe7979a51478cb025049c0f5cfde0ea876abd3602562ce48865b19c87bbdc SHA512 b89049ab6b88422612a7d6427eef1a10bbfa632a228ab207521ed86a8a8f6a3742c23c2a961174c3ed89e56ec70c9535bb21e34d844355edeb1d33d3607e5b84 diff --git a/dev-java/swt/files/swt-4.37-as-needed-and-flag-fixes.patch b/dev-java/swt/files/swt-4.37-as-needed-and-flag-fixes.patch new file mode 100644 index 000000000000..d890934cc795 --- /dev/null +++ b/dev-java/swt/files/swt-4.37-as-needed-and-flag-fixes.patch @@ -0,0 +1,81 @@ +--- a/make_linux.mak ++++ b/make_linux.mak +@@ -99,7 +99,7 @@ ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o atk_stats.o + WEBKIT_OBJECTS = swt.o webkitgtk.o webkitgtk_structs.o webkitgtk_stats.o webkitgtk_custom.o + GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o + +-CFLAGS := $(CFLAGS) \ ++CFLAGS := -fPIC \ + $(SWT_DEBUG) \ + $(SWT_WEBKIT_DEBUG) \ + -DLINUX -DGTK \ +@@ -112,7 +112,7 @@ LFLAGS = -shared -fPIC ${SWT_LFLAGS} + # Treat all warnings as errors. If your new code produces a warning, please + # take time to properly understand and fix/silence it as necessary. + ifeq ($(GTK_VERSION), 3.0) +-CFLAGS += -Werror ++# CFLAGS += -Werror + endif + + ifndef NO_STRIP +@@ -132,13 +132,13 @@ all: make_swt make_atk make_glx make_webkit + make_swt: $(SWT_LIB) $(SWTPI_LIB) + + $(SWT_LIB): $(SWT_OBJECTS) +- $(CC) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS) ++ $(CC) $(LDFLAGS) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS) + + callback.o: callback.c callback.h + $(CC) $(CFLAGS) $(GTKCFLAGS) -DUSE_ASSEMBLER -c callback.c + + $(SWTPI_LIB): $(SWTPI_OBJECTS) +- $(CC) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS) ++ $(CC) $(LDFLAGS) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS) + + swt.o: swt.c swt.h + $(CC) $(CFLAGS) -c swt.c +@@ -171,7 +171,7 @@ gtk4_stats.o: gtk4_stats.c gtk4_structs.h gtk4.h gtk4_stats.h swt.h + make_cairo: $(CAIRO_LIB) + + $(CAIRO_LIB): $(CAIRO_OBJECTS) +- $(CC) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS) ++ $(CC) $(LDFLAGS) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS) + + cairo.o: cairo.c cairo.h swt.h + $(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c +@@ -186,7 +186,7 @@ cairo_stats.o: cairo_stats.c cairo_structs.h cairo.h cairo_stats.h swt.h + make_awt:$(AWT_LIB) + + $(AWT_LIB): $(AWT_OBJECTS) +- $(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS) ++ $(CC) -fPIC $(LDFLAGS) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS) + + # + # Atk lib +@@ -194,7 +194,7 @@ $(AWT_LIB): $(AWT_OBJECTS) + make_atk: $(ATK_LIB) + + $(ATK_LIB): $(ATK_OBJECTS) +- $(CC) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS) ++ $(CC) $(LDFLAGS) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS) + + atk.o: atk.c atk.h + $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c +@@ -211,7 +211,7 @@ atk_stats.o: atk_stats.c atk_structs.h atk_stats.h atk.h + make_webkit: $(WEBKIT_LIB) + + $(WEBKIT_LIB): $(WEBKIT_OBJECTS) +- $(CC) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS) $(WEBKITLIBS) ++ $(CC) $(LDFLAGS) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS) $(WEBKITLIBS) + + webkitgtk.o: webkitgtk.c webkitgtk_custom.h + $(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk.c +@@ -231,7 +231,7 @@ webkitgtk_custom.o: webkitgtk_custom.c + make_glx: $(GLX_LIB) + + $(GLX_LIB): $(GLX_OBJECTS) +- $(CC) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS) ++ $(CC) $(LDFLAGS) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS) + + glx.o: glx.c + $(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c diff --git a/dev-java/swt/swt-4.37.ebuild b/dev-java/swt/swt-4.37.ebuild new file mode 100644 index 000000000000..32f456cfe82e --- /dev/null +++ b/dev-java/swt/swt-4.37.ebuild @@ -0,0 +1,152 @@ +# Copyright 1999-2025 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}-202509050730"; +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="GTK based SWT Library" +HOMEPAGE="https://eclipse.dev/eclipse/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 ) + riscv? ( ${MY_DMF}/${MY_P}-gtk-linux-riscv64.zip )" +S="${WORKDIR}/library" + +LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" +SLOT="0" +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.37-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 +}
