[packages/freetype] - updated ft2demos-includes patch

qboosh qboosh at pld-linux.org
Tue Jul 2 18:20:39 CEST 2019


commit 15a0db77767ce3ae2333495ec2afc5b0011eab62
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Jul 2 18:22:05 2019 +0200

    - updated ft2demos-includes patch

 freetype.spec           | 2 +-
 ft2demos-includes.patch | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/freetype.spec b/freetype.spec
index 5b45892..8141bf5 100644
--- 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 12cc51f..e213676 100644
--- 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.
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/freetype.git/commitdiff/15a0db77767ce3ae2333495ec2afc5b0011eab62



More information about the pld-cvs-commit mailing list