diff --git a/freetype-2.10.0-internal-outline.patch b/freetype-2.10.0-internal-outline.patch deleted file mode 100644 index 0f69ff93502e565960f9b612a2b6733cd03fccc8..0000000000000000000000000000000000000000 --- a/freetype-2.10.0-internal-outline.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- freetype-2.10.0/include/freetype/ftoutln.h -+++ freetype-2.10.0/include/freetype/ftoutln.h -@@ -165,6 +165,15 @@ FT_BEGIN_HEADER - FT_Int numContours, - FT_Outline *anoutline ); - -+ /* -+ * Kept downstream for ABI compatibility only. -+ * It just throws error now. Remove once soname has been bumped. -+ */ -+ FT_EXPORT( FT_Error ) -+ FT_Outline_New_Internal( FT_Memory memory, -+ FT_UInt numPoints, -+ FT_Int numContours, -+ FT_Outline *anoutline ); - - /************************************************************************** - * -@@ -192,6 +201,13 @@ FT_BEGIN_HEADER - FT_Outline_Done( FT_Library library, - FT_Outline* outline ); - -+ /* -+ * Kept downstream for ABI compatibility only. -+ * It just throws error now. Remove once soname has been bumped. -+ */ -+ FT_EXPORT( FT_Error ) -+ FT_Outline_Done_Internal( FT_Memory memory, -+ FT_Outline* outline ); - - /************************************************************************** - * ---- freetype-2.10.0/src/base/ftoutln.c -+++ freetype-2.10.0/src/base/ftoutln.c -@@ -291,6 +291,19 @@ - - /* documentation is in ftoutln.h */ - -+ /* -+ * Kept downstream for ABI compatibility only. -+ * It just throws error now. Remove once soname has been bumped. -+ */ -+ FT_EXPORT_DEF( FT_Error ) -+ FT_Outline_New_Internal( FT_Memory memory, -+ FT_UInt numPoints, -+ FT_Int numContours, -+ FT_Outline *anoutline ) -+ { -+ return FT_THROW( Unimplemented_Feature ); -+ } -+ - FT_EXPORT_DEF( FT_Error ) - FT_Outline_New( FT_Library library, - FT_UInt numPoints, -@@ -423,6 +436,17 @@ - - /* documentation is in ftoutln.h */ - -+ /* -+ * Kept downstream for ABI compatibility only. -+ * It just throws error now. Remove once soname has been bumped. -+ */ -+ FT_EXPORT_DEF( FT_Error ) -+ FT_Outline_Done_Internal( FT_Memory memory, -+ FT_Outline* outline ) -+ { -+ return FT_THROW( Unimplemented_Feature ); -+ } -+ - FT_EXPORT_DEF( FT_Error ) - FT_Outline_Done( FT_Library library, - FT_Outline* outline ) diff --git a/freetype-2.10.1-debughook.patch b/freetype-2.10.1-debughook.patch deleted file mode 100644 index 4421401202d8016c073d1b2be626075909d5009b..0000000000000000000000000000000000000000 --- a/freetype-2.10.1-debughook.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/include/freetype/ftmodapi.h b/include/freetype/ftmodapi.h -index 8d039c4f3..88488bfe8 100644 ---- a/include/freetype/ftmodapi.h -+++ b/include/freetype/ftmodapi.h -@@ -623,7 +623,7 @@ FT_BEGIN_HEADER - * it is bytecode interpreter's execution context, `TT_ExecContext`, - * which is declared in FreeType's internal header file `tttypes.h`. - */ -- typedef FT_Error -+ typedef void - (*FT_DebugHook_Func)( void* arg ); - - diff --git a/freetype-2.10.1.tar.gz b/freetype-2.10.1.tar.gz deleted file mode 100644 index dc4eee6da08bdf2681ecbc3828f5b4ce31851863..0000000000000000000000000000000000000000 Binary files a/freetype-2.10.1.tar.gz and /dev/null differ diff --git a/freetype-2.10.2.tar.xz b/freetype-2.10.2.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..1b5391816d9506849fa0833718ba586dd59a099c Binary files /dev/null and b/freetype-2.10.2.tar.xz differ diff --git a/freetype-2.2.1-enable-valid.patch b/freetype-2.2.1-enable-valid.patch deleted file mode 100644 index e1615aaa44cef5dc679856e97250ad5c4859663a..0000000000000000000000000000000000000000 --- a/freetype-2.2.1-enable-valid.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- freetype-2.2.1/modules.cfg.orig 2006-07-07 21:01:09.000000000 -0400 -+++ freetype-2.2.1/modules.cfg 2006-07-07 21:01:54.000000000 -0400 -@@ -110,7 +110,7 @@ - - # TrueType GX/AAT table validation. Needs `ftgxval.c' below. - # --# AUX_MODULES += gxvalid -+AUX_MODULES += gxvalid - - # Support for streams compressed with gzip (files with suffix .gz). - # -@@ -124,7 +124,7 @@ - - # OpenType table validation. Needs `ftotval.c' below. - # --# AUX_MODULES += otvalid -+AUX_MODULES += otvalid - - # Auxiliary PostScript driver component to share common code. - # diff --git a/freetype-2.3.0-enable-spr.patch b/freetype-2.3.0-enable-spr.patch deleted file mode 100644 index a234782a39bdef5db253e93bc451adeeda7b4c2b..0000000000000000000000000000000000000000 --- a/freetype-2.3.0-enable-spr.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 @@ - * macro is not defined, FreeType offers alternative LCD rendering - * technology that produces excellent output without LCD filtering. - */ --/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ -+#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING - - - /************************************************************************** diff --git a/freetype-2.6.5-libtool.patch b/freetype-2.6.5-libtool.patch deleted file mode 100644 index 4e0c2cb963a1b24fdb01ccbff5e2d2dfc26e2f69..0000000000000000000000000000000000000000 --- a/freetype-2.6.5-libtool.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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/freetype-2.8-multilib.patch b/freetype-2.8-multilib.patch deleted file mode 100644 index 3ffd146b6a488a6cef84cff620e1d8886230b291..0000000000000000000000000000000000000000 --- a/freetype-2.8-multilib.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- 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-doc-2.10.1.tar.gz b/freetype-doc-2.10.1.tar.gz deleted file mode 100644 index efef39e07c553f04d513724bb44578bcef0fafc6..0000000000000000000000000000000000000000 Binary files a/freetype-doc-2.10.1.tar.gz and /dev/null differ diff --git a/freetype-doc-2.10.2.tar.xz b/freetype-doc-2.10.2.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..c7f1edfc899c49127a4e8aa16d56c4711ce9127a Binary files /dev/null and b/freetype-doc-2.10.2.tar.xz differ diff --git a/freetype.spec b/freetype.spec index 5135f80cc359c78102b73b3aaf44154cdd6bbc64..8e0022f272df5b7f2fcaf0c5e1727d78e7a4e40a 100644 --- a/freetype.spec +++ b/freetype.spec @@ -3,29 +3,26 @@ %{!?with_xfree86:%define with_xfree86 1} Name: freetype -Version: 2.10.1 +Version: 2.10.2 Release: 1 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.gz -Source1: http://download.savannah.gnu.org/releases/freetype/freetype-doc-%{version}.tar.gz -Source2: http://download.savannah.gnu.org/releases/freetype/ft2demos-%{version}.tar.gz +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 Source3: ftconfig.h -Patch6000: freetype-2.3.0-enable-spr.patch -Patch6001: freetype-2.2.1-enable-valid.patch -Patch6002: freetype-2.5.2-more-demos.patch -Patch6003: freetype-2.6.5-libtool.patch -Patch6004: freetype-2.8-multilib.patch -Patch6005: freetype-2.10.0-internal-outline.patch -Patch6006: freetype-2.10.1-debughook.patch +Patch1: freetype-2.5.2-more-demos.patch BuildRequires: gcc libX11-devel libpng-devel zlib-devel bzip2-devel -Provides: %{name}-bytecode %{name}-demos = %{version}-%{release} -Provides: %{name}-subpixel -Obsoletes: %{name}-demos < %{version}-%{release} freetype-freeworld < 2.9.1-2 +Provides: %{name}-bytecode %{name}-demos +%if %{?_with_subpixel_rendering:1}%{!?_with_subpixel_rendering:0} +Provides: %{name}-subpixel +%endif + +Obsoletes: %{name}-demos %description FreeType is written in C, designed to be small,efficient, highly customizable, and portable while capable of producing high-quality @@ -49,26 +46,21 @@ Man pages and other related for freetype documents. %prep %setup -q -b 1 -a 2 -%patch6000 -p1 -%patch6001 -p1 pushd ft2demos-%{version} -%patch6002 -p1 -b .more-demos +%patch1 -p1 -b .more-demos popd -%patch6003 -p1 -%patch6004 -p1 -%patch6005 -p1 -%patch6006 -p1 - %build %configure --disable-static --with-zlib=yes --with-bzip2=yes --with-png=yes --enable-freetype-config --with-harfbuzz=no 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 +%if %{with_xfree86} cd ft2demos-%{version} make TOP_DIR=".." +%endif %install %make_install gnulocaledir=$RPM_BUILD_ROOT%{_datadir}/locale @@ -77,9 +69,13 @@ make TOP_DIR=".." builds/unix/libtool --mode=install install -m 755 ft2demos-%{version}/bin/$ftdemo $RPM_BUILD_ROOT/%{_bindir} done } -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} -done +%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} + done +} +%endif %define wordsize %{__isa_bits} @@ -87,8 +83,6 @@ 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 -%delete_la_and_a - %triggerpostun -- freetype < 2.0.5-3 { # ttmkfdir updated - as of 2.0.5-3, on upgrades we need xfs to regenerate @@ -100,6 +94,9 @@ install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_includedir}/freetype2/freetype/co } %ldconfig_scriptlets +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig %files %defattr(-,root,root) @@ -114,6 +111,7 @@ 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 %defattr(-,root,root) @@ -126,6 +124,12 @@ install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_includedir}/freetype2/freetype/co %{_mandir}/man1/* %changelog +* Thu Aug 2020 jinzhimin - 2.10.2-1 +- Type:enhancement +- Id:NA +- SUG:NA +- DESC:version update to 2.10.2 + * Mon Jun 15 2020 fuyangqing - 2.10.1-1 - Type:enhancement - Id:NA diff --git a/ft2demos-2.10.1.tar.gz b/ft2demos-2.10.1.tar.gz deleted file mode 100644 index 52be8a6f428483ebc71b96d130ded6b55f05492c..0000000000000000000000000000000000000000 Binary files a/ft2demos-2.10.1.tar.gz and /dev/null differ diff --git a/ft2demos-2.10.2.tar.xz b/ft2demos-2.10.2.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..dee0c2ed1ed496a9256487fc903a92c0c0f4d0d0 Binary files /dev/null and b/ft2demos-2.10.2.tar.xz differ