From dd8205a888ff5f5c3b3a52ca34e9d40cdb42db5f Mon Sep 17 00:00:00 2001
From: Marek Kasik <mkasik@redhat.com>
Date: Apr 08 2019 14:52:36 +0000
Subject: Remove freetype-2.9-ftsmooth.patch


---

diff --git a/freetype-2.9-ftsmooth.patch b/freetype-2.9-ftsmooth.patch
deleted file mode 100644
index 2735bd5..0000000
--- a/freetype-2.9-ftsmooth.patch
+++ /dev/null
@@ -1,101 +0,0 @@
---- a/src/smooth/ftsmooth.c
-+++ b/src/smooth/ftsmooth.c
-@@ -232,39 +232,13 @@
-       FT_UInt   i, j;
- 
-       unsigned int  height = bitmap->rows;
--      unsigned int  width  = bitmap->width;
-+      unsigned int  width  = bitmap->width / 3;
-       int           pitch  = bitmap->pitch;
- 
--
--      /* Render 3 separate monochrome bitmaps, shifting the outline  */
--      /* by 1/3 pixel.                                               */
--      width /= 3;
--
--      bitmap->buffer += width;
--
--      error = render->raster_render( render->raster, &params );
--      if ( error )
--        goto Exit;
--
--      FT_Outline_Translate( outline, -21, 0 );
--      x_shift        -= 21;
--      bitmap->buffer += width;
--
-       error = render->raster_render( render->raster, &params );
-       if ( error )
-         goto Exit;
- 
--      FT_Outline_Translate( outline,  42, 0 );
--      x_shift        += 42;
--      bitmap->buffer -= 2 * width;
--
--      error = render->raster_render( render->raster, &params );
--      if ( error )
--        goto Exit;
--
--      /* XXX: Rearrange the bytes according to FT_PIXEL_MODE_LCD.    */
--      /* XXX: It is more efficient to render every third byte above. */
--
-       if ( FT_ALLOC( temp, (FT_ULong)pitch ) )
-         goto Exit;
- 
-@@ -272,11 +246,7 @@
-       {
-         line = bitmap->buffer + i * (FT_ULong)pitch;
-         for ( j = 0; j < width; j++ )
--        {
--          temp[3 * j    ] = line[j];
--          temp[3 * j + 1] = line[j + width];
--          temp[3 * j + 2] = line[j + width + width];
--        }
-+          temp[3 * j] = temp[3 * j + 1] = temp[3 * j + 2] = line[j];
-         FT_MEM_COPY( line, temp, pitch );
-       }
- 
-@@ -284,35 +254,23 @@
-     }
-     else if ( vmul )  /* lcd_v */
-     {
--      int  pitch  = bitmap->pitch;
--
-+      FT_Byte*  line;
-+      FT_UInt   i;
-+      int       original_pitch  = bitmap->pitch;
- 
--      /* Render 3 separate monochrome bitmaps, shifting the outline  */
--      /* by 1/3 pixel. Triple the pitch to render on each third row. */
-       bitmap->pitch *= 3;
-       bitmap->rows  /= 3;
- 
--      bitmap->buffer += pitch;
--
--      error = render->raster_render( render->raster, &params );
--      if ( error )
--        goto Exit;
--
--      FT_Outline_Translate( outline, 0,  21 );
--      y_shift        += 21;
--      bitmap->buffer += pitch;
--
-       error = render->raster_render( render->raster, &params );
-       if ( error )
-         goto Exit;
- 
--      FT_Outline_Translate( outline, 0, -42 );
--      y_shift        -= 42;
--      bitmap->buffer -= 2 * pitch;
--
--      error = render->raster_render( render->raster, &params );
--      if ( error )
--        goto Exit;
-+      for ( i = 0; i < bitmap->rows; i++ )
-+      {
-+        line = bitmap->buffer + i * bitmap->pitch;
-+        FT_MEM_COPY( line + original_pitch, line, bitmap->width );
-+        FT_MEM_COPY( line + 2 * original_pitch, line, bitmap->width );
-+      }
- 
-       bitmap->pitch /= 3;
-       bitmap->rows  *= 3;
diff --git a/freetype.spec b/freetype.spec
index 49cb8e8..0aa90c0 100644
--- a/freetype.spec
+++ b/freetype.spec
@@ -3,7 +3,7 @@
 Summary: A free and portable font rendering engine
 Name: freetype
 Version: 2.9.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement
 URL: http://www.freetype.org
 Source:  http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.tar.bz2
@@ -22,8 +22,6 @@ Patch3:  freetype-2.6.5-libtool.patch
 
 Patch4:  freetype-2.8-multilib.patch
 
-Patch5:  freetype-2.9-ftsmooth.patch
-
 BuildRequires:  gcc
 BuildRequires: libX11-devel
 BuildRequires: libpng-devel
@@ -79,7 +77,6 @@ popd
 
 %patch3 -p1 -b .libtool
 %patch4 -p1 -b .multilib
-%patch5 -p1 -b .ftsmooth
 
 %build
 
@@ -192,6 +189,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
 %{_mandir}/man1/*
 
 %changelog
+* Mon Apr 8 2019 Marek Kasik <mkasik@redhat.com> - 2.9.1-8
+- Remove freetype-2.9-ftsmooth.patch
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild