subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: dev\-java\/swt\/, dev\-java\/swt\/files\/"

[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/, dev-java/swt/files/

2023-03-18 Thread Miroslav Šulc

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)
++  $(CC

[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/, dev-java/swt/files/

2023-03-18 Thread Miroslav Šulc

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/, dev-java/swt/files/

2020-09-19 Thread Sam James

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
java-osgi_newjar-fro

[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/, dev-java/swt/files/

2015-10-26 Thread Ryan Hill

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"
+
+

[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/, dev-java/swt/files/

[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/, dev-java/swt/files/

[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/, dev-java/swt/files/

[gentoo-commits] repo/gentoo:master commit in: dev-java/swt/, dev-java/swt/files/

4 matches

Site Navigation

Mail list logo

Footer information