diff options
| author | Rhinoceros | 2018-11-26 20:12:17 +1100 |
|---|---|---|
| committer | Rhinoceros | 2018-11-26 20:12:17 +1100 |
| commit | 69a75f812b2061feebafa8db9b2ef3491bae735e (patch) | |
| tree | 8b9d45b8a4e7fa25df4c0d892ddb10ce1a47b459 | |
| parent | 280c252b7ab12a73c590f47f138d718c432db99a (diff) | |
| download | aur-69a75f812b2061feebafa8db9b2ef3491bae735e.tar.gz | |
Update to 1.4.4-1
* Upstream changelog:
* Fixed issues with FigTree on Java 9 (on any platform) and Mac OS X High Sierra and later.
* New patch for new .sh script. Renamed patch to something more informative.
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | PKGBUILD | 12 | ||||
| -rw-r--r-- | figtree.patch | 8 | ||||
| -rw-r--r-- | fix_jar_path.patch | 8 |
4 files changed, 19 insertions, 21 deletions
@@ -1,18 +1,16 @@ -# Generated by mksrcinfo v8 -# Wed Dec 7 01:24:49 UTC 2016 pkgbase = figtree pkgdesc = Graphical viewer of phylogenetic trees - pkgver = 1.4.3 + pkgver = 1.4.4 pkgrel = 1 url = http://tree.bio.ed.ac.uk/software/figtree arch = any license = GPL2 depends = java-environment - source = figtree-1.4.3.tar.gz::http://tree.bio.ed.ac.uk/download.php?id=96&num=3 - source = figtree.patch + source = figtree-1.4.4.tar.gz::https://github.com/rambaut/figtree/releases/download/v1.4.4/FigTree_v1.4.4.tgz + source = fix_jar_path.patch source = figtree.desktop - sha256sums = f497d4dd3a6d220f6b62495b6f47a12ade50d87dbd8d6089f168e94d202f937b - sha256sums = 8387f23770fed27566b01c9cf1b95f958cade55a90d63916bf7edee383c33321 + sha256sums = 529b867657b29e369cf81cd361e6a76bd713d488a63b91932df2385800423aa8 + sha256sums = f2aa0ebe18924d098f0380d7a5dba3d154c4049c53749be19ab12d77f2c7fccb sha256sums = 93aaadf4db141c57c5a84fe6e9e875af5091c9fe468f41adb8ce6c02ed214ab3 pkgname = figtree @@ -2,22 +2,22 @@ # Contributor: Alexandre G <alex foo lecairn bar org> pkgname=figtree -pkgver=1.4.3 +pkgver=1.4.4 pkgrel=1 pkgdesc='Graphical viewer of phylogenetic trees' arch=('any') url='http://tree.bio.ed.ac.uk/software/figtree' license=('GPL2') # as stated in http://code.google.com/p/figtree/ depends=('java-environment') -source=("$pkgname-$pkgver.tar.gz::http://tree.bio.ed.ac.uk/download.php?id=96&num=3" - "${pkgname}.patch" +source=("$pkgname-$pkgver.tar.gz::https://github.com/rambaut/$pkgname/releases/download/v$pkgver/FigTree_v$pkgver.tgz" + "fix_jar_path.patch" "${pkgname}.desktop") -sha256sums=('f497d4dd3a6d220f6b62495b6f47a12ade50d87dbd8d6089f168e94d202f937b' - '8387f23770fed27566b01c9cf1b95f958cade55a90d63916bf7edee383c33321' +sha256sums=('529b867657b29e369cf81cd361e6a76bd713d488a63b91932df2385800423aa8' + 'f2aa0ebe18924d098f0380d7a5dba3d154c4049c53749be19ab12d77f2c7fccb' '93aaadf4db141c57c5a84fe6e9e875af5091c9fe468f41adb8ce6c02ed214ab3') prepare() { - patch -p1 -i "${srcdir}/${pkgname}.patch" "${srcdir}/FigTree_v${pkgver}/bin/figtree" + patch -p1 -i "${srcdir}/fix_jar_path.patch" "${srcdir}/FigTree_v${pkgver}/bin/figtree" } package() { diff --git a/figtree.patch b/figtree.patch deleted file mode 100644 index 082971231176..000000000000 --- a/figtree.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- figtree.orig 2014-07-10 00:50:25.000000000 +1000 -+++ figtree 2015-02-02 11:49:48.386025165 +1100 -@@ -1,4 +1,4 @@ - #!/bin/sh - --java -Xms64m -Xmx512m -jar lib/figtree.jar $* -+java -Xms64m -Xmx512m -jar /usr/share/figtree/lib/figtree.jar $* - diff --git a/fix_jar_path.patch b/fix_jar_path.patch new file mode 100644 index 000000000000..cfeefbe99487 --- /dev/null +++ b/fix_jar_path.patch @@ -0,0 +1,8 @@ +--- figtree.orig 2018-11-26 19:59:48.790432156 +1100 ++++ figtree 2018-11-26 20:01:28.520151651 +1100 +@@ -1,4 +1,4 @@ + #!/bin/sh + +-java -Xms64m -Xmx512m -jar lib/figtree.jar "$@" ++java -Xms64m -Xmx512m -jar /usr/share/figtree/lib/figtree.jar "$@" + |