[Git][java-team/swt-gtk][master] 6 commits: Add patch for Java 10

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / swt-gtk


Commits:
86679ce2 by Jochen Sprickerhof at 2018-09-14T13:52:19Z
Add patch for Java 10

Closes: #908166

- - - - -
1a380098 by Jochen Sprickerhof at 2018-09-14T13:53:46Z
Add patch for missing swt-gnome-gtk

Closes: #908281

- - - - -
e8df3be9 by Emmanuel Bourg at 2018-09-24T15:36:58Z
Changelog update

- - - - -
c3710eaf by Emmanuel Bourg at 2018-09-24T15:37:04Z
Standards-Version updated to 4.2.1

- - - - -
d3ae7f06 by Emmanuel Bourg at 2018-09-24T15:37:31Z
Use salsa.debian.org Vcs-* URLs

- - - - -
707fe5d9 by Emmanuel Bourg at 2018-09-24T15:45:31Z
Upload to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/patches/0003-Set-javac-release-to-7-for-JDK-1.10-compatibility.patch
- + debian/patches/0004-Remove-falls-through-from-DESKTOP_GIO-to-unused-DESK.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,17 @@
+swt4-gtk (4.6.3-3) unstable; urgency=medium
+
+  * Team upload.
+
+  [ Jochen Sprickerhof ]
+  * Set javac release to 7 for JDK 10 compatibility (Closes: #908166)
+  * Add patch for missing swt-gnome-gtk (Closes: #908281)
+
+  [ Emmanuel Bourg ]
+  * Standards-Version updated to 4.2.1
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 24 Sep 2018 17:45:21 +0200
+
 swt4-gtk (4.6.3-2) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -17,9 +17,9 @@ Build-Depends:
  libgtk2.0-dev,
  libxt-dev,
  maven-repo-helper
-Standards-Version: 4.1.3
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/swt-gtk.git
-Vcs-Browser: https://anonscm.debian.org/gitweb/?p=pkg-java/swt-gtk.git
+Standards-Version: 4.2.1
+Vcs-Git: https://salsa.debian.org/java-team/swt-gtk.git
+Vcs-Browser: https://salsa.debian.org/java-team/swt-gtk
 Homepage: http://www.eclipse.org/swt/
 
 Package: libswt-gtk-4-java


=====================================
debian/patches/0003-Set-javac-release-to-7-for-JDK-1.10-compatibility.patch
=====================================
@@ -0,0 +1,21 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Fri, 7 Sep 2018 22:47:21 +0200
+Subject: Set javac release to 7 for JDK 1.10 compatibility
+
+---
+ bundles/org.eclipse.swt/buildFragment.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bundles/org.eclipse.swt/buildFragment.xml b/bundles/org.eclipse.swt/buildFragment.xml
+index e5e5474..118b3d2 100644
+--- a/bundles/org.eclipse.swt/buildFragment.xml
++++ b/bundles/org.eclipse.swt/buildFragment.xml
+@@ -67,7 +67,7 @@
+ 		<delete dir="${temp.folder}/@dot.bin" />
+ 		<mkdir dir="${temp.folder}/@dot.bin" />
+ 		<antcall target="copy.${swt.ws}.src"/>
+-		<javac destdir="${temp.folder}/@dot.bin" verbose="${javacVerbose}" debug="${debug}" failonerror="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}">
++		<javac destdir="${temp.folder}/@dot.bin" verbose="${javacVerbose}" debug="${debug}" failonerror="no" release="7">
+ 			<src path="${temp.folder}/@dot.src/"/>
+ 			<compilerarg line="-log '${temp.folder}'/@dot.bin${logExtension}" compiler="org.eclipse.jdt.core.JDTCompilerAdapter" />
+ 			<compilerarg line="${compilerArg}" compiler="org.eclipse.jdt.core.JDTCompilerAdapter" />


=====================================
debian/patches/0004-Remove-falls-through-from-DESKTOP_GIO-to-unused-DESK.patch
=====================================
@@ -0,0 +1,21 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Fri, 7 Sep 2018 22:49:36 +0200
+Subject: Remove falls through from DESKTOP_GIO to unused DESKTOP_GNOME
+
+---
+ .../Eclipse SWT Program/gtk/org/eclipse/swt/program/Program.java        | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/bundles/org.eclipse.swt/Eclipse SWT Program/gtk/org/eclipse/swt/program/Program.java b/bundles/org.eclipse.swt/Eclipse SWT Program/gtk/org/eclipse/swt/program/Program.java
+index 467ee95..8b5b690 100644
+--- a/bundles/org.eclipse.swt/Eclipse SWT Program/gtk/org/eclipse/swt/program/Program.java	
++++ b/bundles/org.eclipse.swt/Eclipse SWT Program/gtk/org/eclipse/swt/program/Program.java	
+@@ -967,8 +967,6 @@ static boolean launch (Display display, String fileName, String workingDir) {
+ 	switch (getDesktop (display)) {
+ 		case DESKTOP_GIO:
+ 			if (gio_launch (fileName)) return true;
+-		case DESKTOP_GNOME:
+-			if (gnome_launch (fileName)) return true;
+ 		default:
+ 			int index = fileName.lastIndexOf ('.');
+ 			if (index != -1) {


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,4 @@
 01-make_linux.patch
 search-usr-lib-jni.diff
+0003-Set-javac-release-to-7-for-JDK-1.10-compatibility.patch
+0004-Remove-falls-through-from-DESKTOP_GIO-to-unused-DESK.patch



View it on GitLab: https://salsa.debian.org/java-team/swt-gtk/compare/dc08e4ddd18f0f1f2c04aa5b3f9b1718025d0589...707fe5d9ecd7a45f038677548a2a3b8688c46102

-- 
View it on GitLab: https://salsa.debian.org/java-team/swt-gtk/compare/dc08e4ddd18f0f1f2c04aa5b3f9b1718025d0589...707fe5d9ecd7a45f038677548a2a3b8688c46102
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20180924/0ad2ebdb/attachment.html>