Attachment 913531 Details for Bug 1106066 – Fix FTBFS with freetype-2.5

[patch] Fix FTBFS with freetype-2.5

Fix-FTBFS-with-freetype-25-1106066.patch (text/plain), 2.63 KB, created by Yaakov Selkowitz on 2014-06-30 19:28:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yaakov Selkowitz

Created: 2014-06-30 19:28:31 UTC

Size: 2.63 KB

patch

obsolete

>From 3885c1c2ba896cd64162c71b92502632bfd47674 Mon Sep 17 00:00:00 2001
>From: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
>Date: Mon, 30 Jun 2014 14:28:04 -0500
>Subject: [PATCH] Fix FTBFS with freetype-2.5 (#1106066)
>
>---
> libprojectM-freetype25.patch | 33 +++++++++++++++++++++++++++++++++
> libprojectM.spec             |  8 +++++++-
> 2 files changed, 40 insertions(+), 1 deletion(-)
> create mode 100644 libprojectM-freetype25.patch
>
>diff --git a/libprojectM-freetype25.patch b/libprojectM-freetype25.patch
>new file mode 100644
>index 0000000..75fab00
>--- /dev/null
>+++ b/libprojectM-freetype25.patch
>@@ -0,0 +1,33 @@
>+--- a/cmake/FindFreetype2.cmake
>++++ b/cmake/FindFreetype2.cmake
>+@@ -67,13 +67,30 @@ FIND_PATH(FREETYPE2_INCLUDE_DIR freetype/config/ftheader.h
>+       NO_DEFAULT_PATH
>+ )
>+ 
>++if(NOT FREETYPE2_INCLUDE_DIR)
>++  FIND_PATH(FREETYPE2_INCLUDE_DIR config/ftheader.h
>++       ${ADDITIONAL_INCLUDE_PATH}
>++      /usr/include/freetype2
>++      /usr/X11/include/freetype2
>++      /usr/X11R6/include/freetype2
>++      /sw/include/freetype2
>++      ${VISUS_INCLUDE}/freetype2
>++      NO_DEFAULT_PATH
>++)
>++endif()
>++
>+ FIND_PATH(FREETYPE2_FT2BUILD ft2build.h
>+        ${ADDITIONAL_INCLUDE_PATH}
>+       /usr/include
>++      /usr/include/freetype2
>+       /usr/X11/include
>++      /usr/X11/include/freetype2
>+       /usr/X11R6/include
>++      /usr/X11R6/include/freetype2
>+       /sw/include
>++      /sw/include/freetype2
>+       ${VISUS_INCLUDE}
>++      ${VISUS_INCLUDE}/freetype2
>+       NO_DEFAULT_PATH
>+ )
>+ 
>diff --git a/libprojectM.spec b/libprojectM.spec
>index f57cade..eda2473 100644
>--- a/libprojectM.spec
>+++ b/libprojectM.spec
>@@ -1,6 +1,6 @@
> Name:		libprojectM
> Version:	2.0.1
>-Release:	22%{?dist}
>+Release:	23%{?dist}
> Summary:	The libraries for the projectM music visualization plugin
> Group:		Applications/Multimedia
> License:	LGPLv2+
>@@ -16,6 +16,8 @@ Patch2:		libprojectM-USE_THREADS.patch
> #Patches for clementine
> Patch3:		01-change-texture-size.patch
> Patch4:		04-change-preset-duration.patch
>+#Fix FTBFS with freetype-2.5
>+Patch5:		libprojectM-freetype25.patch
> 
> BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> BuildRequires:	ftgl-devel, cmake, glew-devel
>@@ -59,6 +61,7 @@ done
> %patch2 -p1
> %patch3 -p0
> %patch4 -p0
>+%patch5 -p1
> sed -i 's/\r//' ChangeLog
> 
> 
>@@ -92,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT
> %{_libdir}/pkgconfig/*.pc
> 
> %changelog
>+* Mon Jun 30 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 2.0.1-23
>+- Fix FTBFS with freetype-2.5 (#1106066)
>+
> * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.1-22
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
> 
>-- 
>1.9.3

Actions: View | Diff

Attachments on bug 1106066: 903783 | 903784 | 903785 | 913531