moparisthebest/filebot
1
0
Fork 0
mirror of https://github.com/mitb-archive/filebot synced 2025-03-09 13:59:49 -04:00
Code Issues Releases Wiki Activity

libjna-java is absolutely required for runtime

Browse Source
This commit is contained in:
Reinhard Pointner 2019-03-17 16:15:28 +07:00
parent f53ae92931
commit 76cd072fd2
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
jdk8.patch
View File

@ -57,7 +57,7 @@ index f545ea20..9580b5c4 100644
-Djna.boot.library.path="%EXEDIR%\\lib" \ -Djna.boot.library.path="%EXEDIR%\\lib" \
-Djna.library.path="%EXEDIR%\\lib" \ -Djna.library.path="%EXEDIR%\\lib" \
diff --git a/build.xml b/build.xml diff --git a/build.xml b/build.xml
index 6fe8c659..26cc46af 100644 index fb39e039..a6aa5209 100644
--- a/build.xml --- a/build.xml
+++ b/build.xml +++ b/build.xml
@@ -112,19 +112,13 @@ @@ -112,19 +112,13 @@
@ -128,16 +128,16 @@ index 6fe8c659..26cc46af 100644
<tarfileset prefix="/usr/share/filebot/jar" dir="${dir.dist}/lib" excludes="${deb.jna.depends}" /> <tarfileset prefix="/usr/share/filebot/jar" dir="${dir.dist}/lib" excludes="${deb.jna.depends}" />
diff --git a/installer/deb-universal/control/control b/installer/deb-universal/control/control diff --git a/installer/deb-universal/control/control b/installer/deb-universal/control/control
index df921f9b..7b3eb47a 100644 index 29e9f0d8..de9da74d 100644
--- a/installer/deb-universal/control/control --- a/installer/deb-universal/control/control
+++ b/installer/deb-universal/control/control +++ b/installer/deb-universal/control/control
@@ -7,6 +7,6 @@ Description: @{package.synopsis} @@ -7,6 +7,6 @@ Description: @{package.synopsis}
Homepage: @{package.homepage} Homepage: @{package.homepage}
Section: utils Section: utils
Priority: extra Priority: extra
-Depends: openjdk-@{jvm.version}-jre -Depends: openjdk-@{jvm.version}-jre, libjna-java
+Depends: openjdk-8-jre +Depends: openjdk-8-jre, libjna-java
Recommends: openjfx, libjna-java, mediainfo, libchromaprint-tools, p7zip-full, unrar Recommends: openjfx, mediainfo, libchromaprint-tools, p7zip-full, unrar
Enhances: nautilus-actions Enhances: nautilus-actions
diff --git a/installer/deb-universal/filebot.sh b/installer/deb-universal/filebot.sh diff --git a/installer/deb-universal/filebot.sh b/installer/deb-universal/filebot.sh
index 41e87444..05422081 100644 index 41e87444..05422081 100644
@ -321,7 +321,7 @@ index 9ceea367..236b06f9 100644
public abstract Hash newHash(); public abstract Hash newHash();
diff --git a/source/net/filebot/mediainfo/MediaInfo.java b/source/net/filebot/mediainfo/MediaInfo.java diff --git a/source/net/filebot/mediainfo/MediaInfo.java b/source/net/filebot/mediainfo/MediaInfo.java
index 269e1bbe..84c57d6a 100644 index ad5bbcfc..7c984c54 100644
--- a/source/net/filebot/mediainfo/MediaInfo.java --- a/source/net/filebot/mediainfo/MediaInfo.java
+++ b/source/net/filebot/mediainfo/MediaInfo.java +++ b/source/net/filebot/mediainfo/MediaInfo.java
@@ -8,7 +8,6 @@ import static net.filebot.util.RegularExpressions.*; @@ -8,7 +8,6 @@ import static net.filebot.util.RegularExpressions.*;
@ -345,7 +345,7 @@ index 269e1bbe..84c57d6a 100644
} catch (LinkageError e) { } catch (LinkageError e) {
throw new MediaInfoException(e); throw new MediaInfoException(e);
} }
@@ -247,7 +244,22 @@ public class MediaInfo implements MediaCharacteristics { @@ -256,7 +253,22 @@ public class MediaInfo implements MediaCharacteristics {
@Override @Override
public synchronized void close() { public synchronized void close() {
@ -369,7 +369,7 @@ index 269e1bbe..84c57d6a 100644
} }
public enum StreamKind { public enum StreamKind {
@@ -332,24 +344,4 @@ public class MediaInfo implements MediaCharacteristics { @@ -341,24 +353,4 @@ public class MediaInfo implements MediaCharacteristics {
} }
} }
@ -501,7 +501,7 @@ index ffae21d8..414e9c0d 100644
Rectangle2D r = p1.createUnion(p2); Rectangle2D r = p1.createUnion(p2);
double w = r.getWidth() + 1; double w = r.getWidth() + 1;
diff --git a/source/net/filebot/util/ui/SwingUI.java b/source/net/filebot/util/ui/SwingUI.java diff --git a/source/net/filebot/util/ui/SwingUI.java b/source/net/filebot/util/ui/SwingUI.java
index 951b97f0..0e4a7abc 100644 index 9b40aeac..acb210fe 100644
--- a/source/net/filebot/util/ui/SwingUI.java --- a/source/net/filebot/util/ui/SwingUI.java
+++ b/source/net/filebot/util/ui/SwingUI.java +++ b/source/net/filebot/util/ui/SwingUI.java
@@ -416,11 +416,9 @@ public final class SwingUI { @@ -416,11 +416,9 @@ public final class SwingUI {