From d7506bb53cdbd5ff2d60caf835cf11038d2301eb7217739b9c30abe95f86fc62 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 20 Mar 2022 07:46:54 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmlgraphics-commons?expand=0&rev=53 --- xmlgraphics-commons-javadoc17.patch | 374 ---------------------------- xmlgraphics-commons.changes | 7 - xmlgraphics-commons.spec | 2 - 3 files changed, 383 deletions(-) delete mode 100644 xmlgraphics-commons-javadoc17.patch diff --git a/xmlgraphics-commons-javadoc17.patch b/xmlgraphics-commons-javadoc17.patch deleted file mode 100644 index 97e0065..0000000 --- a/xmlgraphics-commons-javadoc17.patch +++ /dev/null @@ -1,374 +0,0 @@ ---- xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/image/codec/tiff/TIFFField.java 2022-03-19 05:57:50.370576678 +0100 -+++ xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/image/codec/tiff/TIFFField.java 2022-03-19 06:21:55.026639865 +0100 -@@ -100,33 +100,34 @@ - * unsigned datatype, long is used. The mapping between types is - * as follows: - * -- * -+ *
-+ * - * - * - * -- * -+ * - * -- * -+ * - * -- * -+ * - * -- * -+ * - * -- * -+ * - * -- * -+ * - * -- * -+ * - * -- * -+ * - * -- * -+ * - * -- * -+ * - * -- * -+ * - * -- * -+ * - *
TIFF
TIFF type Java type
TIFF_BYTE byteTIFF_BYTE byte
TIFF_ASCII StringTIFF_ASCII String
TIFF_SHORT charTIFF_SHORT char
TIFF_LONG longTIFF_LONG long
TIFF_RATIONAL long[2]TIFF_RATIONAL long[2]
TIFF_SBYTE byteTIFF_SBYTE byte
TIFF_UNDEFINED byteTIFF_UNDEFINED byte
TIFF_SSHORT shortTIFF_SSHORT short
TIFF_SLONG intTIFF_SLONG int
TIFF_SRATIONAL int[2]TIFF_SRATIONAL int[2]
TIFF_FLOAT floatTIFF_FLOAT float
TIFF_DOUBLE doubleTIFF_DOUBLE double
- */ - public TIFFField(int tag, int type, int count, Object data) { ---- xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/image/GraphicsUtil.java 2022-03-19 05:57:50.370576678 +0100 -+++ xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/image/GraphicsUtil.java 2022-03-19 06:09:38.130258686 +0100 -@@ -132,7 +132,7 @@ - * @param premult True if the ColorModel should have premultiplied alpha. - * @return a ColorMdoel with Linear sRGB colorSpace and - * the alpha channel set in accordance with -- * premult -+ * premult - */ - public static ColorModel makeLinear_sRGBCM(boolean premult) { - return premult ? Linear_sRGB_Pre : Linear_sRGB_Unpre; -@@ -155,13 +155,13 @@ - - /** - * This method will return a CacheableRed that has it's data in -- * the linear sRGB colorspace. If src is already in -- * linear sRGB then this method does nothing and returns src. -+ * the linear sRGB colorspace. If src is already in -+ * linear sRGB then this method does nothing and returns src. - * Otherwise it creates a transform that will convert -- * src's output to linear sRGB and returns that CacheableRed. -+ * src's output to linear sRGB and returns that CacheableRed. - * - * @param src The image to convert to linear sRGB. -- * @return An equivilant image to src who's data is in -+ * @return An equivilant image to src who's data is in - * linear sRGB. - */ - public static CachableRed convertToLsRGB(CachableRed src) { -@@ -176,13 +176,13 @@ - - /** - * This method will return a CacheableRed that has it's data in -- * the sRGB colorspace. If src is already in -- * sRGB then this method does nothing and returns src. -+ * the sRGB colorspace. If src is already in -+ * sRGB then this method does nothing and returns src. - * Otherwise it creates a transform that will convert -- * src's output to sRGB and returns that CacheableRed. -+ * src's output to sRGB and returns that CacheableRed. - * - * @param src The image to convert to sRGB. -- * @return An equivilant image to src who's data is in sRGB. -+ * @return An equivilant image to src who's data is in sRGB. - */ - public static CachableRed convertTosRGB(CachableRed src) { - ColorModel cm = src.getColorModel(); -@@ -196,11 +196,11 @@ - - /** - * Convertes any RenderedImage to a CacheableRed.

-- * If ri is already a CacheableRed it casts it down and -+ * If ri is already a CacheableRed it casts it down and - * returns it.

- * -- * In cases where ri is not already a CacheableRed it -- * wraps ri with a helper class. The wrapped -+ * In cases where ri is not already a CacheableRed it -+ * wraps ri with a helper class. The wrapped - * CacheableRed "Pretends" that it has no sources since it has no - * way of inteligently handling the dependency/dirty region calls - * if it exposed the source. -@@ -335,8 +335,8 @@ - - /** - * Copies data from one raster to another. Only the region of -- * overlap between src and dst is copied. Src and -- * Dst must have compatible SampleModels. -+ * overlap between src and dst is copied. Src and -+ * Dst must have compatible SampleModels. - * - * @param src The source of the data - * @param dst The destination for the data. -@@ -353,14 +353,14 @@ - - /** - * Creates a new raster that has a copy of the data in -- * ras. This is highly optimized for speed. There is -+ * ras. This is highly optimized for speed. There is - * no provision for changing any aspect of the SampleModel. - * - * This method should be used when you need to change the contents - * of a Raster that you do not "own" (ie the result of a -- * getData call). -+ * getData call). - * @param ras The Raster to copy. -- * @return A writable copy of ras -+ * @return A writable copy of ras - */ - public static WritableRaster copyRaster(Raster ras) { - return copyRaster(ras, ras.getMinX(), ras.getMinY()); -@@ -369,13 +369,13 @@ - - /** - * Creates a new raster that has a copy of the data in -- * ras. This is highly optimized for speed. There is -+ * ras. This is highly optimized for speed. There is - * no provision for changing any aspect of the SampleModel. - * However you can specify a new location for the returned raster. - * - * This method should be used when you need to change the contents - * of a Raster that you do not "own" (ie the result of a -- * getData call). -+ * getData call). - * - * @param ras The Raster to copy. - * -@@ -385,7 +385,7 @@ - * @param minY The y location for the upper left corner of the - * returned WritableRaster. - * -- * @return A writable copy of ras -+ * @return A writable copy of ras - */ - public static WritableRaster copyRaster(Raster ras, int minX, int minY) { - WritableRaster ret = Raster.createWritableRaster( -@@ -448,25 +448,25 @@ - } - - /** -- * Coerces ras to be writable. The returned Raster continues to -+ * Coerces ras to be writable. The returned Raster continues to - * reference the DataBuffer from ras, so modifications to the returned - * WritableRaster will be seen in ras.

- * - * This method should only be used if you need a WritableRaster due to - * an interface (such as to construct a BufferedImage), but have no - * intention of modifying the contents of the returned Raster. If -- * you have any doubt about other users of the data in ras, -+ * you have any doubt about other users of the data in ras, - * use copyRaster (above). - * @param ras The raster to make writable. - * @return A Writable version of ras (shares DataBuffer with -- * ras). -+ * ras). - */ - public static WritableRaster makeRasterWritable(Raster ras) { - return makeRasterWritable(ras, ras.getMinX(), ras.getMinY()); - } - - /** -- * Coerces ras to be writable. The returned Raster continues to -+ * Coerces ras to be writable. The returned Raster continues to - * reference the DataBuffer from ras, so modifications to the returned - * WritableRaster will be seen in ras.

- * -@@ -477,7 +477,7 @@ - * This method should only be used if you need a WritableRaster due to - * an interface (such as to construct a BufferedImage), but have no - * intention of modifying the contents of the returned Raster. If -- * you have any doubt about other users of the data in ras, -+ * you have any doubt about other users of the data in ras, - * use copyRaster (above). - * - * @param ras The raster to make writable. -@@ -488,9 +488,9 @@ - * @param minY The y location for the upper left corner of the - * returned WritableRaster. - * -- * @return A Writable version of ras with it's upper left -+ * @return A Writable version of ras with it's upper left - * hand coordinate set to minX, minY (shares it's DataBuffer -- * with ras). -+ * with ras). - */ - public static WritableRaster makeRasterWritable(Raster ras, - int minX, int minY) { ---- xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/image/loader/ImageException.java 2022-03-19 05:57:50.370576678 +0100 -+++ xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/image/loader/ImageException.java 2022-03-19 06:10:21.970499498 +0100 -@@ -47,7 +47,7 @@ - * @param message the detail message (which is saved for later retrieval - * by the {@link #getMessage()} method). - * @param cause the cause (which is saved for later retrieval by the -- * {@link #getCause()} method). (A null value is -+ * {@link #getCause()} method). (A null value is - * permitted, and indicates that the cause is nonexistent or - * unknown.) - */ ---- xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/image/loader/SubImageNotFoundException.java 2022-03-19 05:57:50.374576706 +0100 -+++ xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/image/loader/SubImageNotFoundException.java 2022-03-19 06:13:43.971670909 +0100 -@@ -47,7 +47,7 @@ - * @param message the detail message (which is saved for later retrieval - * by the {@link #getMessage()} method). - * @param cause the cause (which is saved for later retrieval by the -- * {@link #getCause()} method). (A null value is -+ * {@link #getCause()} method). (A null value is - * permitted, and indicates that the cause is nonexistent or - * unknown.) - */ ---- xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/image/package.html 2022-03-19 05:57:50.370576678 +0100 -+++ xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/image/package.html 2022-03-19 06:08:17.905826074 +0100 -@@ -6,7 +6,7 @@ - - - Classes, codecs and utilities for bitmap images. --Contains extensions to the java.awt.image package. This -+Contains extensions to the java.awt.image package. This - package provides convenient methods, some utility classes and image - codec classes. These generally bypass broken methods in Java2D or - provide tweaked implementations. ---- xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/java2d/AbstractGraphics2D.java 2022-03-19 05:57:50.378576733 +0100 -+++ xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/java2d/AbstractGraphics2D.java 2022-03-19 06:03:49.176309802 +0100 -@@ -52,19 +52,19 @@ - // CSOFF: WhitespaceAround - - /** -- * This extension of the java.awt.Graphics2D abstract class -- * is still abstract, but it implements a lot of the Graphics2D -+ * This extension of the java.awt.Graphics2D abstract class -+ * is still abstract, but it implements a lot of the Graphics2D - * method in a way that concrete implementations can reuse. - * -- * This class uses a GraphicContext to store the state of -+ * This class uses a GraphicContext to store the state of - * its various attributes that control the rendering, such as the -- * current Font, Paint or clip. -+ * current Font, Paint or clip. - * - * Concrete implementations can focus on implementing the rendering -- * methods, such as drawShape. As a convenience, rendering -+ * methods, such as drawShape. As a convenience, rendering - * methods that can be expressed with other rendering methods (e.g., -- * drawRect can be expressed as draw(new Rectangle(..))), -- * are implemented by AbstractGraphics2D -+ * drawRect can be expressed as draw(new Rectangle(..))), -+ * are implemented by AbstractGraphics2D - * - * @version $Id: AbstractGraphics2D.java 1739071 2016-04-14 12:30:21Z ssteiner $ - * @see org.apache.xmlgraphics.java2d.GraphicContext -@@ -74,7 +74,7 @@ - public abstract class AbstractGraphics2D extends Graphics2D implements Cloneable { - /** - * Current state of the Graphic Context. The GraphicsContext -- * class manages the state of this Graphics2D graphic context -+ * class manages the state of this Graphics2D graphic context - * attributes. - */ - protected GraphicContext gc; ---- xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/java2d/DefaultGraphics2D.java 2022-03-19 05:57:50.378576733 +0100 -+++ xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/java2d/DefaultGraphics2D.java 2022-03-19 06:03:06.888077238 +0100 -@@ -37,12 +37,12 @@ - // CSOFF: WhitespaceAround - - /** -- * This concrete implementation of AbstractGraphics2D is a -+ * This concrete implementation of AbstractGraphics2D is a - * simple help to programmers to get started with their own -- * implementation of Graphics2D. -- * DefaultGraphics2D implements all the abstract methods -- * is AbstractGraphics2D and makes it easy to start -- * implementing a Graphic2D piece-meal. -+ * implementation of Graphics2D. -+ * DefaultGraphics2D implements all the abstract methods -+ * is AbstractGraphics2D and makes it easy to start -+ * implementing a Graphic2D piece-meal. - * - * @version $Id: DefaultGraphics2D.java 1732018 2016-02-24 04:51:06Z gadams $ - * @see org.apache.xmlgraphics.java2d.AbstractGraphics2D ---- xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/java2d/ps/AbstractPSDocumentGraphics2D.java 2022-03-19 05:57:50.378576733 +0100 -+++ xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/java2d/ps/AbstractPSDocumentGraphics2D.java 2022-03-19 06:07:42.073630781 +0100 -@@ -30,9 +30,9 @@ - import org.apache.xmlgraphics.ps.PSProcSets; - - /** -- * This class is a wrapper for the PSGraphics2D that -+ * This class is a wrapper for the PSGraphics2D that - * is used to create a full document around the PostScript rendering from -- * PSGraphics2D. -+ * PSGraphics2D. - * - * @version $Id: AbstractPSDocumentGraphics2D.java 1732018 2016-02-24 04:51:06Z gadams $ - * @see org.apache.xmlgraphics.java2d.ps.PSGraphics2D ---- xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/java2d/ps/EPSDocumentGraphics2D.java 2022-03-19 05:57:50.378576733 +0100 -+++ xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/java2d/ps/EPSDocumentGraphics2D.java 2022-03-19 06:12:41.715295301 +0100 -@@ -24,7 +24,7 @@ - import org.apache.xmlgraphics.ps.DSCConstants; - - /** -- * This class is a wrapper for the AbstractPSDocumentGraphics2D that -+ * This class is a wrapper for the AbstractPSDocumentGraphics2D that - * is used to create EPS (Encapsulated PostScript) files instead of PS file. - * - * @version $Id: EPSDocumentGraphics2D.java 1732018 2016-02-24 04:51:06Z gadams $ ---- xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/java2d/ps/PSDocumentGraphics2D.java 2022-03-19 05:57:50.378576733 +0100 -+++ xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/java2d/ps/PSDocumentGraphics2D.java 2022-03-19 06:04:44.336619389 +0100 -@@ -25,9 +25,9 @@ - import org.apache.xmlgraphics.ps.DSCConstants; - - /** -- * This class is a wrapper for the PSGraphics2D that -+ * This class is a wrapper for the PSGraphics2D that - * is used to create a full document around the PostScript rendering from -- * PSGraphics2D. -+ * PSGraphics2D. - * - * @version $Id: PSDocumentGraphics2D.java 1681108 2015-05-22 13:26:12Z ssteiner $ - * @see org.apache.xmlgraphics.java2d.ps.PSGraphics2D ---- xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/java2d/ps/PSGraphics2D.java 2022-03-19 05:57:50.378576733 +0100 -+++ xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/java2d/ps/PSGraphics2D.java 2022-03-19 06:04:16.840458169 +0100 -@@ -57,8 +57,8 @@ - import org.apache.xmlgraphics.ps.PSImageUtils; - - /** -- * This is a concrete implementation of AbstractGraphics2D (and -- * therefore of Graphics2D) which is able to generate PostScript -+ * This is a concrete implementation of AbstractGraphics2D (and -+ * therefore of Graphics2D) which is able to generate PostScript - * code. - * - * @version $Id: PSGraphics2D.java 1845492 2018-11-01 15:54:06Z ssteiner $ ---- xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/ps/PSPageDeviceDictionary.java 2022-03-19 05:57:50.378576733 +0100 -+++ xmlgraphics-commons-2.6/src/main/java/org/apache/xmlgraphics/ps/PSPageDeviceDictionary.java 2022-03-19 06:11:29.714873319 +0100 -@@ -76,9 +76,9 @@ - } - - /** -- * Returns true if this map contains no key-value mappings. -+ * Returns true if this map contains no key-value mappings. - * -- * @return true if this map contains no key-value mappings. -+ * @return true if this map contains no key-value mappings. - */ - public boolean isEmpty() { - if (flushOnRetrieval) { diff --git a/xmlgraphics-commons.changes b/xmlgraphics-commons.changes index 6e2523d..06518e2 100644 --- a/xmlgraphics-commons.changes +++ b/xmlgraphics-commons.changes @@ -1,10 +1,3 @@ -------------------------------------------------------------------- -Sat Mar 19 05:23:17 UTC 2022 - Fridrich Strba - -- Added patch: - * xmlgraphics-commons-javadoc17.patch - + fix html5 errors that prevent javadoc generation with JDK 17 - ------------------------------------------------------------------- Fri Mar 18 17:52:48 UTC 2022 - Fridrich Strba diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index da128e5..3b471c3 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -27,7 +27,6 @@ URL: http://xmlgraphics.apache.org/ Source0: http://archive.apache.org/dist/xmlgraphics/commons/source/xmlgraphics-commons-%{version}-src.tar.gz Patch0: xmlgraphics-commons-build_xml.patch Patch1: xmlgraphics-commons-jdk10.patch -Patch2: xmlgraphics-commons-javadoc17.patch BuildRequires: ant >= 1.6.5 BuildRequires: commons-io >= 1.1 BuildRequires: commons-logging @@ -58,7 +57,6 @@ Javadoc for package %{name}. %setup -q %{name}-%{version} %patch0 %patch1 -p1 -%patch2 -p1 find . -name "*.jar" | xargs rm %build