Codebase list lwjgl / multiarch-fixes/main debian / patches / java17-compatibility.patch
multiarch-fixes/main

Tree @multiarch-fixes/main (Download .tar.gz)

java17-compatibility.patch @multiarch-fixes/mainraw · history · blame

Description: Drops pack200 compression support to build with OpenJDK 17
Author: Emmanuel Bourg <ebourg@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", ""));