fix build with gcc 10

diff --git a/freetype1.spec b/freetype1.spec
index 447d287c4db54b7a0585701fc31f8382549f4a6f..3e1221ec4f470a241fa47b749ac99df43d37b76d 100644 (file)
--- a/freetype1.spec
+++ b/freetype1.spec
@@ -20,6 +20,7 @@ Patch3:               freetype-gcc33.patch
 Patch4:                %{name}-parallel-make.patch
 Patch5:                %{name}-link.patch
 Patch6:                format-security.patch
+Patch7:                gcc10.patch
 URL:           http://freetype.sourceforge.net/freetype1/index.html
 BuildRequires: autoconf
 BuildRequires: automake
@@ -125,6 +126,7 @@ Przykładowe aplikacje wykorzystujące freetype:
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 install /usr/share/automake/missing .

diff --git a/gcc10.patch b/gcc10.patch
new file mode 100644 (file)
index 0000000..91ff9f9
--- /dev/null
+++ b/gcc10.patch
@@ -0,0 +1,38 @@
+diff -ur freetype-1.3.1.orig/test/ftzoom.c freetype-1.3.1/test/ftzoom.c
+--- freetype-1.3.1.orig/test/ftzoom.c  1999-10-04 21:02:42.000000000 +0000
++++ freetype-1.3.1/test/ftzoom.c       2020-11-20 12:26:09.927974616 +0000
+@@ -58,6 +58,7 @@
+ #include <string.h>
+ 
+ #include "common.h"  /* for Panic() only */
++#include "display.h"
+ #include "freetype.h"
+ #include "ftxpost.h"
+ 
+@@ -105,7 +106,6 @@
+   int        xoffset;
+   int        yoffset;
+ 
+-  TT_Raster_Map  Bit;
+ 
+   int  Fail;
+   int  Num;
+--- freetype-1.3.1.orig/test/fttimer.c 1999-08-23 12:57:44.000000000 +0000
++++ freetype-1.3.1/test/fttimer.c      2020-11-20 12:31:46.829150299 +0000
+@@ -24,6 +24,7 @@
+ #include <string.h>
+ 
+ #include "common.h"  /* for Panic() */
++#include "display.h"
+ #include "freetype.h"
+ 
+ #include "gdriver.h"
+@@ -74,8 +75,6 @@
+   int             cur_point;
+   unsigned short  cur_contour;
+ 
+-  TT_Raster_Map  Bit;
+-
+   int  Fail;
+   int  Num;
+