Hello community, here is the log from the commit of package lilypond for openSUSE:Factory checked in at 2013-12-13 11:58:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lilypond (Old) and /work/SRC/openSUSE:Factory/.lilypond.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lilypond" Changes: -------- --- /work/SRC/openSUSE:Factory/lilypond/lilypond.changes 2013-11-26 19:19:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.lilypond.new/lilypond.changes 2013-12-13 11:58:28.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Dec 11 19:39:03 UTC 2013 - [email protected] + +- Added use-recommended-freetype-include.patch -- Freetype upstream + recommends using their macros together with ft2build include. + Positive sideeffect is that this patch makes it build with both + freetype2 2.5.1, and older version + +------------------------------------------------------------------- New: ---- use-recommended-freetype-include.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lilypond.spec ++++++ --- /var/tmp/diff_new_pack.djDZFD/_old 2013-12-13 11:58:29.000000000 +0100 +++ /var/tmp/diff_new_pack.djDZFD/_new 2013-12-13 11:58:29.000000000 +0100 @@ -30,6 +30,9 @@ Url: http://www.lilypond.org Source0: http://download.linuxaudio.org/lilypond/sources/v%{ver}/lilypond-%{version}.tar.gz +# PATCH-FIX-UPSTREAM use-recommended-freetype-include.patch -- Freetype upstream recommends using their macros together with +# ft2build include. Positive sideeffect is that this patch makes it build with both freetype2 2.5.1, and older versions +Patch0: use-recommended-freetype-include.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: ghostscript >= 8.15 @@ -116,6 +119,7 @@ %prep %setup -q +%patch0 -p1 %build %configure --without-kpathsea --disable-checking \ ++++++ use-recommended-freetype-include.patch ++++++ diff -Naur lilypond-2.17.96.orig/lily/freetype.cc lilypond-2.17.96/lily/freetype.cc --- lilypond-2.17.96.orig/lily/freetype.cc 2013-11-24 13:24:16.000000000 +0100 +++ lilypond-2.17.96/lily/freetype.cc 2013-12-11 20:41:55.046315034 +0100 @@ -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; diff -Naur lilypond-2.17.96.orig/lily/freetype-error.cc lilypond-2.17.96/lily/freetype-error.cc --- lilypond-2.17.96.orig/lily/freetype-error.cc 2013-11-24 13:24:16.000000000 +0100 +++ lilypond-2.17.96/lily/freetype-error.cc 2013-12-11 20:41:55.045315047 +0100 @@ -31,7 +31,7 @@ const char *err_msg; } ft_errors[] = -#include <freetype/fterrors.h> +#include FT_ERRORS_H ; diff -Naur lilypond-2.17.96.orig/lily/include/freetype.hh lilypond-2.17.96/lily/include/freetype.hh --- lilypond-2.17.96.orig/lily/include/freetype.hh 2013-11-24 13:24:16.000000000 +0100 +++ lilypond-2.17.96/lily/include/freetype.hh 2013-12-11 20:42:58.779518259 +0100 @@ -20,6 +20,7 @@ #ifndef FREETYPE_HH #define FREETYPE_HH +// This include file loads the header file macros for FreeType. #include <ft2build.h> #include FT_FREETYPE_H diff -Naur lilypond-2.17.96.orig/lily/open-type-font.cc lilypond-2.17.96/lily/open-type-font.cc --- lilypond-2.17.96.orig/lily/open-type-font.cc 2013-11-24 13:24:16.000000000 +0100 +++ lilypond-2.17.96/lily/open-type-font.cc 2013-12-11 20:43:39.799005445 +0100 @@ -18,12 +18,13 @@ */ #include "open-type-font.hh" +#include "freetype.hh" #include <cstdio> using namespace std; -#include <freetype/tttables.h> +#include FT_TRUETYPE_TABLES_H #include "dimensions.hh" #include "freetype.hh" diff -Naur lilypond-2.17.96.orig/lily/pango-font.cc lilypond-2.17.96/lily/pango-font.cc --- lilypond-2.17.96.orig/lily/pango-font.cc 2013-11-24 13:24:16.000000000 +0100 +++ lilypond-2.17.96/lily/pango-font.cc 2013-12-11 20:44:05.625682567 +0100 @@ -22,7 +22,8 @@ #define PANGO_ENABLE_BACKEND #include <pango/pangoft2.h> -#include <freetype/ftxf86.h> +#include "freetype.hh" +#include FT_XFREE86_H #include <map> #include <cstdio> diff -Naur lilypond-2.17.96.orig/lily/ttf.cc lilypond-2.17.96/lily/ttf.cc --- lilypond-2.17.96.orig/lily/ttf.cc 2013-11-24 13:24:16.000000000 +0100 +++ lilypond-2.17.96/lily/ttf.cc 2013-12-11 20:41:55.053314947 +0100 @@ -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" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
