[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: 1a3087b6011e6fed20bb5245b920f05a9ecbfddc Author: Sam James gentoo org> AuthorDate: Sat Jul 20 04:41:24 2024 + Commit: Sam James gentoo org> CommitDate: Sat Jul 20 04:41:24 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a3087b6 dev-java/swt: Stabilize 4.32 amd64, #936325 Signed-off-by: Sam James gentoo.org> dev-java/swt/swt-4.32.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/swt/swt-4.32.ebuild b/dev-java/swt/swt-4.32.ebuild index 6865543b1f11..24d49b01cb69 100644 --- a/dev-java/swt/swt-4.32.ebuild +++ b/dev-java/swt/swt-4.32.ebuild @@ -21,7 +21,7 @@ S="${WORKDIR}/library" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" SLOT="4.32" -KEYWORDS="~amd64 arm64 ~ppc64" +KEYWORDS="amd64 arm64 ~ppc64" IUSE="cairo opengl webkit" BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: c6d1b009e611ed5a438b8a8611106cbb29719aa6 Author: Sam James gentoo org> AuthorDate: Sat Jul 20 04:41:25 2024 + Commit: Sam James gentoo org> CommitDate: Sat Jul 20 04:41:25 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6d1b009 dev-java/swt: Stabilize 4.32 ppc64, #936325 Signed-off-by: Sam James gentoo.org> dev-java/swt/swt-4.32.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/swt/swt-4.32.ebuild b/dev-java/swt/swt-4.32.ebuild index 24d49b01cb69..5e0f6d998c9b 100644 --- a/dev-java/swt/swt-4.32.ebuild +++ b/dev-java/swt/swt-4.32.ebuild @@ -21,7 +21,7 @@ S="${WORKDIR}/library" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" SLOT="4.32" -KEYWORDS="amd64 arm64 ~ppc64" +KEYWORDS="amd64 arm64 ppc64" IUSE="cairo opengl webkit" BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: c3b44d4a80c7965ff9e784a73dccdff00ab6fe5f Author: Sam James gentoo org> AuthorDate: Sat Jul 20 04:41:23 2024 + Commit: Sam James gentoo org> CommitDate: Sat Jul 20 04:41:23 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3b44d4a dev-java/swt: Stabilize 4.32 arm64, #936325 Signed-off-by: Sam James gentoo.org> dev-java/swt/swt-4.32.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/swt/swt-4.32.ebuild b/dev-java/swt/swt-4.32.ebuild index 0dc6a896fb7a..6865543b1f11 100644 --- a/dev-java/swt/swt-4.32.ebuild +++ b/dev-java/swt/swt-4.32.ebuild @@ -21,7 +21,7 @@ S="${WORKDIR}/library" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" SLOT="4.32" -KEYWORDS="~amd64 ~arm64 ~ppc64" +KEYWORDS="~amd64 arm64 ~ppc64" IUSE="cairo opengl webkit" BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: 7e901236bd9d2182aa7c9fee15b24aaeeb15ceac Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Fri Jun 14 08:42:28 2024 + Commit: Miroslav Šulc gentoo org> CommitDate: Thu Jun 20 10:12:37 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e901236 dev-java/swt: add 4.32 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Signed-off-by: Miroslav Šulc gentoo.org> dev-java/swt/Manifest| 3 + dev-java/swt/swt-4.32.ebuild | 152 +++ 2 files changed, 155 insertions(+) diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest index bdc642795cb1..166e78f0c03c 100644 --- a/dev-java/swt/Manifest +++ b/dev-java/swt/Manifest @@ -12,3 +12,6 @@ DIST swt-4.30-gtk-linux-x86_64.zip 3856990 BLAKE2B 0ea29a5f286fb4bb362758629226b DIST swt-4.31-gtk-linux-aarch64.zip 4019864 BLAKE2B 597f9c2ce1382aacd4667c7d1fc350b2318d8b1577dfc32a0139efb9d26e7c32703a0fb2507876ef441c47901d46ba522ea40714f9b88f1d517e3d9d24c2416a SHA512 636e3a4e7adc21ab8ee3ecdc3f85bbd0ad5786836492cf0096f99177716043150b41807cc456f4813ebb1797092761bb227809e8594bf64155b438973cc84bfc DIST swt-4.31-gtk-linux-ppc64le.zip 4036590 BLAKE2B da9ad8a7e0bf168b024c4e1fbdbcc01154ec0d7e8b38b2912ba7edf1bf8239f05a9ce1f08790174158ebb788c9cc3adf754d13942fc8aa0fe9d4a53177a814ff SHA512 bf8f3f45b4229db383839a64b7d08294340ab2f0c623be8e382609b5ff9a59683229bb308d49480ffb01596ab050d45f97894fec99c0d4eb710e60c40b864531 DIST swt-4.31-gtk-linux-x86_64.zip 4039479 BLAKE2B 6f7e434acf57cd03dd5e938b1b1c578339b3d7817202681a15420ebdec3be10b95b1bf5eca6f1cf71de9a5a0c390d2d6ee903c2a71e8974e03987cc52322e44d SHA512 da61610ce00fc46893ec3ee6d5d7ed5cc59312002c6946a3748cff1a776af75bad0026512b412ef1622ca0bee124764ed8ee7f5f87364cff945b296feb86e74b +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 diff --git a/dev-java/swt/swt-4.32.ebuild b/dev-java/swt/swt-4.32.ebuild new file mode 100644 index ..0dc6a896fb7a --- /dev/null +++ b/dev-java/swt/swt-4.32.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}-202406010610; +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.32" +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
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: 1228641af810c467e3e15c1a3a70864e4644460d Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Sun Jun 2 14:42:08 2024 + Commit: Miroslav Šulc gentoo org> CommitDate: Sun Jun 2 17:44:12 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1228641a dev-java/swt: add x11-libs/libX11 to RDEPEND https://github.com/2Kmm/java/issues/10 https://github.com/2Kmm/java/issues/9 https://github.com/2Kmm/java/issues/8 https://github.com/2Kmm/java/issues/7 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/36978 Signed-off-by: Miroslav Šulc gentoo.org> dev-java/swt/{swt-4.10-r3.ebuild => swt-4.10-r4.ebuild} | 3 ++- dev-java/swt/{swt-4.29.ebuild => swt-4.29-r1.ebuild}| 5 +++-- dev-java/swt/{swt-4.30-r1.ebuild => swt-4.30-r2.ebuild} | 3 ++- dev-java/swt/{swt-4.31.ebuild => swt-4.31-r1.ebuild}| 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dev-java/swt/swt-4.10-r3.ebuild b/dev-java/swt/swt-4.10-r4.ebuild similarity index 99% rename from dev-java/swt/swt-4.10-r3.ebuild rename to dev-java/swt/swt-4.10-r4.ebuild index 5b0d33375cad..9c3211738446 100644 --- a/dev-java/swt/swt-4.10-r3.ebuild +++ b/dev-java/swt/swt-4.10-r4.ebuild @@ -47,7 +47,8 @@ DEPEND="${COMMON_DEP} x11-libs/libXt x11-libs/libXtst" RDEPEND="${COMMON_DEP} - >=virtual/jre-1.8:*" + >=virtual/jre-1.8:* + x11-libs/libX11" # JNI libraries don't need SONAME, bug #253756 QA_SONAME='usr/lib[^/]*/libswt-[^/]+.so' diff --git a/dev-java/swt/swt-4.29.ebuild b/dev-java/swt/swt-4.29-r1.ebuild similarity index 97% rename from dev-java/swt/swt-4.29.ebuild rename to dev-java/swt/swt-4.29-r1.ebuild index 08361076b0b5..6dbc30c768f9 100644 --- a/dev-java/swt/swt-4.29.ebuild +++ b/dev-java/swt/swt-4.29-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -44,7 +44,8 @@ DEPEND="${COMMON_DEP} x11-libs/libXt x11-libs/libXtst" RDEPEND="${COMMON_DEP} - >=virtual/jre-1.8:*" + >=virtual/jre-1.8:* + x11-libs/libX11" BDEPEND=" app-arch/unzip virtual/pkgconfig diff --git a/dev-java/swt/swt-4.30-r1.ebuild b/dev-java/swt/swt-4.30-r2.ebuild similarity index 98% rename from dev-java/swt/swt-4.30-r1.ebuild rename to dev-java/swt/swt-4.30-r2.ebuild index f0ea9b557f4b..61d849831270 100644 --- a/dev-java/swt/swt-4.30-r1.ebuild +++ b/dev-java/swt/swt-4.30-r2.ebuild @@ -45,7 +45,8 @@ DEPEND="${COMMON_DEP} x11-libs/libXtst" # error: pattern matching in instanceof is not supported in -source 11 RDEPEND="${COMMON_DEP} - >=virtual/jre-17:*" + >=virtual/jre-17:* + x11-libs/libX11" BDEPEND=" app-arch/unzip virtual/pkgconfig diff --git a/dev-java/swt/swt-4.31.ebuild b/dev-java/swt/swt-4.31-r1.ebuild similarity index 98% rename from dev-java/swt/swt-4.31.ebuild rename to dev-java/swt/swt-4.31-r1.ebuild index 5d3dfd9effdc..382a538ccff2 100644 --- a/dev-java/swt/swt-4.31.ebuild +++ b/dev-java/swt/swt-4.31-r1.ebuild @@ -50,7 +50,8 @@ DEPEND="${COMMON_DEP} x11-libs/libXtst" # error: pattern matching in instanceof is not supported in -source 11 RDEPEND="${COMMON_DEP} - >=virtual/jre-17:*" + >=virtual/jre-17:* + x11-libs/libX11" HTML_DOCS=( ../about.html )
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/files/
commit: 92632350c74e25fbcfa41e88c8dbc110baa5d67c Author: Michael Mair-Keimberger levelnine at> AuthorDate: Tue May 28 16:26:18 2024 + Commit: Florian Schmaus gentoo org> CommitDate: Wed May 29 08:31:35 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92632350 dev-java/swt: remove unused file Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Florian Schmaus gentoo.org> dev-java/swt/files/build.xml | 17 - 1 file changed, 17 deletions(-) diff --git a/dev-java/swt/files/build.xml b/dev-java/swt/files/build.xml deleted file mode 100644 index ea775871bf09.. --- a/dev-java/swt/files/build.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - -
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: 4c660eda0fa67610a72366b205e0738a2d4a384e Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Sun May 26 07:34:48 2024 + Commit: Miroslav Šulc gentoo org> CommitDate: Sun May 26 08:18:19 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c660eda dev-java/swt: drop 3.7.2-r3, 4.10-r2 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Signed-off-by: Miroslav Šulc gentoo.org> dev-java/swt/swt-3.7.2-r3.ebuild | 159 dev-java/swt/swt-4.10-r2.ebuild | 172 --- 2 files changed, 331 deletions(-) diff --git a/dev-java/swt/swt-3.7.2-r3.ebuild b/dev-java/swt/swt-3.7.2-r3.ebuild deleted file mode 100644 index eb993b82f314.. --- a/dev-java/swt/swt-3.7.2-r3.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit java-pkg-2 java-ant-2 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/; -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" - -COMMON_DEPEND=" - >=dev-libs/atk-1.10.2 - >=dev-libs/glib-2.6 - >=x11-libs/gtk+-2.6.8:2 - x11-libs/libXtst - cairo? ( >=x11-libs/cairo-1.4.14 ) - opengl? ( - virtual/glu - virtual/opengl - )" -BDEPEND=" - app-arch/unzip - virtual/pkgconfig -" -DEPEND="${COMMON_DEPEND} - virtual/jdk:1.8 - x11-base/xorg-proto - x11-libs/libX11 - x11-libs/libXrender - x11-libs/libXt - >=x11-libs/libXtst-1.1.0" -RDEPEND="${COMMON_DEPEND} - >=virtual/jre-1.4" - -S="${WORKDIR}" - -# JNI libraries don't need SONAME, bug #253756 -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} - unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "Unable to extract distfile" - unpack "./src.zip" - - # Cleanup the redirtied directory structure - rm -rf about_files/ || die -} - -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" - - case ${ARCH} in - ppc|x86) eapply "${FILESDIR}"/${P}-gio_launch-URI-x86.patch ;; - *) eapply "${FILESDIR}"/${P}-gio_launch-URI.patch ;; - esac - - default -} - -src_compile() { - # Drop jikes support as it seems to be unfriendly with SWT - java-pkg_filter-compiler jikes - - 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 - 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 - - einfo "Building JNI libraries" - eant compile - - einfo "Copying missing files" - cp -i "${S}/version.txt" "${S}/build/version.txt" || die - cp -i
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: 83a63903bfbc3aa52ca2482a2a8b8559a95eb094 Author: Sam James gentoo org> AuthorDate: Sun May 26 06:00:44 2024 + Commit: Sam James gentoo org> CommitDate: Sun May 26 06:00:44 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83a63903 dev-java/swt: Stabilize 4.10-r3 amd64, #932754 Signed-off-by: Sam James gentoo.org> dev-java/swt/swt-4.10-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/swt/swt-4.10-r3.ebuild b/dev-java/swt/swt-4.10-r3.ebuild index da97a0a165ab..50a9db129c77 100644 --- a/dev-java/swt/swt-4.10-r3.ebuild +++ b/dev-java/swt/swt-4.10-r3.ebuild @@ -19,7 +19,7 @@ SRC_URI=" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" SLOT="4.10" -KEYWORDS="~amd64 ~ppc64" +KEYWORDS="amd64 ~ppc64" IUSE="cairo opengl webkit" BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: 6a63dc67bd077c4c69b50f7c4eca545673d3f1b7 Author: Sam James gentoo org> AuthorDate: Sun May 26 06:00:46 2024 + Commit: Sam James gentoo org> CommitDate: Sun May 26 06:00:46 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a63dc67 dev-java/swt: Stabilize 4.10-r3 ppc64, #932754 Signed-off-by: Sam James gentoo.org> dev-java/swt/swt-4.10-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/swt/swt-4.10-r3.ebuild b/dev-java/swt/swt-4.10-r3.ebuild index 50a9db129c77..5b0d33375cad 100644 --- a/dev-java/swt/swt-4.10-r3.ebuild +++ b/dev-java/swt/swt-4.10-r3.ebuild @@ -19,7 +19,7 @@ SRC_URI=" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" SLOT="4.10" -KEYWORDS="amd64 ~ppc64" +KEYWORDS="amd64 ppc64" IUSE="cairo opengl webkit" BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: 677cd39e706fe5b435b2e63fc0d95e1f1bc31b39 Author: Sam James gentoo org> AuthorDate: Sun May 26 06:00:47 2024 + Commit: Sam James gentoo org> CommitDate: Sun May 26 06:00:47 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=677cd39e dev-java/swt: Stabilize 3.7.2-r4 ppc64, #932754 Signed-off-by: Sam James gentoo.org> dev-java/swt/swt-3.7.2-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/swt/swt-3.7.2-r4.ebuild b/dev-java/swt/swt-3.7.2-r4.ebuild index 701a533f974c..18bc97088217 100644 --- a/dev-java/swt/swt-3.7.2-r4.ebuild +++ b/dev-java/swt/swt-3.7.2-r4.ebuild @@ -21,7 +21,7 @@ SRC_URI=" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" SLOT="3.7" -KEYWORDS="amd64 ~ppc64 x86" +KEYWORDS="amd64 ppc64 x86" IUSE="cairo opengl" BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: 015f00e77aa57cf6c0851c1b2c80b92a2b09c52b Author: Sam James gentoo org> AuthorDate: Sun May 26 06:00:45 2024 + Commit: Sam James gentoo org> CommitDate: Sun May 26 06:00:45 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=015f00e7 dev-java/swt: Stabilize 3.7.2-r4 amd64, #932754 Signed-off-by: Sam James gentoo.org> dev-java/swt/swt-3.7.2-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/swt/swt-3.7.2-r4.ebuild b/dev-java/swt/swt-3.7.2-r4.ebuild index 690449862871..701a533f974c 100644 --- a/dev-java/swt/swt-3.7.2-r4.ebuild +++ b/dev-java/swt/swt-3.7.2-r4.ebuild @@ -21,7 +21,7 @@ SRC_URI=" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" SLOT="3.7" -KEYWORDS="~amd64 ~ppc64 x86" +KEYWORDS="amd64 ~ppc64 x86" IUSE="cairo opengl" BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: 01277bc5b800abf1560d279fe5b3158928c909b8 Author: Sam James gentoo org> AuthorDate: Sun May 26 06:00:43 2024 + Commit: Sam James gentoo org> CommitDate: Sun May 26 06:00:43 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01277bc5 dev-java/swt: Stabilize 3.7.2-r4 x86, #932754 Signed-off-by: Sam James gentoo.org> dev-java/swt/swt-3.7.2-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/swt/swt-3.7.2-r4.ebuild b/dev-java/swt/swt-3.7.2-r4.ebuild index dc1cb9be2255..690449862871 100644 --- a/dev-java/swt/swt-3.7.2-r4.ebuild +++ b/dev-java/swt/swt-3.7.2-r4.ebuild @@ -21,7 +21,7 @@ SRC_URI=" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" SLOT="3.7" -KEYWORDS="~amd64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~ppc64 x86" IUSE="cairo opengl" BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: 529fda144373512c73310218f7e94d44113c67b9 Author: Sam James gentoo org> AuthorDate: Mon Apr 29 13:42:51 2024 + Commit: Sam James gentoo org> CommitDate: Mon Apr 29 13:42:51 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=529fda14 dev-java/swt: Stabilize 4.31 arm64, #930924 Signed-off-by: Sam James gentoo.org> dev-java/swt/swt-4.31.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/swt/swt-4.31.ebuild b/dev-java/swt/swt-4.31.ebuild index b4437e493954..27325e3b9103 100644 --- a/dev-java/swt/swt-4.31.ebuild +++ b/dev-java/swt/swt-4.31.ebuild @@ -21,7 +21,7 @@ S="${WORKDIR}/library" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" SLOT="4.31" -KEYWORDS="amd64 ~arm64 ~ppc64" +KEYWORDS="amd64 arm64 ~ppc64" IUSE="cairo opengl webkit" BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: 0947901c12d8fafffd8119258b4bc57d7ee2082e Author: Sam James gentoo org> AuthorDate: Mon Apr 29 13:42:53 2024 + Commit: Sam James gentoo org> CommitDate: Mon Apr 29 13:42:53 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0947901c dev-java/swt: Stabilize 4.31 ppc64, #930924 Signed-off-by: Sam James gentoo.org> dev-java/swt/swt-4.31.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/swt/swt-4.31.ebuild b/dev-java/swt/swt-4.31.ebuild index 27325e3b9103..5d3dfd9effdc 100644 --- a/dev-java/swt/swt-4.31.ebuild +++ b/dev-java/swt/swt-4.31.ebuild @@ -21,7 +21,7 @@ S="${WORKDIR}/library" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" SLOT="4.31" -KEYWORDS="amd64 arm64 ~ppc64" +KEYWORDS="amd64 arm64 ppc64" IUSE="cairo opengl webkit" BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: 6fce25e68d33f335d42a3e6bbd366c80120c966d Author: Sam James gentoo org> AuthorDate: Mon Apr 29 13:40:07 2024 + Commit: Sam James gentoo org> CommitDate: Mon Apr 29 13:40:07 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fce25e6 dev-java/swt: Stabilize 4.31 amd64, #930924 Signed-off-by: Sam James gentoo.org> dev-java/swt/swt-4.31.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/swt/swt-4.31.ebuild b/dev-java/swt/swt-4.31.ebuild index bcfb034a7ae1..b4437e493954 100644 --- a/dev-java/swt/swt-4.31.ebuild +++ b/dev-java/swt/swt-4.31.ebuild @@ -21,7 +21,7 @@ S="${WORKDIR}/library" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" SLOT="4.31" -KEYWORDS="~amd64 ~arm64 ~ppc64" +KEYWORDS="amd64 ~arm64 ~ppc64" IUSE="cairo opengl webkit" BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: 9f4e5fe2a58389a737f7cf581a78339de9cadd11 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Thu Apr 25 19:39:02 2024 + Commit: Miroslav Šulc gentoo org> CommitDate: Fri Apr 26 08:24:48 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f4e5fe2 dev-java/swt: switch slot 4.10 to java-pkg-simple also update EAPI 7 -> 8 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Signed-off-by: Miroslav Šulc gentoo.org> dev-java/swt/swt-4.10-r3.ebuild | 168 1 file changed, 168 insertions(+) diff --git a/dev-java/swt/swt-4.10-r3.ebuild b/dev-java/swt/swt-4.10-r3.ebuild new file mode 100644 index ..da97a0a165ab --- /dev/null +++ b/dev-java/swt/swt-4.10-r3.ebuild @@ -0,0 +1,168 @@ +# 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 java-osgi + +MY_PV="${PV/_rc/RC}" +MY_DMF="https://archive.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-201812060815; +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 ) + ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64le.zip )" + +LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" +SLOT="4.10" +KEYWORDS="~amd64 ~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+-2.6.8:2 + x11-libs/libXtst + cairo? ( x11-libs/cairo ) + opengl? ( + virtual/glu + virtual/opengl + ) + webkit? ( + net-libs/webkit-gtk:4 + )" +DEPEND="${COMMON_DEP} + >=virtual/jdk-1.8:*[-headless-awt] + x11-base/xorg-proto + x11-libs/libX11 + x11-libs/libXrender + x11-libs/libXt + x11-libs/libXtst" +RDEPEND="${COMMON_DEP} + >=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=( + "${FILESDIR}"/${P}-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 + + # Define missing g_thread_supported() to be already started. + sed -i '1s/^/#define g_thread_supported() 1\n\n/' "${S}"/os_custom.h || die + + # Webext is also in the library directory + sed -i 's|findResource([^,]\+|findResource("swt"|' \ + org/eclipse/swt/browser/WebKit.java || die + + mkdir src || die "mkdir failed" + mv org src || die "moving java sources failed" + 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() { + 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" +
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: 50f96ee89012076baea88d1dc81dcd0d7cb266b1 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Thu Apr 25 19:42:55 2024 + Commit: Miroslav Šulc gentoo org> CommitDate: Fri Apr 26 08:24:53 2024 + 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 pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/36426 Signed-off-by: Miroslav Šulc 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 ..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 +
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: f0dd120770b0eab42d7c8da15409e416530ca324 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Tue Feb 27 15:00:20 2024 + Commit: Miroslav Šulc gentoo org> CommitDate: Fri Mar 29 13:57:38 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0dd1207 dev-java/swt: add 4.31 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Signed-off-by: Miroslav Šulc gentoo.org> dev-java/swt/Manifest| 3 + dev-java/swt/swt-4.31.ebuild | 151 +++ 2 files changed, 154 insertions(+) diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest index 75b83fcd9ee2..bdc642795cb1 100644 --- a/dev-java/swt/Manifest +++ b/dev-java/swt/Manifest @@ -9,3 +9,6 @@ DIST swt-4.29-gtk-linux-x86_64.zip 3857122 BLAKE2B ac4416044f93eaed396ac10edb74e DIST swt-4.30-gtk-linux-aarch64.zip 3836637 BLAKE2B 4cedb6eae73e03c32f6c226560f8e7bcbde5b6fc57579255e793fd5d01a5ff80f8b673dd7035eb7f2693abadd98bd0cfdb2eec632c05995552a9a1f1b673b8cc SHA512 df12ba30373d3ee7f0337b42d3a4f55a55dc898be9c97fbcc3d841c082d00190a75513272076c5709ee626e8af3f77c7c2dc518aa9289e80e33f4b134907 DIST swt-4.30-gtk-linux-ppc64le.zip 3860636 BLAKE2B a535c1bcc6c668905f4d4aaa8c5ae7f3b8f48fc95004522d09924ae54d5172b18f80169d78633e960ce0c5141e5b34492d1dd05188a0b1f48d9f79d286bd2982 SHA512 5a17bd7752343da638466ac28de460d9fa9f0e777d1e48625ddb6c5538704e36cd97439d1bf8f07ad34a32b7d5f27f19d8877e8a9bb9094b4a74bdbb1dc126f7 DIST swt-4.30-gtk-linux-x86_64.zip 3856990 BLAKE2B 0ea29a5f286fb4bb362758629226bcd6f27716afae7abb80cb37e7d4b72f0c835d63a196384465d3bc74135c42454a74c75455c094204e6329229ad8ca1fda78 SHA512 3802bd1dc84c7d684dac6b0b21de6b4958dd0c736a6b42176cf734806f04ae9dfdb18515ec5249eeff5f6bb716bf327a7a10e79d68cc487a1ad02267394507a1 +DIST swt-4.31-gtk-linux-aarch64.zip 4019864 BLAKE2B 597f9c2ce1382aacd4667c7d1fc350b2318d8b1577dfc32a0139efb9d26e7c32703a0fb2507876ef441c47901d46ba522ea40714f9b88f1d517e3d9d24c2416a SHA512 636e3a4e7adc21ab8ee3ecdc3f85bbd0ad5786836492cf0096f99177716043150b41807cc456f4813ebb1797092761bb227809e8594bf64155b438973cc84bfc +DIST swt-4.31-gtk-linux-ppc64le.zip 4036590 BLAKE2B da9ad8a7e0bf168b024c4e1fbdbcc01154ec0d7e8b38b2912ba7edf1bf8239f05a9ce1f08790174158ebb788c9cc3adf754d13942fc8aa0fe9d4a53177a814ff SHA512 bf8f3f45b4229db383839a64b7d08294340ab2f0c623be8e382609b5ff9a59683229bb308d49480ffb01596ab050d45f97894fec99c0d4eb710e60c40b864531 +DIST swt-4.31-gtk-linux-x86_64.zip 4039479 BLAKE2B 6f7e434acf57cd03dd5e938b1b1c578339b3d7817202681a15420ebdec3be10b95b1bf5eca6f1cf71de9a5a0c390d2d6ee903c2a71e8974e03987cc52322e44d SHA512 da61610ce00fc46893ec3ee6d5d7ed5cc59312002c6946a3748cff1a776af75bad0026512b412ef1622ca0bee124764ed8ee7f5f87364cff945b296feb86e74b diff --git a/dev-java/swt/swt-4.31.ebuild b/dev-java/swt/swt-4.31.ebuild new file mode 100644 index ..bcfb034a7ae1 --- /dev/null +++ b/dev-java/swt/swt-4.31.ebuild @@ -0,0 +1,151 @@ +# 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}-202402290520; +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.31" +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:*" + +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' \ +
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: f95f29ff3e5e207a738a29856ccc88483bbf975c Author: Sam James gentoo org> AuthorDate: Sun Jan 7 13:25:38 2024 + Commit: Sam James gentoo org> CommitDate: Sun Jan 7 13:25:38 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f95f29ff dev-java/swt: Stabilize 4.30-r1 amd64, #921548 Signed-off-by: Sam James gentoo.org> dev-java/swt/swt-4.30-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/swt/swt-4.30-r1.ebuild b/dev-java/swt/swt-4.30-r1.ebuild index 9ad758732b15..f0ea9b557f4b 100644 --- a/dev-java/swt/swt-4.30-r1.ebuild +++ b/dev-java/swt/swt-4.30-r1.ebuild @@ -20,7 +20,7 @@ SRC_URI=" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" SLOT="4.30" -KEYWORDS="~amd64 arm64 ppc64" +KEYWORDS="amd64 arm64 ppc64" IUSE="cairo opengl webkit" COMMON_DEP="
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: 187d77664d942768a3ceddc1037b7b298df7ddca Author: Sam James gentoo org> AuthorDate: Sun Jan 7 09:31:34 2024 + Commit: Sam James gentoo org> CommitDate: Sun Jan 7 09:31:34 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=187d7766 dev-java/swt: Stabilize 4.30-r1 ppc64, #921548 Signed-off-by: Sam James gentoo.org> dev-java/swt/swt-4.30-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/swt/swt-4.30-r1.ebuild b/dev-java/swt/swt-4.30-r1.ebuild index f452334ea84e..9ad758732b15 100644 --- a/dev-java/swt/swt-4.30-r1.ebuild +++ b/dev-java/swt/swt-4.30-r1.ebuild @@ -20,7 +20,7 @@ SRC_URI=" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" SLOT="4.30" -KEYWORDS="~amd64 arm64 ~ppc64" +KEYWORDS="~amd64 arm64 ppc64" IUSE="cairo opengl webkit" COMMON_DEP="
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: 5d6ce6a931bb76c1bbdff2c96d7a3ba86eb4cf88 Author: Sam James gentoo org> AuthorDate: Sun Jan 7 09:04:59 2024 + Commit: Sam James gentoo org> CommitDate: Sun Jan 7 09:04:59 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d6ce6a9 dev-java/swt: Stabilize 4.30-r1 arm64, #921548 Signed-off-by: Sam James gentoo.org> dev-java/swt/swt-4.30-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-java/swt/swt-4.30-r1.ebuild b/dev-java/swt/swt-4.30-r1.ebuild index 78bbe7198020..f452334ea84e 100644 --- a/dev-java/swt/swt-4.30-r1.ebuild +++ b/dev-java/swt/swt-4.30-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -20,7 +20,7 @@ SRC_URI=" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" SLOT="4.30" -KEYWORDS="~amd64 ~arm64 ~ppc64" +KEYWORDS="~amd64 arm64 ~ppc64" IUSE="cairo opengl webkit" COMMON_DEP="
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: b5b01b102debe573eccc0d807aff43373100ea15 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Wed Dec 6 20:18:17 2023 + Commit: Miroslav Šulc gentoo org> CommitDate: Thu Dec 7 07:55:30 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5b01b10 dev-java/swt: 4.30-r1 SLOT 4.27 -> 4.30 Closes: https://bugs.gentoo.org/919353 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/34152 Signed-off-by: Miroslav Šulc gentoo.org> dev-java/swt/{swt-4.30.ebuild => swt-4.30-r1.ebuild} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/swt/swt-4.30.ebuild b/dev-java/swt/swt-4.30-r1.ebuild similarity index 99% rename from dev-java/swt/swt-4.30.ebuild rename to dev-java/swt/swt-4.30-r1.ebuild index ca3db3c7eb76..78bbe7198020 100644 --- a/dev-java/swt/swt-4.30.ebuild +++ b/dev-java/swt/swt-4.30-r1.ebuild @@ -19,7 +19,7 @@ SRC_URI=" ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64le.zip )" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" -SLOT="4.27" +SLOT="4.30" KEYWORDS="~amd64 ~arm64 ~ppc64" IUSE="cairo opengl webkit"
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: d2a4e9a62ad1c2f59f796953805d09d96cf0170d Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Fri Nov 17 20:40:35 2023 + Commit: Miroslav Šulc gentoo org> CommitDate: Mon Dec 4 09:03:20 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2a4e9a6 dev-java/swt: add 4.30 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Signed-off-by: Miroslav Šulc gentoo.org> dev-java/swt/Manifest| 3 + dev-java/swt/swt-4.30.ebuild | 148 +++ 2 files changed, 151 insertions(+) diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest index 4b1c6a80a988..75b83fcd9ee2 100644 --- a/dev-java/swt/Manifest +++ b/dev-java/swt/Manifest @@ -6,3 +6,6 @@ DIST swt-4.10-gtk-linux-x86_64.zip 3844306 BLAKE2B 0e0ed21708acce347fd025920ee63 DIST swt-4.29-gtk-linux-aarch64.zip 3836724 BLAKE2B 8c905df298688686ee22c9f2021560856f7ac7b6a92dad744b27cd30530c6ff76470fdcbb79b91ada01f28c43b8f694c334ff1337d692366ae9dc0319f7e46e2 SHA512 44ff572b57631b1b6a98192f60624758d90f54a2b2272c6bbb140ece39e65bb4086cf08fbc50c5f2e388e7b410b28fc014b87a8560062053b4c131970fa38b17 DIST swt-4.29-gtk-linux-ppc64le.zip 3860955 BLAKE2B f24f8224581425dc86926a147f2f4c644f086cb7907e03bfca64df93ef5ce8341f519acc91e90c0af4eede65797ac019c17a410ff0312306714fa26ddb4234b4 SHA512 09326b5204970d9db2cede4aebf11c7f24a47c30b6bc49764dda1d0a33fa83c7c4755797cac387d1814a29ad2574e45244b994e5df0c7ef2fd1375fc7877814b DIST swt-4.29-gtk-linux-x86_64.zip 3857122 BLAKE2B ac4416044f93eaed396ac10edb74eb5ebcbb967797109f57580bd0ac7c1e3752e8895c5ff1b315aa32b5d5b5ce8e1440badb8b9c3138a0eaeb4df63098919a8c SHA512 c92381e4d1479c219e174c027e54af781e674b266334a5e087f5821935e0a87696f40afbc9fe6f9ffaa00b5204165d9ff6476031b5e4e2df8aea1a54aeb2e65e +DIST swt-4.30-gtk-linux-aarch64.zip 3836637 BLAKE2B 4cedb6eae73e03c32f6c226560f8e7bcbde5b6fc57579255e793fd5d01a5ff80f8b673dd7035eb7f2693abadd98bd0cfdb2eec632c05995552a9a1f1b673b8cc SHA512 df12ba30373d3ee7f0337b42d3a4f55a55dc898be9c97fbcc3d841c082d00190a75513272076c5709ee626e8af3f77c7c2dc518aa9289e80e33f4b134907 +DIST swt-4.30-gtk-linux-ppc64le.zip 3860636 BLAKE2B a535c1bcc6c668905f4d4aaa8c5ae7f3b8f48fc95004522d09924ae54d5172b18f80169d78633e960ce0c5141e5b34492d1dd05188a0b1f48d9f79d286bd2982 SHA512 5a17bd7752343da638466ac28de460d9fa9f0e777d1e48625ddb6c5538704e36cd97439d1bf8f07ad34a32b7d5f27f19d8877e8a9bb9094b4a74bdbb1dc126f7 +DIST swt-4.30-gtk-linux-x86_64.zip 3856990 BLAKE2B 0ea29a5f286fb4bb362758629226bcd6f27716afae7abb80cb37e7d4b72f0c835d63a196384465d3bc74135c42454a74c75455c094204e6329229ad8ca1fda78 SHA512 3802bd1dc84c7d684dac6b0b21de6b4958dd0c736a6b42176cf734806f04ae9dfdb18515ec5249eeff5f6bb716bf327a7a10e79d68cc487a1ad02267394507a1 diff --git a/dev-java/swt/swt-4.30.ebuild b/dev-java/swt/swt-4.30.ebuild new file mode 100644 index ..ca3db3c7eb76 --- /dev/null +++ b/dev-java/swt/swt-4.30.ebuild @@ -0,0 +1,148 @@ +# Copyright 1999-2023 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}-202312010110; +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 )" + +LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" +SLOT="4.27" +KEYWORDS="~amd64 ~arm64 ~ppc64" +IUSE="cairo opengl webkit" + +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:*" +BDEPEND=" + app-arch/unzip + virtual/pkgconfig +" + +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 + 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 + mkdir src || die "mkdir failed" + mv org src || die "moving java sources failed" + pushd src > /dev/null || die + find -type f !
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: cc3f714c303f043ad71e448be91f2668d484bfd6 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Wed Nov 29 20:54:07 2023 + Commit: Miroslav Šulc gentoo org> CommitDate: Thu Nov 30 10:02:25 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc3f714c dev-java/swt: drop 4.28-r1 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Signed-off-by: Miroslav Šulc gentoo.org> dev-java/swt/Manifest | 3 - dev-java/swt/swt-4.28-r1.ebuild | 143 2 files changed, 146 deletions(-) diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest index c05938dd3fbb..4b1c6a80a988 100644 --- a/dev-java/swt/Manifest +++ b/dev-java/swt/Manifest @@ -3,9 +3,6 @@ DIST swt-3.7.2-gtk-linux-x86.zip 5374609 BLAKE2B 04d44b9fffcedc6ce255e2651377ac6 DIST swt-3.7.2-gtk-linux-x86_64.zip 5671443 BLAKE2B 953fc9eab6d1f2750b1a1345cddf4aa6969567cb75977f87ee50668d367e55dda8be2ff836d87b780005c22132fa783b475f422c093617fd02f478eadd96076d SHA512 d60ae1d3f3b0577f7e3018139f93069c89d021064fec2f3f4074f95cfae56abdc0c7d531cb904ad3911482543cddcc3f6646ff47192073f4bde97c79e13612b7 DIST swt-4.10-gtk-linux-ppc64le.zip 3848264 BLAKE2B 214861fde6987906fb24f3187936f3bcb49aebed54fe242427c3737bf6761e8f77d049c376f30ca0fc33e74a1e8a48b6aff6d9863775ee9c33fea7cb2edd1309 SHA512 1b3ede58c2b41abae76f58a303bd3fbf1849ba8be3fd6518325bc22400e960c3ab542e7351b1bc08053e2746ea3e28812e04c2d1789cb1e19ea28745c8a5f39a DIST swt-4.10-gtk-linux-x86_64.zip 3844306 BLAKE2B 0e0ed21708acce347fd025920ee635f586c460f8a9c05a7067fd70eed9da999b4a62a5febd17f0c5546ab15198336038e4ab49a1bd588d49ffb39450353a1911 SHA512 9dd946cb7c11446f553f06b8af516167519bab00d4a89f626cd612be6d18e50023fc537aa3d844a8f7a56a767df00410efe4dd20e2bfd930639330a1e279a7a0 -DIST swt-4.28-gtk-linux-aarch64.zip 3836289 BLAKE2B 3460e8bcde76cae74d3fba94198b2f0a6b8ed21c4f123003a216421db4af03686f43a26ce00cf4c59c56f8a31b88626482ae5f13f2e92c06e2147658fa482aeb SHA512 d91ff48ca384de057d70f3a886691193bd88960c6da0e37fb4ef695c32399c0d3ab87f6174075e5637046e7b2b22a73e4b03e0133a2bdb7ee584d4fa53baa11c -DIST swt-4.28-gtk-linux-ppc64le.zip 3860453 BLAKE2B 8de275767f1bd0b68a58744804c71314760fb3d56a396db32917376583830bb0307b5169f0f8c56a200180aaf7e871a1ab01e2ed682c16a49d2d236d1ae3bc3a SHA512 56d7f82b249924966184be29d4cdac454308169247b5c7819b77f592eef7f434ba5e913d95688411667940c354cb9d9db023935925914053e04117a654e2ad91 -DIST swt-4.28-gtk-linux-x86_64.zip 3856600 BLAKE2B 6725d0a261444d113af74e36d8bc451d2a8f3fbecb13f137877d4ac3acf427944b4eeb782967bddbd30c0af88ab0c8976020731c2c70c318012053ccdde83b17 SHA512 81c42fc08432c031f8c2d862fde5ac59c96ff0b70109fb1a65b00c22f136c696d7aa9ec02416660cb71691f3c9d36de553a68315cb4e9aeee86290114e69a829 DIST swt-4.29-gtk-linux-aarch64.zip 3836724 BLAKE2B 8c905df298688686ee22c9f2021560856f7ac7b6a92dad744b27cd30530c6ff76470fdcbb79b91ada01f28c43b8f694c334ff1337d692366ae9dc0319f7e46e2 SHA512 44ff572b57631b1b6a98192f60624758d90f54a2b2272c6bbb140ece39e65bb4086cf08fbc50c5f2e388e7b410b28fc014b87a8560062053b4c131970fa38b17 DIST swt-4.29-gtk-linux-ppc64le.zip 3860955 BLAKE2B f24f8224581425dc86926a147f2f4c644f086cb7907e03bfca64df93ef5ce8341f519acc91e90c0af4eede65797ac019c17a410ff0312306714fa26ddb4234b4 SHA512 09326b5204970d9db2cede4aebf11c7f24a47c30b6bc49764dda1d0a33fa83c7c4755797cac387d1814a29ad2574e45244b994e5df0c7ef2fd1375fc7877814b DIST swt-4.29-gtk-linux-x86_64.zip 3857122 BLAKE2B ac4416044f93eaed396ac10edb74eb5ebcbb967797109f57580bd0ac7c1e3752e8895c5ff1b315aa32b5d5b5ce8e1440badb8b9c3138a0eaeb4df63098919a8c SHA512 c92381e4d1479c219e174c027e54af781e674b266334a5e087f5821935e0a87696f40afbc9fe6f9ffaa00b5204165d9ff6476031b5e4e2df8aea1a54aeb2e65e diff --git a/dev-java/swt/swt-4.28-r1.ebuild b/dev-java/swt/swt-4.28-r1.ebuild deleted file mode 100644 index 8868a156b623.. --- a/dev-java/swt/swt-4.28-r1.ebuild +++ /dev/null @@ -1,143 +0,0 @@ -# Copyright 1999-2023 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}-202306050440; -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 )" - -LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" -SLOT="4.27" -KEYWORDS="amd64 arm64 ppc64" -IUSE="cairo opengl webkit" - -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} -
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: ed1ad4ddf8f3311233bec9c0e0e7ba32692869c6 Author: Sam James gentoo org> AuthorDate: Wed Nov 29 19:44:10 2023 + Commit: Sam James gentoo org> CommitDate: Wed Nov 29 19:44:21 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed1ad4dd dev-java/swt: Stabilize 4.29 amd64, #915719 Signed-off-by: Sam James gentoo.org> dev-java/swt/swt-4.29.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/swt/swt-4.29.ebuild b/dev-java/swt/swt-4.29.ebuild index 6f8aaa2c1780..08361076b0b5 100644 --- a/dev-java/swt/swt-4.29.ebuild +++ b/dev-java/swt/swt-4.29.ebuild @@ -20,7 +20,7 @@ SRC_URI=" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" SLOT="4.27" -KEYWORDS="~amd64 arm64 ppc64" +KEYWORDS="amd64 arm64 ppc64" IUSE="cairo opengl webkit" COMMON_DEP="
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: ead955e4eddc0d5e1e2b05cfda85d571f36f58bf Author: Sam James gentoo org> AuthorDate: Sat Oct 14 10:37:11 2023 + Commit: Sam James gentoo org> CommitDate: Sat Oct 14 10:37:11 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ead955e4 dev-java/swt: Stabilize 4.29 arm64, #915719 Signed-off-by: Sam James gentoo.org> dev-java/swt/swt-4.29.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/swt/swt-4.29.ebuild b/dev-java/swt/swt-4.29.ebuild index 3cd0cc9e97d2..6f8aaa2c1780 100644 --- a/dev-java/swt/swt-4.29.ebuild +++ b/dev-java/swt/swt-4.29.ebuild @@ -20,7 +20,7 @@ SRC_URI=" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" SLOT="4.27" -KEYWORDS="~amd64 ~arm64 ppc64" +KEYWORDS="~amd64 arm64 ppc64" IUSE="cairo opengl webkit" COMMON_DEP="
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: a70b74e4075b2699097aacc723589d1fe69abe06 Author: Sam James gentoo org> AuthorDate: Sat Oct 14 10:37:10 2023 + Commit: Sam James gentoo org> CommitDate: Sat Oct 14 10:37:10 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a70b74e4 dev-java/swt: Stabilize 4.29 ppc64, #915719 Signed-off-by: Sam James gentoo.org> dev-java/swt/swt-4.29.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/swt/swt-4.29.ebuild b/dev-java/swt/swt-4.29.ebuild index 9c0ca3dee2e3..3cd0cc9e97d2 100644 --- a/dev-java/swt/swt-4.29.ebuild +++ b/dev-java/swt/swt-4.29.ebuild @@ -20,7 +20,7 @@ SRC_URI=" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" SLOT="4.27" -KEYWORDS="~amd64 ~arm64 ~ppc64" +KEYWORDS="~amd64 ~arm64 ppc64" IUSE="cairo opengl webkit" COMMON_DEP="
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: 077aa78f3be992dc5bc2a29bf0575320ddfd7413 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Mon Sep 4 08:09:26 2023 + Commit: Miroslav Šulc gentoo org> CommitDate: Thu Sep 14 07:45:46 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=077aa78f dev-java/swt: add 4.29 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/32759 Signed-off-by: Miroslav Šulc gentoo.org> dev-java/swt/Manifest| 3 + dev-java/swt/swt-4.29.ebuild | 147 +++ 2 files changed, 150 insertions(+) diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest index d41e0bbacf6c..c05938dd3fbb 100644 --- a/dev-java/swt/Manifest +++ b/dev-java/swt/Manifest @@ -6,3 +6,6 @@ DIST swt-4.10-gtk-linux-x86_64.zip 3844306 BLAKE2B 0e0ed21708acce347fd025920ee63 DIST swt-4.28-gtk-linux-aarch64.zip 3836289 BLAKE2B 3460e8bcde76cae74d3fba94198b2f0a6b8ed21c4f123003a216421db4af03686f43a26ce00cf4c59c56f8a31b88626482ae5f13f2e92c06e2147658fa482aeb SHA512 d91ff48ca384de057d70f3a886691193bd88960c6da0e37fb4ef695c32399c0d3ab87f6174075e5637046e7b2b22a73e4b03e0133a2bdb7ee584d4fa53baa11c DIST swt-4.28-gtk-linux-ppc64le.zip 3860453 BLAKE2B 8de275767f1bd0b68a58744804c71314760fb3d56a396db32917376583830bb0307b5169f0f8c56a200180aaf7e871a1ab01e2ed682c16a49d2d236d1ae3bc3a SHA512 56d7f82b249924966184be29d4cdac454308169247b5c7819b77f592eef7f434ba5e913d95688411667940c354cb9d9db023935925914053e04117a654e2ad91 DIST swt-4.28-gtk-linux-x86_64.zip 3856600 BLAKE2B 6725d0a261444d113af74e36d8bc451d2a8f3fbecb13f137877d4ac3acf427944b4eeb782967bddbd30c0af88ab0c8976020731c2c70c318012053ccdde83b17 SHA512 81c42fc08432c031f8c2d862fde5ac59c96ff0b70109fb1a65b00c22f136c696d7aa9ec02416660cb71691f3c9d36de553a68315cb4e9aeee86290114e69a829 +DIST swt-4.29-gtk-linux-aarch64.zip 3836724 BLAKE2B 8c905df298688686ee22c9f2021560856f7ac7b6a92dad744b27cd30530c6ff76470fdcbb79b91ada01f28c43b8f694c334ff1337d692366ae9dc0319f7e46e2 SHA512 44ff572b57631b1b6a98192f60624758d90f54a2b2272c6bbb140ece39e65bb4086cf08fbc50c5f2e388e7b410b28fc014b87a8560062053b4c131970fa38b17 +DIST swt-4.29-gtk-linux-ppc64le.zip 3860955 BLAKE2B f24f8224581425dc86926a147f2f4c644f086cb7907e03bfca64df93ef5ce8341f519acc91e90c0af4eede65797ac019c17a410ff0312306714fa26ddb4234b4 SHA512 09326b5204970d9db2cede4aebf11c7f24a47c30b6bc49764dda1d0a33fa83c7c4755797cac387d1814a29ad2574e45244b994e5df0c7ef2fd1375fc7877814b +DIST swt-4.29-gtk-linux-x86_64.zip 3857122 BLAKE2B ac4416044f93eaed396ac10edb74eb5ebcbb967797109f57580bd0ac7c1e3752e8895c5ff1b315aa32b5d5b5ce8e1440badb8b9c3138a0eaeb4df63098919a8c SHA512 c92381e4d1479c219e174c027e54af781e674b266334a5e087f5821935e0a87696f40afbc9fe6f9ffaa00b5204165d9ff6476031b5e4e2df8aea1a54aeb2e65e diff --git a/dev-java/swt/swt-4.29.ebuild b/dev-java/swt/swt-4.29.ebuild new file mode 100644 index ..9c0ca3dee2e3 --- /dev/null +++ b/dev-java/swt/swt-4.29.ebuild @@ -0,0 +1,147 @@ +# Copyright 1999-2023 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}-202309031000; +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 )" + +LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" +SLOT="4.27" +KEYWORDS="~amd64 ~arm64 ~ppc64" +IUSE="cairo opengl webkit" + +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-11:*[-headless-awt] + x11-base/xorg-proto + x11-libs/libX11 + x11-libs/libXrender + x11-libs/libXt + x11-libs/libXtst" +RDEPEND="${COMMON_DEP} + >=virtual/jre-1.8:*" +BDEPEND=" + app-arch/unzip + virtual/pkgconfig +" + +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 + 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 + mkdir src || die "mkdir failed" + mv org src || die "moving java sources failed" + pushd src > /dev/null || die + find -type f ! -name '*.java' \ +
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: d3aabe418ac5b7d1f4e5b639078ab5c133c4b9b5 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Thu Aug 3 18:30:48 2023 + Commit: Miroslav Šulc gentoo org> CommitDate: Fri Aug 4 05:57:59 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3aabe41 dev-java/swt: drop 4.27 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/32158 Signed-off-by: Miroslav Šulc gentoo.org> dev-java/swt/Manifest| 3 - dev-java/swt/swt-4.27.ebuild | 142 --- 2 files changed, 145 deletions(-) diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest index 800979ca156e..d41e0bbacf6c 100644 --- a/dev-java/swt/Manifest +++ b/dev-java/swt/Manifest @@ -3,9 +3,6 @@ DIST swt-3.7.2-gtk-linux-x86.zip 5374609 BLAKE2B 04d44b9fffcedc6ce255e2651377ac6 DIST swt-3.7.2-gtk-linux-x86_64.zip 5671443 BLAKE2B 953fc9eab6d1f2750b1a1345cddf4aa6969567cb75977f87ee50668d367e55dda8be2ff836d87b780005c22132fa783b475f422c093617fd02f478eadd96076d SHA512 d60ae1d3f3b0577f7e3018139f93069c89d021064fec2f3f4074f95cfae56abdc0c7d531cb904ad3911482543cddcc3f6646ff47192073f4bde97c79e13612b7 DIST swt-4.10-gtk-linux-ppc64le.zip 3848264 BLAKE2B 214861fde6987906fb24f3187936f3bcb49aebed54fe242427c3737bf6761e8f77d049c376f30ca0fc33e74a1e8a48b6aff6d9863775ee9c33fea7cb2edd1309 SHA512 1b3ede58c2b41abae76f58a303bd3fbf1849ba8be3fd6518325bc22400e960c3ab542e7351b1bc08053e2746ea3e28812e04c2d1789cb1e19ea28745c8a5f39a DIST swt-4.10-gtk-linux-x86_64.zip 3844306 BLAKE2B 0e0ed21708acce347fd025920ee635f586c460f8a9c05a7067fd70eed9da999b4a62a5febd17f0c5546ab15198336038e4ab49a1bd588d49ffb39450353a1911 SHA512 9dd946cb7c11446f553f06b8af516167519bab00d4a89f626cd612be6d18e50023fc537aa3d844a8f7a56a767df00410efe4dd20e2bfd930639330a1e279a7a0 -DIST swt-4.27-gtk-linux-aarch64.zip 3849438 BLAKE2B b07daa4942c450d5cca5a323b0649a645fe9a283b272a73a9675f3bd07fbae859c41f451521231a93f4fb56ae4093d57474545611c4789c076abad2e9e1c911f SHA512 a3ba011258e5906beb15ffd5deaa73fc9a5ed5f7bce78a4a683ad8ad12a5cca1fa3a0d89fed6da9f4ade530ea3bda09093ad43202993b522a060a9dcd98746d3 -DIST swt-4.27-gtk-linux-ppc64le.zip 3872996 BLAKE2B 58ae779b7103da932719fe702674e211f8f0068c3b6094172b4c58e939de96d8d43ef80d40740c29f6fcd802a252a87ba850e9e6320d881c958b0161700e4e8c SHA512 6f8f1fce502e0980ced3f201dcdeb3397a583a9ba9ebe76d82c713c440d614c4ff38efe5f596a9da25940f931e3c651c36b18211faea4fab31872d25566b060a -DIST swt-4.27-gtk-linux-x86_64.zip 3869518 BLAKE2B d0eb7d1be59944cbffe5556c258043d084f7f1a8fa1d9ad9c3738896adc12aa015f85b675ba72af31de566ae451280bb83d82082b3f589c8da643631bf1f7bfb SHA512 efa89c1752340978e1aa1d2343a07df001fa952092aef959bdeedf53a31270d24ebe34ccb50e72ef2221da810ed08c53b188a80aab8a37e5932f85f6771ea1ef DIST swt-4.28-gtk-linux-aarch64.zip 3836289 BLAKE2B 3460e8bcde76cae74d3fba94198b2f0a6b8ed21c4f123003a216421db4af03686f43a26ce00cf4c59c56f8a31b88626482ae5f13f2e92c06e2147658fa482aeb SHA512 d91ff48ca384de057d70f3a886691193bd88960c6da0e37fb4ef695c32399c0d3ab87f6174075e5637046e7b2b22a73e4b03e0133a2bdb7ee584d4fa53baa11c DIST swt-4.28-gtk-linux-ppc64le.zip 3860453 BLAKE2B 8de275767f1bd0b68a58744804c71314760fb3d56a396db32917376583830bb0307b5169f0f8c56a200180aaf7e871a1ab01e2ed682c16a49d2d236d1ae3bc3a SHA512 56d7f82b249924966184be29d4cdac454308169247b5c7819b77f592eef7f434ba5e913d95688411667940c354cb9d9db023935925914053e04117a654e2ad91 DIST swt-4.28-gtk-linux-x86_64.zip 3856600 BLAKE2B 6725d0a261444d113af74e36d8bc451d2a8f3fbecb13f137877d4ac3acf427944b4eeb782967bddbd30c0af88ab0c8976020731c2c70c318012053ccdde83b17 SHA512 81c42fc08432c031f8c2d862fde5ac59c96ff0b70109fb1a65b00c22f136c696d7aa9ec02416660cb71691f3c9d36de553a68315cb4e9aeee86290114e69a829 diff --git a/dev-java/swt/swt-4.27.ebuild b/dev-java/swt/swt-4.27.ebuild deleted file mode 100644 index 499b8e3841a0.. --- a/dev-java/swt/swt-4.27.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright 1999-2023 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}-202303020300; -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 )" - -LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" -SLOT="4.27" -KEYWORDS="amd64 arm64 ppc64" -IUSE="cairo opengl webkit" - -COMMON_DEP=" - app-accessibility/at-spi2-core:2 - dev-libs/glib - x11-libs/gtk+:2 - x11-libs/libXtst - cairo? ( x11-libs/cairo ) - opengl? ( - virtual/glu - virtual/opengl - ) - webkit? ( - net-libs/webkit-gtk:4.1 -
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: f2e2742d4e1e0fcda04a9cba80daecb79a5ca9f6 Author: Sam James gentoo org> AuthorDate: Thu Aug 3 15:07:41 2023 + Commit: Sam James gentoo org> CommitDate: Thu Aug 3 15:07:41 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2e2742d dev-java/swt: Stabilize 4.28-r1 amd64, #911314 Signed-off-by: Sam James gentoo.org> dev-java/swt/swt-4.28-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/swt/swt-4.28-r1.ebuild b/dev-java/swt/swt-4.28-r1.ebuild index 3c3c401e342d..8868a156b623 100644 --- a/dev-java/swt/swt-4.28-r1.ebuild +++ b/dev-java/swt/swt-4.28-r1.ebuild @@ -20,7 +20,7 @@ SRC_URI=" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" SLOT="4.27" -KEYWORDS="~amd64 arm64 ppc64" +KEYWORDS="amd64 arm64 ppc64" IUSE="cairo opengl webkit" COMMON_DEP="
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: 8042803c62b81096a899371ec51350df3b402282 Author: Sam James gentoo org> AuthorDate: Thu Jul 27 22:28:15 2023 + Commit: Sam James gentoo org> CommitDate: Thu Jul 27 22:28:15 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8042803c dev-java/swt: Stabilize 4.28-r1 arm64, #911314 Signed-off-by: Sam James gentoo.org> dev-java/swt/swt-4.28-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/swt/swt-4.28-r1.ebuild b/dev-java/swt/swt-4.28-r1.ebuild index 56a7f6d535c4..3c3c401e342d 100644 --- a/dev-java/swt/swt-4.28-r1.ebuild +++ b/dev-java/swt/swt-4.28-r1.ebuild @@ -20,7 +20,7 @@ SRC_URI=" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" SLOT="4.27" -KEYWORDS="~amd64 ~arm64 ppc64" +KEYWORDS="~amd64 arm64 ppc64" IUSE="cairo opengl webkit" COMMON_DEP="
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: e7cfd66e9368f3f9740bd4e3993156bb23969d57 Author: Sam James gentoo org> AuthorDate: Thu Jul 27 22:20:09 2023 + Commit: Sam James gentoo org> CommitDate: Thu Jul 27 22:20:09 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7cfd66e dev-java/swt: Stabilize 4.28-r1 ppc64, #911314 Signed-off-by: Sam James gentoo.org> dev-java/swt/swt-4.28-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/swt/swt-4.28-r1.ebuild b/dev-java/swt/swt-4.28-r1.ebuild index 46698300250e..56a7f6d535c4 100644 --- a/dev-java/swt/swt-4.28-r1.ebuild +++ b/dev-java/swt/swt-4.28-r1.ebuild @@ -20,7 +20,7 @@ SRC_URI=" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" SLOT="4.27" -KEYWORDS="~amd64 ~arm64 ~ppc64" +KEYWORDS="~amd64 ~arm64 ppc64" IUSE="cairo opengl webkit" COMMON_DEP="
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: 191761b4f4fc26d3fc205809ba6d842165faf141 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Tue Jun 27 08:18:13 2023 + Commit: Miroslav Šulc gentoo org> CommitDate: Wed Jun 28 07:14:11 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=191761b4 dev-java/swt: adjust dependency on gtk+ Closes: https://bugs.gentoo.org/909285 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/31640 Signed-off-by: Miroslav Šulc gentoo.org> dev-java/swt/{swt-4.28.ebuild => swt-4.28-r1.ebuild} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/swt/swt-4.28.ebuild b/dev-java/swt/swt-4.28-r1.ebuild similarity index 99% rename from dev-java/swt/swt-4.28.ebuild rename to dev-java/swt/swt-4.28-r1.ebuild index 3ce70c836f01..46698300250e 100644 --- a/dev-java/swt/swt-4.28.ebuild +++ b/dev-java/swt/swt-4.28-r1.ebuild @@ -26,7 +26,7 @@ IUSE="cairo opengl webkit" COMMON_DEP=" app-accessibility/at-spi2-core:2 dev-libs/glib - x11-libs/gtk+:2 + x11-libs/gtk+:3 x11-libs/libXtst cairo? ( x11-libs/cairo ) opengl? (
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: 78b3b60aebd47716aeee84f0f49425f4b30fd0b4 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Thu Jun 22 07:41:33 2023 + Commit: Miroslav Šulc gentoo org> CommitDate: Fri Jun 23 05:20:59 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78b3b60a dev-java/swt: add 4.28 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/31570 Signed-off-by: Miroslav Šulc gentoo.org> dev-java/swt/Manifest| 3 + dev-java/swt/swt-4.28.ebuild | 143 +++ 2 files changed, 146 insertions(+) diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest index 296f28fcfb56..800979ca156e 100644 --- a/dev-java/swt/Manifest +++ b/dev-java/swt/Manifest @@ -6,3 +6,6 @@ DIST swt-4.10-gtk-linux-x86_64.zip 3844306 BLAKE2B 0e0ed21708acce347fd025920ee63 DIST swt-4.27-gtk-linux-aarch64.zip 3849438 BLAKE2B b07daa4942c450d5cca5a323b0649a645fe9a283b272a73a9675f3bd07fbae859c41f451521231a93f4fb56ae4093d57474545611c4789c076abad2e9e1c911f SHA512 a3ba011258e5906beb15ffd5deaa73fc9a5ed5f7bce78a4a683ad8ad12a5cca1fa3a0d89fed6da9f4ade530ea3bda09093ad43202993b522a060a9dcd98746d3 DIST swt-4.27-gtk-linux-ppc64le.zip 3872996 BLAKE2B 58ae779b7103da932719fe702674e211f8f0068c3b6094172b4c58e939de96d8d43ef80d40740c29f6fcd802a252a87ba850e9e6320d881c958b0161700e4e8c SHA512 6f8f1fce502e0980ced3f201dcdeb3397a583a9ba9ebe76d82c713c440d614c4ff38efe5f596a9da25940f931e3c651c36b18211faea4fab31872d25566b060a DIST swt-4.27-gtk-linux-x86_64.zip 3869518 BLAKE2B d0eb7d1be59944cbffe5556c258043d084f7f1a8fa1d9ad9c3738896adc12aa015f85b675ba72af31de566ae451280bb83d82082b3f589c8da643631bf1f7bfb SHA512 efa89c1752340978e1aa1d2343a07df001fa952092aef959bdeedf53a31270d24ebe34ccb50e72ef2221da810ed08c53b188a80aab8a37e5932f85f6771ea1ef +DIST swt-4.28-gtk-linux-aarch64.zip 3836289 BLAKE2B 3460e8bcde76cae74d3fba94198b2f0a6b8ed21c4f123003a216421db4af03686f43a26ce00cf4c59c56f8a31b88626482ae5f13f2e92c06e2147658fa482aeb SHA512 d91ff48ca384de057d70f3a886691193bd88960c6da0e37fb4ef695c32399c0d3ab87f6174075e5637046e7b2b22a73e4b03e0133a2bdb7ee584d4fa53baa11c +DIST swt-4.28-gtk-linux-ppc64le.zip 3860453 BLAKE2B 8de275767f1bd0b68a58744804c71314760fb3d56a396db32917376583830bb0307b5169f0f8c56a200180aaf7e871a1ab01e2ed682c16a49d2d236d1ae3bc3a SHA512 56d7f82b249924966184be29d4cdac454308169247b5c7819b77f592eef7f434ba5e913d95688411667940c354cb9d9db023935925914053e04117a654e2ad91 +DIST swt-4.28-gtk-linux-x86_64.zip 3856600 BLAKE2B 6725d0a261444d113af74e36d8bc451d2a8f3fbecb13f137877d4ac3acf427944b4eeb782967bddbd30c0af88ab0c8976020731c2c70c318012053ccdde83b17 SHA512 81c42fc08432c031f8c2d862fde5ac59c96ff0b70109fb1a65b00c22f136c696d7aa9ec02416660cb71691f3c9d36de553a68315cb4e9aeee86290114e69a829 diff --git a/dev-java/swt/swt-4.28.ebuild b/dev-java/swt/swt-4.28.ebuild new file mode 100644 index ..3ce70c836f01 --- /dev/null +++ b/dev-java/swt/swt-4.28.ebuild @@ -0,0 +1,143 @@ +# Copyright 1999-2023 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}-202306050440; +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 )" + +LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" +SLOT="4.27" +KEYWORDS="~amd64 ~arm64 ~ppc64" +IUSE="cairo opengl webkit" + +COMMON_DEP=" + app-accessibility/at-spi2-core:2 + dev-libs/glib + x11-libs/gtk+:2 + x11-libs/libXtst + cairo? ( x11-libs/cairo ) + opengl? ( + virtual/glu + virtual/opengl + ) + webkit? ( + net-libs/webkit-gtk:4.1 + )" +DEPEND="${COMMON_DEP} + >=virtual/jdk-11:*[-headless-awt] + x11-base/xorg-proto + x11-libs/libX11 + x11-libs/libXrender + x11-libs/libXt + x11-libs/libXtst" +RDEPEND="${COMMON_DEP} + >=virtual/jre-1.8:*" +BDEPEND=" + app-arch/unzip + virtual/pkgconfig +" + +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 + 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 + mkdir src || die "mkdir failed" + mv org src || die "moving java sources failed" + find src -type f ! -name '*.java' | xargs \ + cp --parent -t
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: 8a488ed64758f7712a59d83a372620dd39a58cb2 Author: Sam James gentoo org> AuthorDate: Tue Apr 18 02:11:50 2023 + Commit: Sam James gentoo org> CommitDate: Tue Apr 18 02:12:02 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a488ed6 dev-java/swt: Stabilize 4.27 ppc64, #904494 Signed-off-by: Sam James gentoo.org> dev-java/swt/swt-4.27.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/swt/swt-4.27.ebuild b/dev-java/swt/swt-4.27.ebuild index 70696c53d8e6..499b8e3841a0 100644 --- a/dev-java/swt/swt-4.27.ebuild +++ b/dev-java/swt/swt-4.27.ebuild @@ -20,7 +20,7 @@ SRC_URI=" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" SLOT="4.27" -KEYWORDS="amd64 arm64 ~ppc64" +KEYWORDS="amd64 arm64 ppc64" IUSE="cairo opengl webkit" COMMON_DEP="
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: c490b38322442b9fffab581bfff87ce452a6816e Author: Sam James gentoo org> AuthorDate: Tue Apr 18 00:00:42 2023 + Commit: Sam James gentoo org> CommitDate: Tue Apr 18 00:00:42 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c490b383 dev-java/swt: Stabilize 4.27 arm64, #904494 Signed-off-by: Sam James gentoo.org> dev-java/swt/swt-4.27.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/swt/swt-4.27.ebuild b/dev-java/swt/swt-4.27.ebuild index d6fab4c42c59..e1c5c4185ffb 100644 --- a/dev-java/swt/swt-4.27.ebuild +++ b/dev-java/swt/swt-4.27.ebuild @@ -20,7 +20,7 @@ SRC_URI=" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" SLOT="4.27" -KEYWORDS="~amd64 ~arm64 ~ppc64" +KEYWORDS="~amd64 arm64 ~ppc64" IUSE="cairo opengl webkit" COMMON_DEP="
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: 5d9ff3a881d1c7f9c025f4a9528cca112e0caf0e Author: Sam James gentoo org> AuthorDate: Tue Apr 18 00:00:44 2023 + Commit: Sam James gentoo org> CommitDate: Tue Apr 18 00:00:44 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d9ff3a8 dev-java/swt: Stabilize 4.27 amd64, #904494 Signed-off-by: Sam James gentoo.org> dev-java/swt/swt-4.27.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/swt/swt-4.27.ebuild b/dev-java/swt/swt-4.27.ebuild index e1c5c4185ffb..70696c53d8e6 100644 --- a/dev-java/swt/swt-4.27.ebuild +++ b/dev-java/swt/swt-4.27.ebuild @@ -20,7 +20,7 @@ SRC_URI=" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" SLOT="4.27" -KEYWORDS="~amd64 arm64 ~ppc64" +KEYWORDS="amd64 arm64 ~ppc64" IUSE="cairo opengl webkit" COMMON_DEP="
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: f52a0a1f4c3e23398b679a99ca7a0dbf78f5d579 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Mar 31 12:40:29 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Mar 31 12:40:29 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f52a0a1f dev-java/swt: Keyword 4.27 arm64, #902119 Signed-off-by: Arthur Zamarin gentoo.org> dev-java/swt/swt-4.27.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/swt/swt-4.27.ebuild b/dev-java/swt/swt-4.27.ebuild index e21194ce71dd..d6fab4c42c59 100644 --- a/dev-java/swt/swt-4.27.ebuild +++ b/dev-java/swt/swt-4.27.ebuild @@ -20,7 +20,7 @@ SRC_URI=" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" SLOT="4.27" -KEYWORDS="~amd64 ~ppc64" +KEYWORDS="~amd64 ~arm64 ~ppc64" IUSE="cairo opengl webkit" COMMON_DEP="
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/files/
commit: 424c58e349f472b244d353e66e1a1ed803d50ebd Author: Miroslav Šulc gentoo org> AuthorDate: Tue Mar 21 06:05:23 2023 + Commit: Miroslav Šulc gentoo org> CommitDate: Tue Mar 21 06:07:14 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=424c58e3 dev-java/swt/files: scrubbed patches Signed-off-by: Miroslav Šulc gentoo.org> dev-java/swt/files/as-needed-and-flag-fixes-3.6.patch | 8 dev-java/swt/files/swt-4.10-as-needed-and-flag-fixes.patch | 5 ++--- dev-java/swt/files/swt-4.27-as-needed-and-flag-fixes.patch | 2 -- 3 files changed, 6 insertions(+), 9 deletions(-) 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 fba4a36aaf1c..d6cc763ea968 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 @@ a/make_linux.mak 2010-06-08 17:30:58.0 + -+++ b/make_linux.mak 2010-08-09 22:48:01.515433721 + +--- a/make_linux.mak b/make_linux.mak @@ -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 a/make_freebsd.mak 2010-06-08 17:30:58.0 + -+++ b/make_freebsd.mak 2010-08-09 22:50:26.173246263 + +--- a/make_freebsd.mak b/make_freebsd.mak @@ -64,7 +64,7 @@ # Uncomment for Native Stats tool #NATIVE_STATS = -DNATIVE_STATS diff --git a/dev-java/swt/files/swt-4.10-as-needed-and-flag-fixes.patch b/dev-java/swt/files/swt-4.10-as-needed-and-flag-fixes.patch index 09bed21d58f8..cb70122aa411 100644 --- a/dev-java/swt/files/swt-4.10-as-needed-and-flag-fixes.patch +++ b/dev-java/swt/files/swt-4.10-as-needed-and-flag-fixes.patch @@ -1,6 +1,5 @@ -diff -Naur a/make_linux.mak b/make_linux.mak a/make_linux.mak 2019-01-07 14:08:00.269147198 +0100 -+++ b/make_linux.mak 2019-01-07 14:10:28.645155241 +0100 +--- a/make_linux.mak b/make_linux.mak @@ -101,7 +101,7 @@ 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 diff --git a/dev-java/swt/files/swt-4.27-as-needed-and-flag-fixes.patch b/dev-java/swt/files/swt-4.27-as-needed-and-flag-fixes.patch index 4f769cf9d71b..c8ea6322f8a1 100644 --- a/dev-java/swt/files/swt-4.27-as-needed-and-flag-fixes.patch +++ b/dev-java/swt/files/swt-4.27-as-needed-and-flag-fixes.patch @@ -1,5 +1,3 @@ -diff --git a/make_linux.mak b/make_linux.mak -index 65c168f..c3a059a 100644 --- a/make_linux.mak +++ b/make_linux.mak @@ -98,7 +98,7 @@ ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o atk_stats.o
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/files/
commit: dab82896df0e604b23b16da9cfd359d217f76a85 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Mon Mar 20 12:14:42 2023 + Commit: Miroslav Šulc gentoo org> CommitDate: Tue Mar 21 06:07:13 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dab82896 dev-java/swt: No more CFLAGS += -Werror Closes: https://bugs.gentoo.org/902201 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/30259 Signed-off-by: Miroslav Šulc gentoo.org> .../files/swt-4.27-as-needed-and-flag-fixes.patch | 39 +++--- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/dev-java/swt/files/swt-4.27-as-needed-and-flag-fixes.patch b/dev-java/swt/files/swt-4.27-as-needed-and-flag-fixes.patch index fffbc910c521..4f769cf9d71b 100644 --- a/dev-java/swt/files/swt-4.27-as-needed-and-flag-fixes.patch +++ b/dev-java/swt/files/swt-4.27-as-needed-and-flag-fixes.patch @@ -1,7 +1,8 @@ -diff -Naur a/make_linux.mak b/make_linux.mak a/make_linux.mak 2019-01-07 14:08:00.269147198 +0100 -+++ b/make_linux.mak 2019-01-07 14:10:28.645155241 +0100 -@@ -98,7 +98,7 @@ +diff --git a/make_linux.mak b/make_linux.mak +index 65c168f..c3a059a 100644 +--- a/make_linux.mak b/make_linux.mak +@@ -98,7 +98,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 @@ -10,7 +11,16 @@ diff -Naur a/make_linux.mak b/make_linux.mak -DSWT_VERSION=$(SWT_VERSION) \ $(NATIVE_STATS) \ $(SWT_DEBUG) \ -@@ -130,13 +130,13 @@ +@@ -111,7 +111,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. +-CFLAGS += -Werror ++# CFLAGS += -Werror + + ifndef NO_STRIP + # -s = Remove all symbol table and relocation information from the executable. +@@ -130,13 +130,13 @@ all: make_swt make_atk make_glx make_webkit make_swt: $(SWT_LIB) $(SWTPI_LIB) $(SWT_LIB): $(SWT_OBJECTS) @@ -26,7 +36,7 @@ diff -Naur a/make_linux.mak b/make_linux.mak swt.o: swt.c swt.h $(CC) $(CFLAGS) -c swt.c -@@ -169,7 +169,7 @@ +@@ -169,7 +169,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) @@ -35,7 +45,7 @@ diff -Naur a/make_linux.mak b/make_linux.mak cairo.o: cairo.c cairo.h swt.h $(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c -@@ -184,7 +184,7 @@ +@@ -184,7 +184,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) @@ -44,7 +54,7 @@ diff -Naur a/make_linux.mak b/make_linux.mak # # Atk lib -@@ -192,7 +192,7 @@ +@@ -192,7 +192,7 @@ $(AWT_LIB): $(AWT_OBJECTS) make_atk: $(ATK_LIB) $(ATK_LIB): $(ATK_OBJECTS) @@ -53,7 +63,7 @@ diff -Naur a/make_linux.mak b/make_linux.mak atk.o: atk.c atk.h $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c -@@ -209,7 +209,7 @@ +@@ -209,7 +209,7 @@ atk_stats.o: atk_stats.c atk_structs.h atk_stats.h atk.h make_webkit: $(WEBKIT_LIB) $(WEBKIT_LIB): $(WEBKIT_OBJECTS) @@ -62,16 +72,7 @@ diff -Naur a/make_linux.mak b/make_linux.mak webkitgtk.o: webkitgtk.c webkitgtk_custom.h $(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk.c -# @@ -217,7 +217,7 @@ -# make_webkit2extension: $(WEBKIT_EXTENSION_LIB) -# -# $(WEBKIT_EXTENSION_LIB) : webkitgtk_extension.o -# -$(CC) $(LFLAGS) -o $@ $^ $(WEBKIT_EXTENSION_LFLAGS) -# +$(CC) $(LDFLAGS) $(LFLAGS) -o $@ $^ $(WEBKIT_EXTENSION_LFLAGS) -# -# webkitgtk_extension.o : webkitgtk_extension.c -# $(CC) $(CFLAGS) $(WEBKIT_EXTENSION_CFLAGS) ${SWT_PTR_CFLAGS} -fPIC -c $^ -@@ -229,7 +229,7 @@ +@@ -229,7 +229,7 @@ webkitgtk_custom.o: webkitgtk_custom.c make_glx: $(GLX_LIB) $(GLX_LIB): $(GLX_OBJECTS)
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/, dev-java/swt/files/
commit: f827629c3b99735e623babe93c76624251cd2fd2 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Mon Jan 2 18:38:42 2023 + Commit: Miroslav Šulc gentoo org> CommitDate: Sun Mar 19 06:30:39 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f827629c dev-java/swt: add 4.27 - adds arm64 to conditional sources, to be keyworded - switches to java-pkg-simple.eclass - drops osgi stuff, not used upstream - reworks swt-4.27-as-needed-and-flag-fixes.patch from 4.10 - re-uses src_compile() from 4.10 except "eant compile" Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/29142/commits/0cace839b2d3e8c310b1371dcd12f9626c90a147 Signed-off-by: Miroslav Šulc gentoo.org> dev-java/swt/Manifest | 3 + .../files/swt-4.27-as-needed-and-flag-fixes.patch | 82 dev-java/swt/swt-4.27.ebuild | 142 + 3 files changed, 227 insertions(+) diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest index a1e00f9e4f9c..296f28fcfb56 100644 --- a/dev-java/swt/Manifest +++ b/dev-java/swt/Manifest @@ -3,3 +3,6 @@ DIST swt-3.7.2-gtk-linux-x86.zip 5374609 BLAKE2B 04d44b9fffcedc6ce255e2651377ac6 DIST swt-3.7.2-gtk-linux-x86_64.zip 5671443 BLAKE2B 953fc9eab6d1f2750b1a1345cddf4aa6969567cb75977f87ee50668d367e55dda8be2ff836d87b780005c22132fa783b475f422c093617fd02f478eadd96076d SHA512 d60ae1d3f3b0577f7e3018139f93069c89d021064fec2f3f4074f95cfae56abdc0c7d531cb904ad3911482543cddcc3f6646ff47192073f4bde97c79e13612b7 DIST swt-4.10-gtk-linux-ppc64le.zip 3848264 BLAKE2B 214861fde6987906fb24f3187936f3bcb49aebed54fe242427c3737bf6761e8f77d049c376f30ca0fc33e74a1e8a48b6aff6d9863775ee9c33fea7cb2edd1309 SHA512 1b3ede58c2b41abae76f58a303bd3fbf1849ba8be3fd6518325bc22400e960c3ab542e7351b1bc08053e2746ea3e28812e04c2d1789cb1e19ea28745c8a5f39a DIST swt-4.10-gtk-linux-x86_64.zip 3844306 BLAKE2B 0e0ed21708acce347fd025920ee635f586c460f8a9c05a7067fd70eed9da999b4a62a5febd17f0c5546ab15198336038e4ab49a1bd588d49ffb39450353a1911 SHA512 9dd946cb7c11446f553f06b8af516167519bab00d4a89f626cd612be6d18e50023fc537aa3d844a8f7a56a767df00410efe4dd20e2bfd930639330a1e279a7a0 +DIST swt-4.27-gtk-linux-aarch64.zip 3849438 BLAKE2B b07daa4942c450d5cca5a323b0649a645fe9a283b272a73a9675f3bd07fbae859c41f451521231a93f4fb56ae4093d57474545611c4789c076abad2e9e1c911f SHA512 a3ba011258e5906beb15ffd5deaa73fc9a5ed5f7bce78a4a683ad8ad12a5cca1fa3a0d89fed6da9f4ade530ea3bda09093ad43202993b522a060a9dcd98746d3 +DIST swt-4.27-gtk-linux-ppc64le.zip 3872996 BLAKE2B 58ae779b7103da932719fe702674e211f8f0068c3b6094172b4c58e939de96d8d43ef80d40740c29f6fcd802a252a87ba850e9e6320d881c958b0161700e4e8c SHA512 6f8f1fce502e0980ced3f201dcdeb3397a583a9ba9ebe76d82c713c440d614c4ff38efe5f596a9da25940f931e3c651c36b18211faea4fab31872d25566b060a +DIST swt-4.27-gtk-linux-x86_64.zip 3869518 BLAKE2B d0eb7d1be59944cbffe5556c258043d084f7f1a8fa1d9ad9c3738896adc12aa015f85b675ba72af31de566ae451280bb83d82082b3f589c8da643631bf1f7bfb SHA512 efa89c1752340978e1aa1d2343a07df001fa952092aef959bdeedf53a31270d24ebe34ccb50e72ef2221da810ed08c53b188a80aab8a37e5932f85f6771ea1ef diff --git a/dev-java/swt/files/swt-4.27-as-needed-and-flag-fixes.patch b/dev-java/swt/files/swt-4.27-as-needed-and-flag-fixes.patch new file mode 100644 index ..fffbc910c521 --- /dev/null +++ b/dev-java/swt/files/swt-4.27-as-needed-and-flag-fixes.patch @@ -0,0 +1,82 @@ +diff -Naur a/make_linux.mak b/make_linux.mak +--- a/make_linux.mak 2019-01-07 14:08:00.269147198 +0100 b/make_linux.mak 2019-01-07 14:10:28.645155241 +0100 +@@ -98,7 +98,7 @@ + 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 \ + -DSWT_VERSION=$(SWT_VERSION) \ + $(NATIVE_STATS) \ + $(SWT_DEBUG) \ +@@ -130,13 +130,13 @@ + 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 +@@ -169,7 +169,7 @@ + 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 +@@ -184,7 +184,7 @@ + make_awt:$(AWT_LIB) + + $(AWT_LIB): $(AWT_OBJECTS) +- $(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS) ++
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: cbde7303c6e368d944d6717607abaeac7acae22a Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Tue Jan 24 14:53:09 2023 + Commit: Miroslav Šulc gentoo org> CommitDate: Sun Mar 19 06:31:02 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbde7303 dev-java/swt: add github upstream metadata Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/29142/commits/204a9392d2f664b47c00c9dc4ace820fad590aa0 Signed-off-by: Miroslav Šulc gentoo.org> dev-java/swt/metadata.xml | 5 + 1 file changed, 5 insertions(+) diff --git a/dev-java/swt/metadata.xml b/dev-java/swt/metadata.xml index d94f6cdd831e..c06386289922 100644 --- a/dev-java/swt/metadata.xml +++ b/dev-java/swt/metadata.xml @@ -10,4 +10,9 @@ Eclipse platform in an operating system independent manner. It is analogous to AWT/Swing in Java with a difference - SWT uses a rich set of native widgets. + + https://bugs.eclipse.org/bugs/enter_bug.cgi?product=Platform%38component=SWT + https://wiki.eclipse.org/SWT + eclipse-platform/eclipse.platform.swt +
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/, dev-java/swt/files/
commit: c7a97c1fec01e0f833a2c40975971853fb32651f Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Sat Mar 18 17:12:37 2023 + Commit: Miroslav Šulc gentoo org> CommitDate: Sun Mar 19 06:13:23 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7a97c1f dev-java/swt: drop 3.8.2-r4 Closes: https://bugs.gentoo.org/522848 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/30212 Signed-off-by: Miroslav Šulc gentoo.org> dev-java/swt/Manifest | 3 - .../files/swt-3.8-as-needed-and-flag-fixes.patch | 243 - dev-java/swt/files/swt-3.8-manifest| 17 -- dev-java/swt/files/swt-3.8.2-gthread.patch | 44 dev-java/swt/swt-3.8.2-r4.ebuild | 152 - 5 files changed, 459 deletions(-) diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest index 882aec4b4fd1..a1e00f9e4f9c 100644 --- a/dev-java/swt/Manifest +++ b/dev-java/swt/Manifest @@ -1,8 +1,5 @@ DIST swt-3.7.2-gtk-linux-ppc64.zip 5688113 BLAKE2B bb102da40a3f63d63ca6a56d4c57ade55d7fe8d6206acf9e60caa0a8600b5c2cec6c0304cd2ab532948f03ff0706e8b2928ae9e93ef0019051044dad3fe7b1c0 SHA512 750aaa43560bbf6f82f7f8cd9338abc88578f4f0b9aadaec9bc8a5c3d1ad593619cdf01d202cbf06766090ee977989ea7904643669c61971973951d8428b57d0 DIST swt-3.7.2-gtk-linux-x86.zip 5374609 BLAKE2B 04d44b9fffcedc6ce255e2651377ac6968bb41c44cee403f063c159962d9d43a5c9529026819ddb1c8eea98cd11ed818075c37f4e9851d2e95532dc166e570ce SHA512 9f58864d05eba2648e4b5d5c958172f5c0c7c730209525b3d6f607586daaefea4d5ba1013e80c0c11948f01c553044b0a98c81688b33c14114ba79c7ce620426 DIST swt-3.7.2-gtk-linux-x86_64.zip 5671443 BLAKE2B 953fc9eab6d1f2750b1a1345cddf4aa6969567cb75977f87ee50668d367e55dda8be2ff836d87b780005c22132fa783b475f422c093617fd02f478eadd96076d SHA512 d60ae1d3f3b0577f7e3018139f93069c89d021064fec2f3f4074f95cfae56abdc0c7d531cb904ad3911482543cddcc3f6646ff47192073f4bde97c79e13612b7 -DIST swt-3.8.2-gtk-linux-ppc64.zip 5933708 BLAKE2B d49633d9d5049d1a6f9bbdcf5a364b73802194fbaf02aa5064c7a1c917e0aad80c829b026a1a41b7903ed0d8066af89ff24683897ced8cbe8c41406a7696c408 SHA512 cb9f2c7aed0b18bae6546272076c23c91d9e1a38404f0a70ddc6408047d961befe2839db177066312b82d8365bee6bcffb6e92aaa7a869ad37d9f49ab780e337 -DIST swt-3.8.2-gtk-linux-x86.zip 5558694 BLAKE2B 8dd0ce9f2c6b8dc448c85a6c509f39ef2da000e0589da52330b83dec87601d100320af778983b2083ca8f9e2890a2d4c731cb2810d9054a9e50e7940ad14bea2 SHA512 afe1563e92fe9af0a58e7dbae731976991a6afacf6415ab88ebf557f99a5154169ad7103519524f71142c4160d55a9b0a9f7379b21486430318e4160e6f01c00 -DIST swt-3.8.2-gtk-linux-x86_64.zip 5865160 BLAKE2B 45d60d334eb99f407cf9101a06f65e48543538a386103767700fb0af5ea0cf3da73eefe57b8cc6b3d78cb8f29345869f5474513648560395a69cbd4c9b8ee8a4 SHA512 43a27cb6fc891d7da35f5fcfc6ccb689d2b2c58de70b628b1e7cf07131f0641598b627eeedafb6a8dca715a336a7fb4fb6a03bb29fea3e115a4af571b1574cf8 DIST swt-4.10-gtk-linux-ppc64le.zip 3848264 BLAKE2B 214861fde6987906fb24f3187936f3bcb49aebed54fe242427c3737bf6761e8f77d049c376f30ca0fc33e74a1e8a48b6aff6d9863775ee9c33fea7cb2edd1309 SHA512 1b3ede58c2b41abae76f58a303bd3fbf1849ba8be3fd6518325bc22400e960c3ab542e7351b1bc08053e2746ea3e28812e04c2d1789cb1e19ea28745c8a5f39a DIST swt-4.10-gtk-linux-x86_64.zip 3844306 BLAKE2B 0e0ed21708acce347fd025920ee635f586c460f8a9c05a7067fd70eed9da999b4a62a5febd17f0c5546ab15198336038e4ab49a1bd588d49ffb39450353a1911 SHA512 9dd946cb7c11446f553f06b8af516167519bab00d4a89f626cd612be6d18e50023fc537aa3d844a8f7a56a767df00410efe4dd20e2bfd930639330a1e279a7a0 diff --git a/dev-java/swt/files/swt-3.8-as-needed-and-flag-fixes.patch b/dev-java/swt/files/swt-3.8-as-needed-and-flag-fixes.patch deleted file mode 100644 index ce5c54e408e2.. --- a/dev-java/swt/files/swt-3.8-as-needed-and-flag-fixes.patch +++ /dev/null @@ -1,243 +0,0 @@ a/make_freebsd.mak -+++ b/make_freebsd.mak -@@ -64,7 +64,7 @@ GLXLIBS = -L/usr/X11R6/lib -lGL -lGLU -lm - # Uncomment for Native Stats tool - #NATIVE_STATS = -DNATIVE_STATS - --MOZILLACFLAGS = -O \ -+MOZILLACFLAGS += \ - -DSWT_VERSION=$(SWT_VERSION) \ - $(NATIVE_STATS) \ - -DMOZILLA_STRICT_API=1 \ -@@ -91,7 +91,7 @@ XULRUNNER_OBJECTS = swt.o xpcomxul.o xpcomxul_custom.o xpcomxul_structs.o xpcomx - XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o - GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o - --CFLAGS = -O -Wall \ -+CFLAGS += \ - -DSWT_VERSION=$(SWT_VERSION) \ - $(NATIVE_STATS) \ - -DFREEBSD -DGTK \ -@@ -115,13 +115,13 @@ all: make_swt make_atk make_gnome make_glx - 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) -DUSE_ASSEMBLER -c callback.c - - $(SWTPI_LIB): $(SWTPI_OBJECTS) --
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: f9ece755019705a9932aaacf2a6d2a9ed940ac1d Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Fri Dec 30 13:35:34 2022 + Commit: Miroslav Šulc gentoo org> CommitDate: Sat Dec 31 08:51:10 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9ece755 dev-java/swt: update HOMEPAGE, SRC_URI Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/28901 Signed-off-by: Miroslav Šulc gentoo.org> dev-java/swt/swt-3.7.2-r3.ebuild | 4 ++-- dev-java/swt/swt-3.8.2-r4.ebuild | 4 ++-- dev-java/swt/swt-4.10-r2.ebuild | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dev-java/swt/swt-3.7.2-r3.ebuild b/dev-java/swt/swt-3.7.2-r3.ebuild index c00026ba19cc..eb993b82f314 100644 --- a/dev-java/swt/swt-3.7.2-r3.ebuild +++ b/dev-java/swt/swt-3.7.2-r3.ebuild @@ -6,11 +6,11 @@ EAPI=7 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; +MY_DMF="https://archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201202080800; MY_P="${PN}-${MY_PV}" DESCRIPTION="GTK based SWT Library" -HOMEPAGE="http://www.eclipse.org/; +HOMEPAGE="https://www.eclipse.org/; SRC_URI=" amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip ) ppc? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip ) diff --git a/dev-java/swt/swt-3.8.2-r4.ebuild b/dev-java/swt/swt-3.8.2-r4.ebuild index 4078770338fb..ca352d8bd6b2 100644 --- a/dev-java/swt/swt-3.8.2-r4.ebuild +++ b/dev-java/swt/swt-3.8.2-r4.ebuild @@ -6,11 +6,11 @@ EAPI=8 inherit java-pkg-2 java-ant-2 toolchain-funcs java-osgi MY_PV="${PV/_rc/RC}" -MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201301310800; +MY_DMF="https://archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201301310800; MY_P="${PN}-${MY_PV}" DESCRIPTION="GTK based SWT Library" -HOMEPAGE="http://www.eclipse.org/; +HOMEPAGE="https://www.eclipse.org/; SRC_URI=" amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip ) ppc? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip ) diff --git a/dev-java/swt/swt-4.10-r2.ebuild b/dev-java/swt/swt-4.10-r2.ebuild index ec723d8e5d5e..4e117a49acf6 100644 --- a/dev-java/swt/swt-4.10-r2.ebuild +++ b/dev-java/swt/swt-4.10-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,11 +6,11 @@ EAPI=7 inherit flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs java-osgi MY_PV="${PV/_rc/RC}" -MY_DMF="http://download.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-201812060815; +MY_DMF="https://archive.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-201812060815; MY_P="${PN}-${MY_PV}" DESCRIPTION="GTK based SWT Library" -HOMEPAGE="http://www.eclipse.org/; +HOMEPAGE="https://www.eclipse.org/; SRC_URI=" amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip ) ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64le.zip )"
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: 64e76263a6376df8783f7d472f6ab60c84ae9e70 Author: Miroslav Šulc gentoo org> AuthorDate: Sun Jan 30 08:42:10 2022 + Commit: Miroslav Šulc gentoo org> CommitDate: Sun Jan 30 08:42:10 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64e76263 dev-java/swt: removed obsolete 3.8.2-r3 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Miroslav Šulc gentoo.org> dev-java/swt/swt-3.8.2-r3.ebuild | 149 --- 1 file changed, 149 deletions(-) diff --git a/dev-java/swt/swt-3.8.2-r3.ebuild b/dev-java/swt/swt-3.8.2-r3.ebuild deleted file mode 100644 index 31af30f456c6.. --- a/dev-java/swt/swt-3.8.2-r3.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit epatch java-pkg-2 java-ant-2 toolchain-funcs java-osgi - -MY_PV="${PV/_rc/RC}" -MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201301310800; -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="GTK based SWT Library" -HOMEPAGE="http://www.eclipse.org/; -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.8" -KEYWORDS="amd64 ppc64 x86" -IUSE="cairo opengl" - -COMMON_DEPEND=" - >=dev-libs/atk-1.10.2 - >=dev-libs/glib-2.6 - >=x11-libs/gtk+-2.6.8:2 - x11-libs/libXtst - cairo? ( >=x11-libs/cairo-1.4.14 ) - opengl? ( - virtual/glu - virtual/opengl - )" -DEPEND="${COMMON_DEPEND} - app-arch/unzip - virtual/jdk:1.8 - virtual/pkgconfig - x11-base/xorg-proto - x11-libs/libX11 - x11-libs/libXrender - x11-libs/libXt - >=x11-libs/libXtst-1.1.0" -RDEPEND="${COMMON_DEPEND} - >=virtual/jre-1.4" - -S="${WORKDIR}" - -# JNI libraries don't need SONAME, bug #253756 -QA_SONAME="usr/$(get_libdir)/libswt-.*.so" - -src_unpack() { - local DISTFILE=${A} - unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "Unable to extract distfile" - unpack "./src.zip" - - # Cleanup the redirtied directory structure - rm -rf about_files/ || die -} - -java_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 -p "${S}/src" - mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources" - - epatch "${FILESDIR}"/${PN}-3.8-as-needed-and-flag-fixes.patch - epatch "${FILESDIR}"/${P}-gthread.patch -} - -src_compile() { - # Drop jikes support as it seems to be unfriendly with SWT - java-pkg_filter-compiler jikes - - 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 - 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 - - einfo "Building JNI libraries" - eant compile - - einfo "Copying missing files" - 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 - - einfo "Packing JNI libraries" - eant jar -} - -src_install() { - swtArch=${ARCH} - use amd64 && swtArch=x86_64 - - sed "s/SWT_ARCH/${swtArch}/"
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: 43de1d1d9c11acd6124510e5c0f61c2ab6e68ca7 Author: Jakov Smolić gentoo org> AuthorDate: Sat Jan 29 14:20:44 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Sat Jan 29 14:20:44 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43de1d1d dev-java/swt: Stabilize 3.8.2-r4 amd64, #832302 Signed-off-by: Jakov Smolić gentoo.org> dev-java/swt/swt-3.8.2-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/swt/swt-3.8.2-r4.ebuild b/dev-java/swt/swt-3.8.2-r4.ebuild index 593237c1c82e..4078770338fb 100644 --- a/dev-java/swt/swt-3.8.2-r4.ebuild +++ b/dev-java/swt/swt-3.8.2-r4.ebuild @@ -19,7 +19,7 @@ SRC_URI=" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" SLOT="3.8" -KEYWORDS="~amd64 ppc64 x86" +KEYWORDS="amd64 ppc64 x86" IUSE="cairo opengl" COMMON_DEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: 81b36ab558ddcb45a9816794c68421743ee9b4c9 Author: Jakov Smolić gentoo org> AuthorDate: Sat Jan 29 10:03:05 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Sat Jan 29 10:03:05 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81b36ab5 dev-java/swt: Stabilize 3.8.2-r4 x86, #832302 Signed-off-by: Jakov Smolić gentoo.org> dev-java/swt/swt-3.8.2-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/swt/swt-3.8.2-r4.ebuild b/dev-java/swt/swt-3.8.2-r4.ebuild index 76fae96e7716..593237c1c82e 100644 --- a/dev-java/swt/swt-3.8.2-r4.ebuild +++ b/dev-java/swt/swt-3.8.2-r4.ebuild @@ -19,7 +19,7 @@ SRC_URI=" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" SLOT="3.8" -KEYWORDS="~amd64 ppc64 ~x86" +KEYWORDS="~amd64 ppc64 x86" IUSE="cairo opengl" COMMON_DEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: 2d927f3bbc6f31c25cb61bf9fecda01119545af8 Author: Arthur Zamarin gentoo org> AuthorDate: Sat Jan 29 09:23:48 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Jan 29 09:23:48 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d927f3b dev-java/swt: Stabilize 3.8.2-r4 ppc64, #832302 Signed-off-by: Arthur Zamarin gentoo.org> dev-java/swt/swt-3.8.2-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/swt/swt-3.8.2-r4.ebuild b/dev-java/swt/swt-3.8.2-r4.ebuild index 8bca8e212541..76fae96e7716 100644 --- a/dev-java/swt/swt-3.8.2-r4.ebuild +++ b/dev-java/swt/swt-3.8.2-r4.ebuild @@ -19,7 +19,7 @@ SRC_URI=" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" SLOT="3.8" -KEYWORDS="~amd64 ~ppc64 ~x86" +KEYWORDS="~amd64 ppc64 ~x86" IUSE="cairo opengl" COMMON_DEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: 66ff202294c40ba36ea40767c803a62023472689 Author: David Seifert gentoo org> AuthorDate: Wed Jan 5 10:01:19 2022 + Commit: David Seifert gentoo org> CommitDate: Wed Jan 5 10:01:19 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66ff2022 dev-java/swt: remove x86-fbsd Signed-off-by: David Seifert gentoo.org> dev-java/swt/swt-3.7.2-r3.ebuild | 4 +--- dev-java/swt/swt-3.8.2-r3.ebuild | 4 +--- dev-java/swt/swt-3.8.2-r4.ebuild | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dev-java/swt/swt-3.7.2-r3.ebuild b/dev-java/swt/swt-3.7.2-r3.ebuild index 12ccd36700f1..c00026ba19cc 100644 --- a/dev-java/swt/swt-3.7.2-r3.ebuild +++ b/dev-java/swt/swt-3.7.2-r3.ebuild @@ -15,8 +15,7 @@ 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 ) - x86-fbsd? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )" + x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" SLOT="3.7" @@ -144,7 +143,6 @@ src_compile() { src_install() { swtArch=${ARCH} use amd64 && swtArch=x86_64 - use x86-fbsd && swtArch=x86 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" diff --git a/dev-java/swt/swt-3.8.2-r3.ebuild b/dev-java/swt/swt-3.8.2-r3.ebuild index 604916b2de09..31af30f456c6 100644 --- a/dev-java/swt/swt-3.8.2-r3.ebuild +++ b/dev-java/swt/swt-3.8.2-r3.ebuild @@ -15,8 +15,7 @@ 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 ) - x86-fbsd? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )" + x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" SLOT="3.8" @@ -135,7 +134,6 @@ src_compile() { src_install() { swtArch=${ARCH} use amd64 && swtArch=x86_64 - use x86-fbsd && swtArch=x86 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" diff --git a/dev-java/swt/swt-3.8.2-r4.ebuild b/dev-java/swt/swt-3.8.2-r4.ebuild index 341e66a35938..8bca8e212541 100644 --- a/dev-java/swt/swt-3.8.2-r4.ebuild +++ b/dev-java/swt/swt-3.8.2-r4.ebuild @@ -15,8 +15,7 @@ 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 ) - x86-fbsd? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )" + x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" SLOT="3.8" @@ -138,7 +137,6 @@ src_compile() { src_install() { swtArch=${ARCH} use amd64 && swtArch=x86_64 - use x86-fbsd && swtArch=x86 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"
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: b5fe26f75dbcba9737d475414acaee2861cf990f Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Tue Dec 28 10:23:15 2021 + Commit: Miroslav Šulc gentoo org> CommitDate: Wed Dec 29 08:48:31 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5fe26f7 dev-java/swt: EAPI 8 Bug: https://bugs.gentoo.org/593416 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/23548 Signed-off-by: Miroslav Šulc gentoo.org> dev-java/swt/swt-3.8.2-r4.ebuild | 158 +++ 1 file changed, 158 insertions(+) diff --git a/dev-java/swt/swt-3.8.2-r4.ebuild b/dev-java/swt/swt-3.8.2-r4.ebuild new file mode 100644 index ..3b53140c037d --- /dev/null +++ b/dev-java/swt/swt-3.8.2-r4.ebuild @@ -0,0 +1,158 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit java-pkg-2 java-ant-2 toolchain-funcs java-osgi + +MY_PV="${PV/_rc/RC}" +MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201301310800; +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="GTK based SWT Library" +HOMEPAGE="http://www.eclipse.org/; +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 ) + x86-fbsd? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )" + +LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" +SLOT="3.8" +KEYWORDS="~amd64 ~ppc64 ~x86" +IUSE="cairo opengl" + +COMMON_DEPEND=" + >=dev-libs/atk-1.10.2 + >=dev-libs/glib-2.6 + >=x11-libs/gtk+-2.6.8:2 + x11-libs/libXtst + cairo? ( >=x11-libs/cairo-1.4.14 ) + opengl? ( + virtual/glu + virtual/opengl + )" +DEPEND="${COMMON_DEPEND} + app-arch/unzip + virtual/jdk:1.8 + virtual/pkgconfig + x11-base/xorg-proto + x11-libs/libX11 + x11-libs/libXrender + x11-libs/libXt + >=x11-libs/libXtst-1.1.0" +RDEPEND="${COMMON_DEPEND} + >=virtual/jre-1.4" + +S="${WORKDIR}" + +# JNI libraries don't need SONAME, bug #253756 +QA_SONAME="usr/lib.*/libswt-.*.so" + +PATCHES=( + "${FILESDIR}"/swt-3.8-as-needed-and-flag-fixes.patch + "${FILESDIR}"/swt-3.8.2-gthread.patch +) + +src_unpack() { + local DISTFILE=${A} + unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "Unable to extract distfile" + unpack "./src.zip" + + # Cleanup the redirtied directory structure + rm -rf about_files/ || die +} + +src_prepare() { + default + # Replace the build.xml to allow compilation without Eclipse tasks + cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml" + + mkdir -p "${S}/src" + mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources" +} + +src_compile() { + # Drop jikes support as it seems to be unfriendly with SWT + java-pkg_filter-compiler jikes + + 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 + 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 platform="linux" + + use elibc_FreeBSD && platform="freebsd" + + local make="emake -f make_${platform}.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 + + einfo "Building JNI libraries" + eant compile + + einfo "Copying missing files" + cp -i "${S}/version.txt" "${S}/build/version.txt" || die + cp -i
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: 3db9a82d988fbeb9c503063ccc67499f0924ada6 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Mon Aug 9 05:50:19 2021 + Commit: Florian Schmaus gentoo org> CommitDate: Mon Aug 9 08:37:15 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3db9a82d dev-java/swt: remove obsolete 4.10-r1 Package-Manager: Portage-3.0.20, Repoman-3.0.2 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/21922 Signed-off-by: Florian Schmaus gentoo.org> dev-java/swt/swt-4.10-r1.ebuild | 174 1 file changed, 174 deletions(-) diff --git a/dev-java/swt/swt-4.10-r1.ebuild b/dev-java/swt/swt-4.10-r1.ebuild deleted file mode 100644 index cf11ea7c5eb..000 --- a/dev-java/swt/swt-4.10-r1.ebuild +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs java-osgi - -MY_PV="${PV/_rc/RC}" -MY_DMF="http://download.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-201812060815; -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="GTK based SWT Library" -HOMEPAGE="http://www.eclipse.org/; -SRC_URI=" - amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip ) - ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64le.zip )" - -LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" -SLOT="4.10" -KEYWORDS="amd64 ~ppc64" -IUSE="cairo opengl webkit" - -COMMON_DEP=" - >=dev-libs/atk-1.10.2 - >=dev-libs/glib-2.32 - >=x11-libs/gtk+-2.6.8:2 - x11-libs/libXtst - cairo? ( >=x11-libs/cairo-1.4.14 ) - opengl? ( - virtual/glu - virtual/opengl - ) - webkit? ( - net-libs/webkit-gtk:4 - )" -DEPEND="${COMMON_DEP} - >=virtual/jdk-1.8:* - x11-base/xorg-proto - x11-libs/libX11 - x11-libs/libXrender - x11-libs/libXt - >=x11-libs/libXtst-1.1.0" -RDEPEND="${COMMON_DEP} - >=virtual/jre-1.8:*" -BDEPEND=" - app-arch/unzip - virtual/pkgconfig -" - -S="${WORKDIR}" - -# JNI libraries don't need SONAME, bug #253756 -QA_SONAME='usr/lib[^/]*/libswt-[^/]+.so' - -PATCHES=( - "${FILESDIR}"/${P}-as-needed-and-flag-fixes.patch -) - -src_unpack() { - local DISTFILE=${A} - unzip -jq "${DISTDIR}"/${DISTFILE} swt.jar src.zip || die "Unable to extract distfile" - unpack "./src.zip" - - # Cleanup the redirtied directory structure - rm -rf about_files/ || die -} - -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" - - # Apply patches - default - - # Define missing g_thread_supported() to be already started. - sed -i '1s/^/#define g_thread_supported() 1\n\n/' "${S}"/os_custom.h || die - - # Webext is also in the library directory - sed -i 's|findResource([^,]\+|findResource("swt"|' \ - "${S}"/src/org/eclipse/swt/browser/WebKit.java || die -} - -src_compile() { - append-cflags -fcommon # https://bugs.gentoo.org/707838 - - # Drop jikes support as it seems to be unfriendly with SWT - java-pkg_filter-compiler jikes - - local AWT_ARCH - local JAWTSO="libjawt.so" - if [[ $(tc-arch) == 'ppc64' ]] ; then - # no big-endian support - AWT_ARCH="ppc64le" - 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)" - 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" - 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" - ${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" -
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: a30e7a34a192310cbf2be9a114674d725672854a Author: Agostino Sarubbo gentoo org> AuthorDate: Fri Jul 30 15:10:01 2021 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri Jul 30 15:10:01 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a30e7a34 dev-java/swt: amd64 stable wrt bug #796320 Package-Manager: Portage-3.0.20, Repoman-3.0.2 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> dev-java/swt/swt-4.10-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/swt/swt-4.10-r2.ebuild b/dev-java/swt/swt-4.10-r2.ebuild index 4387c8f78a3..ec723d8e5d5 100644 --- a/dev-java/swt/swt-4.10-r2.ebuild +++ b/dev-java/swt/swt-4.10-r2.ebuild @@ -17,7 +17,7 @@ SRC_URI=" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" SLOT="4.10" -KEYWORDS="~amd64 ppc64" +KEYWORDS="amd64 ppc64" IUSE="cairo opengl webkit" COMMON_DEP="
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: 49a1f153a7683d370c393f8faf8f5202c40fbdac Author: Miroslav Šulc gentoo org> AuthorDate: Sun Jul 25 04:41:44 2021 + Commit: Miroslav Šulc gentoo org> CommitDate: Sun Jul 25 04:41:44 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49a1f153 dev-java/swt: added workaround for openjdk{,-bin}-8 to 4.10-r2 Closes: https://bugs.gentoo.org/803650 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Miroslav Šulc gentoo.org> dev-java/swt/swt-4.10-r2.ebuild | 4 1 file changed, 4 insertions(+) diff --git a/dev-java/swt/swt-4.10-r2.ebuild b/dev-java/swt/swt-4.10-r2.ebuild index b96a531dfbf..4387c8f78a3 100644 --- a/dev-java/swt/swt-4.10-r2.ebuild +++ b/dev-java/swt/swt-4.10-r2.ebuild @@ -94,6 +94,10 @@ src_compile() { 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
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: 54b9464321948835f7e0311830f21646cd1e6db8 Author: Sergei Trofimovich gentoo org> AuthorDate: Sun Jul 25 00:32:44 2021 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sun Jul 25 00:32:53 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54b94643 dev-java/swt: Stabilize 4.10-r2 ppc64, #796320 Signed-off-by: Sergei Trofimovich gentoo.org> dev-java/swt/swt-4.10-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/swt/swt-4.10-r2.ebuild b/dev-java/swt/swt-4.10-r2.ebuild index 291a3584886..b96a531dfbf 100644 --- a/dev-java/swt/swt-4.10-r2.ebuild +++ b/dev-java/swt/swt-4.10-r2.ebuild @@ -17,7 +17,7 @@ SRC_URI=" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" SLOT="4.10" -KEYWORDS="~amd64 ~ppc64" +KEYWORDS="~amd64 ppc64" IUSE="cairo opengl webkit" COMMON_DEP="
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: dbdf713c73909fa2631e525a4f2d57e91951a93f Author: Miroslav Šulc gentoo org> AuthorDate: Sun Jul 18 06:15:26 2021 + Commit: Miroslav Šulc gentoo org> CommitDate: Sun Jul 18 06:15:47 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbdf713c dev-java/swt: fixed libdir detection in 4.10-r2 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Miroslav Šulc gentoo.org> dev-java/swt/swt-4.10-r2.ebuild | 26 ++ 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/dev-java/swt/swt-4.10-r2.ebuild b/dev-java/swt/swt-4.10-r2.ebuild index 8c3986977db..291a3584886 100644 --- a/dev-java/swt/swt-4.10-r2.ebuild +++ b/dev-java/swt/swt-4.10-r2.ebuild @@ -87,23 +87,17 @@ src_compile() { # Drop jikes support as it seems to be unfriendly with SWT java-pkg_filter-compiler jikes - local AWT_ARCH local JAWTSO="libjawt.so" - if [[ $(tc-arch) == 'ppc64' ]] ; then - # no big-endian support - AWT_ARCH="ppc64le" - 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)" - elif [[ -f "${JAVA_HOME}/lib/${JAWTSO}" ]] ; then - export AWT_LIB_PATH="${JAVA_HOME}/lib" - 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 + 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
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: 8d042dab2a9e0106ea309e343dafdf58b9cb55f3 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Thu Jul 15 12:50:16 2021 + Commit: Miroslav Šulc gentoo org> CommitDate: Fri Jul 16 06:24:28 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d042dab dev-java/swt: jdk[-headless-awt] Closes: https://bugs.gentoo.org/801277 Package-Manager: Portage-3.0.20, Repoman-3.0.2 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/21651 Signed-off-by: Miroslav Šulc gentoo.org> dev-java/swt/swt-4.10-r2.ebuild | 174 1 file changed, 174 insertions(+) diff --git a/dev-java/swt/swt-4.10-r2.ebuild b/dev-java/swt/swt-4.10-r2.ebuild new file mode 100644 index 000..8c3986977db --- /dev/null +++ b/dev-java/swt/swt-4.10-r2.ebuild @@ -0,0 +1,174 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs java-osgi + +MY_PV="${PV/_rc/RC}" +MY_DMF="http://download.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-201812060815; +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="GTK based SWT Library" +HOMEPAGE="http://www.eclipse.org/; +SRC_URI=" + amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip ) + ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64le.zip )" + +LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" +SLOT="4.10" +KEYWORDS="~amd64 ~ppc64" +IUSE="cairo opengl webkit" + +COMMON_DEP=" + >=dev-libs/atk-1.10.2 + >=dev-libs/glib-2.32 + >=x11-libs/gtk+-2.6.8:2 + x11-libs/libXtst + cairo? ( >=x11-libs/cairo-1.4.14 ) + opengl? ( + virtual/glu + virtual/opengl + ) + webkit? ( + net-libs/webkit-gtk:4 + )" +DEPEND="${COMMON_DEP} + >=virtual/jdk-1.8:*[-headless-awt] + x11-base/xorg-proto + x11-libs/libX11 + x11-libs/libXrender + x11-libs/libXt + >=x11-libs/libXtst-1.1.0" +RDEPEND="${COMMON_DEP} + >=virtual/jre-1.8:*" +BDEPEND=" + app-arch/unzip + virtual/pkgconfig +" + +S="${WORKDIR}" + +# JNI libraries don't need SONAME, bug #253756 +QA_SONAME='usr/lib[^/]*/libswt-[^/]+.so' + +PATCHES=( + "${FILESDIR}"/${P}-as-needed-and-flag-fixes.patch +) + +src_unpack() { + local DISTFILE=${A} + unzip -jq "${DISTDIR}"/${DISTFILE} swt.jar src.zip || die "Unable to extract distfile" + unpack "./src.zip" + + # Cleanup the redirtied directory structure + rm -rf about_files/ || die +} + +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" + + # Apply patches + default + + # Define missing g_thread_supported() to be already started. + sed -i '1s/^/#define g_thread_supported() 1\n\n/' "${S}"/os_custom.h || die + + # Webext is also in the library directory + sed -i 's|findResource([^,]\+|findResource("swt"|' \ + "${S}"/src/org/eclipse/swt/browser/WebKit.java || die +} + +src_compile() { + append-cflags -fcommon # https://bugs.gentoo.org/707838 + + # Drop jikes support as it seems to be unfriendly with SWT + java-pkg_filter-compiler jikes + + local AWT_ARCH + local JAWTSO="libjawt.so" + if [[ $(tc-arch) == 'ppc64' ]] ; then + # no big-endian support + AWT_ARCH="ppc64le" + 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)" + 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" + 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" + ${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
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: 0e23d324a9d6041a08e438a54db60175ae142826 Author: Agostino Sarubbo gentoo org> AuthorDate: Fri Jun 18 06:26:49 2021 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri Jun 18 06:26:49 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e23d324 dev-java/swt: amd64 stable wrt bug #796320 Package-Manager: Portage-3.0.18, Repoman-3.0.2 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> dev-java/swt/swt-4.10-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/swt/swt-4.10-r1.ebuild b/dev-java/swt/swt-4.10-r1.ebuild index 527f2063119..cf11ea7c5eb 100644 --- a/dev-java/swt/swt-4.10-r1.ebuild +++ b/dev-java/swt/swt-4.10-r1.ebuild @@ -17,7 +17,7 @@ SRC_URI=" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" SLOT="4.10" -KEYWORDS="~amd64 ~ppc64" +KEYWORDS="amd64 ~ppc64" IUSE="cairo opengl webkit" COMMON_DEP="
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: 5a9c068b8c01c4806f2592527ec3465b403431ac Author: Wolfgang E. Sanyer gmail com> AuthorDate: Mon May 3 19:34:20 2021 + Commit: Miroslav Šulc gentoo org> CommitDate: Sun May 16 19:28:49 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a9c068b dev-java/swt: update java dependencies Bug 766102 seems to be fixed with the latest stable openjdk-bin-8, however I think the bug remains open until the older open-jdk is removed from the tree. Signed-off-by: Wolfgang E. Sanyer gmail.com> Bug: https://bugs.gentoo.org/766102 Closes: https://github.com/gentoo/gentoo/pull/20608/commits/a3aa8f14d78b836333dbf2fc6ea8a983d296afcb Signed-off-by: Miroslav Šulc gentoo.org> dev-java/swt/{swt-4.10.ebuild => swt-4.10-r1.ebuild} | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dev-java/swt/swt-4.10.ebuild b/dev-java/swt/swt-4.10-r1.ebuild similarity index 98% rename from dev-java/swt/swt-4.10.ebuild rename to dev-java/swt/swt-4.10-r1.ebuild index 13b1abd63b3..527f2063119 100644 --- a/dev-java/swt/swt-4.10.ebuild +++ b/dev-java/swt/swt-4.10-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs java-osgi @@ -34,16 +34,18 @@ COMMON_DEP=" net-libs/webkit-gtk:4 )" DEPEND="${COMMON_DEP} - >=virtual/jdk-1.8 - app-arch/unzip - virtual/pkgconfig + >=virtual/jdk-1.8:* x11-base/xorg-proto x11-libs/libX11 x11-libs/libXrender x11-libs/libXt >=x11-libs/libXtst-1.1.0" RDEPEND="${COMMON_DEP} - >=virtual/jre-1.8" + >=virtual/jre-1.8:*" +BDEPEND=" + app-arch/unzip + virtual/pkgconfig +" S="${WORKDIR}"
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/files/
commit: 01e23220a6c881cc18a61732ad91a6f211328c0e Author: Michael Mair-Keimberger levelnine at> AuthorDate: Sat May 1 17:51:37 2021 + Commit: Miroslav Šulc gentoo org> CommitDate: Sun May 2 06:41:00 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01e23220 dev-java/swt: remove unused patches Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/20634 Signed-off-by: Miroslav Šulc gentoo.org> .../files/swt-4.2-as-needed-and-flag-fixes.patch | 243 - dev-java/swt/files/swt-4.2-manifest| 16 -- 2 files changed, 259 deletions(-) diff --git a/dev-java/swt/files/swt-4.2-as-needed-and-flag-fixes.patch b/dev-java/swt/files/swt-4.2-as-needed-and-flag-fixes.patch deleted file mode 100644 index 98773c15569..000 --- a/dev-java/swt/files/swt-4.2-as-needed-and-flag-fixes.patch +++ /dev/null @@ -1,243 +0,0 @@ make_linux.mak-2012-07-02 00:49:48.729100052 + -+++ make_linux.mak 2012-07-02 00:53:16.753499389 + -@@ -66,7 +66,7 @@ - # Uncomment for Native Stats tool - #NATIVE_STATS = -DNATIVE_STATS - --MOZILLACFLAGS = -O \ -+MOZILLACFLAGS = $(CXXFLAGS) \ - -DSWT_VERSION=$(SWT_VERSION) \ - $(NATIVE_STATS) \ - -DMOZILLA_STRICT_API=1 \ -@@ -106,7 +106,7 @@ - WEBKIT_OBJECTS = swt.o webkit.o webkit_structs.o webkit_stats.o - GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o - --CFLAGS = -O -Wall \ -+CFLAGS += \ - -DSWT_VERSION=$(SWT_VERSION) \ - $(NATIVE_STATS) \ - -DLINUX -DGTK \ -@@ -130,13 +130,13 @@ - 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) -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 -@@ -155,7 +155,7 @@ - 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 -@@ -171,7 +171,7 @@ - make_cde: $(CDE_LIB) - - $(CDE_LIB): $(CDE_OBJECTS) -- $(CC) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS) -+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS) - - # - # AWT lib -@@ -179,7 +179,7 @@ - make_awt:$(AWT_LIB) - - $(AWT_LIB): $(AWT_OBJECTS) -- $(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS) -+ $(CC) $(LDFLAGS) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS) - - # - # Atk lib -@@ -187,7 +187,7 @@ - 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 -@@ -204,7 +204,7 @@ - make_gnome: $(GNOME_LIB) - - $(GNOME_LIB): $(GNOME_OBJECTS) -- $(CC) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS) -+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS) - - gnome.o: gnome.c - $(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c -@@ -221,7 +221,7 @@ - make_mozilla:$(MOZILLA_LIB) - - $(MOZILLA_LIB): $(MOZILLA_OBJECTS) -- $(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS} -+ $(CXX) $(LDFLAGS) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS} - - xpcom.o: xpcom.cpp - $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp -@@ -242,7 +242,7 @@ - - $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS) - echo -e "#include\nsize_t je_malloc_usable_size_in_advance(size_t n) {\nreturn n;\n}" | gcc --shared -xc - -o libswt-xulrunner-fix.so -- $(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS} -+ $(CXX) $(LDFLAGS) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS} - - xpcomxul.o: xpcom.cpp - $(CXX) -o xpcomxul.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom.cpp -@@ -262,7 +262,7 @@ - make_xpcominit:$(XPCOMINIT_LIB) - - $(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS) -- $(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS} -+ $(CXX) $(LDFLAGS) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS} - - xpcominit.o: xpcominit.cpp - $(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp -@@ -279,7 +279,7 @@ - make_webkit: $(WEBKIT_LIB) - - $(WEBKIT_LIB): $(WEBKIT_OBJECTS) --
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: b47ac519a97af446a852d6ac26b0d54e567a77b8 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Thu Apr 29 15:08:57 2021 + Commit: Miroslav Šulc gentoo org> CommitDate: Fri Apr 30 14:07:30 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b47ac519 dev-java/swt: removing unused slot Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/20595 Signed-off-by: Miroslav Šulc gentoo.org> dev-java/swt/Manifest | 3 - dev-java/swt/swt-4.2-r4.ebuild | 159 - 2 files changed, 162 deletions(-) diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest index a7bdcfce8ab..882aec4b4fd 100644 --- a/dev-java/swt/Manifest +++ b/dev-java/swt/Manifest @@ -6,6 +6,3 @@ DIST swt-3.8.2-gtk-linux-x86.zip 5558694 BLAKE2B 8dd0ce9f2c6b8dc448c85a6c509f39e DIST swt-3.8.2-gtk-linux-x86_64.zip 5865160 BLAKE2B 45d60d334eb99f407cf9101a06f65e48543538a386103767700fb0af5ea0cf3da73eefe57b8cc6b3d78cb8f29345869f5474513648560395a69cbd4c9b8ee8a4 SHA512 43a27cb6fc891d7da35f5fcfc6ccb689d2b2c58de70b628b1e7cf07131f0641598b627eeedafb6a8dca715a336a7fb4fb6a03bb29fea3e115a4af571b1574cf8 DIST swt-4.10-gtk-linux-ppc64le.zip 3848264 BLAKE2B 214861fde6987906fb24f3187936f3bcb49aebed54fe242427c3737bf6761e8f77d049c376f30ca0fc33e74a1e8a48b6aff6d9863775ee9c33fea7cb2edd1309 SHA512 1b3ede58c2b41abae76f58a303bd3fbf1849ba8be3fd6518325bc22400e960c3ab542e7351b1bc08053e2746ea3e28812e04c2d1789cb1e19ea28745c8a5f39a DIST swt-4.10-gtk-linux-x86_64.zip 3844306 BLAKE2B 0e0ed21708acce347fd025920ee635f586c460f8a9c05a7067fd70eed9da999b4a62a5febd17f0c5546ab15198336038e4ab49a1bd588d49ffb39450353a1911 SHA512 9dd946cb7c11446f553f06b8af516167519bab00d4a89f626cd612be6d18e50023fc537aa3d844a8f7a56a767df00410efe4dd20e2bfd930639330a1e279a7a0 -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 diff --git a/dev-java/swt/swt-4.2-r4.ebuild b/dev-java/swt/swt-4.2-r4.ebuild deleted file mode 100644 index 3b48a85ba05..000 --- a/dev-java/swt/swt-4.2-r4.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit epatch flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs java-osgi - -MY_PV="${PV/_rc/RC}" -MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-201206081400; -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="GTK based SWT Library" -HOMEPAGE="http://www.eclipse.org/; -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 ) - x86-fbsd? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )" - -LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" -SLOT="4.2" -KEYWORDS="~amd64 ~ppc64 ~x86" -IUSE="cairo opengl" - -COMMON_DEPEND=" - >=dev-libs/atk-1.10.2 - >=dev-libs/glib-2.32 - >=x11-libs/gtk+-2.6.8:2 - x11-libs/libXtst - cairo? ( >=x11-libs/cairo-1.4.14 ) - opengl? ( - virtual/glu - virtual/opengl - )" -DEPEND="${COMMON_DEPEND} - app-arch/unzip - virtual/jdk:1.8 - virtual/pkgconfig - x11-base/xorg-proto - x11-libs/libX11 - x11-libs/libXrender - x11-libs/libXt - >=x11-libs/libXtst-1.1.0" -RDEPEND="${COMMON_DEPEND} - >=virtual/jre-1.4" - -S="${WORKDIR}" - -# JNI libraries don't need SONAME, bug #253756 -QA_SONAME="usr/$(get_libdir)/libswt-.*.so" - -src_unpack() { - local DISTFILE=${A} - unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "Unable to extract distfile" - unpack "./src.zip" - - # Cleanup the redirtied directory structure - rm -rf about_files/ || die -} - -java_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
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/, dev-java/swt/files/
commit: 07f5673249ad52ebd58cfaf4b544796bad3aebca Author: Sam James gentoo org> AuthorDate: Sun Sep 20 01:51:47 2020 + Commit: Sam James gentoo org> CommitDate: Sun Sep 20 02:03:55 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07f56732 dev-java/swt: port to EAPI 7 Closes: https://bugs.gentoo.org/741022 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Sam James gentoo.org> .../swt/files/as-needed-and-flag-fixes-3.6.patch | 8 ++--- dev-java/swt/swt-3.7.2-r3.ebuild | 37 +- 2 files changed, 26 insertions(+), 19 deletions(-) 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 16194fdc5f5..fba4a36aaf1 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.0 + -+++ make_linux.mak 2010-08-09 22:48:01.515433721 + +--- a/make_linux.mak 2010-06-08 17:30:58.0 + b/make_linux.mak 2010-08-09 22:48:01.515433721 + @@ -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.0 + -+++ make_freebsd.mak 2010-08-09 22:50:26.173246263 + +--- a/make_freebsd.mak 2010-06-08 17:30:58.0 + b/make_freebsd.mak 2010-08-09 22:50:26.173246263 + @@ -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 1da53e15860..24e69a97401 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
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: 700329d663a300f38d532048bef657173418d5dc Author: Georgy Yakovlev gentoo org> AuthorDate: Mon Apr 27 03:49:35 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Sat Sep 19 03:14:35 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=700329d6 dev-java/swt: fix build on ppc64le Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Georgy Yakovlev gentoo.org> dev-java/swt/swt-4.10.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev-java/swt/swt-4.10.ebuild b/dev-java/swt/swt-4.10.ebuild index 4b2c5aafc0e..a029c5bc508 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
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: a18f351d6b22cbb5817493ce685e1bd1b709d3f9 Author: Craig Andrews gentoo org> AuthorDate: Wed Aug 5 20:50:22 2020 + Commit: Craig Andrews gentoo org> CommitDate: Wed Aug 5 20:50:53 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a18f351d dev-java/swt: append-cflags -fcommon Workaround for -fno-common build failure Closes: https://bugs.gentoo.org/707838 Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Craig Andrews gentoo.org> dev-java/swt/swt-4.10.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dev-java/swt/swt-4.10.ebuild b/dev-java/swt/swt-4.10.ebuild index 4559e6bb888..4b2c5aafc0e 100644 --- a/dev-java/swt/swt-4.10.ebuild +++ b/dev-java/swt/swt-4.10.ebuild @@ -80,6 +80,8 @@ src_prepare() { } src_compile() { + append-cflags -fcommon # https://bugs.gentoo.org/707838 + # Drop jikes support as it seems to be unfriendly with SWT java-pkg_filter-compiler jikes
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: a42043f83cf4480c3effe41b9729a34bf7e015bd Author: Georgy Yakovlev gentoo org> AuthorDate: Fri Jun 12 19:29:05 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Fri Jun 12 19:30:46 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a42043f8 dev-java/swt/swt: set minimum dep on jdk to 1.8 allows to compile with openjdk:8 and run with openjdk:11 Tested-by: Rick Farina gentoo.org> Signed-off-by: Georgy Yakovlev gentoo.org> dev-java/swt/swt-3.7.2-r3.ebuild | 2 +- dev-java/swt/swt-3.8.2-r3.ebuild | 2 +- dev-java/swt/swt-4.2-r4.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-java/swt/swt-3.7.2-r3.ebuild b/dev-java/swt/swt-3.7.2-r3.ebuild index 082fd3c27e7..1da53e15860 100644 --- a/dev-java/swt/swt-3.7.2-r3.ebuild +++ b/dev-java/swt/swt-3.7.2-r3.ebuild @@ -35,7 +35,7 @@ COMMON_DEPEND=" )" DEPEND="${COMMON_DEPEND} app-arch/unzip - >=virtual/jdk-1.4 + virtual/jdk:1.8 virtual/pkgconfig x11-base/xorg-proto x11-libs/libX11 diff --git a/dev-java/swt/swt-3.8.2-r3.ebuild b/dev-java/swt/swt-3.8.2-r3.ebuild index 83fd139c603..6234e6e4942 100644 --- a/dev-java/swt/swt-3.8.2-r3.ebuild +++ b/dev-java/swt/swt-3.8.2-r3.ebuild @@ -35,7 +35,7 @@ COMMON_DEPEND=" )" DEPEND="${COMMON_DEPEND} app-arch/unzip - >=virtual/jdk-1.4 + virtual/jdk:1.8 virtual/pkgconfig x11-base/xorg-proto x11-libs/libX11 diff --git a/dev-java/swt/swt-4.2-r4.ebuild b/dev-java/swt/swt-4.2-r4.ebuild index 430e488a08c..eff2fb275a5 100644 --- a/dev-java/swt/swt-4.2-r4.ebuild +++ b/dev-java/swt/swt-4.2-r4.ebuild @@ -35,7 +35,7 @@ COMMON_DEPEND=" )" DEPEND="${COMMON_DEPEND} app-arch/unzip - >=virtual/jdk-1.4 + virtual/jdk:1.8 virtual/pkgconfig x11-base/xorg-proto x11-libs/libX11
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: 86d9dfd2da715500db62ffab409aeec68049469c Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jun 3 14:56:53 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Jun 4 08:54:05 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86d9dfd2 dev-java/swt: Drop 3.7.2-r2, 3.8.2-r2 and 4.2-r3 Closes: https://bugs.gentoo.org/644318 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-java/swt/swt-3.7.2-r2.ebuild | 169 --- dev-java/swt/swt-3.8.2-r2.ebuild | 166 -- dev-java/swt/swt-4.2-r3.ebuild | 169 --- 3 files changed, 504 deletions(-) diff --git a/dev-java/swt/swt-3.7.2-r2.ebuild b/dev-java/swt/swt-3.7.2-r2.ebuild deleted file mode 100644 index 8444b55d8ef..000 --- a/dev-java/swt/swt-3.7.2-r2.ebuild +++ /dev/null @@ -1,169 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi - -MY_PV="${PV/_rc/RC}" -MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201202080800; -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="GTK based SWT Library" -HOMEPAGE="http://www.eclipse.org/; -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 ) - x86-fbsd? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )" - -SLOT="3.7" -LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" -KEYWORDS="amd64 ppc64 x86" - -IUSE="cairo gnome opengl" -COMMON=">=dev-libs/glib-2.6 - >=x11-libs/gtk+-2.6.8:2 - >=dev-libs/atk-1.10.2 - cairo? ( >=x11-libs/cairo-1.4.14 ) - gnome? ( - =gnome-base/libgnome-2* - =gnome-base/gnome-vfs-2* - =gnome-base/libgnomeui-2* - ) - opengl? ( - virtual/opengl - virtual/glu - ) - x11-libs/libXtst" - -DEPEND=">=virtual/jdk-1.4 - app-arch/unzip - x11-base/xorg-proto - x11-libs/libX11 - x11-libs/libXrender - x11-libs/libXt - >=x11-libs/libXtst-1.1.0 - virtual/pkgconfig - ${COMMON}" - -RDEPEND=">=virtual/jre-1.4 - ${COMMON}" - -S="${WORKDIR}" - -# JNI libraries don't need SONAME, bug #253756 -QA_SONAME="usr/$(get_libdir)/libswt-.*.so" - -src_unpack() { - local DISTFILE=${A} - unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "Unable to extract distfile" - unpack "./src.zip" - - # Cleanup the redirtied directory structure - rm -rf about_files/ || die -} - -java_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 ;; - esac -} - -src_compile() { - # Drop jikes support as it seems to be unfriendly with SWT - java-pkg_filter-compiler jikes - - 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 - 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 platform="linux" - - use elibc_FreeBSD && platform="freebsd" - - local make="emake -f make_${platform}.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)" - - einfo "Building
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: 644561bdf1cdc7ec8f302313ac99e5a6d9814605 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jun 3 14:55:54 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Jun 4 08:54:05 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=644561bd dev-java/swt: Drop IUSE="gnome" Closes: https://bugs.gentoo.org/644318 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-java/swt/swt-3.7.2-r3.ebuild | 158 ++ dev-java/swt/swt-3.8.2-r3.ebuild | 155 ++ dev-java/swt/swt-4.2-r4.ebuild | 159 +++ 3 files changed, 472 insertions(+) diff --git a/dev-java/swt/swt-3.7.2-r3.ebuild b/dev-java/swt/swt-3.7.2-r3.ebuild new file mode 100644 index 000..082fd3c27e7 --- /dev/null +++ b/dev-java/swt/swt-3.7.2-r3.ebuild @@ -0,0 +1,158 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 + +inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi + +MY_PV="${PV/_rc/RC}" +MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201202080800; +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="GTK based SWT Library" +HOMEPAGE="http://www.eclipse.org/; +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 ) + x86-fbsd? ( ${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" + +COMMON_DEPEND=" + >=dev-libs/atk-1.10.2 + >=dev-libs/glib-2.6 + >=x11-libs/gtk+-2.6.8:2 + x11-libs/libXtst + cairo? ( >=x11-libs/cairo-1.4.14 ) + opengl? ( + virtual/glu + virtual/opengl + )" +DEPEND="${COMMON_DEPEND} + app-arch/unzip + >=virtual/jdk-1.4 + virtual/pkgconfig + x11-base/xorg-proto + x11-libs/libX11 + x11-libs/libXrender + x11-libs/libXt + >=x11-libs/libXtst-1.1.0" +RDEPEND="${COMMON_DEPEND} + >=virtual/jre-1.4" + +S="${WORKDIR}" + +# JNI libraries don't need SONAME, bug #253756 +QA_SONAME="usr/$(get_libdir)/libswt-.*.so" + +src_unpack() { + local DISTFILE=${A} + unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "Unable to extract distfile" + unpack "./src.zip" + + # Cleanup the redirtied directory structure + rm -rf about_files/ || die +} + +java_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 ;; + esac +} + +src_compile() { + # Drop jikes support as it seems to be unfriendly with SWT + java-pkg_filter-compiler jikes + + 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 + 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 platform="linux" + + use elibc_FreeBSD && platform="freebsd" + + local make="emake -f make_${platform}.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
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: f239e95ecddb44dc379f9c12be10b0a36e2dd0c1 Author: Georgy Yakovlev gentoo org> AuthorDate: Sat Apr 25 09:34:55 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Sat Apr 25 09:35:17 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f239e95e dev-java/swt: add openjdk11 libjawt.so path Closes: https://bugs.gentoo.org/689976 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Georgy Yakovlev gentoo.org> dev-java/swt/swt-4.10.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dev-java/swt/swt-4.10.ebuild b/dev-java/swt/swt-4.10.ebuild index f7fa9be7233..4559e6bb888 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"
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/files/, dev-java/swt/
commit: 246c51a12fe5d8ae5a7a37b0ca906f36500954ae Author: Valérian Rousset users noreply github com> AuthorDate: Mon Jan 7 22:24:35 2019 + Commit: Miroslav Šulc gentoo org> CommitDate: Wed Jan 23 15:40:33 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=246c51a1 dev-java/swt: bump Closes: https://bugs.gentoo.org/505968 Tested-by: Valérian Rousset users.noreply.github.com> Signed-off-by: Valérian Rousset users.noreply.github.com> Package-Manager: Portage-2.3.51, Repoman-2.3.12 Closes: https://github.com/gentoo/gentoo/pull/10771 Signed-off-by: Miroslav Šulc gentoo.org> dev-java/swt/Manifest | 2 + .../files/swt-4.10-as-needed-and-flag-fixes.patch | 82 ++ dev-java/swt/files/swt-4.10-manifest | 16 ++ dev-java/swt/swt-4.10.ebuild | 167 + 4 files changed, 267 insertions(+) diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest index a4c8e92cbd1..a7bdcfce8ab 100644 --- a/dev-java/swt/Manifest +++ b/dev-java/swt/Manifest @@ -4,6 +4,8 @@ DIST swt-3.7.2-gtk-linux-x86_64.zip 5671443 BLAKE2B 953fc9eab6d1f2750b1a1345cddf DIST swt-3.8.2-gtk-linux-ppc64.zip 5933708 BLAKE2B d49633d9d5049d1a6f9bbdcf5a364b73802194fbaf02aa5064c7a1c917e0aad80c829b026a1a41b7903ed0d8066af89ff24683897ced8cbe8c41406a7696c408 SHA512 cb9f2c7aed0b18bae6546272076c23c91d9e1a38404f0a70ddc6408047d961befe2839db177066312b82d8365bee6bcffb6e92aaa7a869ad37d9f49ab780e337 DIST swt-3.8.2-gtk-linux-x86.zip 5558694 BLAKE2B 8dd0ce9f2c6b8dc448c85a6c509f39ef2da000e0589da52330b83dec87601d100320af778983b2083ca8f9e2890a2d4c731cb2810d9054a9e50e7940ad14bea2 SHA512 afe1563e92fe9af0a58e7dbae731976991a6afacf6415ab88ebf557f99a5154169ad7103519524f71142c4160d55a9b0a9f7379b21486430318e4160e6f01c00 DIST swt-3.8.2-gtk-linux-x86_64.zip 5865160 BLAKE2B 45d60d334eb99f407cf9101a06f65e48543538a386103767700fb0af5ea0cf3da73eefe57b8cc6b3d78cb8f29345869f5474513648560395a69cbd4c9b8ee8a4 SHA512 43a27cb6fc891d7da35f5fcfc6ccb689d2b2c58de70b628b1e7cf07131f0641598b627eeedafb6a8dca715a336a7fb4fb6a03bb29fea3e115a4af571b1574cf8 +DIST swt-4.10-gtk-linux-ppc64le.zip 3848264 BLAKE2B 214861fde6987906fb24f3187936f3bcb49aebed54fe242427c3737bf6761e8f77d049c376f30ca0fc33e74a1e8a48b6aff6d9863775ee9c33fea7cb2edd1309 SHA512 1b3ede58c2b41abae76f58a303bd3fbf1849ba8be3fd6518325bc22400e960c3ab542e7351b1bc08053e2746ea3e28812e04c2d1789cb1e19ea28745c8a5f39a +DIST swt-4.10-gtk-linux-x86_64.zip 3844306 BLAKE2B 0e0ed21708acce347fd025920ee635f586c460f8a9c05a7067fd70eed9da999b4a62a5febd17f0c5546ab15198336038e4ab49a1bd588d49ffb39450353a1911 SHA512 9dd946cb7c11446f553f06b8af516167519bab00d4a89f626cd612be6d18e50023fc537aa3d844a8f7a56a767df00410efe4dd20e2bfd930639330a1e279a7a0 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 diff --git a/dev-java/swt/files/swt-4.10-as-needed-and-flag-fixes.patch b/dev-java/swt/files/swt-4.10-as-needed-and-flag-fixes.patch new file mode 100644 index 000..09bed21d58f --- /dev/null +++ b/dev-java/swt/files/swt-4.10-as-needed-and-flag-fixes.patch @@ -0,0 +1,82 @@ +diff -Naur a/make_linux.mak b/make_linux.mak +--- a/make_linux.mak 2019-01-07 14:08:00.269147198 +0100 b/make_linux.mak 2019-01-07 14:10:28.645155241 +0100 +@@ -101,7 +101,7 @@ + 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 \ + -DSWT_VERSION=$(SWT_VERSION) \ + $(NATIVE_STATS) \ + $(SWT_DEBUG) \ +@@ -129,13 +129,13 @@ + 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) -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)
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/files/, dev-java/swt/
commit: 89bff051299c4c6a1e6ad456eb3489d86cdcf879 Author: James Le Cuirot gentoo org> AuthorDate: Sun Jan 28 13:33:58 2018 + Commit: James Le Cuirot gentoo org> CommitDate: Sun Jan 28 13:34:35 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89bff051 dev-java/swt: Drop versions with IUSE="webkit" Closes: https://bugs.gentoo.org/625842 Package-Manager: Portage-2.3.20, Repoman-2.3.6 .../swt/files/swt-3.8.2-libwebkit-compat.patch | 23 --- dev-java/swt/metadata.xml | 3 - dev-java/swt/swt-3.7.2-r1.ebuild | 176 - dev-java/swt/swt-3.8.2-r1.ebuild | 174 4 files changed, 376 deletions(-) diff --git a/dev-java/swt/files/swt-3.8.2-libwebkit-compat.patch b/dev-java/swt/files/swt-3.8.2-libwebkit-compat.patch deleted file mode 100644 index ba537f54024..000 --- a/dev-java/swt/files/swt-3.8.2-libwebkit-compat.patch +++ /dev/null @@ -1,23 +0,0 @@ -crash: fatal error in soup_session_feature_detach with WebKitGTK+ >= 1.11.91 -http://git.eclipse.org/c/platform/eclipse.platform.swt.git/commit/?id=b22a7d19afbe2a3811a0f8aa54c1e85d92c62a2c -https://bugs.eclipse.org/404776 -https://bugs.gentoo.org/500570 - a/src/org/eclipse/swt/browser/WebKit.java -+++ b/src/org/eclipse/swt/browser/WebKit.java -@@ -597,9 +597,13 @@ public void create (Composite parent, int style) { - */ - long /*int*/ session = WebKitGTK.webkit_get_default_session (); - long /*int*/ originalAuth = WebKitGTK.soup_session_get_feature (session, WebKitGTK.webkit_soup_auth_dialog_get_type ()); -- WebKitGTK.soup_session_feature_detach (originalAuth, session); -+ if (originalAuth != 0) { -+ WebKitGTK.soup_session_feature_detach (originalAuth, session); -+ } - OS.g_signal_connect (session, WebKitGTK.authenticate, Proc5.getAddress (), webView); -- WebKitGTK.soup_session_feature_attach (originalAuth, session); -+ if (originalAuth != 0) { -+ WebKitGTK.soup_session_feature_attach (originalAuth, session); -+ } - - /* - * Check for proxy values set as documented java properties and update the diff --git a/dev-java/swt/metadata.xml b/dev-java/swt/metadata.xml index 3100286ec07..40abe82a75f 100644 --- a/dev-java/swt/metadata.xml +++ b/dev-java/swt/metadata.xml @@ -10,7 +10,4 @@ Eclipse platform in an operating system independent manner. It is analogous to AWT/Swing in Java with a difference - SWT uses a rich set of native widgets. - - Embedded browser support via net-libs/webkit-gtk:2, replacing former xulrunner-based browser. - diff --git a/dev-java/swt/swt-3.7.2-r1.ebuild b/dev-java/swt/swt-3.7.2-r1.ebuild deleted file mode 100644 index de15a30fd3e..000 --- a/dev-java/swt/swt-3.7.2-r1.ebuild +++ /dev/null @@ -1,176 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi - -MY_PV="${PV/_rc/RC}" -MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201202080800; -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="GTK based SWT Library" -HOMEPAGE="http://www.eclipse.org/; -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 ) - x86-fbsd? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )" - -SLOT="3.7" -LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" -KEYWORDS="amd64 ppc64 x86" - -IUSE="cairo gnome opengl webkit" -COMMON=">=dev-libs/glib-2.6 - >=x11-libs/gtk+-2.6.8:2 - >=dev-libs/atk-1.10.2 - cairo? ( >=x11-libs/cairo-1.4.14 ) - gnome? ( - =gnome-base/libgnome-2* - =gnome-base/gnome-vfs-2* - =gnome-base/libgnomeui-2* - ) - opengl? ( - virtual/opengl - virtual/glu - ) - webkit? ( >=net-libs/webkit-gtk-1.2:2 ) - x11-libs/libXtst" - -DEPEND=">=virtual/jdk-1.4 - app-arch/unzip - x11-libs/libX11 - x11-libs/libXrender - x11-libs/libXt - >=x11-libs/libXtst-1.1.0 - x11-proto/inputproto - virtual/pkgconfig - ${COMMON}" - -RDEPEND=">=virtual/jre-1.4 - ${COMMON}" - -S="${WORKDIR}" - -# JNI libraries don't need SONAME, bug #253756 -QA_SONAME="usr/$(get_libdir)/libswt-.*.so" - -src_unpack() { - local DISTFILE=${A} - unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "Unable to extract distfile" - unpack "./src.zip" - - # Cleanup the
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: f66d699356b6825c235924d75bbf49c216acfac3 Author: James Le Cuirot gentoo org> AuthorDate: Wed Jan 24 22:25:23 2018 + Commit: James Le Cuirot gentoo org> CommitDate: Wed Jan 24 22:38:14 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f66d6993 dev-java/swt: Drop old 4.2-r2 Package-Manager: Portage-2.3.20, Repoman-2.3.6 dev-java/swt/swt-4.2-r2.ebuild | 176 - 1 file changed, 176 deletions(-) diff --git a/dev-java/swt/swt-4.2-r2.ebuild b/dev-java/swt/swt-4.2-r2.ebuild deleted file mode 100644 index 10d4a3a0aa3..000 --- a/dev-java/swt/swt-4.2-r2.ebuild +++ /dev/null @@ -1,176 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs java-osgi - -MY_PV="${PV/_rc/RC}" -MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-201206081400; -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="GTK based SWT Library" -HOMEPAGE="http://www.eclipse.org/; -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 ) - x86-fbsd? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )" - -LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" -SLOT="4.2" -KEYWORDS="~amd64 ~ppc64 ~x86" -IUSE="cairo gnome opengl webkit" - -COMMON_DEP=" - >=dev-libs/atk-1.10.2 - >=dev-libs/glib-2.32 - >=x11-libs/gtk+-2.6.8:2 - x11-libs/libXtst - cairo? ( >=x11-libs/cairo-1.4.14 ) - gnome? ( - =gnome-base/gnome-vfs-2* - =gnome-base/libgnome-2* - =gnome-base/libgnomeui-2* - ) - opengl? ( - virtual/glu - virtual/opengl - ) - webkit? ( >=net-libs/webkit-gtk-1.2:2 )" -DEPEND="${COMMON_DEP} - >=virtual/jdk-1.4 - app-arch/unzip - virtual/pkgconfig - x11-libs/libX11 - x11-libs/libXrender - x11-libs/libXt - >=x11-libs/libXtst-1.1.0 - x11-proto/inputproto" -RDEPEND="${COMMON_DEP} - >=virtual/jre-1.4" - -S="${WORKDIR}" - -# JNI libraries don't need SONAME, bug #253756 -QA_SONAME="usr/$(get_libdir)/libswt-.*.so" - -src_unpack() { - local DISTFILE=${A} - unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "Unable to extract distfile" - unpack "./src.zip" - - # Cleanup the redirtied directory structure - rm -rf about_files/ || die -} - -java_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}"/${P}-as-needed-and-flag-fixes.patch - - # Define missing g_thread_supported() to be 0. - sed -i '1s/^/#define g_thread_supported() 0\n\n/' "${S}"/os_custom.h || die -} - -src_compile() { - # Drop jikes support as it seems to be unfriendly with SWT - java-pkg_filter-compiler jikes - - 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 - 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 platform="linux" - - use elibc_FreeBSD && platform="freebsd" - - # Bug #461784, g_thread_init is deprecated since glib-2.32. - append-cflags -DNO__1g_1thread_1init - - local make="emake -f make_${platform}.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 gnome ; then - einfo "Building GNOME VFS support" - ${make} make_gnome - fi - - if use cairo ; then -
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: a5ed207aaae938747f376ec48231201b743e8ad0 Author: James Le Cuirot gentoo org> AuthorDate: Wed Jan 24 22:24:35 2018 + Commit: James Le Cuirot gentoo org> CommitDate: Wed Jan 24 22:38:13 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5ed207a dev-java/swt: Drop webkit USE flag from all versions webkit-gtk:2 is vulnerable and unmaintained. Straight to stable because this is very long overdue and dropping a flag is fairly safe. Package-Manager: Portage-2.3.20, Repoman-2.3.6 dev-java/swt/swt-3.7.2-r2.ebuild | 169 +++ dev-java/swt/swt-3.8.2-r2.ebuild | 166 ++ dev-java/swt/swt-4.2-r3.ebuild | 169 +++ 3 files changed, 504 insertions(+) diff --git a/dev-java/swt/swt-3.7.2-r2.ebuild b/dev-java/swt/swt-3.7.2-r2.ebuild new file mode 100644 index 000..63f3c11299f --- /dev/null +++ b/dev-java/swt/swt-3.7.2-r2.ebuild @@ -0,0 +1,169 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 + +inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi + +MY_PV="${PV/_rc/RC}" +MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201202080800; +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="GTK based SWT Library" +HOMEPAGE="http://www.eclipse.org/; +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 ) + x86-fbsd? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )" + +SLOT="3.7" +LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" +KEYWORDS="amd64 ppc64 x86" + +IUSE="cairo gnome opengl" +COMMON=">=dev-libs/glib-2.6 + >=x11-libs/gtk+-2.6.8:2 + >=dev-libs/atk-1.10.2 + cairo? ( >=x11-libs/cairo-1.4.14 ) + gnome? ( + =gnome-base/libgnome-2* + =gnome-base/gnome-vfs-2* + =gnome-base/libgnomeui-2* + ) + opengl? ( + virtual/opengl + virtual/glu + ) + x11-libs/libXtst" + +DEPEND=">=virtual/jdk-1.4 + app-arch/unzip + x11-libs/libX11 + x11-libs/libXrender + x11-libs/libXt + >=x11-libs/libXtst-1.1.0 + x11-proto/inputproto + virtual/pkgconfig + ${COMMON}" + +RDEPEND=">=virtual/jre-1.4 + ${COMMON}" + +S="${WORKDIR}" + +# JNI libraries don't need SONAME, bug #253756 +QA_SONAME="usr/$(get_libdir)/libswt-.*.so" + +src_unpack() { + local DISTFILE=${A} + unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "Unable to extract distfile" + unpack "./src.zip" + + # Cleanup the redirtied directory structure + rm -rf about_files/ || die +} + +java_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 ;; + esac +} + +src_compile() { + # Drop jikes support as it seems to be unfriendly with SWT + java-pkg_filter-compiler jikes + + 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 + 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 platform="linux" + + use elibc_FreeBSD && platform="freebsd" + + local make="emake -f make_${platform}.mak NO_STRIP=y CC=$(tc-getCC)
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/files/, dev-java/swt/
commit: 122241651e6870263a7533f3fd1a4b9bbfdd6d34 Author: James Le Cuirot gentoo org> AuthorDate: Wed Jan 24 22:11:03 2018 + Commit: James Le Cuirot gentoo org> CommitDate: Wed Jan 24 22:11:22 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12224165 dev-java/swt: Drop ye olde 3.5.2 Package-Manager: Portage-2.3.20, Repoman-2.3.6 dev-java/swt/Manifest | 3 - dev-java/swt/files/as-needed-and-flag-fixes.patch | 238 -- dev-java/swt/files/swt-3.5-manifest | 17 -- dev-java/swt/swt-3.5.2.ebuild | 165 --- 4 files changed, 423 deletions(-) diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest index fc87bffcbf4..a4c8e92cbd1 100644 --- a/dev-java/swt/Manifest +++ b/dev-java/swt/Manifest @@ -1,6 +1,3 @@ -DIST swt-3.5.2-gtk-linux-ppc.zip 4947929 BLAKE2B b3ad008d8645de9a85c05801696bb65c32676e1482d873a5e6ba58a9915328526440960daa9f146fdc646aaa1d4ded8c72fefd9bebc1b2a1acaf05018e3b524d SHA512 2d3d194d2bb4c7f0e6d5bc801d41cb6de970de78c544a7edd2f18c4ed9291f7639dbedab4594c5221e76dd559c884c6fda7f32d11d0465a2d017fe0398a33dae -DIST swt-3.5.2-gtk-linux-x86.zip 4881316 BLAKE2B fc6be0e041a4fb3decb602d1a0dbde0bd7f22c12a3fb869b364de663c3a870351a794ece2f2a2a73ffdee6ccac71390d70700ff609c1cf86320f9a14bdc70002 SHA512 f53226458e5404cc03475c3bb903de81efa328625b713fe97b3b418a769b0476695e437e0693b5e10fa9a356de90302d6a2d267fe5e13f172803c684db9e9c82 -DIST swt-3.5.2-gtk-linux-x86_64.zip 5068674 BLAKE2B 410cc189b5625061e89a4550b2d0904bd3bbe68d2f0f71ed38cac146d2aa5dff99838173e0fe4499be9f9847c8c43b282df00f907ce54a84b0ea5c9880ef70c9 SHA512 f226d531002dc472852f09ce9814c8dcf7b0c4209353a5639d8b814308807df6477c4a8aa0fd49743578282e6662ca8d5c316371720dca50953ad7ec44b7c6d3 DIST swt-3.7.2-gtk-linux-ppc64.zip 5688113 BLAKE2B bb102da40a3f63d63ca6a56d4c57ade55d7fe8d6206acf9e60caa0a8600b5c2cec6c0304cd2ab532948f03ff0706e8b2928ae9e93ef0019051044dad3fe7b1c0 SHA512 750aaa43560bbf6f82f7f8cd9338abc88578f4f0b9aadaec9bc8a5c3d1ad593619cdf01d202cbf06766090ee977989ea7904643669c61971973951d8428b57d0 DIST swt-3.7.2-gtk-linux-x86.zip 5374609 BLAKE2B 04d44b9fffcedc6ce255e2651377ac6968bb41c44cee403f063c159962d9d43a5c9529026819ddb1c8eea98cd11ed818075c37f4e9851d2e95532dc166e570ce SHA512 9f58864d05eba2648e4b5d5c958172f5c0c7c730209525b3d6f607586daaefea4d5ba1013e80c0c11948f01c553044b0a98c81688b33c14114ba79c7ce620426 DIST swt-3.7.2-gtk-linux-x86_64.zip 5671443 BLAKE2B 953fc9eab6d1f2750b1a1345cddf4aa6969567cb75977f87ee50668d367e55dda8be2ff836d87b780005c22132fa783b475f422c093617fd02f478eadd96076d SHA512 d60ae1d3f3b0577f7e3018139f93069c89d021064fec2f3f4074f95cfae56abdc0c7d531cb904ad3911482543cddcc3f6646ff47192073f4bde97c79e13612b7 diff --git a/dev-java/swt/files/as-needed-and-flag-fixes.patch b/dev-java/swt/files/as-needed-and-flag-fixes.patch deleted file mode 100644 index 4cacaf61d67..000 --- a/dev-java/swt/files/as-needed-and-flag-fixes.patch +++ /dev/null @@ -1,238 +0,0 @@ make_linux.mak 2009-05-24 18:38:39.0 +0300 -+++ make_linux.mak.fixed 2009-05-24 19:38:51.0 +0300 -@@ -64,7 +64,7 @@ - # Uncomment for Native Stats tool - #NATIVE_STATS = -DNATIVE_STATS - --MOZILLACFLAGS = -O \ -+MOZILLACFLAGS = $(CXXFLAGS) \ - -DSWT_VERSION=$(SWT_VERSION) \ - $(NATIVE_STATS) \ - -DMOZILLA_STRICT_API=1 \ -@@ -92,15 +92,14 @@ - XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o - GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o - --CFLAGS = -O -Wall \ -- -DSWT_VERSION=$(SWT_VERSION) \ -+CFLAGS += -DSWT_VERSION=$(SWT_VERSION) \ - $(NATIVE_STATS) \ - -DLINUX -DGTK \ - -I$(JAVA_HOME)/include \ - -I$(JAVA_HOME)/include/linux \ - -fPIC \ - ${SWT_PTR_CFLAGS} --LIBS = -shared -fPIC -+LIBS = -shared -fPIC $(LDFLAGS) - - ifndef NO_STRIP - AWT_LIBS := $(AWT_LIBS) -s -@@ -122,7 +121,7 @@ - $(CC) $(CFLAGS) -DUSE_ASSEMBLER -c callback.c - - $(SWTPI_LIB): $(SWTPI_OBJECTS) -- $(CC) $(LIBS) $(GTKLIBS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) -+ $(CC) $(LIBS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS) - - swt.o: swt.c swt.h - $(CC) $(CFLAGS) -c swt.c -@@ -141,7 +140,7 @@ - make_cairo: $(CAIRO_LIB) - - $(CAIRO_LIB): $(CAIRO_OBJECTS) -- $(CC) $(LIBS) $(CAIROLIBS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) -+ $(CC) $(LIBS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS) - - cairo.o: cairo.c cairo.h swt.h - $(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c -@@ -157,7 +156,7 @@ - make_cde: $(CDE_LIB) - - $(CDE_LIB): $(CDE_OBJECTS) -- $(CC) $(LIBS) $(CDE_LIBS) -o $(CDE_LIB) $(CDE_OBJECTS) -+ $(CC) $(LIBS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS) - - # - # AWT lib -@@ -165,7 +164,7 @@ - make_awt:$(AWT_LIB) - - $(AWT_LIB): $(AWT_OBJECTS) -- $(CC) $(AWT_LIBS) -o $(AWT_LIB) $(AWT_OBJECTS) -+ $(CC) $(LDFLAGS) -o $(AWT_LIB)
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: 68dfde8944b547a63cbf1a33739b2248ea182e60 Author: Agostino Sarubbo gentoo org> AuthorDate: Wed Jan 25 15:51:40 2017 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed Jan 25 15:52:41 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68dfde89 dev-java/swt: ppc64 stable wrt bug #593308 Package-Manager: portage-2.3.0 RepoMan-Options: --include-arches="ppc64" Signed-off-by: Agostino Sarubbo gentoo.org> dev-java/swt/swt-3.8.2-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/swt/swt-3.8.2-r1.ebuild b/dev-java/swt/swt-3.8.2-r1.ebuild index 3c2b65e..aed1fb0 100644 --- a/dev-java/swt/swt-3.8.2-r1.ebuild +++ b/dev-java/swt/swt-3.8.2-r1.ebuild @@ -21,7 +21,7 @@ SRC_URI=" SLOT="3.8" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" -KEYWORDS="amd64 ~ppc64 x86" +KEYWORDS="amd64 ppc64 x86" IUSE="cairo gnome opengl webkit" COMMON=">=dev-libs/glib-2.6
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: 3f4eefb5029cbc9acfe3e451940738b75fa1d698 Author: Agostino Sarubbo gentoo org> AuthorDate: Wed Jan 25 15:34:47 2017 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed Jan 25 15:34:47 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f4eefb5 dev-java/swt: x86 stable wrt bug #593308 Package-Manager: portage-2.3.0 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> dev-java/swt/swt-3.8.2-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-java/swt/swt-3.8.2-r1.ebuild b/dev-java/swt/swt-3.8.2-r1.ebuild index a69a40a..3c2b65e 100644 --- a/dev-java/swt/swt-3.8.2-r1.ebuild +++ b/dev-java/swt/swt-3.8.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -21,7 +21,7 @@ SRC_URI=" SLOT="3.8" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" -KEYWORDS="amd64 ~ppc64 ~x86" +KEYWORDS="amd64 ~ppc64 x86" IUSE="cairo gnome opengl webkit" COMMON=">=dev-libs/glib-2.6
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: edf1e468e4e7da5db8714f8bb5d08ea675e68af8 Author: Tobias Klausmann gentoo org> AuthorDate: Tue Dec 20 15:51:18 2016 + Commit: Tobias Klausmann gentoo org> CommitDate: Tue Dec 20 15:51:18 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edf1e468 dev-java/swt-3.8.2-r1: stable on amd64 Gentoo-Bug: 593308 dev-java/swt/swt-3.8.2-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/swt/swt-3.8.2-r1.ebuild b/dev-java/swt/swt-3.8.2-r1.ebuild index 0089fa3..a69a40a 100644 --- a/dev-java/swt/swt-3.8.2-r1.ebuild +++ b/dev-java/swt/swt-3.8.2-r1.ebuild @@ -21,7 +21,7 @@ SRC_URI=" SLOT="3.8" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" -KEYWORDS="~amd64 ~ppc64 ~x86" +KEYWORDS="amd64 ~ppc64 ~x86" IUSE="cairo gnome opengl webkit" COMMON=">=dev-libs/glib-2.6
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: 41507eed092afe16b927218f4ef1767b349a4442 Author: James Le Cuirot gentoo org> AuthorDate: Fri Oct 28 21:55:26 2016 + Commit: James Le Cuirot gentoo org> CommitDate: Fri Oct 28 22:15:04 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41507eed dev-java/swt: Remove old Package-Manager: portage-2.3.2 dev-java/swt/Manifest | 3 - dev-java/swt/swt-3.7.1.ebuild | 181 dev-java/swt/swt-3.7.2.ebuild | 181 dev-java/swt/swt-3.8.2.ebuild | 183 - dev-java/swt/swt-4.2-r1.ebuild | 174 --- dev-java/swt/swt-4.2.ebuild| 171 -- 6 files changed, 893 deletions(-) diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest index 4a33e84..1b1dd20 100644 --- a/dev-java/swt/Manifest +++ b/dev-java/swt/Manifest @@ -1,9 +1,6 @@ DIST swt-3.5.2-gtk-linux-ppc.zip 4947929 SHA256 f2619f6e107eee3c55c6694df4c89e77976d2d5517b6f3c17c358602536abf28 SHA512 2d3d194d2bb4c7f0e6d5bc801d41cb6de970de78c544a7edd2f18c4ed9291f7639dbedab4594c5221e76dd559c884c6fda7f32d11d0465a2d017fe0398a33dae WHIRLPOOL 282057de0d2e23c887db96d20ff8e39a1ea1e87adde415357903323095d4439e966218390932bebd2234dfed2117a0afa93372e9088e695770cb521ff7180501 DIST swt-3.5.2-gtk-linux-x86.zip 4881316 SHA256 00477e6fc3c913916cd980a1ec29629c5250afc52dc0fcee74b035af0360eef7 SHA512 f53226458e5404cc03475c3bb903de81efa328625b713fe97b3b418a769b0476695e437e0693b5e10fa9a356de90302d6a2d267fe5e13f172803c684db9e9c82 WHIRLPOOL 4ca8f495c6d499ed8f1f6789333a6b357978029a6138a9986b6ef309a3e60303b6399b3c288e3732b13b75eb1db45e3679a559c806113a80572b0a05a226cadd DIST swt-3.5.2-gtk-linux-x86_64.zip 5068674 SHA256 91f9e2d4f6ca3926252d33895aafe82ba1b72bcdb77ec71dafa20d154f5d5bc7 SHA512 f226d531002dc472852f09ce9814c8dcf7b0c4209353a5639d8b814308807df6477c4a8aa0fd49743578282e6662ca8d5c316371720dca50953ad7ec44b7c6d3 WHIRLPOOL 335ab0845f3c27d3396286f26b45583cf4b71469c3567dd2a978fa3b82af7828d02925529ec686825d283207b3e3858237664f43ab4ecb56835a84ffb066033b -DIST swt-3.7.1-gtk-linux-ppc64.zip 5687650 SHA256 11b0ea72554f0f75941b44ae76aaf70b326e1c0cda7328fbb5a83b682a5e653c SHA512 fe73fa10c41cde27393818eab7a3d4c1402fcfad5639d75c9642e2a020e872e7a5d65dd65c1a526b3e70f74ac6cb4bbb7df93ac48cd6923c483754dc74e52125 WHIRLPOOL d599d45cf43b4892faa0d435dc0e22d717234b918b74a29e7d542ebab486dacb3287fd105ba0380ea8b4b53806153ac62cb86d5bd5de4bf236522bb9471d6c49 -DIST swt-3.7.1-gtk-linux-x86.zip 5374283 SHA256 94279a6ab1aab248641daf728bca34f4eb2f4b812aaebc1973c775320cb96942 SHA512 3b9095b04e2cd8d4f3721c7ac51303f93164b47cb2afa992e553b46909e99232d70cceba9088053740fd46ef158f190101f2d84d3e6d1eddeabb40128bde1bf5 WHIRLPOOL f0c5d3190d5a1b2fbf8718591362b1115bb17e583ded59464e5c7108f3e652631bac21e8c8c4d216d4451096d726871b9f64fead3db4234125bae4983f84a00f -DIST swt-3.7.1-gtk-linux-x86_64.zip 5671004 SHA256 dd11d29a95391afed42ac3883c45a2bda7e4597c72c4b7b1291316e006139b75 SHA512 0d7a3b2bb5facb120682c4a5d7ca9232483aea1dab67172368e723849ed79dee89ecfec2d286c4827e91b5f7025232c26e0219b6f9fda3705b3b667ae0e2 WHIRLPOOL c2b6ae1d89de955a1df14fa6b6df8e234ccae84e0b01f5a5c414cd8764eee6f826ac7298e1bfe35d92aa527d4caa96cc4a2b54c91350f88b12a28c132e88ab63 DIST swt-3.7.2-gtk-linux-ppc64.zip 5688113 SHA256 90106c1878470dfb78b665062a6a8f94c19cbb469221a37be4b7b985bed54c5e SHA512 750aaa43560bbf6f82f7f8cd9338abc88578f4f0b9aadaec9bc8a5c3d1ad593619cdf01d202cbf06766090ee977989ea7904643669c61971973951d8428b57d0 WHIRLPOOL 44b3b19b425132a615026209d1b557ab099dec441a8c2fb7aadfd90d19cd56228385e8e4f0ce09d66ebdcb9870cc5a932c1e6c6b4e3c507ca5b687b3ec6e18f4 DIST swt-3.7.2-gtk-linux-x86.zip 5374609 SHA256 4e31f4cf5c6eac378ecaf5e261e925e82c377902c61cfdefaa38b1c3ea445183 SHA512 9f58864d05eba2648e4b5d5c958172f5c0c7c730209525b3d6f607586daaefea4d5ba1013e80c0c11948f01c553044b0a98c81688b33c14114ba79c7ce620426 WHIRLPOOL ff47a49df58f711c9ea9dcbc08ae6e5e78fcf11e9419a97a28a660af10172ba5b8eeff4e181794816c1b6aca9a6b3ea52b4f2cc855c0e399265a761c96b87296 DIST swt-3.7.2-gtk-linux-x86_64.zip 5671443 SHA256 a92498e1fcd001b91a5128a414263908c876c5b74bd10c3276e08a8edd470443 SHA512 d60ae1d3f3b0577f7e3018139f93069c89d021064fec2f3f4074f95cfae56abdc0c7d531cb904ad3911482543cddcc3f6646ff47192073f4bde97c79e13612b7 WHIRLPOOL 2698abf1f6f50d6712d37e7b10ee6b0442f1db43b0d78814c3ee04a3922816c9f62247c55610f539c11dfd10c4f4fcf1ab2986eec81d2555144730c95ee381dd diff --git a/dev-java/swt/swt-3.7.1.ebuild b/dev-java/swt/swt-3.7.1.ebuild deleted file mode 100644 index a64dac7.. --- a/dev-java/swt/swt-3.7.1.ebuild +++ /dev/null @@ -1,181 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi - -MY_PV="${PV/_rc/RC}"
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: 663c686052de6d002a2efa5ae5f9bf499d06b2ca Author: James Le Cuirot gentoo org> AuthorDate: Fri Oct 28 22:14:10 2016 + Commit: James Le Cuirot gentoo org> CommitDate: Fri Oct 28 22:15:06 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=663c6860 dev-java/swt: Fix SRC_URIs, closes bug #598360 Package-Manager: portage-2.3.2 dev-java/swt/swt-3.5.2.ebuild| 23 +++ dev-java/swt/swt-3.7.2-r1.ebuild | 23 +++ dev-java/swt/swt-3.8.2-r1.ebuild | 23 +++ 3 files changed, 21 insertions(+), 48 deletions(-) diff --git a/dev-java/swt/swt-3.5.2.ebuild b/dev-java/swt/swt-3.5.2.ebuild index 62bc824..79a975a 100644 --- a/dev-java/swt/swt-3.5.2.ebuild +++ b/dev-java/swt/swt-3.5.2.ebuild @@ -7,26 +7,17 @@ EAPI=2 inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi MY_PV="${PV/_rc/RC}" -MY_DMF="download.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201002111343" +MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201002111343; MY_P="${PN}-${MY_PV}" DESCRIPTION="GTK based SWT Library" HOMEPAGE="http://www.eclipse.org/; -SRC_URI="x86? ( - http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip - ) - x86-fbsd? ( - http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip - ) - amd64? ( - http://${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip - ) - ppc? ( - http://${MY_DMF}/${MY_P}-gtk-linux-ppc.zip - ) - ppc64? ( - http://${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip - )" +SRC_URI=" + amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip ) + ppc? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc.zip ) + ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip ) + x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip ) + x86-fbsd? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )" SLOT="3.5" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" diff --git a/dev-java/swt/swt-3.7.2-r1.ebuild b/dev-java/swt/swt-3.7.2-r1.ebuild index 5d09ebb..95012a5 100644 --- a/dev-java/swt/swt-3.7.2-r1.ebuild +++ b/dev-java/swt/swt-3.7.2-r1.ebuild @@ -7,26 +7,17 @@ EAPI=4 inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi MY_PV="${PV/_rc/RC}" -MY_DMF="download.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201202080800" +MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201202080800; MY_P="${PN}-${MY_PV}" DESCRIPTION="GTK based SWT Library" HOMEPAGE="http://www.eclipse.org/; -SRC_URI="x86? ( - http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip - ) - x86-fbsd? ( - http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip - ) - amd64? ( - http://${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip - ) - ppc? ( - http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip - ) - ppc64? ( - http://${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip - )" +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 ) + x86-fbsd? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )" SLOT="3.7" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" diff --git a/dev-java/swt/swt-3.8.2-r1.ebuild b/dev-java/swt/swt-3.8.2-r1.ebuild index 01520fc..0089fa3 100644 --- a/dev-java/swt/swt-3.8.2-r1.ebuild +++ b/dev-java/swt/swt-3.8.2-r1.ebuild @@ -7,26 +7,17 @@ EAPI="5" inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi MY_PV="${PV/_rc/RC}" -MY_DMF="archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201301310800" +MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201301310800; MY_P="${PN}-${MY_PV}" DESCRIPTION="GTK based SWT Library" HOMEPAGE="http://www.eclipse.org/; -SRC_URI="x86? ( - http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip - ) - x86-fbsd? ( - http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip - ) - amd64? ( - http://${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip - ) - ppc? ( - http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip - ) - ppc64? ( - http://${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip - )" +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 ) + x86-fbsd? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )" SLOT="3.8" LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/files/
commit: e5c7b9263708a11ed4c1fc54e5409a131505186e Author: Michael Mair-Keimberger (asterix) gmail com> AuthorDate: Thu Aug 4 17:53:26 2016 + Commit: James Le Cuirot gentoo org> CommitDate: Fri Aug 5 16:39:17 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5c7b926 dev-java/swt: remove unused patches/files .../swt-3.3-callback-pointer-dereferencing.patch | 23 -- dev-java/swt/files/swt-3.4-manifest| 16 - .../swt/files/swt-3.4-xulrunner-1.9.1-amd64.patch | 325 - dev-java/swt/files/swt-3.4-xulrunner-1.9.1.patch | 325 - dev-java/swt/files/swt-3.6-manifest| 17 -- 5 files changed, 706 deletions(-) diff --git a/dev-java/swt/files/swt-3.3-callback-pointer-dereferencing.patch b/dev-java/swt/files/swt-3.3-callback-pointer-dereferencing.patch deleted file mode 100644 index 92fbab7..000 --- a/dev-java/swt/files/swt-3.3-callback-pointer-dereferencing.patch +++ /dev/null @@ -1,23 +0,0 @@ -# patch from gcj-overlay, not sure if by geki himself -# removes QA warning about strict-aliasing callback.c.orig2006-12-12 17:25:26.0 +0100 -+++ callback.c 2006-12-12 18:11:34.0 +0100 -@@ -250,12 +250,16 @@ - - #ifdef JNI_VERSION_1_2 - if (IS_JNI_1_2) { -- (*jvm)->GetEnv(jvm, (void **), JNI_VERSION_1_2); -+ /* http://java.sun.com/j2se/1.5.0/docs/guide/jni/spec/invocation.html */ -+ /* jint GetEnv(JavaVM *vm, void **env, jint version); */ -+ (*jvm)->GetEnv(jvm, (void *), JNI_VERSION_1_2); - } - #endif - - if (env == NULL) { -- (*jvm)->AttachCurrentThread(jvm, (void **), NULL); -+ /* http://java.sun.com/j2se/1.5.0/docs/guide/jni/spec/invocation.html*/ -+ /* jint AttachCurrentThread(JavaVM *vm, JNIEnv **p_env, void *thr_args); */ -+ (*jvm)->AttachCurrentThread(jvm, (void *), NULL); - if (IS_JNI_1_2) detach = 1; - } - diff --git a/dev-java/swt/files/swt-3.4-manifest b/dev-java/swt/files/swt-3.4-manifest deleted file mode 100644 index c11c42a..000 --- a/dev-java/swt/files/swt-3.4-manifest +++ /dev/null @@ -1,16 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-Vendor: %providerName -Bundle-Localization: plugin -Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)" -Bundle-SymbolicName: org.eclipse.swt.gtk.linux.SWT_ARCH; singleton:=true -Bundle-Version: 3.4.0 -Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=SWT_ARCH)) -Export-Package: org.eclipse.swt.internal.accessibility.gtk; x-internal:=true, - org.eclipse.swt.internal.cairo; x-internal:=true, - org.eclipse.swt.internal.cde; x-internal:=true, - org.eclipse.swt.internal.gnome; x-internal:=true, - org.eclipse.swt.internal.gtk; x-internal:=true, - org.eclipse.swt.internal.mozilla; x-internal:=true, - org.eclipse.swt.internal.opengl.glx; x-internal:=true diff --git a/dev-java/swt/files/swt-3.4-xulrunner-1.9.1-amd64.patch b/dev-java/swt/files/swt-3.4-xulrunner-1.9.1-amd64.patch deleted file mode 100644 index db2536b..000 --- a/dev-java/swt/files/swt-3.4-xulrunner-1.9.1-amd64.patch +++ /dev/null @@ -1,325 +0,0 @@ -# Patch by Grant Gayed -# https://bugs.eclipse.org/bugs/show_bug.cgi?id=268651#c18 -# https://bugs.eclipse.org/bugs/attachment.cgi?id=130751 -Index: Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java -=== -RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java,v -retrieving revision 1.105.2.3 -diff -u -r1.105.2.3 Mozilla.java src/org/eclipse/swt/browser/Mozilla.java 21 Aug 2008 16:02:30 -1.105.2.3 -+++ src/org/eclipse/swt/browser/Mozilla.java 2 Apr 2009 19:15:06 - -@@ -47,6 +47,7 @@ - Shell tip = null; - Listener listener; - Vector unhookedDOMWindows = new Vector (); -+ byte[] htmlBytes; - - static nsIAppShell AppShell; - static AppFileLocProvider LocationProvider; -@@ -1130,21 +1131,21 @@ -* Once the client does a proper navigate with either setUrl() or setText() then resume as -* normal. The Mozilla bug for this is https://bugzilla.mozilla.org/show_bug.cgi?id=415789. -*/ -- awaitingNavigate = true; -- rc = webBrowser.QueryInterface (nsIWebNavigation.NS_IWEBNAVIGATION_IID, result); -- if (rc != XPCOM.NS_OK) { -- browser.dispose (); -- error (rc); -- } -- if (result[0] == 0) { -- browser.dispose (); --
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/
commit: 44b602563d2ef7b674af5165ff5c3ebb8d873cbe Author: James Le Cuirot gentoo org> AuthorDate: Sat Jan 30 10:10:27 2016 + Commit: James Le Cuirot gentoo org> CommitDate: Sat Jan 30 10:47:45 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44b60256 dev-java/swt: Remove unneeded 3.6 SLOT Only android-sdk-update-manager references it but also allows 3.7. Package-Manager: portage-2.2.27 dev-java/swt/Manifest | 3 - dev-java/swt/swt-3.6.1.ebuild | 175 -- 2 files changed, 178 deletions(-) diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest index dff8fea..4a33e84 100644 --- a/dev-java/swt/Manifest +++ b/dev-java/swt/Manifest @@ -1,9 +1,6 @@ DIST swt-3.5.2-gtk-linux-ppc.zip 4947929 SHA256 f2619f6e107eee3c55c6694df4c89e77976d2d5517b6f3c17c358602536abf28 SHA512 2d3d194d2bb4c7f0e6d5bc801d41cb6de970de78c544a7edd2f18c4ed9291f7639dbedab4594c5221e76dd559c884c6fda7f32d11d0465a2d017fe0398a33dae WHIRLPOOL 282057de0d2e23c887db96d20ff8e39a1ea1e87adde415357903323095d4439e966218390932bebd2234dfed2117a0afa93372e9088e695770cb521ff7180501 DIST swt-3.5.2-gtk-linux-x86.zip 4881316 SHA256 00477e6fc3c913916cd980a1ec29629c5250afc52dc0fcee74b035af0360eef7 SHA512 f53226458e5404cc03475c3bb903de81efa328625b713fe97b3b418a769b0476695e437e0693b5e10fa9a356de90302d6a2d267fe5e13f172803c684db9e9c82 WHIRLPOOL 4ca8f495c6d499ed8f1f6789333a6b357978029a6138a9986b6ef309a3e60303b6399b3c288e3732b13b75eb1db45e3679a559c806113a80572b0a05a226cadd DIST swt-3.5.2-gtk-linux-x86_64.zip 5068674 SHA256 91f9e2d4f6ca3926252d33895aafe82ba1b72bcdb77ec71dafa20d154f5d5bc7 SHA512 f226d531002dc472852f09ce9814c8dcf7b0c4209353a5639d8b814308807df6477c4a8aa0fd49743578282e6662ca8d5c316371720dca50953ad7ec44b7c6d3 WHIRLPOOL 335ab0845f3c27d3396286f26b45583cf4b71469c3567dd2a978fa3b82af7828d02925529ec686825d283207b3e3858237664f43ab4ecb56835a84ffb066033b -DIST swt-3.6.1-gtk-linux-ppc.zip 5396609 SHA256 71caf4106401c8227696f8fc2c6d84a9c88877a38ed046b830455c65b85412ec SHA512 cee062224f8e5508d9f8d0a099535337c73a18338bb804a37dd79c11e7601ebd9455469300ad17fa2bd260b7c673ac8d7e385250fcf55bf9f70af76b6c7b WHIRLPOOL 9a567eb65eee0e8f29da4eb53f0795469b92bfecddfc753f7e42915586b5b7fc2a33b1e2a5d43b41afd33d8f10e27716331195ede79315307c885fc24a58be39 -DIST swt-3.6.1-gtk-linux-x86.zip 5234373 SHA256 d0df381d82b1483bc2ffc576a55250be12db108f6a77058f87dd87ac7874f9ef SHA512 89159a74b27f3afb31c1ce0360012b0d3f72649bac9f068ceb02a3447033a6d06ce5a434f6fa996a2455569b45d263f960e96a7de3860db8ed688b3554cb8a5f WHIRLPOOL 462a7e1bb706a3335ca623ee1a6f8edc429155fd50a678a4865322af07c5daf0dc6cc970b5369914134fba788031dfbdf9a690f719105d5d529f6921d5548aec -DIST swt-3.6.1-gtk-linux-x86_64.zip 5529321 SHA256 e4e72278e710ecda4594a143e76cb7dc30ab7bcd5e6334b4c0d08ca75d900b94 SHA512 175d1827108168596ef5c68f1c9c5eef567f5b27aca8fe45374cc5fb2b59ee003a627edfcc24f34222abc078ec28d230535279bd79b04128cccb1e349d2bf0bb WHIRLPOOL 2d2eb7466a268553a6744e7e1f88402cfffd09fb5b0f00522253bd295e23eeb42ab4ab3d302267fb083c0391158124d3b6eca29c6a06c53d37b71560d91d0f24 DIST swt-3.7.1-gtk-linux-ppc64.zip 5687650 SHA256 11b0ea72554f0f75941b44ae76aaf70b326e1c0cda7328fbb5a83b682a5e653c SHA512 fe73fa10c41cde27393818eab7a3d4c1402fcfad5639d75c9642e2a020e872e7a5d65dd65c1a526b3e70f74ac6cb4bbb7df93ac48cd6923c483754dc74e52125 WHIRLPOOL d599d45cf43b4892faa0d435dc0e22d717234b918b74a29e7d542ebab486dacb3287fd105ba0380ea8b4b53806153ac62cb86d5bd5de4bf236522bb9471d6c49 DIST swt-3.7.1-gtk-linux-x86.zip 5374283 SHA256 94279a6ab1aab248641daf728bca34f4eb2f4b812aaebc1973c775320cb96942 SHA512 3b9095b04e2cd8d4f3721c7ac51303f93164b47cb2afa992e553b46909e99232d70cceba9088053740fd46ef158f190101f2d84d3e6d1eddeabb40128bde1bf5 WHIRLPOOL f0c5d3190d5a1b2fbf8718591362b1115bb17e583ded59464e5c7108f3e652631bac21e8c8c4d216d4451096d726871b9f64fead3db4234125bae4983f84a00f DIST swt-3.7.1-gtk-linux-x86_64.zip 5671004 SHA256 dd11d29a95391afed42ac3883c45a2bda7e4597c72c4b7b1291316e006139b75 SHA512 0d7a3b2bb5facb120682c4a5d7ca9232483aea1dab67172368e723849ed79dee89ecfec2d286c4827e91b5f7025232c26e0219b6f9fda3705b3b667ae0e2 WHIRLPOOL c2b6ae1d89de955a1df14fa6b6df8e234ccae84e0b01f5a5c414cd8764eee6f826ac7298e1bfe35d92aa527d4caa96cc4a2b54c91350f88b12a28c132e88ab63 diff --git a/dev-java/swt/swt-3.6.1.ebuild b/dev-java/swt/swt-3.6.1.ebuild deleted file mode 100644 index 07cf74c..000 --- a/dev-java/swt/swt-3.6.1.ebuild +++ /dev/null @@ -1,175 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=2 - -inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi - -MY_PV="${PV/_rc/RC}" -MY_DMF="download.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201009090800" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="GTK based SWT Library" -HOMEPAGE="http://www.eclipse.org/; -SRC_URI="x86? ( - http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip - ) -
[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/, dev-java/swt/files/
commit: a982577a389eba5e74720efdc9a4a3ca1434b5b3 Author: Ryan Hill gentoo org> AuthorDate: Mon Oct 26 23:38:16 2015 + Commit: Ryan Hill gentoo org> CommitDate: Mon Oct 26 23:39:15 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a982577a dev-java/swt: Backport patch fixing crash to 3.8.2. https://bugs.eclipse.org/404776 Gentoo-Bug: https://bugs.gentoo.org/500570 Package-Manager: portage-2.2.23 Signed-off-by: Ryan Hill gentoo.org> .../swt/files/swt-3.8.2-libwebkit-compat.patch | 23 +++ dev-java/swt/swt-3.8.2-r1.ebuild | 184 + 2 files changed, 207 insertions(+) diff --git a/dev-java/swt/files/swt-3.8.2-libwebkit-compat.patch b/dev-java/swt/files/swt-3.8.2-libwebkit-compat.patch new file mode 100644 index 000..ba537f5 --- /dev/null +++ b/dev-java/swt/files/swt-3.8.2-libwebkit-compat.patch @@ -0,0 +1,23 @@ +crash: fatal error in soup_session_feature_detach with WebKitGTK+ >= 1.11.91 +http://git.eclipse.org/c/platform/eclipse.platform.swt.git/commit/?id=b22a7d19afbe2a3811a0f8aa54c1e85d92c62a2c +https://bugs.eclipse.org/404776 +https://bugs.gentoo.org/500570 + +--- a/src/org/eclipse/swt/browser/WebKit.java b/src/org/eclipse/swt/browser/WebKit.java +@@ -597,9 +597,13 @@ public void create (Composite parent, int style) { + */ + long /*int*/ session = WebKitGTK.webkit_get_default_session (); + long /*int*/ originalAuth = WebKitGTK.soup_session_get_feature (session, WebKitGTK.webkit_soup_auth_dialog_get_type ()); +- WebKitGTK.soup_session_feature_detach (originalAuth, session); ++ if (originalAuth != 0) { ++ WebKitGTK.soup_session_feature_detach (originalAuth, session); ++ } + OS.g_signal_connect (session, WebKitGTK.authenticate, Proc5.getAddress (), webView); +- WebKitGTK.soup_session_feature_attach (originalAuth, session); ++ if (originalAuth != 0) { ++ WebKitGTK.soup_session_feature_attach (originalAuth, session); ++ } + + /* + * Check for proxy values set as documented java properties and update the diff --git a/dev-java/swt/swt-3.8.2-r1.ebuild b/dev-java/swt/swt-3.8.2-r1.ebuild new file mode 100644 index 000..275a366 --- /dev/null +++ b/dev-java/swt/swt-3.8.2-r1.ebuild @@ -0,0 +1,184 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi + +MY_PV="${PV/_rc/RC}" +MY_DMF="archive.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201301310800" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="GTK based SWT Library" +HOMEPAGE="http://www.eclipse.org/; +SRC_URI="x86? ( + http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip + ) + x86-fbsd? ( + http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip + ) + amd64? ( + http://${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip + ) + ppc? ( + http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip + ) + ppc64? ( + http://${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip + )" + +SLOT="3.8" +LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" + +IUSE="cairo gnome opengl webkit" +COMMON=">=dev-libs/glib-2.6 + >=x11-libs/gtk+-2.6.8:2 + >=dev-libs/atk-1.10.2 + cairo? ( >=x11-libs/cairo-1.4.14 ) + gnome? ( + gnome-base/gnome-vfs:2 + gnome-base/libgnome + gnome-base/libgnomeui + ) + opengl? ( + virtual/opengl + virtual/glu + ) + webkit? ( >=net-libs/webkit-gtk-1.2:2 ) + x11-libs/libXtst" + +DEPEND=">=virtual/jdk-1.4 + app-arch/unzip + x11-libs/libX11 + x11-libs/libXrender + x11-libs/libXt + >=x11-libs/libXtst-1.1.0 + x11-proto/inputproto + virtual/pkgconfig + ${COMMON}" + +RDEPEND=">=virtual/jre-1.4 + ${COMMON}" + +S="${WORKDIR}" + +# JNI libraries don't need SONAME, bug #253756 +QA_SONAME="usr/$(get_libdir)/libswt-.*.so" + +src_unpack() { + local DISTFILE=${A} + unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "Unable to extract distfile" + unpack "./src.zip" + + # Cleanup the redirtied directory structure + rm -rf about_files/ || die +} + +java_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 -p "${S}/src" + mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources" + +