[pkg-java] r11811 - in trunk/fop/debian: . patches

[Vincent Fourmond]

Author: fourmond
Date: 2010-03-06 20:21:54 +0000 (Sat, 06 Mar 2010)
New Revision: 11811

Added:
   trunk/fop/debian/patches/series
Modified:
   trunk/fop/debian/changelog
   trunk/fop/debian/control
   trunk/fop/debian/patches/01_from_svn_16_bit_alpha_png.patch
   trunk/fop/debian/patches/02_fix_segfault_with_anchors.patch
   trunk/fop/debian/rules
Log:
[fop] Switch the patches to real 3.0 (quilt) + finally fix bug #570095 with patch from Mathieu Malaterre + fix bug #551294

Modified: trunk/fop/debian/changelog
===================================================================
--- trunk/fop/debian/changelog	2010-03-06 16:50:45 UTC (rev 11810)
+++ trunk/fop/debian/changelog	2010-03-06 20:21:54 UTC (rev 11811)
@@ -1,3 +1,12 @@
+fop (1:0.95.dfsg-10) unstable; urgency=low
+
+  * Pull in new patch from Mathieu Malaterre <mathieu.malaterre at gmail.com>
+    to really fix the segfaults with anchors (closes: #570095)
+  * Drop dependency on headed packages (closes: #551294)
+  * Refreshed old patches and switch to using the full 3.0 (quilt) power
+
+ -- Vincent Fourmond <fourmond at debian.org>  Sat, 06 Mar 2010 21:02:37 +0100
+
 fop (1:0.95.dfsg-9) unstable; urgency=low
 
   * Added Maven support

Modified: trunk/fop/debian/control
===================================================================
--- trunk/fop/debian/control	2010-03-06 16:50:45 UTC (rev 11810)
+++ trunk/fop/debian/control	2010-03-06 20:21:54 UTC (rev 11811)
@@ -17,7 +17,7 @@
 
 Package: fop
 Architecture: all
-Depends: default-jre-headless | java2-runtime,
+Depends: default-jre-headless | java2-runtime-headless,
  libxerces2-java, libxalan2-java, libbsf-java,
  libavalon-framework-java (>=4.1.2-2), libbatik-java (>= 1.7),
  libcommons-io-java, libcommons-logging-java, libxp6, libxt6,

Modified: trunk/fop/debian/patches/01_from_svn_16_bit_alpha_png.patch
===================================================================
--- trunk/fop/debian/patches/01_from_svn_16_bit_alpha_png.patch	2010-03-06 16:50:45 UTC (rev 11810)
+++ trunk/fop/debian/patches/01_from_svn_16_bit_alpha_png.patch	2010-03-06 20:21:54 UTC (rev 11811)
@@ -1,5 +1,7 @@
---- trunk/src/java/org/apache/fop/pdf/AlphaRasterImage.java	2008/07/24 09:35:34	679326
-+++ trunk/src/java/org/apache/fop/pdf/AlphaRasterImage.java	2008/09/17 16:41:14	696365
+Index: fop-0.95.dfsg/src/java/org/apache/fop/pdf/AlphaRasterImage.java
+===================================================================
+--- fop-0.95.dfsg.orig/src/java/org/apache/fop/pdf/AlphaRasterImage.java	2008-07-31 16:02:57.000000000 +0200
++++ fop-0.95.dfsg/src/java/org/apache/fop/pdf/AlphaRasterImage.java	2010-03-06 21:02:05.527650998 +0100
 @@ -48,6 +48,9 @@
       */
      public AlphaRasterImage(String k, Raster alpha) {

Modified: trunk/fop/debian/patches/02_fix_segfault_with_anchors.patch
===================================================================
--- trunk/fop/debian/patches/02_fix_segfault_with_anchors.patch	2010-03-06 16:50:45 UTC (rev 11810)
+++ trunk/fop/debian/patches/02_fix_segfault_with_anchors.patch	2010-03-06 20:21:54 UTC (rev 11811)
@@ -1,6 +1,10 @@
-diff -ur fop.old/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java fop-0.95.dfsg/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java
---- fop.old/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java	2010-02-17 20:56:53.000000000 +0000
-+++ fop-0.95.dfsg/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java	2010-02-17 21:00:00.000000000 +0000
+Description: Fix segfaults on anchors
+Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
+Bug: https://issues.apache.org/bugzilla/show_bug.cgi?id=46386
+Index: fop-0.95.dfsg/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java
+===================================================================
+--- fop-0.95.dfsg.orig/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java	2008-07-31 16:02:58.000000000 +0200
++++ fop-0.95.dfsg/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java	2010-03-06 21:02:05.535650523 +0100
 @@ -331,6 +331,11 @@
          while (oldListIterator.hasNext()) {
              oldElement = (KnuthElement) oldListIterator.next();
@@ -13,3 +17,13 @@
              // initialize prevLM
              if (prevLM == null) {
                  prevLM = currLM;
+@@ -400,6 +405,9 @@
+         while (oldListIterator.hasNext()) {
+             oldElement = (KnuthElement) oldListIterator.next();
+             currLM = (InlineLevelLayoutManager) oldElement.getLayoutManager();
++            if (currLM == null) {
++            	continue;
++            }
+             if (prevLM == null) {
+                 prevLM = currLM;
+             }

Added: trunk/fop/debian/patches/series
===================================================================
--- trunk/fop/debian/patches/series	                        (rev 0)
+++ trunk/fop/debian/patches/series	2010-03-06 20:21:54 UTC (rev 11811)
@@ -0,0 +1,2 @@
+01_from_svn_16_bit_alpha_png.patch
+02_fix_segfault_with_anchors.patch

Modified: trunk/fop/debian/rules
===================================================================
--- trunk/fop/debian/rules	2010-03-06 16:50:45 UTC (rev 11810)
+++ trunk/fop/debian/rules	2010-03-06 20:21:54 UTC (rev 11811)
@@ -2,7 +2,7 @@
 # debian/rules for FOP (uses CDBS)
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+# include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/ant.mk
 
 JAVA_HOME            := /usr/lib/jvm/java-6-openjdk