summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO24
-rw-r--r--.gitignore10
-rw-r--r--PKGBUILD46
-rw-r--r--plantuml.run6
4 files changed, 19 insertions, 67 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ade4f1e264ff..92397b54ccf9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,12 @@
pkgbase = plantuml-pdf
- pkgdesc = Component that allows to quickly write uml diagrams, with PDF support.
- pkgver = 1.2018.1
+ pkgdesc = Extends plantuml package to enable PDF support
+ pkgver = 1.9999.0
pkgrel = 1
url = http://plantuml.com/
arch = any
license = GPL
- makedepends = apache-ant
- makedepends = java-environment>=8
- depends = java-runtime>=8
- depends = graphviz
- provides = plantuml
- conflicts = plantuml
- source = http://downloads.sourceforge.net/project/plantuml/1.2018.1/plantuml-1.2018.1.tar.gz
- source = http://apache.mirror.digionline.de/xmlgraphics/batik/binaries/batik-bin-1.9.tar.gz
- source = http://apache.mirror.digionline.de/xmlgraphics/fop/binaries/fop-2.2-bin.tar.gz
- source = http://beta.plantuml.net/plantuml-jlatexmath.zip
- source = plantuml.run
- sha256sums = 57ea4641cea6db9d2a0e6fd4a111f0f4baa44e1cf29af4698024583fc2c27595
- sha256sums = 349bf6a4f02ce9f631248b224994e20ffc263fe65c1673c9180daa3584418b75
- sha256sums = 9dc1f9d1cb9acf5b3352116924c0b7678a88703b1214d537bc027c6867ec4dfe
- sha256sums = e041164c6dce5dec3377242a0664c1855d863094dd51c28880888f59820fc7e2
- sha256sums = 7c5fec987bd3030dc9efa4ca65719e43edaaba631f1e6f0b5af8e1578d9c4f69
+ depends = plantuml
+ source = http://beta.plantuml.net/batikAndFop.zip
+ sha256sums = c1f328a9aacfd954c6cd90650cefd924baea358d6e27520de7ccf9b30a681877
pkgname = plantuml-pdf
-
diff --git a/.gitignore b/.gitignore
index d26ebb7694b8..05c6d4d4c97b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,4 @@
-*~
-pkg/
-src/
-plantuml-*.tar.gz
-*.tar.xz
-tests/
+*
+!.gitignore
+!.SRCINFO
+!PKGBUILD
diff --git a/PKGBUILD b/PKGBUILD
index baa6edd74e1a..91e644a937f3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,44 +1,18 @@
-# Maintainer: Mikołaj Chwalisz <m.chwalisz@gmail.com>
+# Maintainer: Linus Dierheimer <Linus@Dierheimer.de>
+# Contributor: Mikołaj Chwalisz <m.chwalisz@gmail.com>
-_appname_=plantuml
-pkgname=${_appname_}-pdf
-pkgver=1.2018.1
+pkgname=plantuml-pdf
+pkgver=1.9999.0 # Keep compatible with previous package versioning
pkgrel=1
-pkgdesc="Component that allows to quickly write uml diagrams, with PDF support."
+pkgdesc="Extends plantuml package to enable PDF support"
arch=(any)
url="http://plantuml.com/"
license=('GPL')
-depends=("java-runtime>=8" "graphviz")
-makedepends=("apache-ant" "java-environment>=8")
-provides=("${_appname_}")
-conflicts=("${_appname_}")
-source=("http://downloads.sourceforge.net/project/${_appname_}/$pkgver/${_appname_}-$pkgver.tar.gz"
- "http://apache.mirror.digionline.de/xmlgraphics/batik/binaries/batik-bin-1.9.tar.gz"
- "http://apache.mirror.digionline.de/xmlgraphics/fop/binaries/fop-2.2-bin.tar.gz"
- "http://beta.plantuml.net/plantuml-jlatexmath.zip"
- "${_appname_}.run")
-sha256sums=('57ea4641cea6db9d2a0e6fd4a111f0f4baa44e1cf29af4698024583fc2c27595'
- '349bf6a4f02ce9f631248b224994e20ffc263fe65c1673c9180daa3584418b75'
- '9dc1f9d1cb9acf5b3352116924c0b7678a88703b1214d537bc027c6867ec4dfe'
- 'e041164c6dce5dec3377242a0664c1855d863094dd51c28880888f59820fc7e2'
- '7c5fec987bd3030dc9efa4ca65719e43edaaba631f1e6f0b5af8e1578d9c4f69')
+depends=("plantuml")
+source=("http://beta.plantuml.net/batikAndFop.zip")
+sha256sums=("c1f328a9aacfd954c6cd90650cefd924baea358d6e27520de7ccf9b30a681877")
package() {
- install -m 755 -D "${_appname_}.run" "$pkgdir/usr/bin/${_appname_}"
-
- cd "$srcdir/${_appname_}-$pkgver"
- sed 's/target="1.6"/target="1.8"/g' -i build.xml
- ant dist
- install -m 644 -D "${_appname_}.jar" "$pkgdir/opt/${_appname_}/${_appname_}.jar"
-
- cd "$srcdir/batik-1.9/"
- install -m 644 -D *.jar "$pkgdir/opt/${_appname_}/"
-
- cd "$srcdir/fop-2.2/fop/"
- install -m 644 -D build/*.jar "$pkgdir/opt/${_appname_}/"
- install -m 644 -D lib/*.jar "$pkgdir/opt/${_appname_}/"
-
- cd "$srcdir/"
- install -m 644 -D jlatexmath-*.jar "$pkgdir/opt/${_appname_}/"
- install -m 644 -D jlm_*.jar "$pkgdir/opt/${_appname_}/"
+ mkdir -p "$pkgdir/usr/share/java/plantuml/"
+ cp -r "$srcdir"/*.jar "$pkgdir/usr/share/java/plantuml/"
}
diff --git a/plantuml.run b/plantuml.run
deleted file mode 100644
index ade90c3db5b8..000000000000
--- a/plantuml.run
+++ /dev/null
@@ -1,6 +0,0 @@
-#! /bin/sh
-
-exec java \
- -cp "/opt/plantuml/*" \
- net.sourceforge.plantuml.Run \
- "$@"