[Git][java-team/lwjgl][master] 4 commits: Fixed the build failure with Java 17 (Closes: #1011167)
Emmanuel Bourg (@ebourg)
gitlab at salsa.debian.org
Mon May 23 12:40:03 BST 2022
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / lwjgl
Commits:
56944c36 by Emmanuel Bourg at 2022-05-23T13:35:36+02:00
Fixed the build failure with Java 17 (Closes: #1011167)
- - - - -
01598255 by Emmanuel Bourg at 2022-05-23T13:35:42+02:00
Standards-Version updated to 4.6.1
- - - - -
09cc7a3e by Emmanuel Bourg at 2022-05-23T13:35:50+02:00
Switch to debhelper level 13
- - - - -
e09b117a by Emmanuel Bourg at 2022-05-23T13:37:42+02:00
Upload to unstable
- - - - -
5 changed files:
- debian/changelog
- − debian/compat
- debian/control
- + debian/patches/java17-compatibility.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+lwjgl (2.9.3+dfsg-6) unstable; urgency=medium
+
+ * Team upload.
+ * Fixed the build failure with Java 17 (Closes: #1011167)
+ * Standards-Version updated to 4.6.1
+ * Switch to debhelper level 13
+
+ -- Emmanuel Bourg <ebourg at apache.org> Mon, 23 May 2022 13:37:39 +0200
+
lwjgl (2.9.3+dfsg-5) unstable; urgency=medium
* Team upload.
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11
=====================================
debian/control
=====================================
@@ -8,7 +8,7 @@ Uploaders:
Build-Depends:
ant,
ant-optional,
- debhelper (>= 11),
+ debhelper-compat (= 13),
default-jdk,
default-jdk-doc,
javahelper,
@@ -17,7 +17,7 @@ Build-Depends:
libxrandr-dev,
libxt-dev,
libxxf86vm-dev
-Standards-Version: 4.3.0
+Standards-Version: 4.6.1
Vcs-Git: https://salsa.debian.org/java-team/lwjgl.git
Vcs-Browser: https://salsa.debian.org/java-team/lwjgl
Homepage: https://www.lwjgl.org
=====================================
debian/patches/java17-compatibility.patch
=====================================
@@ -0,0 +1,90 @@
+Description: Drops pack200 compression support to build with OpenJDK 17
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/src/java/org/lwjgl/util/applet/AppletLoader.java
++++ b/src/java/org/lwjgl/util/applet/AppletLoader.java
+@@ -85,7 +85,6 @@
+ import java.util.jar.JarEntry;
+ import java.util.jar.JarFile;
+ import java.util.jar.JarOutputStream;
+-import java.util.jar.Pack200;
+ import java.util.zip.CRC32;
+ import java.util.zip.CheckedInputStream;
+ import java.util.zip.GZIPInputStream;
+@@ -374,14 +373,6 @@
+ } catch (Throwable e) {
+ /* no lzma support */
+ }
+-
+- // check pack200 support
+- try {
+- java.util.jar.Pack200.class.getSimpleName();
+- pack200Supported = true;
+- } catch (Throwable e) {
+- /* no pack200 support */
+- }
+ }
+
+ /**
+@@ -1674,29 +1665,6 @@
+ }
+
+ /**
+- * Extract Pack File
+- * @param in Input path to pack file
+- * @param out output path to resulting file
+- * @throws Exception if any errors occur
+- */
+- protected void extractPack(String in, String out) throws Exception {
+- File f = new File(in);
+- FileOutputStream fostream = new FileOutputStream(out);
+- JarOutputStream jostream = new JarOutputStream(fostream);
+-
+- try {
+- Pack200.Unpacker unpacker = Pack200.newUnpacker();
+- unpacker.unpack(f, jostream);
+- } finally {
+- jostream.close();
+- fostream.close();
+- }
+-
+- // delete pack file as its no longer needed
+- f.delete();
+- }
+-
+- /**
+ * Extract all jars from any lzma/gz/pack files
+ *
+ * @param path output path
+@@ -1715,30 +1683,7 @@
+ percentage = 55 + (int) (increment * (i+1));
+ String filename = getFileName(urlList[i]);
+
+- if (filename.endsWith(".pack.lzma")) {
+- subtaskMessage = "Extracting: " + filename + " to " + replaceLast(filename, ".lzma", "");
+- debug_sleep(1000);
+- extractLZMA(path + filename, path + replaceLast(filename, ".lzma", ""));
+-
+- subtaskMessage = "Extracting: " + replaceLast(filename, ".lzma", "") + " to " + replaceLast(filename, ".pack.lzma", "");
+- debug_sleep(1000);
+- extractPack(path + replaceLast(filename, ".lzma", ""), path + replaceLast(filename, ".pack.lzma", ""));
+- }
+- else if (filename.endsWith(".pack.gz")) {
+- subtaskMessage = "Extracting: " + filename + " to " + replaceLast(filename, ".gz", "");
+- debug_sleep(1000);
+- extractGZip(path + filename, path + replaceLast(filename, ".gz", ""));
+-
+- subtaskMessage = "Extracting: " + replaceLast(filename, ".gz", "") + " to " + replaceLast(filename, ".pack.gz", "");
+- debug_sleep(1000);
+- extractPack(path + replaceLast(filename, ".gz", ""), path + replaceLast(filename, ".pack.gz", ""));
+- }
+- else if (filename.endsWith(".pack")) {
+- subtaskMessage = "Extracting: " + filename + " to " + replaceLast(filename, ".pack", "");
+- debug_sleep(1000);
+- extractPack(path + filename, path + replaceLast(filename, ".pack", ""));
+- }
+- else if (filename.endsWith(".lzma")) {
++ if (filename.endsWith(".lzma")) {
+ subtaskMessage = "Extracting: " + filename + " to " + replaceLast(filename, ".lzma", "");
+ debug_sleep(1000);
+ extractLZMA(path + filename, path + replaceLast(filename, ".lzma", ""));
=====================================
debian/patches/series
=====================================
@@ -10,3 +10,4 @@ java9-compatibility.patch
annotation-processor-workaround.patch
javah.patch
add-missing-symbols-in-native-lib-v2.patch
+java17-compatibility.patch
View it on GitLab: https://salsa.debian.org/java-team/lwjgl/-/compare/9cc5dad02e6252af3ae96e057f648434c54e63cc...e09b117a32ea01563e4e3b9004851f0c276b1d06
--
View it on GitLab: https://salsa.debian.org/java-team/lwjgl/-/compare/9cc5dad02e6252af3ae96e057f648434c54e63cc...e09b117a32ea01563e4e3b9004851f0c276b1d06
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/20220523/eaba8edd/attachment.htm>
More information about the pkg-java-commits
mailing list