Marek Kasik
parent
9496ba14ab
commit
26db638bc7
3
.gitignore
vendored
3
.gitignore
vendored
@ -52,3 +52,6 @@ ft2demos-2.4.2.tar.bz2
|
||||
/freetype-2.6.tar.bz2
|
||||
/freetype-doc-2.6.tar.bz2
|
||||
/ft2demos-2.6.tar.bz2
|
||||
/freetype-2.6.1.tar.bz2
|
||||
/freetype-doc-2.6.1.tar.bz2
|
||||
/ft2demos-2.6.1.tar.bz2
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
From b650dfbb0b0700440cc88da31f97cec45b4140de Mon Sep 17 00:00:00 2001
|
||||
From: Matthias Clasen <matthias.clasen@gmail.com>
|
||||
Date: Sun, 26 Jul 2015 21:08:34 +0200
|
||||
Subject: [PATCH] [cff] Don't use `hmtx' table for LSB (#45520).
|
||||
|
||||
* src/cff/cffgload.c (cff_slot_load): Use `htmx' table for advance
|
||||
width only. Bug introduced 2015-04-10.
|
||||
|
||||
diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c
|
||||
index 43054f8..a075ddc 100644
|
||||
--- a/src/cff/cffgload.c
|
||||
+++ b/src/cff/cffgload.c
|
||||
@@ -3064,9 +3064,7 @@
|
||||
metrics->width = cbox.xMax - cbox.xMin;
|
||||
metrics->height = cbox.yMax - cbox.yMin;
|
||||
|
||||
- if ( !face->horizontal.number_Of_HMetrics )
|
||||
- metrics->horiBearingX = cbox.xMin;
|
||||
-
|
||||
+ metrics->horiBearingX = cbox.xMin;
|
||||
metrics->horiBearingY = cbox.yMax;
|
||||
|
||||
if ( has_vertical_info )
|
||||
--
|
||||
2.4.3
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
--- freetype-2.3.0/include/config/ftoption.h.spf 2007-01-18 14:27:34.000000000 -0500
|
||||
+++ freetype-2.3.0/include/config/ftoption.h 2007-01-18 14:27:48.000000000 -0500
|
||||
--- freetype-2.3.0/include/freetype/config/ftoption.h.spf 2007-01-18 14:27:34.000000000 -0500
|
||||
+++ freetype-2.3.0/include/freetype/config/ftoption.h 2007-01-18 14:27:48.000000000 -0500
|
||||
@@ -92,7 +92,7 @@
|
||||
/* This is done to allow FreeType clients to run unmodified, forcing */
|
||||
/* them to display normal gray-level anti-aliased glyphs. */
|
||||
|
||||
@ -13,31 +13,6 @@
|
||||
-libdir="%libdir%"
|
||||
+includedir=`pkg-config --variable includedir freetype2`
|
||||
+libdir=`pkg-config --variable libdir freetype2`
|
||||
enable_shared="%build_libtool_libs%"
|
||||
|
||||
usage()
|
||||
@@ -119,20 +119,20 @@ else
|
||||
fi
|
||||
|
||||
if test "$echo_ft_version" = "yes" ; then
|
||||
- major=`grep define ${SYSROOT}$includedir/freetype2/freetype.h \
|
||||
+ major=`grep define ${SYSROOT}$includedir/freetype.h \
|
||||
| grep FREETYPE_MAJOR \
|
||||
| sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'`
|
||||
- minor=`grep define ${SYSROOT}$includedir/freetype2/freetype.h \
|
||||
+ minor=`grep define ${SYSROOT}$includedir/freetype.h \
|
||||
| grep FREETYPE_MINOR \
|
||||
| sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'`
|
||||
- patch=`grep define ${SYSROOT}$includedir/freetype2/freetype.h \
|
||||
+ patch=`grep define ${SYSROOT}$includedir/freetype.h \
|
||||
| grep FREETYPE_PATCH \
|
||||
| sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'`
|
||||
echo $major.$minor.$patch
|
||||
fi
|
||||
|
||||
if test "$echo_cflags" = "yes" ; then
|
||||
- cflags="-I${SYSROOT}$includedir/freetype2"
|
||||
+ cflags="-I${SYSROOT}$includedir"
|
||||
echo $cflags
|
||||
fi
|
||||
|
||||
{
|
||||
|
||||
@ -4,22 +4,18 @@
|
||||
|
||||
%{!?with_xfree86:%define with_xfree86 1}
|
||||
|
||||
%define version26 2.6
|
||||
|
||||
Summary: A free and portable font rendering engine
|
||||
Name: freetype
|
||||
Version: 2.6.0
|
||||
Release: 3%{?dist}
|
||||
Version: 2.6.1
|
||||
Release: 1%{?dist}
|
||||
License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement
|
||||
Group: System Environment/Libraries
|
||||
URL: http://www.freetype.org
|
||||
Source: http://download.savannah.gnu.org/releases/freetype/freetype-%{version26}.tar.bz2
|
||||
Source1: http://download.savannah.gnu.org/releases/freetype/freetype-doc-%{version26}.tar.bz2
|
||||
Source2: http://download.savannah.gnu.org/releases/freetype/ft2demos-%{version26}.tar.bz2
|
||||
Source: http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.tar.bz2
|
||||
Source1: http://download.savannah.gnu.org/releases/freetype/freetype-doc-%{version}.tar.bz2
|
||||
Source2: http://download.savannah.gnu.org/releases/freetype/ft2demos-%{version}.tar.bz2
|
||||
Source3: ftconfig.h
|
||||
|
||||
Patch0: 0001-cff-Don-t-use-hmtx-table-for-LSB-45520.patch
|
||||
|
||||
Patch21: freetype-2.3.0-enable-spr.patch
|
||||
|
||||
# Enable otvalid and gxvalid modules
|
||||
@ -80,9 +76,7 @@ FreeType.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -b 1 -a 2 -n %{name}-%{version26}
|
||||
|
||||
%patch0 -p1 -b .hmtx-table
|
||||
%setup -q -b 1 -a 2
|
||||
|
||||
%if %{?_with_subpixel_rendering:1}%{!?_with_subpixel_rendering:0}
|
||||
%patch21 -p1 -b .enable-spr
|
||||
@ -90,7 +84,7 @@ FreeType.
|
||||
|
||||
%patch46 -p1 -b .enable-valid
|
||||
|
||||
pushd ft2demos-%{version26}
|
||||
pushd ft2demos-%{version}
|
||||
%patch47 -p1 -b .more-demos
|
||||
popd
|
||||
|
||||
@ -111,7 +105,7 @@ make %{?_smp_mflags}
|
||||
|
||||
%if %{with_xfree86}
|
||||
# Build demos
|
||||
pushd ft2demos-%{version26}
|
||||
pushd ft2demos-%{version}
|
||||
make TOP_DIR=".."
|
||||
popd
|
||||
%endif
|
||||
@ -136,13 +130,13 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
{
|
||||
for ftdemo in ftbench ftchkwd ftmemchk ftpatchk fttimer ftdump ftlint ftmemchk ftvalid ; do
|
||||
builds/unix/libtool --mode=install install -m 755 ft2demos-%{version26}/bin/$ftdemo $RPM_BUILD_ROOT/%{_bindir}
|
||||
builds/unix/libtool --mode=install install -m 755 ft2demos-%{version}/bin/$ftdemo $RPM_BUILD_ROOT/%{_bindir}
|
||||
done
|
||||
}
|
||||
%if %{with_xfree86}
|
||||
{
|
||||
for ftdemo in ftdiff ftgamma ftgrid ftmulti ftstring fttimer ftview ; do
|
||||
builds/unix/libtool --mode=install install -m 755 ft2demos-%{version26}/bin/$ftdemo $RPM_BUILD_ROOT/%{_bindir}
|
||||
builds/unix/libtool --mode=install install -m 755 ft2demos-%{version}/bin/$ftdemo $RPM_BUILD_ROOT/%{_bindir}
|
||||
done
|
||||
}
|
||||
%endif
|
||||
@ -150,9 +144,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
# fix multilib issues
|
||||
%define wordsize %{__isa_bits}
|
||||
|
||||
mv $RPM_BUILD_ROOT%{_includedir}/freetype2/config/ftconfig.h \
|
||||
$RPM_BUILD_ROOT%{_includedir}/freetype2/config/ftconfig-%{wordsize}.h
|
||||
install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_includedir}/freetype2/config/ftconfig.h
|
||||
mv $RPM_BUILD_ROOT%{_includedir}/freetype2/freetype/config/ftconfig.h \
|
||||
$RPM_BUILD_ROOT%{_includedir}/freetype2/freetype/config/ftconfig-%{wordsize}.h
|
||||
install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_includedir}/freetype2/freetype/config/ftconfig.h
|
||||
|
||||
# Don't package static a or .la files
|
||||
rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
|
||||
@ -218,6 +212,11 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_mandir}/man1/*
|
||||
|
||||
%changelog
|
||||
* Mon Oct 12 2015 Marek Kasik <mkasik@redhat.com> - 2.6.1-1
|
||||
- Update to 2.6.1
|
||||
- Adapt to the new header structure
|
||||
- Resolves: #1268661
|
||||
|
||||
* Tue Jul 28 2015 Marek Kasik <mkasik@redhat.com> - 2.6.0-3
|
||||
- Don't use `hmtx' table for LSB
|
||||
|
||||
|
||||
6
sources
6
sources
@ -1,3 +1,3 @@
|
||||
5682890cb0267f6671dd3de6eabd3e69 freetype-2.6.tar.bz2
|
||||
f456b7ead3c351c7c218bb3afd45803c freetype-doc-2.6.tar.bz2
|
||||
c6c209b37f10621d6ff100620b8292b4 ft2demos-2.6.tar.bz2
|
||||
35cb8f4d9e5906847901bb39324c2f80 freetype-2.6.1.tar.bz2
|
||||
9a6f668a2bef1ac3f65c619af22a17bc freetype-doc-2.6.1.tar.bz2
|
||||
19f001c9d782aefe4c036b4c8dc11a95 ft2demos-2.6.1.tar.bz2
|
||||
|
||||
Loading…
Reference in New Issue
Block a user