public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Miroslav Šulc" <fordfrog@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
Date: Fri, 26 Apr 2024 08:27:43 +0000 (UTC)	[thread overview]
Message-ID: <1714119893.50f96ee89012076baea88d1dc81dcd0d7cb266b1.fordfrog@gentoo> (raw)

commit:     50f96ee89012076baea88d1dc81dcd0d7cb266b1
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Thu Apr 25 19:42:55 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Apr 26 08:24:53 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50f96ee8

dev-java/swt: switch slot 3.7 to java-pkg-simple

- updates EAPI 7 -> 8
- backports JAWTSO handling from slot 4.10
- drops jdk:1.8 restriction

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/36426
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/swt/swt-3.7.2-r4.ebuild | 169 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 169 insertions(+)

diff --git a/dev-java/swt/swt-3.7.2-r4.ebuild b/dev-java/swt/swt-3.7.2-r4.ebuild
new file mode 100644
index 000000000000..dc1cb9be2255
--- /dev/null
+++ b/dev-java/swt/swt-3.7.2-r4.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple java-osgi toolchain-funcs
+
+MY_PV="${PV/_rc/RC}"
+MY_DMF="https://archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201202080800"
+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 )
+	ppc? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
+	ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip )
+	x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )"
+
+LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
+SLOT="3.7"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="cairo opengl"
+
+BDEPEND="
+	app-arch/unzip
+	virtual/pkgconfig
+"
+COMMON_DEPEND="
+	app-accessibility/at-spi2-core:2
+	dev-libs/glib
+	>=x11-libs/gtk+-2.6.8:2
+	x11-libs/libXtst
+	cairo? ( x11-libs/cairo )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)"
+DEPEND="${COMMON_DEPEND}
+	>=virtual/jdk-1.8:*[-headless-awt]
+	x11-base/xorg-proto
+	x11-libs/libX11
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/libXtst"
+RDEPEND="${COMMON_DEPEND}
+	>=virtual/jre-1.8:*"
+
+# JNI libraries don't need SONAME, bug #253756
+QA_SONAME="usr/lib.*/libswt-.*.so"
+
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="src"
+
+PATCHES=(
+	# Fix Makefiles to respect flags and work with --as-needed
+	"${FILESDIR}"/as-needed-and-flag-fixes-3.6.patch
+)
+
+src_unpack() {
+	default
+	unpack "./src.zip"
+}
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+	java-pkg_clean
+
+	mkdir resources src || die "mkdir failed"
+	mv org src || die "moving java sources failed"
+
+	case ${ARCH} in
+		ppc|x86) eapply "${FILESDIR}"/${P}-gio_launch-URI-x86.patch ;;
+		*)       eapply "${FILESDIR}"/${P}-gio_launch-URI.patch ;;
+	esac
+
+	pushd src > /dev/null || die
+		find -type f ! -name '*.java' \
+			| xargs \
+			cp --parent -t ../resources -v \
+			|| die "copying resources failed"
+	popd > /dev/null || die
+	cp version.txt resources || die "adding version.txt failed"
+}
+
+src_compile() {
+	local AWT_ARCH
+	local JAWTSO="libjawt.so"
+#	if [[ $(tc-arch) == 'x86' ]] ; then
+#		AWT_ARCH="i386"
+#	elif [[ $(tc-arch) == 'ppc' ]] ; then
+#		AWT_ARCH="ppc"
+#	elif [[ $(tc-arch) == 'ppc64' ]] ; then
+#		AWT_ARCH="ppc64"
+#	else
+#		AWT_ARCH="amd64"
+#	fi
+#	if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then
+#		export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}"
+#	elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then
+#		export AWT_LIB_PATH="${JAVA_HOME}/jre/bin"
+#	elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then
+#		export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)"
+#	else
+	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
+	[[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DJNI64
+
+	local make="emake -f make_linux.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
+
+	einfo "Building AWT library"
+	${make} make_awt
+
+	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
+
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	swtArch=${ARCH}
+	use amd64 && swtArch=x86_64
+
+	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" || 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" || 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
+
+	docinto html
+	dodoc about.html
+}


             reply	other threads:[~2024-04-26  8:27 UTC|newest]

Thread overview: 71+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-26  8:27 Miroslav Šulc [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-09-19  8:44 [gentoo-commits] repo/gentoo:master commit in: dev-java/swt/ Miroslav Šulc
2024-09-19  8:43 Miroslav Šulc
2024-09-19  8:43 Miroslav Šulc
2024-07-20  4:41 Sam James
2024-07-20  4:41 Sam James
2024-07-20  4:41 Sam James
2024-06-20 10:12 Miroslav Šulc
2024-06-02 17:44 Miroslav Šulc
2024-05-26  8:18 Miroslav Šulc
2024-05-26  6:01 Sam James
2024-05-26  6:01 Sam James
2024-05-26  6:01 Sam James
2024-05-26  6:01 Sam James
2024-05-26  6:01 Sam James
2024-04-29 13:43 Sam James
2024-04-29 13:43 Sam James
2024-04-29 13:42 Sam James
2024-04-26  8:27 Miroslav Šulc
2024-03-29 13:57 Miroslav Šulc
2024-01-07 13:26 Sam James
2024-01-07  9:31 Sam James
2024-01-07  9:05 Sam James
2023-12-07  7:55 Miroslav Šulc
2023-12-04  9:09 Miroslav Šulc
2023-11-30 10:02 Miroslav Šulc
2023-11-29 19:44 Sam James
2023-10-14 10:37 Sam James
2023-10-14 10:37 Sam James
2023-09-14  7:45 Miroslav Šulc
2023-08-04  5:58 Miroslav Šulc
2023-08-03 15:10 Sam James
2023-07-27 22:28 Sam James
2023-07-27 22:20 Sam James
2023-06-28  7:14 Miroslav Šulc
2023-06-23  5:34 Miroslav Šulc
2023-04-18  2:12 Sam James
2023-04-18  0:00 Sam James
2023-04-18  0:00 Sam James
2023-03-31 12:40 Arthur Zamarin
2023-03-19  6:38 Miroslav Šulc
2022-12-31  8:51 Miroslav Šulc
2022-01-30  8:42 Miroslav Šulc
2022-01-29 14:20 Jakov Smolić
2022-01-29 10:04 Jakov Smolić
2022-01-29  9:23 Arthur Zamarin
2022-01-05 10:01 David Seifert
2021-12-29  8:48 Miroslav Šulc
2021-08-09  8:37 Florian Schmaus
2021-07-30 15:10 Agostino Sarubbo
2021-07-25  4:41 Miroslav Šulc
2021-07-25  0:32 Sergei Trofimovich
2021-07-18  6:15 Miroslav Šulc
2021-07-16  6:29 Miroslav Šulc
2021-06-18  6:27 Agostino Sarubbo
2021-05-16 19:30 Miroslav Šulc
2021-04-30 14:07 Miroslav Šulc
2020-09-19  3:15 Georgy Yakovlev
2020-08-05 20:51 Craig Andrews
2020-06-12 19:30 Georgy Yakovlev
2020-06-04  8:55 Andreas Sturmlechner
2020-06-04  8:55 Andreas Sturmlechner
2020-04-25  9:35 Georgy Yakovlev
2018-01-24 22:38 James Le Cuirot
2018-01-24 22:38 James Le Cuirot
2017-01-25 15:52 Agostino Sarubbo
2017-01-25 15:35 Agostino Sarubbo
2016-12-20 15:51 Tobias Klausmann
2016-10-28 22:15 James Le Cuirot
2016-10-28 22:15 James Le Cuirot
2016-01-30 10:48 James Le Cuirot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1714119893.50f96ee89012076baea88d1dc81dcd0d7cb266b1.fordfrog@gentoo \
    --to=fordfrog@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox