diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..05a0e946187b8160d0c54c23a9f8100f44e0f43b --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.xz filter=lfs diff=lfs merge=lfs -text diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 0000000000000000000000000000000000000000..bbaa75bc7f2bd8cc35ff96603843ba5d4b913e31 --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +[lfs] + url = https://artlfs.openeuler.openatom.cn/src-openEuler/freetype diff --git a/freetype-2.13.2-include-header.patch b/freetype-2.13.2-include-header.patch deleted file mode 100644 index ba84ab22da685778abcdbab495442577454b8480..0000000000000000000000000000000000000000 --- a/freetype-2.13.2-include-header.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- freetype-2.13.2/meson.build.orig 2024-08-12 22:01:02.043277188 +0800 -+++ freetype-2.13.2/meson.build 2024-08-12 22:09:40.560560147 +0800 -@@ -156,6 +156,7 @@ - 'include/freetype/ftincrem.h', - 'include/freetype/ftlcdfil.h', - 'include/freetype/ftlist.h', -+ 'include/freetype/ftlogging.h', - 'include/freetype/ftlzw.h', - 'include/freetype/ftmac.h', - 'include/freetype/ftmm.h', diff --git a/freetype-2.13.3.tar.xz b/freetype-2.13.3.tar.xz deleted file mode 100644 index 4e2d0d4285d8a2db776c142b1703e8a488a88e79..0000000000000000000000000000000000000000 Binary files a/freetype-2.13.3.tar.xz and /dev/null differ diff --git a/freetype-2.14.1.tar.xz b/freetype-2.14.1.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..3dbb3bf13075252d6b4356ab5bd5669bb371a55d --- /dev/null +++ b/freetype-2.14.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:32427e8c471ac095853212a37aef816c60b42052d4d9e48230bab3bdf2936ccc +size 2664948 diff --git a/freetype-doc-2.13.3.tar.xz b/freetype-doc-2.13.3.tar.xz deleted file mode 100644 index 66f2f28375f9da8601f3fef30cc0801496134c32..0000000000000000000000000000000000000000 Binary files a/freetype-doc-2.13.3.tar.xz and /dev/null differ diff --git a/freetype-doc-2.14.1.tar.xz b/freetype-doc-2.14.1.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..16aa3ec0a1fa79cafcfb16af8e765339ada9d034 --- /dev/null +++ b/freetype-doc-2.14.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:719142a897aef4e5b47689ba4394934285045f45f6aade07c65160e1813839f2 +size 2175972 diff --git a/freetype.spec b/freetype.spec index bf3c24e711b793d323e4355001f4017e77d10b43..026e84e31ecc98f73090da1ef02be8d507830e65 100644 --- a/freetype.spec +++ b/freetype.spec @@ -1,12 +1,8 @@ -%{!?_with_subpixel_rendering: %{!?_without_subpixel_rendering: %define _without_subpixel_rendering --without-subpixel_rendering}} - -%{!?with_xfree86:%define with_xfree86 1} - -%bcond_with harfbuzz +%bcond_with xfree86 Name: freetype -Version: 2.13.3 -Release: 2 +Version: 2.14.1 +Release: 1 Summary: FreeType is a freely available software library to render fonts 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 @@ -17,7 +13,6 @@ 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: freetype-2.13.2-include-header.patch Patch6000: backport-freetype-2.3.0-enable-spr.patch Patch6001: backport-freetype-2.2.1-enable-valid.patch Patch6002: backport-freetype-2.10.0-internal-outline.patch @@ -28,25 +23,32 @@ BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(libbrotlidec) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(zlib) -%if %{with harfbuzz} -BuildRequires: pkgconfig(harfbuzz) >= 2.0.0 +BuildRequires: chrpath +%if %{with xfree86} +BuildRequires: pkgconfig(librsvg-2.0) >= 2.46.0 +BuildRequires: pkgconfig(x11) %endif +Requires: (harfbuzz%{?_isa} >= 2.6.8 if harfbuzz) Provides: %{name}-bytecode = %{version}-%{release} -%if %{?_with_subpixel_rendering:1}%{!?_with_subpixel_rendering:0} -Provides: %{name}-subpixel = %{version}-%{release} -%endif %description -FreeType is written in C, designed to be small,efficient, highly customizable, and portable while capable of producing high-quality -output (glyph images) of most vector and bitmap font formats +FreeType is a freely available software library to render fonts. + +It is written in C, designed to be small, efficient, highly +customizable, and portable while capable of producing high-quality +output (glyph images) of most vector and bitmap font formats. %package demos Summary: A collection of freetype demos Requires: %{name} = %{version}-%{release} %description demos -The FreeType engine is a free and portable font rendering engine,developed to provide advanced font support for a variety of platforms and environments.The demos package includes a set of useful small utilities showing various capabilities of the FreeType library. +The FreeType engine is a free and portable font rendering engine, developed +to provide advanced font support for a variety of platforms and environments. + +The demos package includes a set of useful small utilities showing various +capabilities of the FreeType library. %package devel Summary: FreeType development libraries and header files @@ -73,22 +75,18 @@ popd -Dbzip2=enabled \ -Dpng=enabled \ -Dzlib=system \ -%if %{with harfbuzz} - -Dharfbuzz=enabled \ -%else - -Dharfbuzz=disabled \ -%endif + -Dharfbuzz=dynamic \ %{nil} %meson_build pushd ft2demos-%{version} %meson -Dfreetype2:default_library=shared \ - -Dlibrsvg=disabled \ -%if %{with harfbuzz} - -Dfreetype2:harfbuzz=enabled \ +%if %{with xfree86} + -Dlibrsvg=enabled \ %else - -Dfreetype2:harfbuzz=disabled \ + -Dlibrsvg=disabled \ %endif + -Dfreetype2:harfbuzz=dynamic \ %{nil} %meson_build popd @@ -102,14 +100,16 @@ mkdir -p %{buildroot}/%{_mandir}/man1 { for ftdemo in ftbench ftchkwd ftmemchk ftpatchk fttimer ftdump ftlint ftmemchk ftvalid ttdebug ; do install -m 755 ft2demos-%{version}/%{_vpath_builddir}/$ftdemo %{buildroot}/%{_bindir} + chrpath -d %{buildroot}/%{_bindir}/$ftdemo done install ft2demos-%{version}/man/{ftbench.1,ftdump.1,ftlint.1,ftvalid.1,ttdebug.1} %{buildroot}/%{_mandir}/man1 } -%if %{with_xfree86} +%if %{with xfree86} { for ftdemo in ftdiff ftgamma ftgrid ftmulti ftsdf ftstring ftview ; do install -m 755 ft2demos-%{version}/%{_vpath_builddir}/$ftdemo %{buildroot}/%{_bindir} + chrpath -d %{buildroot}/%{_bindir}/$ftdemo install ft2demos-%{version}/man/$ftdemo.1 %{buildroot}/%{_mandir}/man1 done } @@ -160,6 +160,10 @@ cp %{S:4} tests/data/ %{_mandir}/man1/* %changelog +* Fri Sep 12 2025 Funda Wang - 2.14.1-1 +- update to 2.14.1 +- dynamic load harfbuzz + * Thu Jun 5 2025 zhangpan - 2.13.3-2 - undepend on harfbuzz diff --git a/ft2demos-2.13.3.tar.xz b/ft2demos-2.13.3.tar.xz deleted file mode 100644 index c0d40c38721328d85e675a35c0dc1f57561dbad9..0000000000000000000000000000000000000000 Binary files a/ft2demos-2.13.3.tar.xz and /dev/null differ diff --git a/ft2demos-2.14.1.tar.xz b/ft2demos-2.14.1.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..57ce4768904bb8d1abe08b19445e900131d158b8 --- /dev/null +++ b/ft2demos-2.14.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:06aaf46e1cabca75856193e83f01f260a0d3dfc9954081db5b4ed1467b4385a0 +size 344228