Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/swt/files/, dev-java/swt/
Date: Wed, 23 Jan 2019 15:41:25
Message-Id: 1548258033.246c51a12fe5d8ae5a7a37b0ca906f36500954ae.fordfrog@gentoo
1 commit: 246c51a12fe5d8ae5a7a37b0ca906f36500954ae
2 Author: Valérian Rousset <tharvik <AT> users <DOT> noreply <DOT> github <DOT> com>
3 AuthorDate: Mon Jan 7 22:24:35 2019 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 23 15:40:33 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=246c51a1
7
8 dev-java/swt: bump
9
10 Closes: https://bugs.gentoo.org/505968
11 Tested-by: Valérian Rousset <tharvik <AT> users.noreply.github.com>
12 Signed-off-by: Valérian Rousset <tharvik <AT> users.noreply.github.com>
13 Package-Manager: Portage-2.3.51, Repoman-2.3.12
14 Closes: https://github.com/gentoo/gentoo/pull/10771
15 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
16
17 dev-java/swt/Manifest | 2 +
18 .../files/swt-4.10-as-needed-and-flag-fixes.patch | 82 ++++++++++
19 dev-java/swt/files/swt-4.10-manifest | 16 ++
20 dev-java/swt/swt-4.10.ebuild | 167 +++++++++++++++++++++
21 4 files changed, 267 insertions(+)
22
23 diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
24 index a4c8e92cbd1..a7bdcfce8ab 100644
25 --- a/dev-java/swt/Manifest
26 +++ b/dev-java/swt/Manifest
27 @@ -4,6 +4,8 @@ DIST swt-3.7.2-gtk-linux-x86_64.zip 5671443 BLAKE2B 953fc9eab6d1f2750b1a1345cddf
28 DIST swt-3.8.2-gtk-linux-ppc64.zip 5933708 BLAKE2B d49633d9d5049d1a6f9bbdcf5a364b73802194fbaf02aa5064c7a1c917e0aad80c829b026a1a41b7903ed0d8066af89ff24683897ced8cbe8c41406a7696c408 SHA512 cb9f2c7aed0b18bae6546272076c23c91d9e1a38404f0a70ddc6408047d961befe2839db177066312b82d8365bee6bcffb6e92aaa7a869ad37d9f49ab780e337
29 DIST swt-3.8.2-gtk-linux-x86.zip 5558694 BLAKE2B 8dd0ce9f2c6b8dc448c85a6c509f39ef2da000e0589da52330b83dec87601d100320af778983b2083ca8f9e2890a2d4c731cb2810d9054a9e50e7940ad14bea2 SHA512 afe1563e92fe9af0a58e7dbae731976991a6afacf6415ab88ebf557f99a5154169ad7103519524f71142c4160d55a9b0a9f7379b21486430318e4160e6f01c00
30 DIST swt-3.8.2-gtk-linux-x86_64.zip 5865160 BLAKE2B 45d60d334eb99f407cf9101a06f65e48543538a386103767700fb0af5ea0cf3da73eefe57b8cc6b3d78cb8f29345869f5474513648560395a69cbd4c9b8ee8a4 SHA512 43a27cb6fc891d7da35f5fcfc6ccb689d2b2c58de70b628b1e7cf07131f0641598b627eeedafb6a8dca715a336a7fb4fb6a03bb29fea3e115a4af571b1574cf8
31 +DIST swt-4.10-gtk-linux-ppc64le.zip 3848264 BLAKE2B 214861fde6987906fb24f3187936f3bcb49aebed54fe242427c3737bf6761e8f77d049c376f30ca0fc33e74a1e8a48b6aff6d9863775ee9c33fea7cb2edd1309 SHA512 1b3ede58c2b41abae76f58a303bd3fbf1849ba8be3fd6518325bc22400e960c3ab542e7351b1bc08053e2746ea3e28812e04c2d1789cb1e19ea28745c8a5f39a
32 +DIST swt-4.10-gtk-linux-x86_64.zip 3844306 BLAKE2B 0e0ed21708acce347fd025920ee635f586c460f8a9c05a7067fd70eed9da999b4a62a5febd17f0c5546ab15198336038e4ab49a1bd588d49ffb39450353a1911 SHA512 9dd946cb7c11446f553f06b8af516167519bab00d4a89f626cd612be6d18e50023fc537aa3d844a8f7a56a767df00410efe4dd20e2bfd930639330a1e279a7a0
33 DIST swt-4.2-gtk-linux-ppc64.zip 5935799 BLAKE2B 6b1ca0d25d81134239e56ead673303075b6d9c5f20e4ab07fb7b5b87d54582023d02c28a1d330fd40d647bdbc27823ca7b184837cb974706ee13809ebdfd2db4 SHA512 bedd64099380980a6dbe47b86f4719666366680f7580150f97282c6f6b6acc95822493469e950e8fcbc9c584f6fca9f35a59937551ae8b6e799b188dc3751e9d
34 DIST swt-4.2-gtk-linux-x86.zip 5561088 BLAKE2B cf8bda6a48d5d8e389c387162bf2aafde5a95c43d76e444a4b79008e1154348d2c99850851b3d0e428890e6b2da1e4bec53a7f9050169ad4866a5a8352e9ed2b SHA512 e3d53bcd0521411c40f4c37719917f3570a17fb3ea5c617560986273fd155b99d9b0790ba27c57da26663d49ebec4c6a8387b41bd01b0ba934b21724ba98e133
35 DIST swt-4.2-gtk-linux-x86_64.zip 5867140 BLAKE2B 994bf18799297529329637c1b9ebf15638187339b4f56bf8cc1dedfc97c25a1ea4a1664605cac1374fe3d79b321dc450c6129ebef00ddd6f9507f238b7836316 SHA512 56c5ec4ca2ddeed5256dd6ff350dc3911034ecbc414a06ba879f04ab53d6380ca9da9037097f76228ca8182f6076bcd9cc4cb9b01c10766c10048e6576fc5f50
36
37 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
38 new file mode 100644
39 index 00000000000..09bed21d58f
40 --- /dev/null
41 +++ b/dev-java/swt/files/swt-4.10-as-needed-and-flag-fixes.patch
42 @@ -0,0 +1,82 @@
43 +diff -Naur a/make_linux.mak b/make_linux.mak
44 +--- a/make_linux.mak 2019-01-07 14:08:00.269147198 +0100
45 ++++ b/make_linux.mak 2019-01-07 14:10:28.645155241 +0100
46 +@@ -101,7 +101,7 @@
47 + WEBKIT_OBJECTS = swt.o webkitgtk.o webkitgtk_structs.o webkitgtk_stats.o webkitgtk_custom.o
48 + GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
49 +
50 +-CFLAGS := $(CFLAGS) \
51 ++CFLAGS += -fPIC \
52 + -DSWT_VERSION=$(SWT_VERSION) \
53 + $(NATIVE_STATS) \
54 + $(SWT_DEBUG) \
55 +@@ -129,13 +129,13 @@
56 + make_swt: $(SWT_LIB) $(SWTPI_LIB)
57 +
58 + $(SWT_LIB): $(SWT_OBJECTS)
59 +- $(CC) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS)
60 ++ $(CC) $(LDFLAGS) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS)
61 +
62 + callback.o: callback.c callback.h
63 + $(CC) $(CFLAGS) -DUSE_ASSEMBLER -c callback.c
64 +
65 + $(SWTPI_LIB): $(SWTPI_OBJECTS)
66 +- $(CC) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
67 ++ $(CC) $(LDFLAGS) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
68 +
69 + swt.o: swt.c swt.h
70 + $(CC) $(CFLAGS) -c swt.c
71 +@@ -154,7 +154,7 @@
72 + make_cairo: $(CAIRO_LIB)
73 +
74 + $(CAIRO_LIB): $(CAIRO_OBJECTS)
75 +- $(CC) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
76 ++ $(CC) $(LDFLAGS) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
77 +
78 + cairo.o: cairo.c cairo.h swt.h
79 + $(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c
80 +@@ -169,7 +169,7 @@
81 + make_awt:$(AWT_LIB)
82 +
83 + $(AWT_LIB): $(AWT_OBJECTS)
84 +- $(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
85 ++ $(CC) -fPIC $(LDFLAGS) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
86 +
87 + #
88 + # Atk lib
89 +@@ -177,7 +177,7 @@
90 + make_atk: $(ATK_LIB)
91 +
92 + $(ATK_LIB): $(ATK_OBJECTS)
93 +- $(CC) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
94 ++ $(CC) $(LDFLAGS) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
95 +
96 + atk.o: atk.c atk.h
97 + $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c
98 +@@ -198,7 +198,7 @@
99 + endif
100 +
101 + $(WEBKIT_LIB): $(WEBKIT_OBJECTS)
102 +- $(CC) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS) $(WEBKITLIBS)
103 ++ $(CC) $(LDFLAGS) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS) $(WEBKITLIBS)
104 +
105 + webkitgtk.o: webkitgtk.c webkitgtk_custom.h
106 + $(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk.c
107 +@@ -217,7 +217,7 @@
108 + make_webkit2extension: $(WEBKIT_EXTENSION_LIB)
109 +
110 + $(WEBKIT_EXTENSION_LIB) : webkitgtk_extension.o
111 +- $(CC) $(LFLAGS) -o $@ $^ $(WEBKIT_EXTENSION_LFLAGS)
112 ++ $(CC) $(LDFLAGS) $(LFLAGS) -o $@ $^ $(WEBKIT_EXTENSION_LFLAGS)
113 +
114 + webkitgtk_extension.o : webkitgtk_extension.c
115 + $(CC) $(CFLAGS) $(WEBKIT_EXTENSION_CFLAGS) ${SWT_PTR_CFLAGS} -fPIC -c $^
116 +@@ -228,7 +228,7 @@
117 + make_glx: $(GLX_LIB)
118 +
119 + $(GLX_LIB): $(GLX_OBJECTS)
120 +- $(CC) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
121 ++ $(CC) $(LDFLAGS) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
122 +
123 + glx.o: glx.c
124 + $(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c
125
126 diff --git a/dev-java/swt/files/swt-4.10-manifest b/dev-java/swt/files/swt-4.10-manifest
127 new file mode 100644
128 index 00000000000..230d33f7bf1
129 --- /dev/null
130 +++ b/dev-java/swt/files/swt-4.10-manifest
131 @@ -0,0 +1,16 @@
132 +Manifest-Version: 1.0
133 +Bundle-ManifestVersion: 2
134 +Bundle-Name: %pluginName
135 +Bundle-Vendor: %providerName
136 +Bundle-Localization: plugin
137 +Fragment-Host: org.eclipse.swt; bundle-version=4.5.1
138 +Bundle-SymbolicName: org.eclipse.swt.gtk.linux.SWT_ARCH; singleton:=true
139 +Bundle-Version: 4.5
140 +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=SWT_ARCH))
141 +Export-Package: org.eclipse.swt.internal.accessibility.gtk; x-internal:=true,
142 + org.eclipse.swt.internal.cairo; x-internal:=true,
143 + org.eclipse.swt.internal.cde; x-internal:=true,
144 + org.eclipse.swt.internal.gnome; x-internal:=true,
145 + org.eclipse.swt.internal.gtk; x-internal:=true,
146 + org.eclipse.swt.internal.opengl.glx; x-internal:=true
147 + org.eclipse.swt.internal.webkit; x-internal:=true
148
149 diff --git a/dev-java/swt/swt-4.10.ebuild b/dev-java/swt/swt-4.10.ebuild
150 new file mode 100644
151 index 00000000000..f7fa9be7233
152 --- /dev/null
153 +++ b/dev-java/swt/swt-4.10.ebuild
154 @@ -0,0 +1,167 @@
155 +# Copyright 1999-2019 Gentoo Authors
156 +# Distributed under the terms of the GNU General Public License v2
157 +
158 +EAPI=6
159 +
160 +inherit eutils flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs java-osgi
161 +
162 +MY_PV="${PV/_rc/RC}"
163 +MY_DMF="http://download.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-201812060815"
164 +MY_P="${PN}-${MY_PV}"
165 +
166 +DESCRIPTION="GTK based SWT Library"
167 +HOMEPAGE="http://www.eclipse.org/"
168 +SRC_URI="
169 + amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
170 + ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64le.zip )"
171 +
172 +LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
173 +SLOT="4.10"
174 +KEYWORDS="~amd64 ~ppc64"
175 +IUSE="cairo opengl webkit"
176 +
177 +COMMON_DEP="
178 + >=dev-libs/atk-1.10.2
179 + >=dev-libs/glib-2.32
180 + >=x11-libs/gtk+-2.6.8:2
181 + x11-libs/libXtst
182 + cairo? ( >=x11-libs/cairo-1.4.14 )
183 + opengl? (
184 + virtual/glu
185 + virtual/opengl
186 + )
187 + webkit? (
188 + net-libs/webkit-gtk:4
189 + )"
190 +DEPEND="${COMMON_DEP}
191 + >=virtual/jdk-1.8
192 + app-arch/unzip
193 + virtual/pkgconfig
194 + x11-base/xorg-proto
195 + x11-libs/libX11
196 + x11-libs/libXrender
197 + x11-libs/libXt
198 + >=x11-libs/libXtst-1.1.0"
199 +RDEPEND="${COMMON_DEP}
200 + >=virtual/jre-1.8"
201 +
202 +S="${WORKDIR}"
203 +
204 +# JNI libraries don't need SONAME, bug #253756
205 +QA_SONAME='usr/lib[^/]*/libswt-[^/]+.so'
206 +
207 +PATCHES=(
208 + "${FILESDIR}"/${P}-as-needed-and-flag-fixes.patch
209 +)
210 +
211 +src_unpack() {
212 + local DISTFILE=${A}
213 + unzip -jq "${DISTDIR}"/${DISTFILE} swt.jar src.zip || die "Unable to extract distfile"
214 + unpack "./src.zip"
215 +
216 + # Cleanup the redirtied directory structure
217 + rm -rf about_files/ || die
218 +}
219 +
220 +src_prepare() {
221 + # Replace the build.xml to allow compilation without Eclipse tasks
222 + cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml"
223 + mkdir "${S}/src" && mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources"
224 +
225 + # Apply patches
226 + default
227 +
228 + # Define missing g_thread_supported() to be already started.
229 + sed -i '1s/^/#define g_thread_supported() 1\n\n/' "${S}"/os_custom.h || die
230 +
231 + # Webext is also in the library directory
232 + sed -i 's|findResource([^,]\+|findResource("swt"|' \
233 + "${S}"/src/org/eclipse/swt/browser/WebKit.java || die
234 +}
235 +
236 +src_compile() {
237 + # Drop jikes support as it seems to be unfriendly with SWT
238 + java-pkg_filter-compiler jikes
239 +
240 + local AWT_ARCH
241 + local JAWTSO="libjawt.so"
242 + if [[ $(tc-arch) == 'ppc64' ]] ; then
243 + AWT_ARCH="ppc64"
244 + else
245 + AWT_ARCH="amd64"
246 + fi
247 + if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then
248 + export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}"
249 + elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then
250 + export AWT_LIB_PATH="${JAVA_HOME}/jre/bin"
251 + elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then
252 + export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)"
253 + else
254 + eerror "${JAWTSO} not found in the JDK being used for compilation!"
255 + die "cannot build AWT library"
256 + fi
257 +
258 + # Fix the pointer size for AMD64
259 + export SWT_PTR_CFLAGS=-DJNI64
260 +
261 + # Bug #461784, g_thread_init is deprecated since glib-2.32.
262 + append-cflags -DNO__1g_1thread_1init
263 +
264 + local make="emake -f make_linux.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
265 +
266 + einfo "Building AWT library"
267 + ${make} make_awt AWT_LIBS="-L\$(AWT_LIB_PATH) -Wl,-rpath,\$(AWT_LIB_PATH) -ljawt \`pkg-config --libs x11\`"
268 +
269 + einfo "Building SWT library"
270 + ${make} make_swt
271 +
272 + einfo "Building JAVA-AT-SPI bridge"
273 + ${make} make_atk
274 +
275 + if use cairo ; then
276 + einfo "Building CAIRO support"
277 + ${make} make_cairo
278 + fi
279 +
280 + if use opengl ; then
281 + einfo "Building OpenGL component"
282 + ${make} make_glx
283 + fi
284 +
285 + if use webkit ; then
286 + einfo "Building WebKit component"
287 + ${make} make_webkit make_webkit2extension
288 + fi
289 +
290 + einfo "Building JNI libraries"
291 + eant compile
292 +
293 + einfo "Copying missing files"
294 + cp -i "${S}/version.txt" "${S}/build/version.txt" || die
295 + cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \
296 + "${S}/build/org/eclipse/swt/internal/" || die
297 + unzip swt.jar 'org/eclipse/swt/internal/gtk/*.css' -d build || die
298 +
299 + einfo "Packing JNI libraries"
300 + eant jar
301 +}
302 +
303 +src_install() {
304 + local swtArch=${ARCH}
305 + use amd64 && swtArch=x86_64
306 +
307 + sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die
308 + remove_from_manifest() {
309 + local subpkg=$1
310 + sed -i -e "/ org.eclipse.swt.internal.$subpkg; x-internal:=true,/d" "MANIFEST_TMP.MF" || die
311 + }
312 + use cairo || remove_from_manifest cairo
313 + use opengl || remove_from_manifest opengl.glx
314 + use webkit || remove_from_manifest webkit
315 + java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"
316 +
317 + java-pkg_sointo "/usr/$(get_libdir)/swt"
318 + java-pkg_doso *.so
319 +
320 + dodoc about.html
321 +}