[114419] trunk/dports/textproc/lilypond-devel
ryandesign at macports.org
ryandesign at macports.org
Sat Dec 7 09:56:59 PST 2013
Revision: 114419
https://trac.macports.org/changeset/114419
Author: ryandesign at macports.org
Date: 2013-12-07 09:56:58 -0800 (Sat, 07 Dec 2013)
Log Message:
-----------
lilypond-devel: update to 2.17.96; 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-devel/Portfile
Added Paths:
-----------
trunk/dports/textproc/lilypond-devel/files/patch-freetype-2.5.1.diff
Modified: trunk/dports/textproc/lilypond-devel/Portfile
===================================================================
--- trunk/dports/textproc/lilypond-devel/Portfile 2013-12-07 17:29:06 UTC (rev 114418)
+++ trunk/dports/textproc/lilypond-devel/Portfile 2013-12-07 17:56:58 UTC (rev 114419)
@@ -5,7 +5,7 @@
name lilypond-devel
set my_name lilypond
-version 2.17.28
+version 2.17.96
set branch [join [lrange [split ${version} .] 0 1] .]
categories textproc
maintainers snc openmaintainer
@@ -22,8 +22,8 @@
platforms darwin
master_sites http://download.linuxaudio.org/lilypond/sources/v${branch}/
distname ${my_name}-${version}
-checksums rmd160 090c7c73ccf74a0aaa8d270517bbefbcd4e6695d \
- sha256 298a5c479ca07c3f2897a8dc13eb94ec97e948900417debb3e14351eb483db48
+checksums rmd160 b00cc6be07598d0cb28a0e0fb52b67472b00e3e1 \
+ sha256 c0dda829ebbe637ec9fee27c47928a2cc934a2b363e761040b0e04d9e4e97a3c
depends_build port:t1utils \
@@ -40,12 +40,14 @@
port:texlive-lang-cyrillic \
port:texlive-metapost \
port:dblatex \
- port:urw-fonts
-depends_run-append port:python27
+ port:urw-fonts \
+ port:libtool \
+ port:python27
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 \
@@ -83,7 +85,6 @@
--disable-documentation
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-devel/files/patch-freetype-2.5.1.diff
===================================================================
--- trunk/dports/textproc/lilypond-devel/files/patch-freetype-2.5.1.diff (rev 0)
+++ trunk/dports/textproc/lilypond-devel/files/patch-freetype-2.5.1.diff 2013-12-07 17:56:58 UTC (rev 114419)
@@ -0,0 +1,60 @@
+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/freetype.cc.orig
++++ lily/freetype.cc
+@@ -20,8 +20,8 @@
+ #include "freetype.hh"
+ #include "warn.hh"
+
+-#include <freetype/ftoutln.h>
+-#include <freetype/ftbbox.h>
++#include FT_OUTLINE_H
++#include FT_BBOX_H
+
+ FT_Library freetype2_library;
+
+--- 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/6fd544b9/attachment.html>
More information about the macports-changes
mailing list