diff options
author | Geoffrey “Frogeye” Preud'homme | 2023-03-18 18:29:45 +0100 |
---|---|---|
committer | Geoffrey “Frogeye” Preud'homme | 2023-03-18 18:29:45 +0100 |
commit | 545ec269fad66d0e87f6e2d9594091a85454b8e7 (patch) | |
tree | b67de22a40bdbb8f0a1a54eedd1daa7aa13c09c1 | |
parent | 48d86e19ce2f77526e3aa9d62abcd9de5ba5d79b (diff) | |
download | aur-sheepit-client-git.tar.gz |
Fix gradle not able to find javac
This issues seems to happen regardless of the gradle version,
except maybe the one that can be installed with the included wrapper.
This seems to be caused by the setting
`options.forkOptions.executable = 'javac'`
in build.gradle.
This commit removes this option,
as the comment suggests it is only done to fix warnings.
Maybe this should be fixed upstream, either on SheepIt client or gradle,
but not sure where, why or how.
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | PKGBUILD | 14 | ||||
-rw-r--r-- | build.gradle.patch | 10 |
3 files changed, 23 insertions, 7 deletions
@@ -1,6 +1,6 @@ pkgbase = sheepit-client-git pkgdesc = Client for the free and distributed render farm - pkgver = v6.21338.0r526.37244b4 + pkgver = v7.23039.0r731.3f54c82 pkgrel = 1 url = https://www.sheepit-renderfarm.com/ arch = i686 @@ -8,7 +8,7 @@ pkgbase = sheepit-client-git license = GPL makedepends = git makedepends = gradle - depends = java-runtime + depends = java-runtime>=11 depends = freetype2 depends = glew depends = libxrender @@ -26,11 +26,13 @@ pkgbase = sheepit-client-git source = sheepit-client.sh source = sheepit-client.sysusers source = sheepit-client.tmpfiles + source = build.gradle.patch sha256sums = SKIP sha256sums = 69220c93518e1bbd034feded5c5deb4e29e21340151d51096adf269d9ec641af sha256sums = 4181b60d36dda17a6d93698166e46e54049d14490993912eb4b31fa833711ee2 sha256sums = 18c3c158263861bca6f61204741f7c7c9ea8201b99ec711bc60d096598f4e8ed sha256sums = 2ec4f41f996f149102403a0376da75bf6545a80883c595232aa27eedc2eb9803 sha256sums = ba7e49757345d04ae42a8a86fcee3ff53eb9fc86ef8a5b3db8895b5e4b42440a + sha256sums = 55aaa64e69451209d58bd452f776697fd0feb4ba56a81d6d7d5d7196928a8cb9 pkgname = sheepit-client-git @@ -2,13 +2,13 @@ # Maintainer: John Turner <jturner.usa+aur@gmail.com> pkgname=sheepit-client-git -pkgver=v6.21338.0r526.37244b4 +pkgver=v7.23039.0r731.3f54c82 pkgrel=1 pkgdesc="Client for the free and distributed render farm" arch=('i686' 'x86_64') url="https://www.sheepit-renderfarm.com/" license=('GPL') -depends=('java-runtime' 'freetype2' 'glew' 'libxrender' 'libxfixes' 'libxi' 'libxxf86vm') +depends=('java-runtime>=11' 'freetype2' 'glew' 'libxrender' 'libxfixes' 'libxi' 'libxxf86vm') makedepends=('git' 'gradle') optdepends=('cuda: CUDA GPU rendering (not in service mode)' 'blender: Create 3D scenes to render') provides=("${pkgname%-git}") @@ -19,14 +19,17 @@ source=('sheepit-client::git+https://gitlab.com/sheepitrenderfarm/client.git' "${pkgname%-git}.service" "${pkgname%-git}.sh" "${pkgname%-git}.sysusers" - "${pkgname%-git}.tmpfiles") + "${pkgname%-git}.tmpfiles" + "build.gradle.patch" + ) sha256sums=('SKIP' '69220c93518e1bbd034feded5c5deb4e29e21340151d51096adf269d9ec641af' '4181b60d36dda17a6d93698166e46e54049d14490993912eb4b31fa833711ee2' '18c3c158263861bca6f61204741f7c7c9ea8201b99ec711bc60d096598f4e8ed' '2ec4f41f996f149102403a0376da75bf6545a80883c595232aa27eedc2eb9803' - 'ba7e49757345d04ae42a8a86fcee3ff53eb9fc86ef8a5b3db8895b5e4b42440a') + 'ba7e49757345d04ae42a8a86fcee3ff53eb9fc86ef8a5b3db8895b5e4b42440a' + '55aaa64e69451209d58bd452f776697fd0feb4ba56a81d6d7d5d7196928a8cb9') pkgver() { cd "${srcdir}/${pkgname%-git}" @@ -35,11 +38,12 @@ pkgver() { build() { cd "${srcdir}/${pkgname%-git}" + patch -p0 -i ../build.gradle.patch gradle shadowJar } package() { - cd "$srcdir" + cd "$srcdir" install -Dm644 "${pkgname%-git}/build/libs/${pkgname%-git}-all.jar" "${pkgdir}/usr/share/java/${pkgname%-git}/${pkgname%-git}.jar" install -Dm755 "${pkgname%-git}.sh" "${pkgdir}/usr/bin/${pkgname%-git}" install -Dm644 "${pkgname%-git}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${pkgname%-git}.conf" diff --git a/build.gradle.patch b/build.gradle.patch new file mode 100644 index 000000000000..ca6b328bef85 --- /dev/null +++ b/build.gradle.patch @@ -0,0 +1,10 @@ +--- build.gradle ++++ build.gradle +@@ -9,7 +9,6 @@ targetCompatibility = '1.11' + compileJava { + // Suppress warnings about internal api usage - https://stackoverflow.com/a/19553686/6238618 + options.fork = true +- options.forkOptions.executable = 'javac' + options.compilerArgs << '-XDignore.symbol.file' + } + |