From 33b99626794b76ab125b72e90878c38ddc728c73 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 00:05:52 +0100 Subject: [PATCH] rebuilt without gcj [release 1.1.3-2mamba;Fri Dec 10 2021] --- ...h => java-jfree-libfonts-1.1.3-build.patch | 7 +- java-jfree-libfonts-1.1.3-java11.patch | 13 + ...onts-1.1.3-remove-antcontrib-support.patch | 247 ++++++++++ ...ibfonts-1.1.3-remove-commons-logging.patch | 448 ++++++++++++++++++ java-jfree-libfonts.spec | 99 +--- 5 files changed, 732 insertions(+), 82 deletions(-) rename java-jfree-libfonts-1.1.3-build_properties.patch => java-jfree-libfonts-1.1.3-build.patch (65%) create mode 100644 java-jfree-libfonts-1.1.3-java11.patch create mode 100644 java-jfree-libfonts-1.1.3-remove-antcontrib-support.patch create mode 100644 java-jfree-libfonts-1.1.3-remove-commons-logging.patch diff --git a/java-jfree-libfonts-1.1.3-build_properties.patch b/java-jfree-libfonts-1.1.3-build.patch similarity index 65% rename from java-jfree-libfonts-1.1.3-build_properties.patch rename to java-jfree-libfonts-1.1.3-build.patch index 13df3d8..6093c20 100644 --- a/java-jfree-libfonts-1.1.3-build_properties.patch +++ b/java-jfree-libfonts-1.1.3-build.patch @@ -1,5 +1,5 @@ ---- build.properties 2009-11-16 10:26:48.000000000 +0100 -+++ build.properties-gil 2011-01-22 15:39:16.000000000 +0100 +--- libfonts-1.1.3/build.properties 2009-11-17 15:56:39.000000000 +0000 ++++ libfonts-1.1.3/build.properties 2009-11-17 15:57:29.000000000 +0000 @@ -1,8 +1,10 @@ -project.revision=TRUNK-SNAPSHOT +project.revision=1.1.3 @@ -10,8 +10,7 @@ src.dir=${basedir}/source dependency.libloader.revision=1.1.3 -testsrc.dir=${basedir}/test -\ Manca newline alla fine del file +\ No newline at end of file +testsrc.dir=${basedir}/test +antcontrib.available=true +build.cache.dir=lib -\ Manca newline alla fine del file diff --git a/java-jfree-libfonts-1.1.3-java11.patch b/java-jfree-libfonts-1.1.3-java11.patch new file mode 100644 index 0000000..77d20f3 --- /dev/null +++ b/java-jfree-libfonts-1.1.3-java11.patch @@ -0,0 +1,13 @@ +--- libfonts-1.1.3/common_build.xml 2020-05-05 19:47:17.413675774 +0100 ++++ libfonts-1.1.3/common_build.xml 2020-05-05 19:47:24.239734072 +0100 +@@ -136,8 +136,8 @@ + +- +- ++ ++ + + + +- + +@@ -324,69 +321,6 @@ TYPICAL TARGET SEQUENCE + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + ++ depends="svnant.download-check"> + + + +@@ -491,58 +425,13 @@ TYPICAL TARGET SEQUENCE + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + ++ depends="ivy.download-check"> + + + +@@ -602,7 +491,7 @@ TYPICAL TARGET SEQUENCE + Verifies that there are no SNAPSHOT dependencies defined in the ivy xml. + If there are SNAPSHOTS, fail the release build. + ====================================================================--> +- ++ + + + +@@ -769,7 +658,7 @@ TYPICAL TARGET SEQUENCE + Publishes the jar file for this project to a Maven2 repository. + ====================================================================--> + ++ depends="create-pom,ivy.deliver"> + + + +@@ -1038,12 +927,11 @@ TYPICAL TARGET SEQUENCE + - compile.pre : anything needed to prep for compile + - compile.compile : the actual compilation step + - compile.src_copy : copying the source into the bin directory +- - compile.res_copy : copying the resources into the bin directory + - compile.lic_copy : copying the license information into the bin directory + - compile.post : anything needed after the compile is done + ====================================================================--> + + + +@@ -1075,36 +963,6 @@ TYPICAL TARGET SEQUENCE + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + +- ++ + + + +@@ -1164,7 +1022,7 @@ TYPICAL TARGET SEQUENCE + Creates a new manifest file if one is not specified, or updates + an existing manifest file if one is specified. + ====================================================================--> +- ++ + + + +@@ -1648,4 +1506,4 @@ TYPICAL TARGET SEQUENCE + + + +- +\ No newline at end of file ++ diff --git a/java-jfree-libfonts-1.1.3-remove-commons-logging.patch b/java-jfree-libfonts-1.1.3-remove-commons-logging.patch new file mode 100644 index 0000000..a205a79 --- /dev/null +++ b/java-jfree-libfonts-1.1.3-remove-commons-logging.patch @@ -0,0 +1,448 @@ +diff -ru libfonts-1.1.3.orig/source/org/pentaho/reporting/libraries/fonts/afm/AfmFontRegistry.java libfonts-1.1.3/source/org/pentaho/reporting/libraries/fonts/afm/AfmFontRegistry.java +--- libfonts-1.1.3.orig/source/org/pentaho/reporting/libraries/fonts/afm/AfmFontRegistry.java 2021-03-12 10:15:06.215353433 +0000 ++++ libfonts-1.1.3/source/org/pentaho/reporting/libraries/fonts/afm/AfmFontRegistry.java 2021-03-12 10:26:44.036236575 +0000 +@@ -37,8 +37,7 @@ + import org.pentaho.reporting.libraries.resourceloader.ResourceData; + import org.pentaho.reporting.libraries.base.util.StringUtils; + import org.pentaho.reporting.libraries.base.util.ObjectUtilities; +-import org.apache.commons.logging.Log; +-import org.apache.commons.logging.LogFactory; ++import java.util.logging.Logger; + + /** + * Creation-Date: 21.07.2007, 20:14:05 +@@ -47,7 +46,8 @@ + */ + public class AfmFontRegistry extends AbstractFontFileRegistry + { +- private static final Log logger = LogFactory.getLog(AfmFontRegistry.class); ++ private static final Logger logger = Logger.getLogger(AfmFontRegistry.class.getName()); ++ + /** + * The font path filter is used to collect font files and directories during + * the font path registration. +@@ -133,7 +133,7 @@ + filePfb.isFile() == false || + filePfb.canRead() == false) + { +- logger.warn("Cannot embedd font: " + filePfb + " is missing for " + font); ++ logger.warning("Cannot embedd font: " + filePfb + " is missing for " + font); + embedded = false; + } + +@@ -264,11 +264,11 @@ + catch (final ClassNotFoundException cnfe) + { + // ignore the exception. +- logger.debug("Failed to restore the cache: Cache was created by a different version of LibFonts"); ++ logger.config("Failed to restore the cache: Cache was created by a different version of LibFonts"); + } + catch (Exception e) + { +- logger.debug("Failed to restore the cache:", e); ++ logger.config("Failed to restore the cache: " + e); + } + } + +@@ -311,14 +311,14 @@ + catch (IOException e) + { + // ignore .. +- logger.debug("Failed to store cached font data", e); ++ logger.config("Failed to store cached font data: " + e); + } + } + } + catch (IOException e) + { + // should not happen +- logger.debug("Failed to store cached font data", e); ++ logger.config("Failed to store cached font data: " + e); + } + } + } +diff -ru libfonts-1.1.3.orig/source/org/pentaho/reporting/libraries/fonts/encoding/EncodingRegistry.java libfonts-1.1.3/source/org/pentaho/reporting/libraries/fonts/encoding/EncodingRegistry.java +--- libfonts-1.1.3.orig/source/org/pentaho/reporting/libraries/fonts/encoding/EncodingRegistry.java 2021-03-12 10:15:06.228353587 +0000 ++++ libfonts-1.1.3/source/org/pentaho/reporting/libraries/fonts/encoding/EncodingRegistry.java 2021-03-12 10:27:11.614524616 +0000 +@@ -31,8 +31,7 @@ + import org.pentaho.reporting.libraries.resourceloader.factory.property.PropertiesResourceFactory; + import org.pentaho.reporting.libraries.base.config.Configuration; + import org.pentaho.reporting.libraries.base.util.ObjectUtilities; +-import org.apache.commons.logging.Log; +-import org.apache.commons.logging.LogFactory; ++import java.util.logging.Logger; + + /** + * A global registry for all supported encodings. This offers the option to fall +@@ -42,7 +41,7 @@ + */ + public final class EncodingRegistry + { +- private static final Log logger = LogFactory.getLog(EncodingRegistry.class); ++ private static final Logger logger = Logger.getLogger(EncodingRegistry.class.getName()); + + /** + * Implementation doc: This class uses several sources to load the encodings. +@@ -266,7 +265,7 @@ + catch (Exception e) + { + // fall back ... +- logger.warn("Failed to create external-encoding instance for key " + key, e); ++ logger.warning("Failed to create external-encoding instance for key " + key + " : " + e); + } + } + if (isEncodingSupportedJVM(name)) +diff -ru libfonts-1.1.3.orig/source/org/pentaho/reporting/libraries/fonts/encoding/generator/EncodingGenerator.java libfonts-1.1.3/source/org/pentaho/reporting/libraries/fonts/encoding/generator/EncodingGenerator.java +--- libfonts-1.1.3.orig/source/org/pentaho/reporting/libraries/fonts/encoding/generator/EncodingGenerator.java 2021-03-12 10:15:06.218353469 +0000 ++++ libfonts-1.1.3/source/org/pentaho/reporting/libraries/fonts/encoding/generator/EncodingGenerator.java 2021-03-12 10:27:47.015894357 +0000 +@@ -35,8 +35,7 @@ + import org.pentaho.reporting.libraries.fonts.encoding.External8BitEncodingData; + import org.pentaho.reporting.libraries.base.config.DefaultConfiguration; + import org.pentaho.reporting.libraries.base.util.ObjectUtilities; +-import org.apache.commons.logging.Log; +-import org.apache.commons.logging.LogFactory; ++import java.util.logging.Logger; + + /** + * A simple sourcecode generator. +@@ -45,7 +44,7 @@ + */ + public class EncodingGenerator + { +- private static final Log logger = LogFactory.getLog(EncodingGenerator.class); ++ private static final Logger logger = Logger.getLogger(EncodingGenerator.class.getName()); + + private File targetDirectory; + private DefaultConfiguration propertySet; +@@ -200,7 +199,7 @@ + } + catch(Exception e) + { +- logger.warn ("Failed to generate Encoding " + key, e); ++ logger.warning("Failed to generate Encoding " + key + " : " + e); + } + } + } +@@ -269,7 +268,7 @@ + } + catch(Exception e) + { +- logger.warn ("Failed to generate Encoding " + key, e); ++ logger.warning("Failed to generate Encoding " + key + " : " + e); + } + } + +diff -ru libfonts-1.1.3.orig/source/org/pentaho/reporting/libraries/fonts/pfm/PfmFontRegistry.java libfonts-1.1.3/source/org/pentaho/reporting/libraries/fonts/pfm/PfmFontRegistry.java +--- libfonts-1.1.3.orig/source/org/pentaho/reporting/libraries/fonts/pfm/PfmFontRegistry.java 2021-03-12 10:15:06.217353457 +0000 ++++ libfonts-1.1.3/source/org/pentaho/reporting/libraries/fonts/pfm/PfmFontRegistry.java 2021-03-12 10:28:33.904384084 +0000 +@@ -37,8 +37,7 @@ + import org.pentaho.reporting.libraries.resourceloader.ResourceData; + import org.pentaho.reporting.libraries.base.util.StringUtils; + import org.pentaho.reporting.libraries.base.util.ObjectUtilities; +-import org.apache.commons.logging.Log; +-import org.apache.commons.logging.LogFactory; ++import java.util.logging.Logger; + + /** + * Creation-Date: 21.07.2007, 16:58:06 +@@ -47,7 +46,7 @@ + */ + public class PfmFontRegistry extends AbstractFontFileRegistry + { +- private static final Log logger = LogFactory.getLog(PfmFontRegistry.class); ++ private static final Logger logger = Logger.getLogger(PfmFontRegistry.class.getName()); + + /** + * The font path filter is used to collect font files and directories during +@@ -146,7 +145,7 @@ + filePfb.isFile() == false || + filePfb.canRead() == false) + { +- logger.warn("Cannot embedd font: " + filePfb + " is missing for " + font); ++ logger.warning("Cannot embedd font: " + filePfb + " is missing for " + font); + embedded = false; + } + +@@ -155,7 +154,7 @@ + { + if (pfmFont.isItextCompatible() == false) + { +- logger.warn("Cannot embedd font: pfb-file for " + font + " is not valid (according to iText)."); ++ logger.warning("Cannot embedd font: pfb-file for " + font + " is not valid (according to iText)."); + } + } + registerFont (pfmFont); +@@ -283,7 +282,7 @@ + } + catch (Exception e) + { +- logger.debug("Failed to restore the cache:", e); ++ logger.config("Failed to restore the cache: " + e); + } + } + +@@ -326,14 +325,14 @@ + catch (IOException e) + { + // ignore .. +- logger.debug("Failed to store cached font data", e); ++ logger.config("Failed to store cached font data: " + e); + } + } + } + catch (IOException e) + { + // should not happen +- logger.debug("Failed to store cached font data", e); ++ logger.config("Failed to store cached font data: " + e); + } + } + } +diff -ru libfonts-1.1.3.orig/source/org/pentaho/reporting/libraries/fonts/registry/AbstractFontFileRegistry.java libfonts-1.1.3/source/org/pentaho/reporting/libraries/fonts/registry/AbstractFontFileRegistry.java +--- libfonts-1.1.3.orig/source/org/pentaho/reporting/libraries/fonts/registry/AbstractFontFileRegistry.java 2021-03-12 10:15:06.229353599 +0000 ++++ libfonts-1.1.3/source/org/pentaho/reporting/libraries/fonts/registry/AbstractFontFileRegistry.java 2021-03-12 10:25:43.831607771 +0000 +@@ -25,8 +25,7 @@ + import java.util.Iterator; + import java.util.Map; + +-import org.apache.commons.logging.Log; +-import org.apache.commons.logging.LogFactory; ++import java.util.logging.Logger; + import org.pentaho.reporting.libraries.fonts.LibFontBoot; + import org.pentaho.reporting.libraries.fonts.encoding.EncodingRegistry; + import org.pentaho.reporting.libraries.base.util.StringUtils; +@@ -39,7 +38,7 @@ + */ + public abstract class AbstractFontFileRegistry implements FontRegistry + { +- private static final Log logger = LogFactory.getLog(AbstractFontFileRegistry.class); ++ private static final Logger logger = Logger.getLogger(AbstractFontFileRegistry.class.getName()); + + private HashMap seenFiles; + +@@ -74,7 +73,7 @@ + } + catch (Exception e) + { +- logger.warn("Extra font path " + extraDir + " could not be fully registered.", e); ++ logger.warning("Extra font path " + extraDir + " could not be fully registered: " + e); + } + } + } +@@ -98,13 +97,13 @@ + final String jrepath = safeSystemGetProperty("java.home", "."); + final String fs = safeSystemGetProperty("file.separator", File.separator); + +- logger.debug("Running on operating system: " + osname); +- logger.debug("Character encoding used as default: " + encoding); ++ logger.config("Running on operating system: " + osname); ++ logger.config("Character encoding used as default: " + encoding); + + if (safeSystemGetProperty("mrj.version", null) != null) + { + final String userhome = safeSystemGetProperty("user.home", "."); +- logger.debug("Detected MacOS (Property 'mrj.version' is present."); ++ logger.config("Detected MacOS (Property 'mrj.version' is present."); + registerFontPath(new File(userhome + "/Library/Fonts"), encoding); + registerFontPath(new File("/Library/Fonts"), encoding); + registerFontPath(new File("/Network/Library/Fonts"), encoding); +@@ -116,7 +115,7 @@ + } + else + { +- logger.debug("Assuming unix like file structures"); ++ logger.config("Assuming unix like file structures"); + // Assume X11 is installed in the default location. + registerFontPath(new File("/usr/X11R6/lib/X11/fonts"), encoding); + registerFontPath(new File("/usr/share/fonts"), encoding); +@@ -145,7 +144,7 @@ + */ + private void registerWindowsFontPath(final String encoding) + { +- logger.debug("Found 'Windows' in the OS name, assuming DOS/Win32 structures"); ++ logger.config("Found 'Windows' in the OS name, assuming DOS/Win32 structures"); + // Assume windows + // If you are not using windows, ignore this. This just checks if a windows system + // directory exist and includes a font dir. +@@ -182,7 +181,7 @@ + } + } + } +- logger.debug("Fonts located in \"" + fontPath + '\"'); ++ logger.config("Fonts located in \"" + fontPath + '\"'); + if (fontPath != null) + { + final File file = new File(fontPath); +@@ -272,7 +271,7 @@ + } + catch (Exception e) + { +- logger.warn("Font " + file + " is invalid. Message:" + e.getMessage(), e); ++ logger.warning("Font " + file + " is invalid. Message: " + e); + } + } + } +diff -ru libfonts-1.1.3.orig/source/org/pentaho/reporting/libraries/fonts/text/GraphemeClassifier.java libfonts-1.1.3/source/org/pentaho/reporting/libraries/fonts/text/GraphemeClassifier.java +--- libfonts-1.1.3.orig/source/org/pentaho/reporting/libraries/fonts/text/GraphemeClassifier.java 2021-03-12 10:15:06.205353315 +0000 ++++ libfonts-1.1.3/source/org/pentaho/reporting/libraries/fonts/text/GraphemeClassifier.java 2021-03-12 10:29:03.600694237 +0000 +@@ -22,8 +22,7 @@ + import java.io.IOException; + + import org.pentaho.reporting.libraries.fonts.tools.ByteTable; +-import org.apache.commons.logging.Log; +-import org.apache.commons.logging.LogFactory; ++import java.util.logging.Logger; + + /** + * Creation-Date: 11.06.2006, 17:11:16 +@@ -32,7 +31,7 @@ + */ + public final class GraphemeClassifier + { +- private static final Log logger = LogFactory.getLog(GraphemeClassifier.class); ++ private static final Logger logger = Logger.getLogger(GraphemeClassifier.class.getName()); + + public static final int OTHER = 0; + +@@ -70,7 +69,7 @@ + } + catch(Exception e) + { +- logger.warn ("Unable to load the pre-generated classification data.", e); ++ logger.warning("Unable to load the pre-generated classification data: " + e); + } + finally + { +diff -ru libfonts-1.1.3.orig/source/org/pentaho/reporting/libraries/fonts/truetype/TrueTypeFont.java libfonts-1.1.3/source/org/pentaho/reporting/libraries/fonts/truetype/TrueTypeFont.java +--- libfonts-1.1.3.orig/source/org/pentaho/reporting/libraries/fonts/truetype/TrueTypeFont.java 2021-03-12 10:15:06.214353421 +0000 ++++ libfonts-1.1.3/source/org/pentaho/reporting/libraries/fonts/truetype/TrueTypeFont.java 2021-03-12 10:29:19.746862875 +0000 +@@ -24,8 +24,7 @@ + import org.pentaho.reporting.libraries.fonts.ByteAccessUtilities; + import org.pentaho.reporting.libraries.fonts.io.FileFontDataInputSource; + import org.pentaho.reporting.libraries.fonts.io.FontDataInputSource; +-import org.apache.commons.logging.Log; +-import org.apache.commons.logging.LogFactory; ++import java.util.logging.Logger; + + /** + * Creation-Date: 06.11.2005, 18:27:21 +@@ -34,7 +33,7 @@ + */ + public class TrueTypeFont + { +- private static final Log logger = LogFactory.getLog(TrueTypeFont.class); ++ private static final Logger logger = Logger.getLogger(TrueTypeFont.class.getName()); + + private static class TrueTypeFontHeader + { +@@ -327,7 +326,7 @@ + (FontHeaderTable) getTable(FontHeaderTable.TABLE_ID); + if (header == null) + { +- logger.warn("The font '" + filename + "' does not have a 'head' table. The font file is not valid."); ++ logger.warning("The font '" + filename + "' does not have a 'head' table. The font file is not valid."); + return null; + } + final byte[] buffer = +diff -ru libfonts-1.1.3.orig/source/org/pentaho/reporting/libraries/fonts/truetype/TrueTypeFontMetricsFactory.java libfonts-1.1.3/source/org/pentaho/reporting/libraries/fonts/truetype/TrueTypeFontMetricsFactory.java +--- libfonts-1.1.3.orig/source/org/pentaho/reporting/libraries/fonts/truetype/TrueTypeFontMetricsFactory.java 2021-03-12 10:15:06.213353409 +0000 ++++ libfonts-1.1.3/source/org/pentaho/reporting/libraries/fonts/truetype/TrueTypeFontMetricsFactory.java 2021-03-12 10:29:38.442058137 +0000 +@@ -21,8 +21,7 @@ + import java.io.IOException; + import java.util.HashMap; + +-import org.apache.commons.logging.Log; +-import org.apache.commons.logging.LogFactory; ++import java.util.logging.Logger; + import org.pentaho.reporting.libraries.fonts.io.FileFontDataInputSource; + import org.pentaho.reporting.libraries.fonts.io.FontDataInputSource; + import org.pentaho.reporting.libraries.fonts.registry.FontContext; +@@ -38,7 +37,7 @@ + */ + public class TrueTypeFontMetricsFactory implements FontMetricsFactory + { +- private static final Log logger = LogFactory.getLog(TrueTypeFontMetricsFactory.class); ++ private static final Logger logger = Logger.getLogger(TrueTypeFontMetricsFactory.class.getName()); + private HashMap fontRecords; + + public TrueTypeFontMetricsFactory() +@@ -77,7 +76,7 @@ + } + catch (IOException e) + { +- logger.warn("Unable to read the font.", e); ++ logger.warning("Unable to read the font: " + e); + // todo: We should throw a better exception instead, shouldnt we? + throw new IllegalStateException(); + } +diff -ru libfonts-1.1.3.orig/source/org/pentaho/reporting/libraries/fonts/truetype/TrueTypeFontRegistry.java libfonts-1.1.3/source/org/pentaho/reporting/libraries/fonts/truetype/TrueTypeFontRegistry.java +--- libfonts-1.1.3.orig/source/org/pentaho/reporting/libraries/fonts/truetype/TrueTypeFontRegistry.java 2021-03-12 10:15:06.214353421 +0000 ++++ libfonts-1.1.3/source/org/pentaho/reporting/libraries/fonts/truetype/TrueTypeFontRegistry.java 2021-03-12 10:31:15.504071887 +0000 +@@ -28,8 +28,7 @@ + import java.io.Serializable; + import java.util.HashMap; + +-import org.apache.commons.logging.Log; +-import org.apache.commons.logging.LogFactory; ++import java.util.logging.Logger; + import org.pentaho.reporting.libraries.fonts.FontException; + import org.pentaho.reporting.libraries.fonts.LibFontBoot; + import org.pentaho.reporting.libraries.fonts.cache.FontCache; +@@ -61,7 +60,7 @@ + return secondLevelCache; + } + +- private static final Log logger = LogFactory.getLog(TrueTypeFontRegistry.class); ++ private static final Logger logger = Logger.getLogger(TrueTypeFontRegistry.class.getName()); + + /** + * The font path filter is used to collect font files and directories during the font path registration. +@@ -180,7 +179,7 @@ + } + catch (Exception e) + { +- logger.info("Unable to register font file " + file, e); ++ logger.info("Unable to register font file " + file + " : " + e); + // An error must not stop us on our holy mission to find and register + // all fonts :) + return false; +@@ -206,7 +205,7 @@ + } + catch (FontException e) + { +- logger.info("The font '" + font.getFilename() + "' is invalid.", e); ++ logger.info("The font '" + font.getFilename() + "' is invalid: " + e); + return; + } + +@@ -347,11 +346,11 @@ + catch (final ClassNotFoundException cnfe) + { + // ignore the exception. +- logger.debug("Failed to restore the cache: Cache was created by a different version of LibFonts"); ++ logger.config("Failed to restore the cache: Cache was created by a different version of LibFonts"); + } + catch (Exception e) + { +- logger.debug("Non-Fatal: Failed to restore the cache. The cache will be rebuilt.", e); ++ logger.config("Non-Fatal: Failed to restore the cache. The cache will be rebuilt: " + e); + } + } + +@@ -394,14 +393,14 @@ + catch (IOException e) + { + // ignore .. +- logger.debug("Failed to store cached font data", e); ++ logger.config("Failed to store cached font data: " + e); + } + } + } + catch (IOException e) + { + // should not happen +- logger.debug("Failed to store cached font data", e); ++ logger.config("Failed to store cached font data: " + e); + } + } + } diff --git a/java-jfree-libfonts.spec b/java-jfree-libfonts.spec index 5397068..2d5e849 100644 --- a/java-jfree-libfonts.spec +++ b/java-jfree-libfonts.spec @@ -1,92 +1,53 @@ -%define with_gcj 1 -%define javahome %{_jvmdir}/jdk Name: java-jfree-libfonts Version: 1.1.3 -Release: 1mamba +Release: 2mamba Summary: TrueType Font Layouting Group: Development/Libraries/Java Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco -URL: http://reporting.pentaho.org/ -# http://sourceforge.net/projects/jfreereport/ -# cvs -d:pserver:anonymous@jfreereport.cvs.sourceforge.net:/cvsroot/jfreereport login -# cvs -z3 -d:pserver:anonymous@jfreereport.cvs.sourceforge.net:/cvsroot/jfreereport co -P libfonts -Source: http://sourceforge.net/projects/jfreereport/files/02.%20Libraries/1.1.3-stable/libfonts-1.1.3.zip -Patch0: java-jfree-libfonts-1.1.3-build_properties.patch +URL: https://community.hitachivantara.com/home +Source: https://sourceforge.net/projects/jfreereport/files/02.%20Libraries/%{version}-stable/libfonts-%{version}.zip +Patch0: java-jfree-libfonts-1.1.3-build.patch +Patch1: java-jfree-libfonts-1.1.3-java11.patch +Patch2: java-jfree-libfonts-1.1.3-remove-antcontrib-support.patch +Patch3: java-jfree-libfonts-1.1.3-remove-commons-logging.patch License: LGPL ## AUTOBUILDREQ-BEGIN -BuildRequires: glibc-devel -BuildRequires: java-gcj-compat -BuildRequires: libgcc -BuildRequires: libgcj4-devel -BuildRequires: libz-devel ## AUTOBUILDREQ-END -BuildRequires: ant-contribb3 +BuildRequires: javapackages BuildRequires: apache-ant -BuildRequires: jakarta-commons-logging -BuildRequires: java-iText BuildRequires: java-jfree-libbase BuildRequires: java-jfree-libloader -BuildRequires: java-junit3 -BuildRequires: jpackage-utils -Requires: java-iText Requires: java-jfree-libloader -Requires: jpackage-utils -BuildRoot: %{_tmppath}/%{name}-%{version}-root +Requires: javapackages %description LibFonts is a library developed to support advanced layouting in JFreeReport. This library allows to read TrueType-Font files to extract layouting specific informations. -%if %with_gcj -%package gcj -Group: System/Libraries/Java -Summary: GCJ support for %{name} -Requires: java-gcj-compat - -%description gcj -JFree Java General Serialization Framework Library. - -This package contains GCJ support for %{name}. -%endif - %package javadoc Group: Documentation Summary: Javadoc for %{name} %description javadoc libFonts is a layouting support library used to read and manage fonts. - This package contains documentation for %{name}. %prep - %setup -q -c -n libfonts -%patch0 -for j in $(find . -name "*.jar"); do - rm -rf $j -done +%patch0 -p1 -b .build +%patch1 -p1 -b .java11 +%patch2 -p1 -b .remove-antcontrib-support +%patch3 -p1 -b .remove-commons-logging -for txt in ChangeLog.txt licence-LGPL.txt README.txt; do - %{__perl} -pi -e 's/\r$//g' $txt -done - -mkdir -p lib/ant-contrib -ln -sf $(build-classpath commons-logging-api) lib/commons-logging-api-1.0.4.jar -ln -sf $(build-classpath itext) lib/itext-1.5.2.jar -ln -sf $(build-classpath libbase) lib/libbase-%{version}.jar -ln -sf $(build-classpath libloader) lib/libloader-%{version}.jar -ln -sf $(build-classpath junit-3.8.2) test-lib/junit-3.8.1.jar -ln -s %{_javadir}/ant/* lib/ant-contrib +find . -name "*.jar" -exec rm -f {} \; +rm -r source/org/pentaho/reporting/libraries/fonts/itext +mkdir -p lib +build-jar-repository -s -p lib libbase libloader %build - -unset JAVA_HOME -export JAVA_HOME=%{javahome} -export CLASSPATH=$(build-classpath ant-contribb3 commons-logging-api junit-3.8.2 libbase libloader itext) -ant \ - jar javadoc +ant jar javadoc %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -105,10 +66,6 @@ install -pm 644 dist/libfonts-%{version}.jar %{buildroot}%{_javadir}/libfonts-%{ mkdir -p %{buildroot}%{_javadocdir}/libfonts cp -pr bin/javadoc/docs/api/* %{buildroot}%{_javadocdir}/libfonts -%if %with_gcj -%{_bindir}/aot-compile-rpm -%endif - %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -118,28 +75,14 @@ cp -pr bin/javadoc/docs/api/* %{buildroot}%{_javadocdir}/libfonts %{_javadir}/libfonts.jar %doc ChangeLog.txt licence-LGPL.txt README.txt -%if %with_gcj -%post gcj -if [ -x %{_bindir}/rebuild-gcj-db ] ; then - %{_bindir}/rebuild-gcj-db -fi - -%postun gcj -if [ -x %{_bindir}/rebuild-gcj-db ] ; then - %{_bindir}/rebuild-gcj-db -fi - -%files gcj -%defattr(-,root,root) -%{_libdir}/gcj/java-jfree-libfonts/libfonts-%{version}.jar.db -%{_libdir}/gcj/java-jfree-libfonts/libfonts-%{version}.jar.so -%endif - %files javadoc %defattr(-,root,root) %{_javadocdir}/libfonts %changelog +* Fri Dec 10 2021 Silvan Calarco 1.1.3-2mamba +- rebuilt without gcj + * Sat Jan 22 2011 gil 1.1.3-1mamba - update to 1.1.3