From 681428774035c20e9e7ed0a513f7c81cccd4af4c Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Oct 29 2018 15:59:58 +0000 Subject: Enable ClearType code --- diff --git a/freetype-2.3.0-enable-spr.patch b/freetype-2.3.0-enable-spr.patch deleted file mode 100644 index d551000..0000000 --- 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 @@ - /* 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.spec b/freetype.spec index 40e789f..0ef10f4 100644 --- a/freetype.spec +++ b/freetype.spec @@ -1,13 +1,9 @@ -# Patented subpixel rendering disabled by default. -# Pass '--with subpixel_rendering' on rpmbuild command-line to enable. -%{!?_with_subpixel_rendering: %{!?_without_subpixel_rendering: %define _without_subpixel_rendering --without-subpixel_rendering}} - %{!?with_xfree86:%define with_xfree86 1} Summary: A free and portable font rendering engine Name: freetype Version: 2.9.1 -Release: 3%{?dist} +Release: 4%{?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 @@ -16,8 +12,6 @@ Source1: http://download.savannah.gnu.org/releases/freetype/freetype-doc-%{versi Source2: http://download.savannah.gnu.org/releases/freetype/ft2demos-%{version}.tar.bz2 Source3: ftconfig.h -Patch0: freetype-2.3.0-enable-spr.patch - # Enable otvalid and gxvalid modules Patch1: freetype-2.2.1-enable-valid.patch # Enable additional demos @@ -36,9 +30,6 @@ BuildRequires: zlib-devel BuildRequires: bzip2-devel Provides: %{name}-bytecode -%if %{?_with_subpixel_rendering:1}%{!?_with_subpixel_rendering:0} -Provides: %{name}-subpixel -%endif %description The FreeType engine is a free and portable font rendering @@ -78,10 +69,6 @@ FreeType. %prep %setup -q -b 1 -a 2 -%if %{?_with_subpixel_rendering:1}%{!?_with_subpixel_rendering:0} -%patch0 -p1 -b .enable-spr -%endif - %patch1 -p1 -b .enable-valid pushd ft2demos-%{version} @@ -203,6 +190,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog +* Mon Oct 29 2018 Marek Kasik - 2.9.1-4 +- Enable ClearType code thanks to Microsoft joining OIN + * Fri Oct 19 2018 Marek Kasik - 2.9.1-3 - Use 'pkgconf' directly for multilib reasons - Resolves: #1639379