[114420] trunk/dports/textproc/lilypond

ryandesign at macports.org ryandesign at macports.org
Sat Dec 7 09:57:58 PST 2013


Revision: 114420
          https://trac.macports.org/changeset/114420
Author:   ryandesign at macports.org
Date:     2013-12-07 09:57:58 -0800 (Sat, 07 Dec 2013)
Log Message:
-----------
lilypond: add upstream patch to fix build with freetype 2.5.1 (#41719); make python27 a library dependency because it is also used at build time; add libtool dependency because it uses libltdl; remove unnecessary setting of configure.python to itself

Modified Paths:
--------------
    trunk/dports/textproc/lilypond/Portfile

Added Paths:
-----------
    trunk/dports/textproc/lilypond/files/patch-freetype-2.5.1.diff

Modified: trunk/dports/textproc/lilypond/Portfile
===================================================================
--- trunk/dports/textproc/lilypond/Portfile	2013-12-07 17:56:58 UTC (rev 114419)
+++ trunk/dports/textproc/lilypond/Portfile	2013-12-07 17:57:58 UTC (rev 114420)
@@ -39,8 +39,9 @@
                     port:t1utils \
                     port:texlive-metapost \
                     port:dblatex \
-                    port:urw-fonts
-depends_run-append  port:python27
+                    port:urw-fonts \
+                    port:libtool \
+                    port:python27
 
 # accidental-engraver.cc:508:1: error: cannot cast from type 'void (Accidental_engraver::*)()' to pointer type 'Translator_void_method_ptr' (aka 'void (*)(Translator *)')
 compiler.blacklist  *clang*
@@ -55,6 +56,7 @@
 configure.python    ${frameworks_dir}/Python.framework/Versions/2.7/bin/python2.7
 
 patchfiles          patch-scripts-build-mf2pt1.pl.diff
+patchfiles-append   patch-freetype-2.5.1.diff
 post-patch {
     reinplace s|__vector|lily_vector|g ${worksrcpath}/flower/include/std-vector.hh
     set files {Documentation/contributor/build-notes.itexi \
@@ -92,7 +94,6 @@
 
 configure.env       LTDL_LIBRARY_PATH=${prefix}/lib \
                     PYTHON_CONFIG=${configure.python}-config
-configure.python    ${configure.python}
 
 build.env           LTDL_LIBRARY_PATH=${prefix}/lib
 

Added: trunk/dports/textproc/lilypond/files/patch-freetype-2.5.1.diff
===================================================================
--- trunk/dports/textproc/lilypond/files/patch-freetype-2.5.1.diff	                        (rev 0)
+++ trunk/dports/textproc/lilypond/files/patch-freetype-2.5.1.diff	2013-12-07 17:57:58 UTC (rev 114420)
@@ -0,0 +1,47 @@
+Fix build with freetype 2.5.1.
+https://code.google.com/p/lilypond/issues/detail?id=3694
+http://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=commitdiff;h=fc455c4192d5c688a5728947c79a68e99b4de553
+--- lily/freetype-error.cc.orig
++++ lily/freetype-error.cc
+@@ -31,7 +31,7 @@ const struct Freetype_error_message
+   const char *err_msg;
+ } ft_errors[] =
+ 
+-#include <freetype/fterrors.h>
++#include FT_ERRORS_H
+ 
+   ;
+ 
+--- lily/open-type-font.cc.orig
++++ lily/open-type-font.cc
+@@ -23,7 +23,7 @@
+ 
+ using namespace std;
+ 
+-#include <freetype/tttables.h>
++#include FT_TRUETYPE_TABLES_H
+ 
+ #include "dimensions.hh"
+ #include "freetype.hh"
+--- lily/pango-font.cc.orig
++++ lily/pango-font.cc
+@@ -22,7 +22,7 @@
+ #define PANGO_ENABLE_BACKEND
+ 
+ #include <pango/pangoft2.h>
+-#include <freetype/ftxf86.h>
++#include FT_XFREE86_H
+ 
+ #include <map>
+ #include <cstdio>
+--- lily/ttf.cc.orig
++++ lily/ttf.cc
+@@ -20,7 +20,7 @@
+ #include <cstdio>
+ #include "freetype.hh"
+ 
+-#include <freetype/tttables.h>
++#include FT_TRUETYPE_TABLES_H
+ 
+ #include "international.hh"
+ #include "memory-stream.hh"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131207/9ab05d52/attachment.html>


More information about the macports-changes mailing list