[graxxia] 04/05: Fixed a compilation error with Groovy 2.4.6

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Thu May 19 08:03:35 UTC 2016


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository graxxia.

commit a0e6a84f175f54b335033e09cfbc56c80c33d088
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu May 19 09:57:42 2016 +0200

    Fixed a compilation error with Groovy 2.4.6
---
 debian/changelog                             |  1 +
 debian/patches/03-groovy-compatibility.patch | 13 +++++++++++++
 debian/patches/series                        |  1 +
 3 files changed, 15 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ad9a44a..0a50e56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ graxxia (1.0~20150714-2) UNRELEASED; urgency=medium
 
   * Fixed the build failure caused by the switch from groovy2 to groovy
     (Closes: #823653)
+  * Fixed a compilation error with Groovy 2.4.6
   * Standards-Version updated to 3.9.8 (no changes)
   * Use a secure Vcs-Git URL
 
diff --git a/debian/patches/03-groovy-compatibility.patch b/debian/patches/03-groovy-compatibility.patch
new file mode 100644
index 0000000..9b6e1e1
--- /dev/null
+++ b/debian/patches/03-groovy-compatibility.patch
@@ -0,0 +1,13 @@
+Description: Fixes a compilation error with Groovy 2.4.6
+Origin: backport, https://github.com/ssadedin/graxxia/commit/3c30e4843c5e23b3df1ab62cc49e15720af26879
+--- a/src/main/groovy/graxxia/Matrix.groovy
++++ b/src/main/groovy/graxxia/Matrix.groovy
+@@ -416,7 +416,7 @@
+                 ++rowIndex
+             }
+         }
+-        return keepRows
++        return (List<Number>) keepRows
+     }
+         
+     /**
diff --git a/debian/patches/series b/debian/patches/series
index 3531344..b1d408c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01-gradle-compatibility.patch
 02-unbundle-dependencies.patch
+03-groovy-compatibility.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/graxxia.git



More information about the pkg-java-commits mailing list