up to 2.10.3

- ft2demos-includes patch no longer necessary

diff --git a/freetype.spec b/freetype.spec
index 1ee3770758260a2c70ae9892dda3f89079ebba9f..a6c64f4aa6a18fc5637ea04c91fc2904a30d1966 100644 (file)
--- a/freetype.spec
+++ b/freetype.spec
@@ -18,19 +18,18 @@ Summary(pt_BR.UTF-8):       Biblioteca de renderização de fontes TrueType
 Summary(ru.UTF-8):     Растеризатор шрифтов TrueType
 Summary(uk.UTF-8):     Растеризатор шрифтів TrueType
 Name:          freetype
-Version:       2.10.2
+Version:       2.10.3
 Release:       1
 Epoch:         1
 License:       GPL v2 or FTL
 Group:         Libraries
 Source0:       http://download.savannah.gnu.org/releases/freetype/%{name}-%{version}.tar.xz
-# Source0-md5: 7c0d5a39f232d7eb9f9d7da76bf08074
+# Source0-md5: b181a5e303456c19fafca2e4aac4350a
 Source1:       http://download.savannah.gnu.org/releases/freetype/%{name}-doc-%{version}.tar.xz
-# Source1-md5: 836b03f8741d9af50d24d3cdaea6f1e9
+# Source1-md5: 62884ce0ade15cc26ce70b5901de4177
 Source2:       http://download.savannah.gnu.org/releases/freetype/ft2demos-%{version}.tar.xz
-# Source2-md5: 972a0691714998d538877a7274322421
+# Source2-md5: ac549fac4d693da944a47af1e5500250
 Patch0:                %{name}-2.2.1-enable-valid.patch
-Patch1:                ft2demos-includes.patch
 URL:           http://www.freetype.org/
 BuildRequires: automake
 BuildRequires: bzip2-devel
@@ -215,9 +214,6 @@ Programy demonstracyjne do biblioteki FreeType.
 %prep
 %setup -q -a1 -a2
 %patch0 -p1
-cd ft2demos-%{version}
-%patch1 -p1
-cd ..
 
 # avoid propagating -L%{_libdir} through *.la
 %{__sed} -i -e 's,libpng-config --ldflags,libpng-config --libs,' builds/unix/configure

diff --git a/ft2demos-includes.patch b/ft2demos-includes.patch
deleted file mode 100644 (file)
index 5ebd6af..0000000
--- a/ft2demos-includes.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- ft2demos-2.10.1/Makefile.orig      2019-07-02 17:26:30.444954351 +0200
-+++ ft2demos-2.10.1/Makefile   2019-07-02 18:17:59.171554616 +0200
-@@ -127,10 +127,10 @@
-                  $(TOP_DIR)/include \
-                  $(SRC_DIR)
- 
--  COMPILE = $(CC) $(CPPFLAGS) \
-+  COMPILE = $(CC) $(INCLUDES:%=$I%) \
-+                  $(CPPFLAGS) \
-                   $(CFLAGS) \
-                   $(ANSIFLAGS) \
--                  $(INCLUDES:%=$I%)
- 
-   # Enable C99 for gcc to avoid warnings.
-