| 1 |
commit: f827629c3b99735e623babe93c76624251cd2fd2 |
| 2 |
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> |
| 3 |
AuthorDate: Mon Jan 2 18:38:42 2023 +0000 |
| 4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Mar 19 06:30:39 2023 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f827629c |
| 7 |
|
| 8 |
dev-java/swt: add 4.27 |
| 9 |
|
| 10 |
- adds arm64 to conditional sources, to be keyworded |
| 11 |
- switches to java-pkg-simple.eclass |
| 12 |
- drops osgi stuff, not used upstream |
| 13 |
- reworks swt-4.27-as-needed-and-flag-fixes.patch from 4.10 |
| 14 |
- re-uses src_compile() from 4.10 except "eant compile" |
| 15 |
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> |
| 16 |
Closes: https://github.com/gentoo/gentoo/pull/29142/commits/0cace839b2d3e8c310b1371dcd12f9626c90a147 |
| 17 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
| 18 |
|
| 19 |
dev-java/swt/Manifest | 3 + |
| 20 |
.../files/swt-4.27-as-needed-and-flag-fixes.patch | 82 ++++++++++++ |
| 21 |
dev-java/swt/swt-4.27.ebuild | 142 +++++++++++++++++++++ |
| 22 |
3 files changed, 227 insertions(+) |
| 23 |
|
| 24 |
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest |
| 25 |
index a1e00f9e4f9c..296f28fcfb56 100644 |
| 26 |
--- a/dev-java/swt/Manifest |
| 27 |
+++ b/dev-java/swt/Manifest |
| 28 |
@@ -3,3 +3,6 @@ DIST swt-3.7.2-gtk-linux-x86.zip 5374609 BLAKE2B 04d44b9fffcedc6ce255e2651377ac6 |
| 29 |
DIST swt-3.7.2-gtk-linux-x86_64.zip 5671443 BLAKE2B 953fc9eab6d1f2750b1a1345cddf4aa6969567cb75977f87ee50668d367e55dda8be2ff836d87b780005c22132fa783b475f422c093617fd02f478eadd96076d SHA512 d60ae1d3f3b0577f7e3018139f93069c89d021064fec2f3f4074f95cfae56abdc0c7d531cb904ad3911482543cddcc3f6646ff47192073f4bde97c79e13612b7 |
| 30 |
DIST swt-4.10-gtk-linux-ppc64le.zip 3848264 BLAKE2B 214861fde6987906fb24f3187936f3bcb49aebed54fe242427c3737bf6761e8f77d049c376f30ca0fc33e74a1e8a48b6aff6d9863775ee9c33fea7cb2edd1309 SHA512 1b3ede58c2b41abae76f58a303bd3fbf1849ba8be3fd6518325bc22400e960c3ab542e7351b1bc08053e2746ea3e28812e04c2d1789cb1e19ea28745c8a5f39a |
| 31 |
DIST swt-4.10-gtk-linux-x86_64.zip 3844306 BLAKE2B 0e0ed21708acce347fd025920ee635f586c460f8a9c05a7067fd70eed9da999b4a62a5febd17f0c5546ab15198336038e4ab49a1bd588d49ffb39450353a1911 SHA512 9dd946cb7c11446f553f06b8af516167519bab00d4a89f626cd612be6d18e50023fc537aa3d844a8f7a56a767df00410efe4dd20e2bfd930639330a1e279a7a0 |
| 32 |
+DIST swt-4.27-gtk-linux-aarch64.zip 3849438 BLAKE2B b07daa4942c450d5cca5a323b0649a645fe9a283b272a73a9675f3bd07fbae859c41f451521231a93f4fb56ae4093d57474545611c4789c076abad2e9e1c911f SHA512 a3ba011258e5906beb15ffd5deaa73fc9a5ed5f7bce78a4a683ad8ad12a5cca1fa3a0d89fed6da9f4ade530ea3bda09093ad43202993b522a060a9dcd98746d3 |
| 33 |
+DIST swt-4.27-gtk-linux-ppc64le.zip 3872996 BLAKE2B 58ae779b7103da932719fe702674e211f8f0068c3b6094172b4c58e939de96d8d43ef80d40740c29f6fcd802a252a87ba850e9e6320d881c958b0161700e4e8c SHA512 6f8f1fce502e0980ced3f201dcdeb3397a583a9ba9ebe76d82c713c440d614c4ff38efe5f596a9da25940f931e3c651c36b18211faea4fab31872d25566b060a |
| 34 |
+DIST swt-4.27-gtk-linux-x86_64.zip 3869518 BLAKE2B d0eb7d1be59944cbffe5556c258043d084f7f1a8fa1d9ad9c3738896adc12aa015f85b675ba72af31de566ae451280bb83d82082b3f589c8da643631bf1f7bfb SHA512 efa89c1752340978e1aa1d2343a07df001fa952092aef959bdeedf53a31270d24ebe34ccb50e72ef2221da810ed08c53b188a80aab8a37e5932f85f6771ea1ef |
| 35 |
|
| 36 |
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 |
| 37 |
new file mode 100644 |
| 38 |
index 000000000000..fffbc910c521 |
| 39 |
--- /dev/null |
| 40 |
+++ b/dev-java/swt/files/swt-4.27-as-needed-and-flag-fixes.patch |
| 41 |
@@ -0,0 +1,82 @@ |
| 42 |
+diff -Naur a/make_linux.mak b/make_linux.mak |
| 43 |
+--- a/make_linux.mak 2019-01-07 14:08:00.269147198 +0100 |
| 44 |
++++ b/make_linux.mak 2019-01-07 14:10:28.645155241 +0100 |
| 45 |
+@@ -98,7 +98,7 @@ |
| 46 |
+ WEBKIT_OBJECTS = swt.o webkitgtk.o webkitgtk_structs.o webkitgtk_stats.o webkitgtk_custom.o |
| 47 |
+ GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o |
| 48 |
+ |
| 49 |
+-CFLAGS := $(CFLAGS) \ |
| 50 |
++CFLAGS += -fPIC \ |
| 51 |
+ -DSWT_VERSION=$(SWT_VERSION) \ |
| 52 |
+ $(NATIVE_STATS) \ |
| 53 |
+ $(SWT_DEBUG) \ |
| 54 |
+@@ -130,13 +130,13 @@ |
| 55 |
+ make_swt: $(SWT_LIB) $(SWTPI_LIB) |
| 56 |
+ |
| 57 |
+ $(SWT_LIB): $(SWT_OBJECTS) |
| 58 |
+- $(CC) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS) |
| 59 |
++ $(CC) $(LDFLAGS) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS) |
| 60 |
+ |
| 61 |
+ callback.o: callback.c callback.h |
| 62 |
+ $(CC) $(CFLAGS) $(GTKCFLAGS) -DUSE_ASSEMBLER -c callback.c |
| 63 |
+ |
| 64 |
+ $(SWTPI_LIB): $(SWTPI_OBJECTS) |
| 65 |
+- $(CC) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS) |
| 66 |
++ $(CC) $(LDFLAGS) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS) |
| 67 |
+ |
| 68 |
+ swt.o: swt.c swt.h |
| 69 |
+ $(CC) $(CFLAGS) -c swt.c |
| 70 |
+@@ -169,7 +169,7 @@ |
| 71 |
+ make_cairo: $(CAIRO_LIB) |
| 72 |
+ |
| 73 |
+ $(CAIRO_LIB): $(CAIRO_OBJECTS) |
| 74 |
+- $(CC) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS) |
| 75 |
++ $(CC) $(LDFLAGS) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS) |
| 76 |
+ |
| 77 |
+ cairo.o: cairo.c cairo.h swt.h |
| 78 |
+ $(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c |
| 79 |
+@@ -184,7 +184,7 @@ |
| 80 |
+ make_awt:$(AWT_LIB) |
| 81 |
+ |
| 82 |
+ $(AWT_LIB): $(AWT_OBJECTS) |
| 83 |
+- $(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS) |
| 84 |
++ $(CC) -fPIC $(LDFLAGS) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS) |
| 85 |
+ |
| 86 |
+ # |
| 87 |
+ # Atk lib |
| 88 |
+@@ -192,7 +192,7 @@ |
| 89 |
+ make_atk: $(ATK_LIB) |
| 90 |
+ |
| 91 |
+ $(ATK_LIB): $(ATK_OBJECTS) |
| 92 |
+- $(CC) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS) |
| 93 |
++ $(CC) $(LDFLAGS) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS) |
| 94 |
+ |
| 95 |
+ atk.o: atk.c atk.h |
| 96 |
+ $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c |
| 97 |
+@@ -209,7 +209,7 @@ |
| 98 |
+ make_webkit: $(WEBKIT_LIB) |
| 99 |
+ |
| 100 |
+ $(WEBKIT_LIB): $(WEBKIT_OBJECTS) |
| 101 |
+- $(CC) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS) $(WEBKITLIBS) |
| 102 |
++ $(CC) $(LDFLAGS) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS) $(WEBKITLIBS) |
| 103 |
+ |
| 104 |
+ webkitgtk.o: webkitgtk.c webkitgtk_custom.h |
| 105 |
+ $(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk.c |
| 106 |
+# @@ -217,7 +217,7 @@ |
| 107 |
+# make_webkit2extension: $(WEBKIT_EXTENSION_LIB) |
| 108 |
+# |
| 109 |
+# $(WEBKIT_EXTENSION_LIB) : webkitgtk_extension.o |
| 110 |
+# - $(CC) $(LFLAGS) -o $@ $^ $(WEBKIT_EXTENSION_LFLAGS) |
| 111 |
+# + $(CC) $(LDFLAGS) $(LFLAGS) -o $@ $^ $(WEBKIT_EXTENSION_LFLAGS) |
| 112 |
+# |
| 113 |
+# webkitgtk_extension.o : webkitgtk_extension.c |
| 114 |
+# $(CC) $(CFLAGS) $(WEBKIT_EXTENSION_CFLAGS) ${SWT_PTR_CFLAGS} -fPIC -c $^ |
| 115 |
+@@ -229,7 +229,7 @@ |
| 116 |
+ make_glx: $(GLX_LIB) |
| 117 |
+ |
| 118 |
+ $(GLX_LIB): $(GLX_OBJECTS) |
| 119 |
+- $(CC) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS) |
| 120 |
++ $(CC) $(LDFLAGS) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS) |
| 121 |
+ |
| 122 |
+ glx.o: glx.c |
| 123 |
+ $(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c |
| 124 |
|
| 125 |
diff --git a/dev-java/swt/swt-4.27.ebuild b/dev-java/swt/swt-4.27.ebuild |
| 126 |
new file mode 100644 |
| 127 |
index 000000000000..e21194ce71dd |
| 128 |
--- /dev/null |
| 129 |
+++ b/dev-java/swt/swt-4.27.ebuild |
| 130 |
@@ -0,0 +1,142 @@ |
| 131 |
+# Copyright 1999-2023 Gentoo Authors |
| 132 |
+# Distributed under the terms of the GNU General Public License v2 |
| 133 |
+ |
| 134 |
+EAPI=8 |
| 135 |
+ |
| 136 |
+JAVA_PKG_IUSE="doc source" |
| 137 |
+ |
| 138 |
+inherit flag-o-matic java-pkg-2 java-pkg-simple toolchain-funcs |
| 139 |
+ |
| 140 |
+MY_PV="${PV/_rc/RC}" |
| 141 |
+MY_DMF="https://download.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-202303020300" |
| 142 |
+MY_P="${PN}-${MY_PV}" |
| 143 |
+ |
| 144 |
+DESCRIPTION="GTK based SWT Library" |
| 145 |
+HOMEPAGE="https://www.eclipse.org/swt/" |
| 146 |
+SRC_URI=" |
| 147 |
+ amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip ) |
| 148 |
+ arm64? ( ${MY_DMF}/${MY_P}-gtk-linux-aarch64.zip ) |
| 149 |
+ ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64le.zip )" |
| 150 |
+ |
| 151 |
+LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" |
| 152 |
+SLOT="4.27" |
| 153 |
+KEYWORDS="~amd64 ~ppc64" |
| 154 |
+IUSE="cairo opengl webkit" |
| 155 |
+ |
| 156 |
+COMMON_DEP=" |
| 157 |
+ app-accessibility/at-spi2-core:2 |
| 158 |
+ dev-libs/glib |
| 159 |
+ x11-libs/gtk+:2 |
| 160 |
+ x11-libs/libXtst |
| 161 |
+ cairo? ( x11-libs/cairo ) |
| 162 |
+ opengl? ( |
| 163 |
+ virtual/glu |
| 164 |
+ virtual/opengl |
| 165 |
+ ) |
| 166 |
+ webkit? ( |
| 167 |
+ net-libs/webkit-gtk:4.1 |
| 168 |
+ )" |
| 169 |
+DEPEND="${COMMON_DEP} |
| 170 |
+ >=virtual/jdk-11:*[-headless-awt] |
| 171 |
+ x11-base/xorg-proto |
| 172 |
+ x11-libs/libX11 |
| 173 |
+ x11-libs/libXrender |
| 174 |
+ x11-libs/libXt |
| 175 |
+ x11-libs/libXtst" |
| 176 |
+RDEPEND="${COMMON_DEP} |
| 177 |
+ >=virtual/jre-1.8:*" |
| 178 |
+BDEPEND=" |
| 179 |
+ app-arch/unzip |
| 180 |
+ virtual/pkgconfig |
| 181 |
+" |
| 182 |
+ |
| 183 |
+HTML_DOCS=( about.html ) |
| 184 |
+ |
| 185 |
+JAVA_RESOURCE_DIRS="resources" |
| 186 |
+JAVA_SRC_DIR="src" |
| 187 |
+ |
| 188 |
+PATCHES=( |
| 189 |
+ "${FILESDIR}/${P}-as-needed-and-flag-fixes.patch" |
| 190 |
+) |
| 191 |
+ |
| 192 |
+src_unpack() { |
| 193 |
+ default |
| 194 |
+ unpack "./src.zip" |
| 195 |
+} |
| 196 |
+ |
| 197 |
+src_prepare() { |
| 198 |
+ default |
| 199 |
+ java-pkg-2_src_prepare |
| 200 |
+ # .css stuff is essential at least for running net-p2p/biglybt |
| 201 |
+ unzip swt.jar 'org/eclipse/swt/internal/gtk/*.css' -d resources || die |
| 202 |
+ java-pkg_clean |
| 203 |
+ mkdir src || die "mkdir failed" |
| 204 |
+ mv org src || die "moving java sources failed" |
| 205 |
+ find src -type f ! -name '*.java' | xargs \ |
| 206 |
+ cp --parent -t resources -v || die "copying resources failed" |
| 207 |
+ cp version.txt resources || die "adding version.txt failed" |
| 208 |
+} |
| 209 |
+ |
| 210 |
+src_compile() { |
| 211 |
+ append-cflags -fcommon # https://bugs.gentoo.org/707838 |
| 212 |
+ |
| 213 |
+ local JAWTSO="libjawt.so" |
| 214 |
+ IFS=":" read -r -a ldpaths <<< $(java-config -g LDPATH) |
| 215 |
+ |
| 216 |
+ for libpath in "${ldpaths[@]}"; do |
| 217 |
+ if [[ -f "${libpath}/${JAWTSO}" ]]; then |
| 218 |
+ export AWT_LIB_PATH="${libpath}" |
| 219 |
+ break |
| 220 |
+ # this is a workaround for broken LDPATH in <=openjdk-8.292_p10 and <=dev-java/openjdk-bin-8.292_p10 |
| 221 |
+ elif [[ -f "${libpath}/$(tc-arch)/${JAWTSO}" ]]; then |
| 222 |
+ export AWT_LIB_PATH="${libpath}/$(tc-arch)" |
| 223 |
+ break |
| 224 |
+ fi |
| 225 |
+ done |
| 226 |
+ |
| 227 |
+ if [[ -z "${AWT_LIB_PATH}" ]]; then |
| 228 |
+ eerror "${JAWTSO} not found in the JDK being used for compilation!" |
| 229 |
+ die "cannot build AWT library" |
| 230 |
+ fi |
| 231 |
+ |
| 232 |
+ # Fix the pointer size for AMD64 |
| 233 |
+ export SWT_PTR_CFLAGS=-DJNI64 |
| 234 |
+ |
| 235 |
+ # Bug #461784, g_thread_init is deprecated since glib-2.32. |
| 236 |
+ append-cflags -DNO__1g_1thread_1init |
| 237 |
+ |
| 238 |
+ local make="emake -f make_linux.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)" |
| 239 |
+ |
| 240 |
+ einfo "Building AWT library" |
| 241 |
+ ${make} make_awt AWT_LIBS="-L\$(AWT_LIB_PATH) -Wl,-rpath,\$(AWT_LIB_PATH) -ljawt \`pkg-config --libs x11\`" |
| 242 |
+ |
| 243 |
+ einfo "Building SWT library" |
| 244 |
+ ${make} make_swt |
| 245 |
+ |
| 246 |
+ einfo "Building JAVA-AT-SPI bridge" |
| 247 |
+ ${make} make_atk |
| 248 |
+ |
| 249 |
+ if use cairo ; then |
| 250 |
+ einfo "Building CAIRO support" |
| 251 |
+ ${make} make_cairo |
| 252 |
+ fi |
| 253 |
+ |
| 254 |
+ if use opengl ; then |
| 255 |
+ einfo "Building OpenGL component" |
| 256 |
+ ${make} make_glx |
| 257 |
+ fi |
| 258 |
+ |
| 259 |
+ if use webkit ; then |
| 260 |
+ einfo "Building WebKit component" |
| 261 |
+ ${make} make_webkit |
| 262 |
+ fi |
| 263 |
+ |
| 264 |
+ java-pkg-simple_src_compile |
| 265 |
+} |
| 266 |
+ |
| 267 |
+src_install() { |
| 268 |
+ java-pkg-simple_src_install |
| 269 |
+ |
| 270 |
+ java-pkg_sointo "/usr/$(get_libdir)/swt" |
| 271 |
+ java-pkg_doso *.so |
| 272 |
+} |
Archives