ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: antlr3-3.1: Fix java8 issue.

Browse source 
* gnu/packages/java.scm (antlr3-3.1)[source]: Add patch.
* gnu/packages/patches/antlr3-3_1-fix-java8-compilation.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.

Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
This commit is contained in:
Gábor Boskovits 2018-03-04 14:13:47 +01:00 committed by Danny Milosavljevic
parent 82f09c0e8e
commit 4c763b4d67
No known key found for this signature in database
GPG key ID: E71A35542C30BAA5
3 changed files with 39 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -553,6 +553,7 @@ dist_patch_DATA = \
%D%/packages/patches/agg-am_c_prototype.patch \ %D%/packages/patches/agg-am_c_prototype.patch \
%D%/packages/patches/ansible-wrap-program-hack.patch \ %D%/packages/patches/ansible-wrap-program-hack.patch \
%D%/packages/patches/antiword-CVE-2014-8123.patch \ %D%/packages/patches/antiword-CVE-2014-8123.patch \
%D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch \
%D%/packages/patches/ao-cad-aarch64-support.patch \ %D%/packages/patches/ao-cad-aarch64-support.patch \
%D%/packages/patches/apr-skip-getservbyname-test.patch \ %D%/packages/patches/apr-skip-getservbyname-test.patch \
%D%/packages/patches/aspell-default-dict-dir.patch \ %D%/packages/patches/aspell-default-dict-dir.patch \

4
gnu/packages/java.scm
View file

@ -6113,7 +6113,9 @@ (define antlr3-3.1
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0sfimc9cpbgrihz4giyygc8afgpma2c93yqpwb951giriri6x66z")))) "0sfimc9cpbgrihz4giyygc8afgpma2c93yqpwb951giriri6x66z"))
(patches
(search-patches "antlr3-3_1-fix-java8-compilation.patch"))))
(arguments (arguments
`(#:jar-name (string-append "antlr3-" ,version ".jar") `(#:jar-name (string-append "antlr3-" ,version ".jar")
#:source-dir "src:runtime/Java/src" #:source-dir "src:runtime/Java/src"

35
gnu/packages/patches/antlr3-3_1-fix-java8-compilation.patch Normal file
View file

@ -0,0 +1,35 @@
Based on the upstream fix for the java8 compilation issue.
Simplified patch.
Upstream version of patch does not work with this source tree.
The issue is that in java8 it is an error to pass null to
removeAll. Results in null pointer exception. java7
behaviour was to return the list unmodified.
From db2a350c6d90efaa8dde949fa76005c2c5af45c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Boskovits?= <boskovits@gmail.com>
Date: Fri, 5 Jan 2018 17:05:31 +0100
Subject: [PATCH] Fix java8 compilation.
---
src/org/antlr/tool/CompositeGrammar.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/org/antlr/tool/CompositeGrammar.java b/src/org/antlr/tool/CompositeGrammar.java
index f1408e7..7e02431 100644
--- a/src/org/antlr/tool/CompositeGrammar.java
+++ b/src/org/antlr/tool/CompositeGrammar.java
@@ -218,7 +218,9 @@ public class CompositeGrammar {
public List<Grammar> getIndirectDelegates(Grammar g) {
List<Grammar> direct = getDirectDelegates(g);
List<Grammar> delegates = getDelegates(g);
- delegates.removeAll(direct);
+ if (direct != null) {
+ delegates.removeAll(direct);
+ }
return delegates;
}
--
2.15.1