[packages/ParaView/Paraview-3.14: 1/2] fix building with freetype 2.5.1

draenog draenog at pld-linux.org
Fri Aug 22 15:31:06 CEST 2014


commit 96c0a6b2efd036038b708072e7120b2c822985a7
Author: Kacper Kornet <draenog at pld-linux.org>
Date:   Fri Feb 14 19:53:42 2014 +0000

    fix building with freetype 2.5.1

 ParaView-freetype.patch | 11 +++++++++++
 ParaView.spec           |  2 ++
 2 files changed, 13 insertions(+)
---
diff --git a/ParaView.spec b/ParaView.spec
index d1cae5b..486012e 100644
--- a/ParaView.spec
+++ b/ParaView.spec
@@ -16,6 +16,7 @@ Patch3:         %{name}-kwprocessxml_rpath.patch
 Patch4:         %{name}-vtkboost.patch
 Patch5:		%{name}-vtk-use-system-libs.patch
 Patch6:		%{name}-vtknetcdf-lm.patch
+Patch7:		%{name}-freetype.patch
 BuildRequires:	Mesa-libOSMesa-devel
 BuildRequires:	QtDesigner-devel
 BuildRequires:	QtHelp-devel
@@ -89,6 +90,7 @@ developing applications that use %{name}.
 %patch4 -p1
 %patch5 -p0
 %patch6 -p1
+%patch7 -p0
 #Remove included hdf5 just to be sure
 rm -r VTK/Utilities/vtkhdf5
 
diff --git a/ParaView-freetype.patch b/ParaView-freetype.patch
new file mode 100644
index 0000000..830af62
--- /dev/null
+++ b/ParaView-freetype.patch
@@ -0,0 +1,11 @@
+--- VTK/CMake/FindFREETYPE.cmake~	2011-11-08 20:56:34.000000000 +0000
++++ VTK/CMake/FindFREETYPE.cmake	2014-02-16 03:22:58.280286297 +0000
+@@ -10,7 +10,7 @@
+ # also defined, but not for general use are
+ # FREETYPE_LIBRARY, where to find the FREETYPE library.
+ 
+-FIND_PATH(FREETYPE_INCLUDE_DIR_FT2BUILD ft2build.h)
++FIND_PATH(FREETYPE_INCLUDE_DIR_FT2BUILD freetype2/ft2build.h)
+ 
+ FIND_PATH(FREETYPE_INCLUDE_DIR_FTHEADER freetype/config/ftheader.h
+   /usr/include/freetype2
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ParaView.git/commitdiff/2fea872a767a9bfa4a93a9e990b6db228ad837d3



More information about the pld-cvs-commit mailing list