This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master-4.3
in repository swt-gtk.
commit f1a431eebedc536a65c8d5df1b1c29d7d95fc673
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Mon Mar 12 17:53:11 2018 +0100
Fixed the build failure with Java 9 (Closes: #874134)
---
debian/changelog | 1 +
debian/patches/01-make_linux.patch | 11 ++++++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 64dee7b..df89482 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
swt4-gtk (4.6.3-2) UNRELEASED; urgency=medium
* Team upload.
+ * Fixed the build failure with Java 9 (Closes: #874134)
* Standards-Version updated to 4.1.3
* Switch to debhelper level 11
diff --git a/debian/patches/01-make_linux.patch
b/debian/patches/01-make_linux.patch
index 05fe991..f7d51a8 100644
--- a/debian/patches/01-make_linux.patch
+++ b/debian/patches/01-make_linux.patch
@@ -1,7 +1,16 @@
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
-index 9d3aa87..b88f2e8 100644
+index 9d3aa87..1e8af57 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
+@@ -62,7 +62,7 @@ endif
+ CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc
+
+ AWT_LFLAGS = -shared ${SWT_LFLAGS}
+-AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt
++AWT_LIBS = -L$(AWT_LIB_PATH) -L/usr/lib/jvm/default-java/lib/ -ljawt
+
+ ATKCFLAGS = `pkg-config --cflags atk gtk+-$(GTK_VERSION)
gtk+-unix-print-$(GTK_VERSION)`
+ ATKLIBS = `pkg-config --libs-only-L atk` -latk-1.0
@@ -75,6 +75,7 @@ GLXLIBS = -lGL -lGLU -lm
# Uncomment for Native Stats tool
#NATIVE_STATS = -DNATIVE_STATS
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/swt-gtk.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
