[jasperreports] 05/06: Add no-commons-javaflow.patch.

Markus Koschany apo at moszumanska.debian.org
Fri Apr 22 09:55:31 UTC 2016


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

apo pushed a commit to branch master
in repository jasperreports.

commit 7a70df936cac1deed314bb5f2197607b9ad4137f
Author: Markus Koschany <apo at debian.org>
Date:   Fri Apr 22 11:38:17 2016 +0200

    Add no-commons-javaflow.patch.
    
    We don't support commons-javaflow for now because nobody needs it.
---
 debian/patches/build.patch               |   2 +-
 debian/patches/javadoc.patch             |  15 +++-
 debian/patches/no-commons-javaflow.patch | 139 +++++++++++++++++++++++++++++++
 debian/patches/series                    |   1 +
 4 files changed, 152 insertions(+), 5 deletions(-)

diff --git a/debian/patches/build.patch b/debian/patches/build.patch
index 885f667..5db2231 100644
--- a/debian/patches/build.patch
+++ b/debian/patches/build.patch
@@ -14,7 +14,7 @@ Forwarded: not-needed
  1 file changed, 52 insertions(+), 6 deletions(-)
 
 diff --git a/build.xml b/build.xml
-index cfa2166..1e1f061 100644
+index cfa2166..480b61f 100644
 --- a/build.xml
 +++ b/build.xml
 @@ -6,15 +6,48 @@
diff --git a/debian/patches/javadoc.patch b/debian/patches/javadoc.patch
index ab44af6..c135ae2 100644
--- a/debian/patches/javadoc.patch
+++ b/debian/patches/javadoc.patch
@@ -1,9 +1,16 @@
-Description: Make the javadoc reproducible
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: no
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Fri, 22 Apr 2016 11:14:01 +0200
+Subject: javadoc
+
+---
+ build.xml | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/build.xml b/build.xml
+index 480b61f..29c4f55 100644
 --- a/build.xml
 +++ b/build.xml
-@@ -195,6 +195,8 @@
+@@ -196,6 +196,8 @@
  				windowtitle="JasperReports ${version} API"
  				excludepackagenames="org.w3c.tools.codec"
  				maxmemory="1024m"
diff --git a/debian/patches/no-commons-javaflow.patch b/debian/patches/no-commons-javaflow.patch
new file mode 100644
index 0000000..479f3d0
--- /dev/null
+++ b/debian/patches/no-commons-javaflow.patch
@@ -0,0 +1,139 @@
+From: Markus Koschany <apo at debian.org>
+Date: Fri, 22 Apr 2016 11:38:00 +0200
+Subject: no-commons-javaflow
+
+---
+ .../engine/fill/JRContinuationSubreportRunner.java | 75 ----------------------
+ .../fill/JRContinuationSubreportRunnerFactory.java | 41 ------------
+ 2 files changed, 116 deletions(-)
+ delete mode 100644 src/net/sf/jasperreports/engine/fill/JRContinuationSubreportRunner.java
+ delete mode 100644 src/net/sf/jasperreports/engine/fill/JRContinuationSubreportRunnerFactory.java
+
+diff --git a/src/net/sf/jasperreports/engine/fill/JRContinuationSubreportRunner.java b/src/net/sf/jasperreports/engine/fill/JRContinuationSubreportRunner.java
+deleted file mode 100644
+index 13e7d8a..0000000
+--- a/src/net/sf/jasperreports/engine/fill/JRContinuationSubreportRunner.java
++++ /dev/null
+@@ -1,75 +0,0 @@
+-/*
+- * JasperReports - Free Java Reporting Library.
+- * Copyright (C) 2001 - 2014 TIBCO Software Inc. All rights reserved.
+- * http://www.jaspersoft.com
+- *
+- * Unless you have purchased a commercial license agreement from Jaspersoft,
+- * the following license terms apply:
+- *
+- * This program is part of JasperReports.
+- *
+- * JasperReports is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License as published by
+- * the Free Software Foundation, either version 3 of the License, or
+- * (at your option) any later version.
+- *
+- * JasperReports is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+- * GNU Lesser General Public License for more details.
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+- */
+-package net.sf.jasperreports.engine.fill;
+-
+-
+-import org.apache.commons.javaflow.Continuation;
+-
+-
+-/**
+- * Implemetation of {@link net.sf.jasperreports.engine.fill.JRSubreportRunner JRSubreportRunner}
+- * using <a href="http://jakarta.apache.org/commons/sandbox/javaflow/">Javaflow</a> continuations.
+- * 
+- * @author Lucian Chirita (lucianc at users.sourceforge.net)
+- */
+-public class JRContinuationSubreportRunner extends JRSubreportRunnable implements JRSubreportRunner
+-{
+-	private Continuation continuation;
+-
+-	public JRContinuationSubreportRunner(JRFillSubreport fillSubreport)
+-	{
+-		super(fillSubreport);
+-	}
+-
+-	public boolean isFilling()
+-	{
+-		return continuation != null;
+-	}
+-
+-	public JRSubreportRunResult start()
+-	{
+-		continuation = Continuation.startWith(this);
+-		return runResult();
+-	}
+-
+-	public JRSubreportRunResult resume()
+-	{
+-		continuation = Continuation.continueWith(continuation);
+-		return runResult();
+-	}
+-
+-	public void reset()
+-	{
+-		continuation = null;
+-	}
+-
+-	public void cancel()
+-	{
+-	}
+-
+-	public void suspend()
+-	{
+-		Continuation.suspend();
+-	}
+-}
+diff --git a/src/net/sf/jasperreports/engine/fill/JRContinuationSubreportRunnerFactory.java b/src/net/sf/jasperreports/engine/fill/JRContinuationSubreportRunnerFactory.java
+deleted file mode 100644
+index e3f7fa8..0000000
+--- a/src/net/sf/jasperreports/engine/fill/JRContinuationSubreportRunnerFactory.java
++++ /dev/null
+@@ -1,41 +0,0 @@
+-/*
+- * JasperReports - Free Java Reporting Library.
+- * Copyright (C) 2001 - 2014 TIBCO Software Inc. All rights reserved.
+- * http://www.jaspersoft.com
+- *
+- * Unless you have purchased a commercial license agreement from Jaspersoft,
+- * the following license terms apply:
+- *
+- * This program is part of JasperReports.
+- *
+- * JasperReports is free software: you can redistribute it and/or modify
+- * it under the terms of the GNU Lesser General Public License as published by
+- * the Free Software Foundation, either version 3 of the License, or
+- * (at your option) any later version.
+- *
+- * JasperReports is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+- * GNU Lesser General Public License for more details.
+- *
+- * You should have received a copy of the GNU Lesser General Public License
+- * along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+- */
+-package net.sf.jasperreports.engine.fill;
+-
+-
+-/**
+- * {@link net.sf.jasperreports.engine.fill.JRContinuationSubreportRunner JRContinuationSubreportRunner}
+- * subreport runners factory.
+- * 
+- * @author Lucian Chirita (lucianc at users.sourceforge.net)
+- */
+-public class JRContinuationSubreportRunnerFactory implements JRSubreportRunnerFactory
+-{
+-
+-	public JRSubreportRunner createSubreportRunner(JRFillSubreport fillSubreport, JRBaseFiller subreportFiller)
+-	{
+-		return new JRContinuationSubreportRunner(fillSubreport);
+-	}
+-
+-}
diff --git a/debian/patches/series b/debian/patches/series
index d82e4e3..7e5fd4d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ commons-codec-Base64.patch
 batik-1.8.patch
 exclude-barcode4j-and-barbecue.patch
 javadoc.patch
+no-commons-javaflow.patch

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



More information about the pkg-java-commits mailing list