dev-java/swt: bump

Closes: https://bugs.gentoo.org/505968
Tested-by: Valérian Rousset <tharvik@users.noreply.github.com>
Signed-off-by: Valérian Rousset <tharvik@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 <fordfrog@gentoo.org>

diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index a4c8e92cbd15e8e38a10c1acd0e6ff01a1fa497a..a7bdcfce8ab296257a6c6831177ff164c734abcc 100644 (file)
--- 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 (file)
index 0000000..09bed21
--- /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) $(GTKLIBS)
+ 
+ swt.o: swt.c swt.h
+       $(CC) $(CFLAGS) -c swt.c
+@@ -154,7 +154,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
+@@ -169,7 +169,7 @@
+ make_awt:$(AWT_LIB)
+ 
+ $(AWT_LIB): $(AWT_OBJECTS)
+-      $(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
++      $(CC) -fPIC $(LDFLAGS) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
+ 
+ #
+ # Atk lib
+@@ -177,7 +177,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
+@@ -198,7 +198,7 @@
+ endif
+ 
+ $(WEBKIT_LIB): $(WEBKIT_OBJECTS)
+-      $(CC) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS) $(WEBKITLIBS)
++      $(CC) $(LDFLAGS) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS) $(WEBKITLIBS)
+ 
+ webkitgtk.o: webkitgtk.c webkitgtk_custom.h
+       $(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk.c
+@@ -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 $^
+@@ -228,7 +228,7 @@
+ make_glx: $(GLX_LIB)
+ 
+ $(GLX_LIB): $(GLX_OBJECTS)
+-      $(CC) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
++      $(CC) $(LDFLAGS) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
+ 
+ glx.o: glx.c 
+       $(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c

diff --git a/dev-java/swt/files/swt-4.10-manifest b/dev-java/swt/files/swt-4.10-manifest
new file mode 100644 (file)
index 0000000..230d33f
--- /dev/null
+++ b/dev-java/swt/files/swt-4.10-manifest
@@ -0,0 +1,16 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Fragment-Host: org.eclipse.swt; bundle-version=4.5.1
+Bundle-SymbolicName: org.eclipse.swt.gtk.linux.SWT_ARCH; singleton:=true
+Bundle-Version: 4.5
+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.opengl.glx; x-internal:=true
+ org.eclipse.swt.internal.webkit; x-internal:=true

diff --git a/dev-java/swt/swt-4.10.ebuild b/dev-java/swt/swt-4.10.ebuild
new file mode 100644 (file)
index 0000000..f7fa9be
--- /dev/null
+++ b/dev-java/swt/swt-4.10.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils 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
+       app-arch/unzip
+       virtual/pkgconfig
+       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"
+
+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() {
+       # 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
+               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
+       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"
+               ${make} make_cairo
+       fi
+
+       if use opengl ; then
+               einfo "Building OpenGL component"
+               ${make} make_glx
+       fi
+
+       if use webkit ; then
+               einfo "Building WebKit component"
+               ${make} make_webkit make_webkit2extension
+       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
+       unzip swt.jar 'org/eclipse/swt/internal/gtk/*.css' -d build || die
+
+       einfo "Packing JNI libraries"
+       eant jar
+}
+
+src_install() {
+       local swtArch=${ARCH}
+       use amd64 && swtArch=x86_64
+
+       sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die
+       remove_from_manifest() {
+               local subpkg=$1
+               sed -i -e "/ org.eclipse.swt.internal.$subpkg; x-internal:=true,/d" "MANIFEST_TMP.MF" || die
+       }
+       use cairo || remove_from_manifest cairo
+       use opengl || remove_from_manifest opengl.glx
+       use webkit || remove_from_manifest webkit
+       java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"
+
+       java-pkg_sointo "/usr/$(get_libdir)/swt"
+       java-pkg_doso *.so
+
+       dodoc about.html
+}