Attachment 910071 Details for Bug 1110872 – Patch for rawhide

[patch] Patch for rawhide

0001-Fix-detection-of-freetype-2.5-1110872.patch (text/plain), 2.28 KB, created by Yaakov Selkowitz on 2014-06-18 16:17:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yaakov Selkowitz

Created: 2014-06-18 16:17:12 UTC

Size: 2.28 KB

patch

obsolete

>From 84d96339d79930241cadd88a9f6b89e31385385b Mon Sep 17 00:00:00 2001
>From: Yaakov Selkowitz <yselkowi@redhat.com>
>Date: Wed, 18 Jun 2014 11:16:34 -0500
>Subject: [PATCH] Fix detection of freetype-2.5 (#1110872)
>
>---
> perl-Tk-freetype25.patch | 16 ++++++++++++++++
> perl-Tk.spec             | 10 +++++++++-
> 2 files changed, 25 insertions(+), 1 deletion(-)
> create mode 100644 perl-Tk-freetype25.patch
>
>diff --git a/perl-Tk-freetype25.patch b/perl-Tk-freetype25.patch
>new file mode 100644
>index 0000000..28a0ef4
>--- /dev/null
>+++ b/perl-Tk-freetype25.patch
>@@ -0,0 +1,16 @@
>+diff --git a/myConfig b/myConfig
>+index e0ace45..c0ae343 100755
>+--- a/myConfig
>++++ b/myConfig
>+@@ -147,9 +147,9 @@ sub Ift
>+ {
>+  foreach (map { "$_/freetype2" } @_)
>+   {
>+-   if (-d $_ && -d "$_/freetype" && -r "$_/freetype/freetype.h")
>++   if (-d $_ && -r "$_/freetype.h")
>+     {
>+-     print "Using -I$_ to find $_/freetype/freetype.h\n";
>++     print "Using -I$_ to find $_/freetype.h\n";
>+      return "-I$_";
>+     }
>+   }
>diff --git a/perl-Tk.spec b/perl-Tk.spec
>index e119b7b..df64325 100644
>--- a/perl-Tk.spec
>+++ b/perl-Tk.spec
>@@ -4,7 +4,7 @@
> Name:           perl-Tk
> # devel version fix for perl 5.14: 
> Version:        804.031
>-Release:        5%{?dist}
>+Release:        6%{?dist}
> Summary:        Perl Graphical User Interface ToolKit
> 
> Group:          Development/Libraries
>@@ -18,6 +18,9 @@ Patch1:         perl-Tk-debian.patch.gz
> Patch2:         perl-Tk-seg.patch
> # Detect system libpng properly, CPAN RT#86988
> Patch3:         Tk-804.031-Link-PNG-test-to-zlib.patch
>+# Fix freetype detection with 2.5
>+Patch4:         perl-Tk-freetype25.patch
>+
> 
> # Versions before this have Unicode issues
> BuildRequires:  perl-devel >= 3:5.8.3
>@@ -80,6 +83,8 @@ chmod -x pod/Popup.pod Tixish/lib/Tk/balArrow.xbm
> %patch2 -p1 -b .seg
> # CPAN RT #86988
> %patch3 -p1
>+# freetype-2.5 detection
>+%patch4 -p1
> 
> %build
> %{__perl} Makefile.PL INSTALLDIRS=vendor X11LIB=%{_libdir} XFT=1
>@@ -126,6 +131,9 @@ find __demos/ -type f -exec chmod -x {} \;
> 
> 
> %changelog
>+* Wed Jun 18 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 804.031-6
>+- Fix detection of freetype-2.5 (#1110872)
>+
> * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 804.031-5
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
> 
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1110872: 910071