Olivier Sallou pushed to branch master at Debian Med / igv
Commits: 14eb6c5f by Olivier Sallou at 2018-10-15T14:06:00Z add log4j to log4j2 bridge - - - - - 7ffc6e7c by Olivier Sallou at 2018-10-15T14:07:10Z fixes to compile, but more issues.... - - - - - 5efcfda6 by Olivier Sallou at 2018-10-15T14:07:26Z Merge branch 'master' of salsa.debian.org:med-team/igv - - - - - 2 changed files: - debian/changelog - debian/patches/fix_gradle.patch Changes: ===================================== debian/changelog ===================================== @@ -13,8 +13,9 @@ igv (2.4.14+dfsg-1) UNRELEASED; urgency=medium [ Olivier Sallou] * d/patches/fix_gradle.patch: adapt build to Debian - // TODO there is still an issue with log4j, Logger class is not found - though modules and libraries are loaded in classpath + // TODO there is still an issue with batik: + if defined, there are some conflicts + for other libs, they are found but marked as not visible.... -- Andreas Tille <[email protected]> Mon, 01 Oct 2018 21:14:39 +0200 ===================================== debian/patches/fix_gradle.patch ===================================== @@ -34,10 +34,17 @@ Forwarded: no sourceSets { main { java { -@@ -45,6 +54,20 @@ +@@ -45,6 +54,27 @@ dependencies { // Use the newer JIDE lib for Java 9 builds compile fileTree(dir: 'lib', include: '*.jar', exclude: 'jide-oss-3.5.5.jar') + fileTree(dir: 'lib_java9', include: '*.jar') ++ compile files ("/usr/share/maven-repo/org/openjfx/javafx-graphics/debian/javafx-graphics-debian-linux.jar") ++ compile files ("/usr/share/maven-repo/org/openjfx/javafx-controls/debian/javafx-controls-debian-linux.jar") ++ compile files ("/usr/share/maven-repo/org/openjfx/javafx-base/debian/javafx-base-debian-linux.jar") ++ compile files ("/usr/share/maven-repo/org/openjfx/javafx-swing/debian/javafx-swing-debian-linux.jar") ++ compile files ("/usr/share/maven-repo/org/openjfx/javafx-fxml/debian/javafx-fxml-debian-linux.jar") ++ //compile "org.apache.xmlgraphics:batik-dom:debian" ++ //compile "org.apache.xmlgraphics:batik-svggen:debian" + compile "com.google.guava:guava:debian" + compile "commons-io:commons-io:debian" + compile "org.apache.commons:commons-math:debian" View it on GitLab: https://salsa.debian.org/med-team/igv/compare/9b46e631cc0b6f5732987c6979f1f90cc46c8fc4...5efcfda62531713f5125221f98cbee66210337f6 -- View it on GitLab: https://salsa.debian.org/med-team/igv/compare/9b46e631cc0b6f5732987c6979f1f90cc46c8fc4...5efcfda62531713f5125221f98cbee66210337f6 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
