[swt-gtk] 03/04: Fixed the build failure with Java 9 (Closes: #893420)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository swt-gtk.

commit f93adaf82572d33bb454d9e01f43372ef17d9055
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Mar 29 10:43:19 2018 +0200

    Fixed the build failure with Java 9 (Closes: #893420)
---
 debian/Makefile                                 |  2 +-
 debian/changelog                                |  1 +
 debian/patches/common/java9-compatibility.patch | 11 +++++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/debian/Makefile b/debian/Makefile
index 33ded9e..3e284ec 100644
--- a/debian/Makefile
+++ b/debian/Makefile
@@ -3,7 +3,7 @@ JAVA=swt-gtk-$(RELEASE).jar
 CLEANFILES=*.files *.jar *-stamp
 
 JAR=fastjar
-JAVAC=javac -classpath . -source 1.5 -target 1.5
+JAVAC=javac -classpath . -source 1.8 -target 1.8
 RM=rm -f
 
 all: $(JAVA)
diff --git a/debian/changelog b/debian/changelog
index 8d4d0b0..85b7de5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 swt-gtk (3.8.2-5) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Fixed the build failure with Java 9 (Closes: #893420)
   * Standards-Version updated to 4.1.3
   * Use secure Vcs-* URLs
 
diff --git a/debian/patches/common/java9-compatibility.patch b/debian/patches/common/java9-compatibility.patch
new file mode 100644
index 0000000..97ae47f
--- /dev/null
+++ b/debian/patches/common/java9-compatibility.patch
@@ -0,0 +1,11 @@
+--- a/make_linux.mak
++++ b/make_linux.mak
+@@ -53,7 +53,7 @@
+ 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+-2.0`
+ ATKLIBS = `pkg-config --libs-only-L atk gtk+-2.0` -latk-1.0 -lgtk-x11-2.0

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/swt-gtk.git