summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSainnhe Park2021-03-28 09:44:26 +0800
committerSainnhe Park2021-03-28 09:44:26 +0800
commitc510b875e7e8864968ae782b325f5807ee21d5e7 (patch)
tree34739c51eb225ce8ed53ea865f72bd2dee2956b6
parent56276c59f8cc18e44738b9d5e621ae5f94b6e4f7 (diff)
downloadaur-vim-coc-java-git.tar.gz
Fix depends
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD11
-rw-r--r--package.json.patch11
3 files changed, 22 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4490dccd22f..56db8fd5c6b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = vim-coc-java-git
pkgdesc = Java extension for coc.nvim
- pkgver = 1.5.0.r0.g281d9e0
+ pkgver = 1.5.3.r2.g64ab35d
pkgrel = 1
url = https://github.com/neoclide/coc-java
arch = any
@@ -9,10 +9,13 @@ pkgbase = vim-coc-java-git
makedepends = npm
makedepends = git
depends = vim-coc
+ depends = java-runtime-headless
provides = vim-coc-java
conflicts = vim-coc-java
source = coc-java::git+https://github.com/neoclide/coc-java.git
+ source = package.json.patch
sha256sums = SKIP
+ sha256sums = 013e5a469c6cada8baca2bf7feca967faeb7aac043c919332959e816e16634a5
pkgname = vim-coc-java-git
diff --git a/PKGBUILD b/PKGBUILD
index cc3a3981e26..ff0fa649d57 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,13 +9,15 @@ pkgname="${_variant}-${_extname}-git"
provides=("${_variant}-${_extname}")
conflicts=("${_variant}-${_extname}")
arch=('any')
-depends=("${_variant}-coc")
+depends=("${_variant}-coc" 'java-runtime-headless')
makedepends=('yarn' 'npm' 'git')
license=('EPL')
-source=("${_extname}::git+${url}.git")
-pkgver=1.5.0.r0.g281d9e0
+source=("${_extname}::git+${url}.git"
+ 'package.json.patch')
+pkgver=1.5.3.r2.g64ab35d
pkgrel=1
-sha256sums=('SKIP')
+sha256sums=('SKIP'
+ '013e5a469c6cada8baca2bf7feca967faeb7aac043c919332959e816e16634a5')
pkgver() {
cd "${srcdir}/${_extname}"
@@ -40,5 +42,6 @@ package() {
install -Dm 644 '{}' "${pkgdir}/${_packdir}/{}" \;
rm -rf "${srcdir}/${_extname}/package"
find "$pkgdir" -name package.json -print0 | xargs -r -0 sed -i '/_where/d'
+ patch "$pkgdir/$_packdir/package.json" <"$srcdir/package.json.patch"
chown -R root:root "${pkgdir}"
}
diff --git a/package.json.patch b/package.json.patch
new file mode 100644
index 00000000000..0601b5d617b
--- /dev/null
+++ b/package.json.patch
@@ -0,0 +1,11 @@
+--- package.json.old 2021-03-28 09:28:27.984047295 +0800
++++ package.json.new 2021-03-28 09:32:20.180718825 +0800
+@@ -59,7 +59,7 @@
+ "string",
+ "null"
+ ],
+- "default": null,
++ "default": "/usr/lib/jvm/default",
+ "description": "Specifies the folder path to the JDK (8 or more recent) used to launch the Java Language Server.\nOn Windows, backslashes must be escaped, i.e.\n\"java.home\":\"C:\\\\Program Files\\\\Java\\\\jdk1.8.0_161\"",
+ "scope": "window"
+ },