Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
3d716967fd
!56 [sync] PR-50: Cleanup spec
From: @openeuler-sync-bot 
Reviewed-by: @weidongkl 
Signed-off-by: @weidongkl
2024-12-17 01:31:22 +00:00
Funda Wang
cde02f4183 Cleanup spec
(cherry picked from commit ba6a15a9a2ba4b6ceee8cbbda046f8e3383804a1)
2024-12-16 19:00:14 +08:00
openeuler-ci-bot
edc0b40349
!49 update to version 2.13.2
From: @paulthomas100199 
Reviewed-by: @open-bot 
Signed-off-by: @open-bot
2023-12-29 07:14:24 +00:00
lwg
b8aa4cbfb7 update to version 2.13.2 2023-12-28 17:49:15 +08:00
openeuler-ci-bot
daf2f94186
!42 enable check
From: @zhouwenpei 
Reviewed-by: @open-bot 
Signed-off-by: @open-bot
2023-10-18 02:02:44 +00:00
zhouwenpei
d47f500e34 enable check 2023-09-28 02:05:57 +00:00
openeuler-ci-bot
ad6465a624
!41 update to 2.13.1
From: @zppzhangpan 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
2023-07-26 09:31:03 +00:00
zhangpan
78799d21c1 update to 2.13.1 2023-07-14 07:31:22 +00:00
openeuler-ci-bot
93da8a5966
!37 fix CVE-2023-2004
From: @zhouwenpei 
Reviewed-by: @leeffo 
Signed-off-by: @leeffo
2023-04-18 01:04:19 +00:00
zhouwenpei
7138813857 fix CVE-2023-2004 2023-04-17 09:33:08 +00:00
8 changed files with 65 additions and 32 deletions

BIN
As.I.Lay.Dying.ttf Normal file

Binary file not shown.

Binary file not shown.

BIN
freetype-2.13.2.tar.xz Normal file

Binary file not shown.

Binary file not shown.

BIN
freetype-doc-2.13.2.tar.xz Normal file

Binary file not shown.

View File

@ -2,16 +2,20 @@
%{!?with_xfree86:%define with_xfree86 1}
%bcond_without harfbuzz
Name: freetype
Version: 2.12.1
Release: 1
Version: 2.13.2
Release: 2
Summary: FreeType is a freely available software library to render fonts
License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement
URL: http://www.freetype.org
Source0: http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.tar.xz
Source1: http://download.savannah.gnu.org/releases/freetype/freetype-doc-%{version}.tar.xz
Source2: http://download.savannah.gnu.org/releases/freetype/ft2demos-%{version}.tar.xz
License: (FTL OR GPL-2.0-or-later) AND BSD-3-Clause AND MIT AND MIT-Modern-Variant AND Zlib
URL: https://www.freetype.org
Source0: https://download.savannah.gnu.org/releases/freetype/freetype-%{version}.tar.xz
Source1: https://download.savannah.gnu.org/releases/freetype/freetype-doc-%{version}.tar.xz
Source2: https://download.savannah.gnu.org/releases/freetype/ft2demos-%{version}.tar.xz
Source3: ftconfig.h
#from tests/scripts/download-test-fonts.py:https://github.com/python-pillow/Pillow/files/6622147/As.I.Lay.Dying.zip
Source4: As.I.Lay.Dying.ttf
Patch1: backport-freetype-2.5.2-more-demos.patch
Patch6000: backport-freetype-2.3.0-enable-spr.patch
@ -21,11 +25,18 @@ Patch6003: backport-freetype-2.8-multilib.patch
Patch6004: backport-freetype-2.10.0-internal-outline.patch
Patch6005: backport-freetype-2.10.1-debughook.patch
BuildRequires: gcc libX11-devel libpng-devel zlib-devel bzip2-devel
BuildRequires: gcc meson
BuildRequires: pkgconfig(bzip2)
BuildRequires: pkgconfig(libbrotlidec)
BuildRequires: pkgconfig(libpng)
BuildRequires: pkgconfig(zlib)
%if %{with harfbuzz}
BuildRequires: pkgconfig(harfbuzz) >= 2.0.0
%endif
Provides: %{name}-bytecode
Provides: %{name}-bytecode = %{version}-%{release}
%if %{?_with_subpixel_rendering:1}%{!?_with_subpixel_rendering:0}
Provides: %{name}-subpixel
Provides: %{name}-subpixel = %{version}-%{release}
%endif
%description
@ -41,35 +52,39 @@ The FreeType engine is a free and portable font rendering engine,developed to pr
%package devel
Summary: FreeType development libraries and header files
Requires: %{name} = %{version}-%{release} pkgconf
Requires: %{name} = %{version}-%{release}
%description devel
The freetype-devel package includes the static libraries and header files
for the FreeType font rendering engine.Install freetype-devel if you want to develop programs which will use
FreeType.
%package help
Summary: Documents for freetype
Buildarch: noarch
%description help
Man pages and other related for freetype documents.
%package_help
%prep
%setup -q -b 1 -a 2
%setup -q -b 1 -a 2
pushd ft2demos-%{version}
%patch1 -p1 -b .more-demos
%patch -P1 -p1 -b .more-demos
popd
%patch6000 -p1
%patch6001 -p1
%patch6002 -p1
%patch6003 -p1
%patch6004 -p1
%patch6005 -p1
%patch -P6000 -p1
%patch -P6001 -p1
%patch -P6002 -p1
%patch -P6003 -p1
%patch -P6004 -p1
%patch -P6005 -p1
%build
%configure --disable-static --with-zlib=yes --with-bzip2=yes --with-png=yes --enable-freetype-config --with-harfbuzz=no
%configure --disable-static \
--with-zlib=yes \
--with-bzip2=yes \
--with-png=yes \
%if %{with harfbuzz}
--with-harfbuzz=yes \
%else
--with-harfbuzz=no \
%endif
--enable-freetype-config
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' builds/unix/libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' builds/unix/libtool
%make_build
@ -80,7 +95,8 @@ make TOP_DIR=".."
%endif
%install
%make_install gnulocaledir=$RPM_BUILD_ROOT%{_datadir}/locale
%make_install
%delete_la
{
for ftdemo in ftbench ftchkwd ftmemchk ftpatchk fttimer ftdump ftlint ftmemchk ftvalid ; do
builds/unix/libtool --mode=install install -m 755 ft2demos-%{version}/bin/$ftdemo $RPM_BUILD_ROOT/%{_bindir}
@ -110,12 +126,14 @@ install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_includedir}/freetype2/freetype/co
exit 0
}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%check
mkdir -p tests/data/
cp %{SOURCE4} tests/data/
meson setup out -Dtests=enabled
meson compile -C out
meson test -C out
%files
%{!?_licensedir:%global license %%doc}
%license LICENSE.TXT docs/FTL.TXT docs/GPLv2.TXT
%{_libdir}/libfreetype.so.*
@ -128,7 +146,6 @@ install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_includedir}/freetype2/freetype/co
%{_libdir}/libfreetype.so
%{_libdir}/pkgconfig/freetype2.pc
%{_bindir}/freetype-config
%exclude %{_libdir}/*.{a,la}
%files help
%doc docs/design
@ -140,6 +157,22 @@ install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_includedir}/freetype2/freetype/co
%{_mandir}/man1/*
%changelog
* Sun Aug 11 2024 Funda Wang <fundawang@yeah.net> - 2.13.2-2
- Cleanup spec
- Conditioned build harfbuzz support
* Thu Dec 28 2023 Paul Thomas <paulthomas100199@gmail.com> - 2.13.2-1
- update to version 2.13.2
* Wed Sep 20 2023 zhouwenpei <zhouwenpei1@h-partners.com> - 2.13.1-2
- enable check
* Fri Jul 14 2023 zhangpan <zhangpan103@h-partners.com> - 2.13.1-1
- update to 2.13.1
* Mon Apr 17 2023 zhouwenpei <zhouwenpei1@h-partners.com> - 2.12.1-2
- fix CVE-2023-2004
* Tue Nov 29 2022 zhouwenpei <zhouwenpei1@h-partners.com> - 2.12.1-1
- update to 2.12.1

Binary file not shown.

BIN
ft2demos-2.13.2.tar.xz Normal file

Binary file not shown.