[prev in list] [next in list] [prev in thread] [next in thread] 

List:       macports-changes
Subject:    [114139] trunk/dports/gnome/libgnomeprint
From:       ryandesign () macports ! org
Date:       2013-11-30 10:14:48
Message-ID: 20131130101448.E2DDE140F22 () svn ! macports ! org
[Download RAW message or body]

[Attachment #2 (multipart/alternative)]


Revision: 114139
          https://trac.macports.org/changeset/114139
Author:   ryandesign@macports.org
Date:     2013-11-30 02:14:48 -0800 (Sat, 30 Nov 2013)
Log Message:
-----------
libgnomeprint: fix build with freetype 2.5.1 (#41613)

Modified Paths:
--------------
    trunk/dports/gnome/libgnomeprint/Portfile

Added Paths:
-----------
    trunk/dports/gnome/libgnomeprint/files/patch-freetype-2.5.1.diff

Modified: trunk/dports/gnome/libgnomeprint/Portfile
===================================================================
--- trunk/dports/gnome/libgnomeprint/Portfile	2013-11-30 09:17:59 UTC (rev 114138)
+++ trunk/dports/gnome/libgnomeprint/Portfile	2013-11-30 10:14:48 UTC (rev 114139)
@@ -39,6 +39,9 @@
 # https://bugzilla.gnome.org/show_bug.cgi?id=653388
 patchfiles      missing-stdio.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=719592
+patchfiles-append patch-freetype-2.5.1.diff
+
 configure.args  --disable-gtk-doc
 
 livecheck.type  gnome

Added: trunk/dports/gnome/libgnomeprint/files/patch-freetype-2.5.1.diff
===================================================================
--- trunk/dports/gnome/libgnomeprint/files/patch-freetype-2.5.1.diff	                        (rev 0)
+++ trunk/dports/gnome/libgnomeprint/files/patch-freetype-2.5.1.diff	2013-11-30 10:14:48 UTC (rev 114139)
@@ -0,0 +1,38 @@
+Fix build with freetype 2.5.1.
+https://bugzilla.gnome.org/show_bug.cgi?id=719592
+--- libgnomeprint/gnome-font-face.c.orig	2010-02-09 06:32:51.000000000 -0600
++++ libgnomeprint/gnome-font-face.c	2013-11-30 04:10:52.000000000 -0600
+@@ -36,7 +36,8 @@
+ #include <stdarg.h>
+ #include <locale.h>
+ 
+-#include <freetype/ftoutln.h>
++#include <ft2build.h>
++#include FT_OUTLINE_H
+ 
+ #include <libgnomeprint/gnome-print-private.h>
+ #include <libgnomeprint/gnome-font-private.h>
+--- libgnomeprint/gnome-print-gdi.c.orig	2010-02-09 06:32:51.000000000 -0600
++++ libgnomeprint/gnome-print-gdi.c	2013-11-30 04:10:07.000000000 -0600
+@@ -36,7 +36,7 @@
+ #include <libgnomeprint/gp-gc-private.h>
+ 
+ #include <ft2build.h>
+-#include <freetype/freetype.h>
++#include FT_FREETYPE_H
+ 
+ #define WIN32_LEAN_AND_MEAN
+ #include <windows.h>
+--- libgnomeprint/gnome-rfont.c.orig	2010-02-09 06:32:51.000000000 -0600
++++ libgnomeprint/gnome-rfont.c	2013-11-30 04:09:50.000000000 -0600
+@@ -28,8 +28,8 @@
+ 
+ #include <ft2build.h>
+ #include FT_FREETYPE_H
+-#include <freetype/ftglyph.h>
+-#include <freetype/ftbbox.h>
++#include FT_GLYPH_H
++#include FT_BBOX_H
+ #include <libart_lgpl/art_misc.h>
+ #include <libart_lgpl/art_affine.h>
+ #include <libart_lgpl/art_vpath.h>

[Attachment #5 (text/html)]

<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[114139] trunk/dports/gnome/libgnomeprint</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: \
verdana,arial,helvetica,sans-serif; font-size: 10pt;  } #msg dl a { font-weight: \
bold} #msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: \
bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: \
6px; } #logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em \
0; } #logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg \
h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } \
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; \
} #logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: \
-1.5em; padding-left: 1.5em; } #logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em \
1em 0 1em; background: white;} #logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid \
#fa0; border-bottom: 1px solid #fa0; background: #fff; } #logmsg table th { \
text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted \
#fa0; } #logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: \
0.2em 0.5em; } #logmsg table thead th { text-align: center; border-bottom: 1px solid \
#fa0; } #logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: \
6px; } #patch { width: 100%; }
#patch h4 {font-family: \
verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
 #patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, \
#patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins \
{background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del \
{background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, \
                .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a \
href="https://trac.macports.org/changeset/114139">114139</a></dd> <dt>Author</dt> \
<dd>ryandesign@macports.org</dd> <dt>Date</dt> <dd>2013-11-30 02:14:48 -0800 (Sat, 30 \
Nov 2013)</dd> </dl>

<h3>Log Message</h3>
<pre>libgnomeprint: fix build with freetype 2.5.1 (#41613)</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgnomelibgnomeprintPortfile">trunk/dports/gnome/libgnomeprint/Portfile</a></li>
 </ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgnomelibgnomeprintfilespatchfreetype251diff">trunk/dports/gnome/libgnomeprint/files/patch-freetype-2.5.1.diff</a></li>
 </ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgnomelibgnomeprintPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/libgnomeprint/Portfile (114138 \
=> 114139)</h4> <pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/libgnomeprint/Portfile	2013-11-30 09:17:59 \
                UTC (rev 114138)
+++ trunk/dports/gnome/libgnomeprint/Portfile	2013-11-30 10:14:48 UTC (rev 114139)
</span><span class="lines">@@ -39,6 +39,9 @@
</span><span class="cx"> # https://bugzilla.gnome.org/show_bug.cgi?id=653388
</span><span class="cx"> patchfiles      missing-stdio.patch
</span><span class="cx"> 
</span><ins>+# https://bugzilla.gnome.org/show_bug.cgi?id=719592
+patchfiles-append patch-freetype-2.5.1.diff
+
</ins><span class="cx"> configure.args  --disable-gtk-doc
</span><span class="cx"> 
</span><span class="cx"> livecheck.type  gnome
</span></span></pre></div>
<a id="trunkdportsgnomelibgnomeprintfilespatchfreetype251diff"></a>
<div class="addfile"><h4>Added: \
trunk/dports/gnome/libgnomeprint/files/patch-freetype-2.5.1.diff (0 => 114139)</h4> \
<pre class="diff"><span> <span class="info">--- \
trunk/dports/gnome/libgnomeprint/files/patch-freetype-2.5.1.diff	                     \
                (rev 0)
+++ trunk/dports/gnome/libgnomeprint/files/patch-freetype-2.5.1.diff	2013-11-30 \
10:14:48 UTC (rev 114139) </span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+Fix build with freetype 2.5.1.
+https://bugzilla.gnome.org/show_bug.cgi?id=719592
+--- libgnomeprint/gnome-font-face.c.orig	2010-02-09 06:32:51.000000000 -0600
++++ libgnomeprint/gnome-font-face.c	2013-11-30 04:10:52.000000000 -0600
+@@ -36,7 +36,8 @@
+ #include &lt;stdarg.h&gt;
+ #include &lt;locale.h&gt;
+ 
+-#include &lt;freetype/ftoutln.h&gt;
++#include &lt;ft2build.h&gt;
++#include FT_OUTLINE_H
+ 
+ #include &lt;libgnomeprint/gnome-print-private.h&gt;
+ #include &lt;libgnomeprint/gnome-font-private.h&gt;
+--- libgnomeprint/gnome-print-gdi.c.orig	2010-02-09 06:32:51.000000000 -0600
++++ libgnomeprint/gnome-print-gdi.c	2013-11-30 04:10:07.000000000 -0600
+@@ -36,7 +36,7 @@
+ #include &lt;libgnomeprint/gp-gc-private.h&gt;
+ 
+ #include &lt;ft2build.h&gt;
+-#include &lt;freetype/freetype.h&gt;
++#include FT_FREETYPE_H
+ 
+ #define WIN32_LEAN_AND_MEAN
+ #include &lt;windows.h&gt;
+--- libgnomeprint/gnome-rfont.c.orig	2010-02-09 06:32:51.000000000 -0600
++++ libgnomeprint/gnome-rfont.c	2013-11-30 04:09:50.000000000 -0600
+@@ -28,8 +28,8 @@
+ 
+ #include &lt;ft2build.h&gt;
+ #include FT_FREETYPE_H
+-#include &lt;freetype/ftglyph.h&gt;
+-#include &lt;freetype/ftbbox.h&gt;
++#include FT_GLYPH_H
++#include FT_BBOX_H
+ #include &lt;libart_lgpl/art_misc.h&gt;
+ #include &lt;libart_lgpl/art_affine.h&gt;
+ #include &lt;libart_lgpl/art_vpath.h&gt;
</ins></span></pre>
</div>
</div>

</body>
</html>



_______________________________________________
macports-changes mailing list
macports-changes@lists.macosforge.org
https://lists.macosforge.org/mailman/listinfo/macports-changes


[prev in list] [next in list] [prev in thread] [next in thread]

Configure | About | News | Add a list | Sponsored by KoreLogic