Build against openjdk-8 and openjfx

6 files changed, 135 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7ffe5b83f069..3dba5f2e0adc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,31 @@
 pkgbase = latexdraw-git
 	pkgdesc = Create svg graphics and/or pstricks code usable in latex documents. (GIT version)
-	pkgver = 1308.d4bcf14
+	pkgver = 1316.02b7e13
 	pkgrel = 1
 	url = http://latexdraw.sourceforge.net
+	install = latexdraw.install
 	arch = any
-	license = GPL
+	license = GPL2
 	makedepends = git
-	makedepends = jdk7-openjdk
+	makedepends = java-environment-openjdk=8
+	makedepends = java-openjfx
 	makedepends = maven
 	makedepends = unzip
-	depends = jdk7-openjdk
+	makedepends = desktop-file-utils
+	depends = java-environment-openjdk=8
+	depends = java-openjfx
 	optdepends = texlive-pstricks: use generated code in latex documents
 	conflicts = latexdraw
 	source = latexdraw::git+https://github.com/arnobl/latexdraw.git
 	source = latexdraw.desktop
 	source = latexdraw.sh
+	source = assembly.patch
+	source = assemblyBin.xml
 	md5sums = SKIP
 	md5sums = 9674cf3a8d85b4d09bd27ebed416bb71
-	md5sums = a306ee12d3f992c66493359ebc1159e4
+	md5sums = af55038de87bf657cf05b7de10d66d7f
+	md5sums = 3efdc0d53aff7e10cba624583d133d97
+	md5sums = 715764362cac4539e2bad0e173d7a39a
 
 pkgname = latexdraw-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 0ab8056aea12..3e548b6810cc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,34 @@
 # Maintainer: Bhanupong Petchlert <bpetlert@gmail.com>
 pkgname=latexdraw-git
 _pkgname=latexdraw
-pkgver=1308.d4bcf14
+pkgver=1316.02b7e13
 pkgrel=1
 pkgdesc="Create svg graphics and/or pstricks code usable in latex documents. (GIT version)"
 arch=('any')
 url="http://latexdraw.sourceforge.net"
-license=('GPL')
-depends=('jdk7-openjdk')
+license=('GPL2')
+depends=('java-environment-openjdk=8'
+         'java-openjfx')
 optdepends=('texlive-pstricks: use generated code in latex documents')
-makedepends=('git' 'jdk7-openjdk' 'maven' 'unzip')
+makedepends=('git'
+             'java-environment-openjdk=8'
+             'java-openjfx'
+             'maven'
+             'unzip'
+             'desktop-file-utils')
+provide=('latexdraw')
 conflicts=('latexdraw')
 source=("${_pkgname}::git+https://github.com/arnobl/latexdraw.git"
   'latexdraw.desktop'
-  'latexdraw.sh')
+  'latexdraw.sh'
+  'assembly.patch'
+  'assemblyBin.xml')
 md5sums=('SKIP'
          '9674cf3a8d85b4d09bd27ebed416bb71'
-         'a306ee12d3f992c66493359ebc1159e4')
+         'af55038de87bf657cf05b7de10d66d7f'
+         '3efdc0d53aff7e10cba624583d133d97'
+         '715764362cac4539e2bad0e173d7a39a')
+install=latexdraw.install
 
 
 pkgver() {
@@ -27,11 +39,23 @@ pkgver() {
 }
 
 build() {
+  export JAVA_HOME=/usr/lib/jvm/java-8-openjdk
+
   cd ${srcdir}/${_pkgname}/latexdraw-core/net.sf.latexdraw.installer
-  mvn clean package install
+  mvn clean package
+
+  # Fix: java.lang.NullPointerException: Location is required.
+  # Place fxml in a corresponding resource directory.
+  cd ${srcdir}/${_pkgname}/latexdraw-core/net.sf.latexdraw/src
+  jfx_ui_dir=net/sf/latexdraw/glib/views/jfx/ui
+  mkdir -p resources/main/$jfx_ui_dir
+  mv main/$jfx_ui_dir/*.fxml resources/main/$jfx_ui_dir
 
+  cd ${srcdir}/${_pkgname}
+  patch -p1 < ${srcdir}/assembly.patch
   cd ${srcdir}/${_pkgname}/latexdraw-core/net.sf.latexdraw
-  mvn clean package install
+  cp -f ${srcdir}/assemblyBin.xml src/assembly/assemblyBin.xml
+  mvn clean package
 
   # Get project version
   projver=$(mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -Ev '(^\[|Download\w+:)')
@@ -43,14 +67,22 @@ build() {
 }
 
 package() {
+  # Install LaTeXDraw
   cd ${srcdir}/${_pkgname}/latexdraw-core/net.sf.latexdraw/target/LaTeXDraw
+  cp -r usr ${pkgdir}/
 
-  # Create directory
-  install -d ${pkgdir}/usr/share/java/${_pkgname}
+  # Workaround for SNAPSHOT filename
+  cd ${srcdir}/${_pkgname}/latexdraw-core/net.sf.latexdraw/target
+  unzip latexdraw.core-4.0.0-SNAPSHOT.jar META-INF/MANIFEST.MF
+  malai_core=$(cat META-INF/MANIFEST.MF | tr -d '\r\n ' | sed "s/lib\// /g; s/\.jar/ /g" | tr ' ' '\n' | grep malai.core)
+  cd ${pkgdir}/usr/share/java/${_pkgname}/lib
+  mv malai.core-2.0-SNAPSHOT.jar $malai_core.jar
 
-  # Install LaTeXDraw
-  cp -r data/* ${pkgdir}/usr/share/java/${_pkgname}/
-  cp license.txt release_note.txt ${pkgdir}/usr/share/java/${_pkgname}/
+  # TXT files
+  cp ${srcdir}/${_pkgname}/latexdraw-core/net.sf.latexdraw/src/resources/main/res/license.txt \
+     ${pkgdir}/usr/share/java/${_pkgname}/
+  cp ${srcdir}/${_pkgname}/latexdraw-core/net.sf.latexdraw/src/resources/main/res/release_note.txt \
+     ${pkgdir}/usr/share/java/${_pkgname}/
 
   # Install sh wrapper script
   install -Dm755 ${srcdir}/${_pkgname}.sh \
@@ -59,8 +91,4 @@ package() {
   # Install menu entry
   install -Dm644 ${srcdir}/${_pkgname}.desktop \
     ${pkgdir}/usr/share/applications/${_pkgname}.desktop
-
-  # Install menu entry
-  install -Dm644 ${srcdir}/${_pkgname}/latexdraw-core/net.sf.latexdraw/src/resources/main/res/LaTeXDrawIcon.png \
-    ${pkgdir}/usr/share/pixmaps/${_pkgname}.png
 }
diff --git a/assembly.patch b/assembly.patch
new file mode 100644
index 000000000000..90c67fd5986c
--- /dev/null
+++ b/assembly.patch
@@ -0,0 +1,12 @@
+diff --git a/latexdraw-core/net.sf.latexdraw/pom.xml b/latexdraw-core/net.sf.latexdraw/pom.xml
+index e518091..4dea5fe 100644
+--- a/latexdraw-core/net.sf.latexdraw/pom.xml
++++ b/latexdraw-core/net.sf.latexdraw/pom.xml
+@@ -61,7 +61,6 @@
+         <version>2.5.5</version>
+         <configuration>
+           <descriptors>
+-            <descriptor>src/assembly/assemblySrc.xml</descriptor>
+             <descriptor>src/assembly/assemblyBin.xml</descriptor>
+           </descriptors>
+          <finalName>LaTeXDraw-${project.version}</finalName>
diff --git a/assemblyBin.xml b/assemblyBin.xml
new file mode 100644
index 000000000000..92e9132da6f4
--- /dev/null
+++ b/assemblyBin.xml
@@ -0,0 +1,52 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" 
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+  <id>bin</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>usr/share/java/latexdraw/lib/</outputDirectory>
+      <includes>
+        <include>org.malai:malai.javafx</include>
+        <include>org.malai:malai.core</include>
+        <include>org.malai:malai.swing</include>
+        <include>org.scala-lang:scala-library</include>
+        <include>org.swinglabs:pdf-renderer</include>
+        <include>org.scala-lang.modules:scala-parser-combinators_2.11</include>
+        <include>org.eclipse.jdt:org.eclipse.jdt.annotation</include>
+        <include>com.google.inject:guice</include>
+        <include>com.google.guava:guava</include>
+        <include>aopalliance:aopalliance</include>
+        <include>javax.inject</include>
+        <include>net.sf.jlibeps:jlibeps</include>
+        <include>net.sf.latexdraw:latexdraw.installer</include>
+      </includes>
+      <unpack>false</unpack>
+    </dependencySet>
+  </dependencySets>
+  <files>
+    <file>
+	  <source>${project.basedir}/src/resources/main/res/LaTeXDrawIcon.png</source>
+	  <outputDirectory>usr/share/pixmaps/</outputDirectory>
+	  <destName>latexdraw.png</destName>
+  	</file>
+    <file>
+	  <source>${project.build.directory}/${project.artifactId}-${project.version}.jar</source>
+	  <outputDirectory>usr/share/java/latexdraw/</outputDirectory>
+	  <destName>LaTeXDraw.jar</destName>
+  	</file>
+  </files>
+  <fileSets>
+    <fileSet>
+      <directory>${project.basedir}/templates/</directory>
+      <outputDirectory>usr/share/java/latexdraw/</outputDirectory>
+      <includes>
+        <include>.cache/</include>
+        <include>templates/</include>
+      </includes>
+      <useDefaultExcludes>true</useDefaultExcludes>
+    </fileSet>
+  </fileSets>
+</assembly>
diff --git a/latexdraw.install b/latexdraw.install
new file mode 100644
index 000000000000..3b7ac3624b3d
--- /dev/null
+++ b/latexdraw.install
@@ -0,0 +1,11 @@
+post_install() {
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    update-desktop-database -q
+}
diff --git a/latexdraw.sh b/latexdraw.sh
index 2ac28536430f..b63e523020b7 100644
--- a/latexdraw.sh
+++ b/latexdraw.sh
@@ -1,3 +1,4 @@
 #!/bin/sh
 
-java -jar /usr/share/java/latexdraw/LaTeXDraw.jar
+set -e
+java $JAVA_OPTS -cp '/usr/share/java/latexdraw/*' net.sf.latexdraw.LaTeXDraw $*