* [bug#30050] [PATCH 1/2] gnu: antlr3-3.1: Fix java8 issue.
2018-01-09 20:02 [bug#30050] [PATCH 0/2 core-updates] Fix antlr3 bootstrap toolchain to work on java8 Gábor Boskovits
@ 2018-01-09 20:10 ` Gábor Boskovits
2018-01-09 20:12 ` [bug#30050] [PATCH 2/2] gnu: antlr3-3.3: " Gábor Boskovits
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Gábor Boskovits @ 2018-01-09 20:10 UTC (permalink / raw)
To: 30050; +Cc: Gábor Boskovits
* 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.
In java8 it is an error to pass null to removeAll. Fix it.
---
gnu/local.mk | 1 +
gnu/packages/java.scm | 4 ++-
.../patches/antlr3-3_1-fix-java8-compilation.patch | 35 ++++++++++++++++++++++
3 files changed, 39 insertions(+), 1 deletion(-)
create mode 100644 gnu/packages/patches/antlr3-3_1-fix-java8-compilation.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 8ed01eb2f..eb19acd59 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -541,6 +541,7 @@ dist_patch_DATA = \
%D%/packages/patches/agg-am_c_prototype.patch \
%D%/packages/patches/ansible-wrap-program-hack.patch \
%D%/packages/patches/antiword-CVE-2014-8123.patch \
+ %D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch \
%D%/packages/patches/apr-skip-getservbyname-test.patch \
%D%/packages/patches/aspell-default-dict-dir.patch \
%D%/packages/patches/ath9k-htc-firmware-binutils.patch \
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 66db15389..1349906a9 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -5194,7 +5194,9 @@ import org.antlr.grammar.v2.ANTLRTreePrinter;"))
version ".tar.gz"))
(sha256
(base32
- "0sfimc9cpbgrihz4giyygc8afgpma2c93yqpwb951giriri6x66z"))))
+ "0sfimc9cpbgrihz4giyygc8afgpma2c93yqpwb951giriri6x66z"))
+ (patches
+ (search-patches "antlr3-3_1-fix-java8-compilation.patch"))))
(arguments
`(#:jar-name (string-append ,name "-" ,version ".jar")
#:source-dir "src:runtime/Java/src"
diff --git a/gnu/packages/patches/antlr3-3_1-fix-java8-compilation.patch b/gnu/packages/patches/antlr3-3_1-fix-java8-compilation.patch
new file mode 100644
index 000000000..0c4deb024
--- /dev/null
+++ b/gnu/packages/patches/antlr3-3_1-fix-java8-compilation.patch
@@ -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
+
--
2.15.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#30050] [PATCH 2/2] gnu: antlr3-3.3: Fix java8 issue.
2018-01-09 20:02 [bug#30050] [PATCH 0/2 core-updates] Fix antlr3 bootstrap toolchain to work on java8 Gábor Boskovits
2018-01-09 20:10 ` [bug#30050] [PATCH 1/2] gnu: antlr3-3.1: Fix java8 issue Gábor Boskovits
@ 2018-01-09 20:12 ` Gábor Boskovits
2018-03-04 9:10 ` [bug#30050] Please push this to master Gábor Boskovits
2018-03-04 16:52 ` [bug#30050] [PATCH 0/2 core-updates] Fix antlr3 bootstrap toolchain to work on java8 Danny Milosavljevic
3 siblings, 0 replies; 5+ messages in thread
From: Gábor Boskovits @ 2018-01-09 20:12 UTC (permalink / raw)
To: 30050; +Cc: Gábor Boskovits
* gnu/packages/java.scm: Add missing copyright line.
* gnu/packages/java.scm (antlr3-3.3)[source]: Add patch.
* gnu/packages/patches/antlr3-3_3-fix-java8-compilation.patch: New file.
* gnu/local.mk: Update copyright line.
* gnu/local.mk (dist_patch_DATA): Add it.
In java8 it is an error to pass null to removeAll. Fix it.
---
gnu/local.mk | 3 +-
gnu/packages/java.scm | 5 +++-
.../patches/antlr3-3_3-fix-java8-compilation.patch | 35 ++++++++++++++++++++++
3 files changed, 41 insertions(+), 2 deletions(-)
create mode 100644 gnu/packages/patches/antlr3-3_3-fix-java8-compilation.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index eb19acd59..0c41bcd2a 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -15,7 +15,7 @@
# Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
# Copyright © 2017 Clément Lassieur <clement@lassieur.org>
# Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
-# Copyright © 2017 Gábor Boskovits <boskovits@gmail.com>
+# Copyright © 2017, 2018 Gábor Boskovits <boskovits@gmail.com>
#
# This file is part of GNU Guix.
#
@@ -542,6 +542,7 @@ dist_patch_DATA = \
%D%/packages/patches/ansible-wrap-program-hack.patch \
%D%/packages/patches/antiword-CVE-2014-8123.patch \
%D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch \
+ %D%/packages/patches/antlr3-3_3-fix-java8-compilation.patch \
%D%/packages/patches/apr-skip-getservbyname-test.patch \
%D%/packages/patches/aspell-default-dict-dir.patch \
%D%/packages/patches/ath9k-htc-firmware-binutils.patch \
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 1349906a9..e1e9093df 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -7,6 +7,7 @@
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2016, 2017 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017, 2018 Gábor Boskovits <boskovits@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -5103,7 +5104,9 @@ tree walking, and translation.")
version ".tar.gz"))
(sha256
(base32
- "0qgg5vgsm4l1d6dj9pfbaa25dpv2ry2gny8ajy4vvgvfklw97b3m"))))
+ "0qgg5vgsm4l1d6dj9pfbaa25dpv2ry2gny8ajy4vvgvfklw97b3m"))
+ (patches
+ (search-patches "antlr3-3_3-fix-java8-compilation.patch"))))
(arguments
`(#:jar-name (string-append ,name "-" ,version ".jar")
#:source-dir (string-join '("tool/src/main/java"
diff --git a/gnu/packages/patches/antlr3-3_3-fix-java8-compilation.patch b/gnu/packages/patches/antlr3-3_3-fix-java8-compilation.patch
new file mode 100644
index 000000000..a7d6be9b6
--- /dev/null
+++ b/gnu/packages/patches/antlr3-3_3-fix-java8-compilation.patch
@@ -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 43867d50c05d1c06ab7220eb974a8874ae10c308 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?G=C3=A1bor=20Boskovits?= <boskovits@gmail.com>
+Date: Fri, 5 Jan 2018 19:08:24 +0100
+Subject: [PATCH] Fix java8 complilation error.
+
+---
+ tool/src/main/java/org/antlr/tool/CompositeGrammar.java | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/tool/src/main/java/org/antlr/tool/CompositeGrammar.java b/tool/src/main/java/org/antlr/tool/CompositeGrammar.java
+index f34ea73..63740a6 100644
+--- a/tool/src/main/java/org/antlr/tool/CompositeGrammar.java
++++ b/tool/src/main/java/org/antlr/tool/CompositeGrammar.java
+@@ -226,7 +226,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
+
--
2.15.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#30050] Please push this to master
2018-01-09 20:02 [bug#30050] [PATCH 0/2 core-updates] Fix antlr3 bootstrap toolchain to work on java8 Gábor Boskovits
2018-01-09 20:10 ` [bug#30050] [PATCH 1/2] gnu: antlr3-3.1: Fix java8 issue Gábor Boskovits
2018-01-09 20:12 ` [bug#30050] [PATCH 2/2] gnu: antlr3-3.3: " Gábor Boskovits
@ 2018-03-04 9:10 ` Gábor Boskovits
2018-03-04 16:52 ` [bug#30050] [PATCH 0/2 core-updates] Fix antlr3 bootstrap toolchain to work on java8 Danny Milosavljevic
3 siblings, 0 replies; 5+ messages in thread
From: Gábor Boskovits @ 2018-03-04 9:10 UTC (permalink / raw)
To: 30050
[-- Attachment #1: Type: text/plain, Size: 135 bytes --]
The original tag says this is a core-updates patch series, but since then
core-updates has been merged, so please push this to master.
[-- Attachment #2: Type: text/html, Size: 156 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* [bug#30050] [PATCH 0/2 core-updates] Fix antlr3 bootstrap toolchain to work on java8
2018-01-09 20:02 [bug#30050] [PATCH 0/2 core-updates] Fix antlr3 bootstrap toolchain to work on java8 Gábor Boskovits
` (2 preceding siblings ...)
2018-03-04 9:10 ` [bug#30050] Please push this to master Gábor Boskovits
@ 2018-03-04 16:52 ` Danny Milosavljevic
3 siblings, 0 replies; 5+ messages in thread
From: Danny Milosavljevic @ 2018-03-04 16:52 UTC (permalink / raw)
To: Gábor Boskovits; +Cc: 30050-done
[-- Attachment #1: Type: text/plain, Size: 53 bytes --]
Hi Gábor,
thanks!
I've applied it to master.
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread