- updated ft2demos-includes patch

diff --git a/freetype.spec b/freetype.spec
index 5b458921f0ca5949785984fd33a9e45e19175a84..8141bf5459def9d0e0cd7f5175d22f0011845093 100644 (file)
--- a/freetype.spec
+++ b/freetype.spec
@@ -208,7 +208,7 @@ Programy demonstracyjne do biblioteki FreeType.
 %setup -q -a1 -a2
 %patch0 -p1
 cd ft2demos-%{version}
-%patch1 -p2
+%patch1 -p1
 cd ..
 
 # avoid propagating -L%{_libdir} through *.la

diff --git a/ft2demos-includes.patch b/ft2demos-includes.patch
index 12cc51f590df26d17d85524a56a94b890c6db97e..e21367630968829467729cccfa51378794bda964 100644 (file)
--- a/ft2demos-includes.patch
+++ b/ft2demos-includes.patch
@@ -1,5 +1,5 @@
---- freetype-2.7.1/ft2demos-2.7.1/Makefile.orig        2017-01-21 23:38:47.751279050 +0100
-+++ freetype-2.7.1/ft2demos-2.7.1/Makefile     2017-01-21 23:40:12.444611419 +0100
+--- 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)
@@ -10,6 +10,6 @@
                    $(CFLAGS) \
                    $(ANSIFLAGS) \
 -                  $(INCLUDES:%=$I%) \
+                   $DFT_CONFIG_OPTIONS_H="<ftoption.h>" \
                    $DFT_CONFIG_MODULES_H="<ftmodule.h>"
  
-   # Enable C99 for gcc to avoid warnings.