[packages/freetype1] fix build with gcc 10
atler
atler at pld-linux.org
Fri Nov 20 13:36:53 CET 2020
commit 61f6a48fa53d6adb6ab29bfc0f56549322dfa96a
Author: Jan Palus <atler at pld-linux.org>
Date: Fri Nov 20 13:35:17 2020 +0100
fix build with gcc 10
freetype1.spec | 2 ++
gcc10.patch | 38 ++++++++++++++++++++++++++++++++++++++
2 files changed, 40 insertions(+)
---
diff --git a/freetype1.spec b/freetype1.spec
index 447d287..3e1221e 100644
--- 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
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;
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/freetype1.git/commitdiff/61f6a48fa53d6adb6ab29bfc0f56549322dfa96a
More information about the pld-cvs-commit
mailing list