diff --git a/backport-freetype-2.5.2-more-demos.patch b/backport-freetype-2.5.2-more-demos.patch deleted file mode 100644 index 7e58be73d9828a5c34823b66810de66ea281f388..0000000000000000000000000000000000000000 --- a/backport-freetype-2.5.2-more-demos.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- ft2demos-2.5.2/Makefile -+++ ft2demos-2.5.2/Makefile -@@ -296,10 +296,10 @@ else - # The following programs are not compiled automatically; either comment - # out the affected line or use the program name as a Makefile target. - # -- # EXES += ftchkwd -- # EXES += ftmemchk -- # EXES += ftpatchk -- # EXES += fttimer -+ EXES += ftchkwd -+ EXES += ftmemchk -+ EXES += ftpatchk -+ EXES += fttimer - # EXES += testname - - # Not all demo programs have a man page; we thus check for existence in a diff --git a/backport-freetype-2.6.5-libtool.patch b/backport-freetype-2.6.5-libtool.patch deleted file mode 100644 index 22d18bec94577fb76142f7a9e45d9ea21e5ad921..0000000000000000000000000000000000000000 --- a/backport-freetype-2.6.5-libtool.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 928ba6125d73435fddd73f9bf155e0f2a813bab7 Mon Sep 17 00:00:00 2001 -From: Marek Kasik -Date: Aug 22 2016 13:08:48 +0000 -Subject: Don't show path of non-existing libtool file - -Conflict:NA -Reference:https://src.fedoraproject.org/rpms/freetype/c/928ba6125d73435fddd73f9bf155e0f2a813bab7 - ---- freetype-2.8/builds/unix/freetype-config.in.orig 2017-03-30 12:20:23.000000001 +0200 -+++ freetype-2.8/builds/unix/freetype-config.in 2017-05-16 13:25:39.223041128 +0200 -@@ -205,7 +205,7 @@ if test "$echo_libs" = "yes" ; then - fi - - if test "$echo_libtool" = "yes" ; then -- echo ${SYSROOT}$libdir/libfreetype.la -+ echo "" - fi - - # EOF diff --git a/backport-freetype-2.8-multilib.patch b/backport-freetype-2.8-multilib.patch deleted file mode 100644 index a738cb52212aa83969179147c2fbf79c068c39c4..0000000000000000000000000000000000000000 --- a/backport-freetype-2.8-multilib.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 1007098e54f9449281f83516f0272afa5d20ec29 Mon Sep 17 00:00:00 2001 -From: Marek Kasik -Date: Oct 09 2017 11:57:11 +0000 -Subject: Fix multilib conflict - -Require pkgconf so we can make freetype-config multilib compatible again - -Resolves: #1497443 - -Conflict:NA -Reference:https://src.fedoraproject.org/rpms/freetype/c/1007098e54f9449281f83516f0272afa5d20ec29?branch=rawhide - ---- freetype-2.9/builds/unix/freetype-config.in -+++ freetype-2.9/builds/unix/freetype-config.in -@@ -13,45 +13,25 @@ LC_ALL=C - export LC_ALL - - --# if `pkg-config' is available, use values from `freetype2.pc' --%PKG_CONFIG% --atleast-pkgconfig-version 0.24 >/dev/null 2>&1 --if test $? -eq 0 ; then -- # note that option `--variable' is not affected by the -- # PKG_CONFIG_SYSROOT_DIR environment variable -- if test "x$SYSROOT" != "x" ; then -- PKG_CONFIG_SYSROOT_DIR="$SYSROOT" -- export PKG_CONFIG_SYSROOT_DIR -- fi -- -- prefix=`%PKG_CONFIG% --variable prefix freetype2` -- exec_prefix=`%PKG_CONFIG% --variable exec_prefix freetype2` -- -- includedir=`%PKG_CONFIG% --variable includedir freetype2` -- libdir=`%PKG_CONFIG% --variable libdir freetype2` -- -- version=`%PKG_CONFIG% --modversion freetype2` -- -- cflags=`%PKG_CONFIG% --cflags freetype2` -- dynamic_libs=`%PKG_CONFIG% --libs freetype2` -- static_libs=`%PKG_CONFIG% --static --libs freetype2` --else -- prefix="%prefix%" -- exec_prefix="%exec_prefix%" -- -- includedir="%includedir%" -- libdir="%libdir%" -- -- version=%ft_version% -- -- cflags="-I${SYSROOT}$includedir/freetype2" -- dynamic_libs="-lfreetype" -- static_libs="%LIBSSTATIC_CONFIG%" -- if test "${SYSROOT}$libdir" != "/usr/lib" && -- test "${SYSROOT}$libdir" != "/usr/lib64" ; then -- libs_L="-L${SYSROOT}$libdir" -- fi -+# note that option `--variable' is not affected by the -+# PKG_CONFIG_SYSROOT_DIR environment variable -+if test "x$SYSROOT" != "x" ; then -+ PKG_CONFIG_SYSROOT_DIR="$SYSROOT" -+ export PKG_CONFIG_SYSROOT_DIR - fi - -+prefix=`pkgconf --variable prefix freetype2` -+exec_prefix=`pkgconf --variable exec_prefix freetype2` -+ -+includedir=`pkgconf --variable includedir freetype2` -+libdir=`pkgconf --variable libdir freetype2` -+ -+version=`pkgconf --modversion freetype2` -+ -+cflags=`pkgconf --cflags freetype2` -+dynamic_libs=`pkgconf --libs freetype2` -+static_libs=`pkgconf --static --libs freetype2` -+ - orig_prefix=$prefix - orig_exec_prefix=$exec_prefix - diff --git a/freetype-2.13.2-include-header.patch b/freetype-2.13.2-include-header.patch new file mode 100644 index 0000000000000000000000000000000000000000..ba84ab22da685778abcdbab495442577454b8480 --- /dev/null +++ b/freetype-2.13.2-include-header.patch @@ -0,0 +1,10 @@ +--- 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.2.tar.xz b/freetype-2.13.2.tar.xz deleted file mode 100644 index fad61bcb42314a9695e814a7cc140835651d2377..0000000000000000000000000000000000000000 Binary files a/freetype-2.13.2.tar.xz and /dev/null differ diff --git a/freetype-2.13.3.tar.xz b/freetype-2.13.3.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..4e2d0d4285d8a2db776c142b1703e8a488a88e79 Binary files /dev/null and b/freetype-2.13.3.tar.xz differ diff --git a/freetype-doc-2.13.2.tar.xz b/freetype-doc-2.13.2.tar.xz deleted file mode 100644 index e98f4cb47845a058b2884671315dc482b57caeba..0000000000000000000000000000000000000000 Binary files a/freetype-doc-2.13.2.tar.xz and /dev/null differ diff --git a/freetype-doc-2.13.3.tar.xz b/freetype-doc-2.13.3.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..66f2f28375f9da8601f3fef30cc0801496134c32 Binary files /dev/null and b/freetype-doc-2.13.3.tar.xz differ diff --git a/freetype.spec b/freetype.spec index a3f91d82d2e754d254b464a5ac02158916808d3e..306d07e28ab1dbceb8de64e729d565e861b821bd 100644 --- a/freetype.spec +++ b/freetype.spec @@ -5,8 +5,8 @@ %bcond_without harfbuzz Name: freetype -Version: 2.13.2 -Release: 2 +Version: 2.13.3 +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,15 +17,13 @@ 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 +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.6.5-libtool.patch -Patch6003: backport-freetype-2.8-multilib.patch -Patch6004: backport-freetype-2.10.0-internal-outline.patch -Patch6005: backport-freetype-2.10.1-debughook.patch +Patch6002: backport-freetype-2.10.0-internal-outline.patch +Patch6003: backport-freetype-2.10.1-debughook.patch -BuildRequires: gcc meson +BuildRequires: gcc meson >= 0.55.0 BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(libbrotlidec) BuildRequires: pkgconfig(libpng) @@ -62,50 +60,57 @@ FreeType. %package_help %prep -%setup -q -b 1 -a 2 +%autosetup -b 1 -a 2 -p1 pushd ft2demos-%{version} -%patch -P1 -p1 -b .more-demos +tar xf %{S:0} +mv %{name}-%{version} subprojects/freetype2 popd -%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 \ +%meson -Dtests=enabled \ + -Dbrotli=enabled \ + -Dbzip2=enabled \ + -Dpng=enabled \ + -Dzlib=system \ %if %{with harfbuzz} - --with-harfbuzz=yes \ + -Dharfbuzz=enabled \ %else - --with-harfbuzz=no \ + -Dharfbuzz=disabled \ %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 +%{nil} +%meson_build -%if %{with_xfree86} -cd ft2demos-%{version} -make TOP_DIR=".." +pushd ft2demos-%{version} +%meson -Dfreetype2:default_library=shared \ + -Dlibrsvg=disabled \ +%if %{with harfbuzz} + -Dfreetype2:harfbuzz=enabled \ +%else + -Dfreetype2:harfbuzz=disabled \ %endif +%{nil} +%meson_build +popd %install -%make_install -%delete_la +%meson_install + +mkdir -p %{buildroot}/%{_bindir} +mkdir -p %{buildroot}/%{_mandir}/man1 + { - 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} + for ftdemo in ftbench ftchkwd ftmemchk ftpatchk fttimer ftdump ftlint ftmemchk ftvalid ttdebug ; do + install -m 755 ft2demos-%{version}/%{_vpath_builddir}/$ftdemo %{buildroot}/%{_bindir} done + install ft2demos-%{version}/man/{ftbench.1,ftdump.1,ftlint.1,ftvalid.1,ttdebug.1} %{buildroot}/%{_mandir}/man1 } + %if %{with_xfree86} { - for ftdemo in ftdiff ftgamma ftgrid ftmulti ftstring fttimer ftview ; do - builds/unix/libtool --mode=install install -m 755 ft2demos-%{version}/bin/$ftdemo $RPM_BUILD_ROOT/%{_bindir} + for ftdemo in ftdiff ftgamma ftgrid ftmulti ftsdf ftstring ftview ; do + install -m 755 ft2demos-%{version}/%{_vpath_builddir}/$ftdemo %{buildroot}/%{_bindir} + install ft2demos-%{version}/man/$ftdemo.1 %{buildroot}/%{_mandir}/man1 done } %endif @@ -114,7 +119,7 @@ make TOP_DIR=".." 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 +install -p -m 644 %{S:3} $RPM_BUILD_ROOT%{_includedir}/freetype2/freetype/config/ftconfig.h %triggerpostun -- freetype < 2.0.5-3 { @@ -127,11 +132,9 @@ install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_includedir}/freetype2/freetype/co } %check -mkdir -p tests/data/ -cp %{SOURCE4} tests/data/ -meson setup out -Dtests=enabled -meson compile -C out -meson test -C out +mkdir -p tests/data +cp %{S:4} tests/data/ +%meson_test %files %license LICENSE.TXT docs/FTL.TXT docs/GPLv2.TXT @@ -139,13 +142,13 @@ meson test -C out %files demos %{_bindir}/ft* +%{_bindir}/ttdebug %files devel %{_datadir}/aclocal/freetype2.m4 %{_includedir}/freetype2/* %{_libdir}/libfreetype.so %{_libdir}/pkgconfig/freetype2.pc -%{_bindir}/freetype-config %files help %doc docs/design @@ -157,6 +160,10 @@ meson test -C out %{_mandir}/man1/* %changelog +* Mon Aug 12 2024 Funda Wang - 2.13.3-1 +- update to 2.13.3 +- build with meson + * Sun Aug 11 2024 Funda Wang - 2.13.2-2 - Cleanup spec - Conditioned build harfbuzz support diff --git a/ft2demos-2.13.2.tar.xz b/ft2demos-2.13.2.tar.xz deleted file mode 100644 index ead45207ba52ea8d5270819b2a34a9343eeef76f..0000000000000000000000000000000000000000 Binary files a/ft2demos-2.13.2.tar.xz and /dev/null differ diff --git a/ft2demos-2.13.3.tar.xz b/ft2demos-2.13.3.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..c0d40c38721328d85e675a35c0dc1f57561dbad9 Binary files /dev/null and b/ft2demos-2.13.3.tar.xz differ