moparisthebest
/
filebot
mirror of https://github.com/mitb-archive/filebot
1
0
Fork 0
Code Issues Releases Wiki Activity

Update JDK8 patch

This commit is contained in:
Reinhard Pointner 2018-07-17 16:26:21 +07:00
parent 284e259d71
commit 61a856da84
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
jdk8.patch
View File

@ -1,5 +1,5 @@
diff --git a/app.properties b/app.properties
index e2c6dc4c..625a83f6 100644
index 6a57920d..9b19ebdb 100644
--- a/app.properties
+++ b/app.properties
@@ -35,11 +35,12 @@ link.release.index: https://get.filebot.net/filebot/
@ -18,17 +18,8 @@ index e2c6dc4c..625a83f6 100644
# Package Information
package.name: filebot
@@ -77,7 +78,7 @@ msi.compression: high
deb.application.action.import: filebot -script fn:amc --output "$HOME/Media" --action duplicate -non-strict --log-file "$HOME/Media/amc.log" --def excludeList="$HOME/Media/amc.excludes" unsorted=y music=y artwork=y
# Default Java Options
-java.application.options: -Dunixfs=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Djava.net.useSystemProxies=true -Djna.nosys=true -Djna.nounpack=true --illegal-access=permit --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.util.function=ALL-UNNAMED --add-opens=java.base/java.util.regex=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.nio.file=ALL-UNNAMED --add-opens=java.base/java.nio.file.attribute=ALL-UNNAMED --add-opens=java.base/java.nio.channels=ALL-UNNAMED --add-opens=java.base/java.nio.charset=ALL-UNNAMED --add-opens=java.base/java.time=ALL-UNNAMED --add-opens=java.base/java.time.chrono=ALL-UNNAMED --add-opens=java.base/java.util.concurrent=ALL-UNNAMED --add-opens=java.logging/java.util.logging=ALL-UNNAMED --add-opens=java.desktop/java.awt=ALL-UNNAMED
+java.application.options: -Dunixfs=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Djava.net.useSystemProxies=true -Djna.nosys=true -Djna.nounpack=true
# Default Windows Java Options
windows.application.options: -Dapplication.help=show -Dapplication.dir="%APPDATA%\\FileBot" -Dapplication.dir="%APPDATA%\\FileBot" -Djava.io.tmpdir="%APPDATA%\\FileBot\\tmp" -Dnet.filebot.AcoustID.fpcalc="%EXEDIR%\\lib\\fpcalc.exe" -Djna.boot.library.path="%EXEDIR%\\lib" -Djna.library.path="%EXEDIR%\\lib" -Djava.library.path="%EXEDIR%\\lib"
diff --git a/build.xml b/build.xml
index be7df8a5..81d3b49d 100644
index 851cb6ac..18762d77 100644
--- a/build.xml
+++ b/build.xml
@@ -93,9 +93,10 @@
@ -43,7 +34,7 @@ index be7df8a5..81d3b49d 100644
<patternset refid="pattern.jre" />
<cutdirsmapper dirs="1" />
</untar>
@@ -224,7 +225,7 @@
@@ -225,7 +226,7 @@
</manifestclasspath>
<!-- compile -->
@ -52,7 +43,7 @@ index be7df8a5..81d3b49d 100644
<classpath refid="jar.classpath" />
</javac>
@@ -262,7 +263,7 @@
@@ -263,7 +264,7 @@
<fileset dir="${dir.installer}/msi" includes="filebot.exe, filebot.launcher.exe" />
</copy>
<copy todir="${dir.staging}/lib">
@ -61,7 +52,7 @@ index be7df8a5..81d3b49d 100644
</copy>
<copy todir="${dir.staging}/jar">
<fileset dir="${dir.dist}/lib" includes="*.jar" />
@@ -293,7 +294,7 @@
@@ -294,7 +295,7 @@
<arg line="new /o /pr . /cf priconfig.xml /in ${microsoft.application.name}" />
</exec>
<exec executable="makeappx" dir="${dir.dist}" failonerror="yes">
@ -197,7 +188,7 @@ index 660c7cef..d551a310 100644
files.stream().map(it -> it.getParentFile()).distinct().forEach(it -> {
try {
diff --git a/source/net/filebot/mediainfo/MediaInfo.java b/source/net/filebot/mediainfo/MediaInfo.java
index e4caaad7..4e6f7289 100644
index befa2d5f..b6594ee2 100644
--- a/source/net/filebot/mediainfo/MediaInfo.java
+++ b/source/net/filebot/mediainfo/MediaInfo.java
@@ -8,7 +8,6 @@ import static net.filebot.util.RegularExpressions.*;
@ -221,7 +212,7 @@ index e4caaad7..4e6f7289 100644
} catch (LinkageError e) {
throw new MediaInfoException(e);
}
@@ -228,7 +225,22 @@ public class MediaInfo implements MediaCharacteristics {
@@ -229,7 +226,22 @@ public class MediaInfo implements MediaCharacteristics {
@Override
public synchronized void close() {
@ -245,7 +236,7 @@ index e4caaad7..4e6f7289 100644
}
public enum StreamKind {
@@ -313,24 +325,4 @@ public class MediaInfo implements MediaCharacteristics {
@@ -314,24 +326,4 @@ public class MediaInfo implements MediaCharacteristics {
}
}