rpms/libfonts
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Compare commits

base: rpms:c8s
Branches Tags
rpms:c8s
rpms:c9s
rpms:c9
rpms:c9-beta
rpms:c8-beta
rpms:c8
rpms:c10s
rpms:imports/c9/libfonts-1.1.3-35.el9
rpms:imports/c9-beta/libfonts-1.1.3-35.el9
rpms:imports/c8-beta/libfonts-1.1.3-21.el8
rpms:imports/c8/libfonts-1.1.3-21.el8
rpms:imports/c8s/libfonts-1.1.3-21.el8
rpms:imports/c10s/libfonts-1.1.3-35.el10
..
compare: rpms:c9-beta
Branches Tags
rpms:c8s
rpms:c9s
rpms:c9
rpms:c9-beta
rpms:c8-beta
rpms:c8
rpms:c10s
rpms:imports/c9/libfonts-1.1.3-35.el9
rpms:imports/c9-beta/libfonts-1.1.3-35.el9
rpms:imports/c8-beta/libfonts-1.1.3-21.el8
rpms:imports/c8/libfonts-1.1.3-21.el8
rpms:imports/c8s/libfonts-1.1.3-21.el8
rpms:imports/c10s/libfonts-1.1.3-35.el10

No commits in common. "c8s" and "c9-beta" have entirely different histories.
c8s ... c9-beta

9 changed files with 764 additions and 18 deletions
Show Stats Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1 +1 @@
/libfonts-1.1.3-jarsdeleted.zip
SOURCES/libfonts-1.1.3-jars-itextpatch-deleted.zip

1
.libfonts.metadata Normal file
View File

@ -0,0 +1 @@
241d2e580d9c05dc7e9661a55743a63936de2df6 SOURCES/libfonts-1.1.3-jars-itextpatch-deleted.zip

0
libfonts-1.1.2.build.patch → SOURCES/libfonts-1.1.2.build.patch
View File

13
SOURCES/libfonts-1.1.2.java11.patch Normal file
View File

@ -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 @@
<property name="javac.deprecation"
value="true"
description="Indicates whether source should be compiled with deprecation information" />
- <property name="javac.source" value="1.5" description="Provide source compatibility with specified release" />
- <property name="javac.target" value="1.5" description="Generate class files for specific VM version" />
+ <property name="javac.source" value="1.6" description="Provide source compatibility with specified release" />
+ <property name="javac.target" value="1.6" description="Generate class files for specific VM version" />
<!-- Build Cache properties -->
<property name="build.cache.dir"

247
SOURCES/libfonts-1.1.3-remove-antcontrib-support.patch Normal file
View File

@ -0,0 +1,247 @@
diff --git a/common_build.xml b/common_build.xml
index 3a42daa..0589cd2 100644
--- a/common_build.xml
+++ b/common_build.xml
@@ -152,9 +152,6 @@ TYPICAL TARGET SEQUENCE
<property name="cobertura.build.cache.dir"
value="${build.cache.dir}/cobertura"
description="Directory where the Cobertura jar (and dependencies) is placed after it is auto-downloaded by the build" />
- <property name="antcontrib.build.cache.dir"
- value="${build.cache.dir}/ant-contrib"
- description="Directory where the Ant-Contrib jar (and dependencies) is placed after it is auto-downloaded by the build" />
<property name="pentaho.build.cache.dir"
value="${build.cache.dir}/pentaho"
description="Directory where the Pentaho ant tasks jar (and dependencies) is placed after it is auto-downloaded by the build" />
@@ -324,69 +321,6 @@ TYPICAL TARGET SEQUENCE
<dirset dir="${testclasses.dir}" />
</path>
-
- <!--=======================================================================
- install-antcontrib
-
- (Fetches and) installs ant-contrib tasks.
- ====================================================================-->
- <target name="install-antcontrib"
- depends="antcontrib.download-check">
- <taskdef resource="net/sf/antcontrib/antlib.xml">
- <classpath>
- <fileset dir="${antcontrib.build.cache.dir}">
- <include name="*.jar" />
- </fileset>
- </classpath>
- </taskdef>
- </target>
-
-
- <!--=======================================================================
- antcontrib.download-check
-
- Fetches ant-contrib from sourceforge if it is not already present
- ====================================================================-->
- <target name="antcontrib.download-check">
- <condition property="antcontrib.available">
- <and>
- <available file="${antcontrib.build.cache.dir}" />
- <available classname="net.sf.antcontrib.logic.IfTask">
- <classpath>
- <fileset dir="${antcontrib.build.cache.dir}">
- <include name="*.jar" />
- </fileset>
- </classpath>
- </available>
- </and>
- </condition>
- <antcall target="antcontrib.download" />
- </target>
-
-
- <!--=======================================================================
- antcontrib.download
-
- Fetches ant-contrib from sourceforge
- ====================================================================-->
- <target name="antcontrib.download" unless="antcontrib.available">
- <mkdir dir="${tmp.build.cache.dir}" />
- <get src="http://downloads.sourceforge.net/ant-contrib/ant-contrib-1.0b3-bin.zip"
- dest="${tmp.build.cache.dir}/antcontrib.zip"
- usetimestamp="true" />
- <unzip src="${tmp.build.cache.dir}/antcontrib.zip" dest="${tmp.build.cache.dir}">
- <patternset>
- <include name="**/*.jar" />
- </patternset>
- </unzip>
- <copy todir="${antcontrib.build.cache.dir}">
- <fileset dir="${tmp.build.cache.dir}/ant-contrib">
- <include name="**/*.jar" />
- </fileset>
- </copy>
- </target>
-
-
<!--=======================================================================
init
@@ -445,7 +379,7 @@ TYPICAL TARGET SEQUENCE
(Fetches and) installs the SVN ANT for use by this ant script
====================================================================-->
<target name="install-svnant"
- depends="install-antcontrib, svnant.download-check">
+ depends="svnant.download-check">
<if>
<istrue value="${svnant.isinstalled}" />
<then>
@@ -491,58 +425,13 @@ TYPICAL TARGET SEQUENCE
</target>
- <!--=======================================================================
- set-build.id
-
- Sets a property build.id to the either "development" or the svn revision
- if in release mode
- ====================================================================-->
- <target name="set-build.id" unless="build.id" depends="install-antcontrib">
- <if>
- <istrue value="${release}" />
- <then>
- <antcallback target="svn-revision" return="svn.revision" />
- <property name="build.id" value="${svn.revision}" />
- </then>
- <else>
- <property name="build.id" value="development" />
- </else>
- </if>
- </target>
-
- <!--=================================================================================
- version-properties: common Ant driven version file generation. Projects that produce
- a package or packages should run this target. Projects that produce
- jars only should NOT.
- ===================================================================================-->
- <target name="version-properties" depends="set-build.id">
- <tstamp>
- <format property="build.time" pattern="yyyy/MM/dd hh:mm aa"/>
- </tstamp>
- <propertyfile
- file="version.properties" comment="Release Build version info">
- <entry key="release.major.number" value="${release.major.number}" />
- <entry key="release.minor.number" value="${release.minor.number}" />
- <entry key="release.milestone.number" value="${release.milestone.number}" />
- <entry key="release.candidate.token" value="${release.candidate.token}" />
- <entry key="impl.vendor" value="${impl.vendor}" />
- <entry key="impl.version" value="${release.major.number}.${release.minor.number}.${release.milestone.number}.${build.id}" />
- <entry key="impl.title" value="${impl.title}" />
- <entry key="buildDate" value="${build.time}"/>
- <entry key="svn.revision" value="${build.id}"/>
- <entry key="release.build.number" default="0" type="int" operation="+" value="1" pattern="0000"/>
- </propertyfile>
- <property file="${basedir}/version.properties"/>
- </target>
-
-
<!--=======================================================================
install-ivy
(Fetches and) installs the IVY jar for use by this ant script
====================================================================-->
<target name="install-ivy"
- depends="install-antcontrib,ivy.download-check">
+ depends="ivy.download-check">
<if>
<istrue value="${ivy.isinstalled}" />
<then>
@@ -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.
====================================================================-->
- <target name="ivy.check-releasable" depends="install-ivy, install-antcontrib">
+ <target name="ivy.check-releasable" depends="install-ivy">
<if>
<istrue value="${release}" />
<then>
@@ -769,7 +658,7 @@ TYPICAL TARGET SEQUENCE
Publishes the jar file for this project to a Maven2 repository.
====================================================================-->
<target name="publish-pentaho-nojar"
- depends="install-antcontrib,create-pom,ivy.deliver">
+ depends="create-pom,ivy.deliver">
<antcall target="maven-publish-dependencies">
<param name="publish.groupId" value="${ivy.artifact.group}" />
<param name="publish.artifactId" value="${ivy.artifact.id}" />
@@ -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
====================================================================-->
<target name="compile"
- depends="init, compile.pre, compile.compile, compile.src_copy, compile.res_copy, compile.lic_copy, compile.post"
+ depends="init, compile.pre, compile.compile, compile.src_copy, compile.lic_copy, compile.post"
description="Performs all the steps to prepare the bin directory with a complete compilation" />
@@ -1075,36 +963,6 @@ TYPICAL TARGET SEQUENCE
</target>
- <!--=======================================================================
- compile.res_copy
-
- Copies any needed resources into the classes directory. Will not
- duplicate copying of resources from src tree (handled by compile.src_copy
- if jar.include.source is set.
- ====================================================================-->
- <target name="compile.res_copy" depends="install-antcontrib">
- <if>
- <available file="${res.dir}" />
- <then>
- <copy todir="${classes.dir}">
- <fileset dir="${res.dir}" />
- </copy>
- </then>
- </if>
-
- <if>
- <not>
- <isset property="jar.include.source" />
- </not>
- <then>
- <copy todir="${classes.dir}" flatten="false">
- <fileset dir="${src.dir}" excludes="**/*.java" />
- </copy>
- </then>
- </if>
- </target>
-
-
<!--=======================================================================
compile.src_copy
@@ -1151,7 +1009,7 @@ TYPICAL TARGET SEQUENCE
Creates a jar file from the bin directory
====================================================================-->
- <target name="jar" depends="compile,set-build.id,generate.manifest" description="Jars up the bin directory after a compile">
+ <target name="jar" depends="compile,generate.manifest" description="Jars up the bin directory after a compile">
<jar destfile="${dist.dir}/${ivy.artifact.id}-${project.revision}.jar" manifest="${dist.manifest.file}">
<fileset dir="${classes.dir}" />
</jar>
@@ -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.
====================================================================-->
- <target name="generate.manifest" depends="init,set-build.id">
+ <target name="generate.manifest" depends="init">
<delete file="${dist.manifest.file}" />
<touch file="${dist.manifest.file}" />
<copy file="${manifest.file}" tofile="${dist.manifest.file}" overwrite="true" failonerror="false" />
@@ -1648,4 +1506,4 @@ TYPICAL TARGET SEQUENCE
</dot-classpath>
</target>
-</project>
\ No newline at end of file
+</project>

448
SOURCES/libfonts-1.1.3-remove-commons-logging.patch Normal file
View File

@ -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);
}
}
}

64
libfonts.spec → SPECS/libfonts.spec
View File

@ -1,19 +1,20 @@
Name: libfonts
Version: 1.1.3
Release: 21%{?dist}
Release: 35%{?dist}
Summary: TrueType Font Layouting
License: LGPLv2 and UCD
Group: System Environment/Libraries
#Original source: http://downloads.sourceforge.net/jfreereport/%%{name}-%%{version}.zip
#unzip, find . -name "*.jar" -exec rm {} \;
#unzip, find . -name "*.jar" -exec rm {} \;, rm -r patches
#to simplify the licensing
Source: %{name}-%{version}-jarsdeleted.zip
Source: %{name}-%{version}-jars-itextpatch-deleted.zip
URL: http://reporting.pentaho.org/
BuildRequires: ant, ant-contrib, java-devel, jpackage-utils, libloader >= 1.1.3
BuildRequires: ant, java-devel, jpackage-utils, libloader >= 1.1.3
Requires: java-headless, jpackage-utils, libloader >= 1.1.3
BuildArch: noarch
Patch0: libfonts-1.1.2.build.patch
Patch1: libfonts-1.1.2.java11.patch
Patch2: libfonts-1.1.3-remove-antcontrib-support.patch
Patch3: libfonts-1.1.3-remove-commons-logging.patch
%description
LibFonts is a library developed to support advanced layouting in JFreeReport.
This library allows to read TrueType-Font files to extract layouting specific
@ -21,7 +22,6 @@ informations.
%package javadoc
Summary: Javadoc for %{name}
Group: Documentation
Requires: %{name} = %{version}-%{release}
Requires: jpackage-utils
@ -31,12 +31,13 @@ Javadoc for %{name}.
%prep
%setup -q -c
%patch0 -p1 -b .build
%patch1 -p1 -b .java11
%patch2 -p1 -b .no_antcontrib
%patch3 -p1 -b .no_commons_logging
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 commons-logging-api libloader
cd lib
ln -s /usr/share/java/ant ant-contrib
build-jar-repository -s -p lib libbase libloader
%build
ant jar javadoc
@ -60,6 +61,49 @@ cp -rp bin/javadoc/docs/api $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%{_javadocdir}/%{name}
%changelog
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.1.3-35
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.1.3-34
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Fri Mar 12 2021 Caolán McNamara <caolanm@redhat.com> - 1.1.3-33
- Related: rhbz#1895921 replace apache-commons-logging with java.util.logging
* Fri Mar 12 2021 Caolán McNamara <caolanm@redhat.com> - 1.1.3-32
- remove itext patch from source zip
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-31
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Fri Jan 15 2021 Nicolas Lécureuil <neoclust@mageia.org> - 1.1.3-30
- Remove ant-contrib support
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-29
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 1.1.3-28
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
* Tue May 05 2020 Caolán McNamara <caolanm@redhat.com> - 1.1.3-27
- allow rebuild with java 11
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-26
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-25
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Apr 04 2019 Stephan Bergmann <sbergman@redhat.com> - 1.1.3-24
- Use /usr/share/java instead of _javadir macro for build dependencies
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

6
gating.yaml
View File

@ -1,6 +0,0 @@
--- !Policy
product_versions:
- rhel-8
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}

1
sources
View File

@ -1 +0,0 @@
SHA512 (libfonts-1.1.3-jarsdeleted.zip) = 3e05fc1df900bffcefb02ed9cc22422f552c76f0ca0f36fc51ad61df6047324a666fafd2a3df79fc817c8f13e7ee2769560aa3483e89487d3f18cf91308128af