[arch-commits] Commit in lilypond/trunk (4 files)
Sergej Pupykin
spupykin at nymeria.archlinux.org
Tue Mar 25 08:56:38 UTC 2014
Date: Tuesday, March 25, 2014 @ 09:56:38
Author: spupykin
Revision: 108233
upgpkg: lilypond 2.18.2-1
upd
Modified:
lilypond/trunk/PKGBUILD
Deleted:
lilypond/trunk/lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch
lilypond/trunk/lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch
lilypond/trunk/texlive-workaround.patch
-------------------------------------------------------------+
PKGBUILD | 10 -
lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch | 29 ---
lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch | 63 -------
texlive-workaround.patch | 88 ----------
4 files changed, 3 insertions(+), 187 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-03-25 08:56:33 UTC (rev 108232)
+++ PKGBUILD 2014-03-25 08:56:38 UTC (rev 108233)
@@ -5,7 +5,7 @@
# Contributor: Robert Emil Berge <filoktetes at linuxophic.org>
pkgname=lilypond
-pkgver=2.18.0
+pkgver=2.18.2
pkgrel=1
pkgdesc="An automated music engraving system"
arch=('i686' 'x86_64')
@@ -15,9 +15,9 @@
makedepends=('flex' 'bison' 'gettext' 'mftrace' 'texinfo' 'fontforge' 't1utils'
'gsfonts' 'texi2html')
options=('emptydirs')
-#install=lilypond.install
+install=lilypond.install
source=(http://download.linuxaudio.org/lilypond/sources/v2.18/$pkgname-$pkgver.tar.gz)
-md5sums=('5696fec935c616fb437693bed477cc27')
+md5sums=('3c4bcbb708d12644668b32bfe82ebf25')
prepare() {
cd "$srcdir/$pkgname-$pkgver"
@@ -32,10 +32,6 @@
sed -i 's|GUILE_LDFLAGS=.*|GUILE_LDFLAGS="`pkg-config --libs guile-1.8`"|' configure
rm -rf lily/out/ python/out/
-
- # Fix build
-# patch -Np1 -i "$srcdir/lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch"
-# patch -Np1 -i "$srcdir/lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch"
}
build() {
Deleted: lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch
===================================================================
--- lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch 2014-03-25 08:56:33 UTC (rev 108232)
+++ lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch 2014-03-25 08:56:38 UTC (rev 108233)
@@ -1,29 +0,0 @@
-From: Julien Rioux <julien.rioux at gmail.com>
-Date: Mon, 28 Oct 2013 20:42:43 +0000 (+0100)
-Subject: Build: Fix compilation with GNU make 4.0
-X-Git-Tag: release/2.17.95-1~4^2
-X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=commitdiff_plain;h=1ca9814191d16fd3c571d93035247db039254fc1;hp=025f0236ebab947e6fe2047f20b7f74f4cec3fc4
-
-Build: Fix compilation with GNU make 4.0
-
-Fix "recipes commence before first target" error.
-
-Patch from Thomas Klausner.
----
-
-diff --git a/stepmake/stepmake/po-targets.make b/stepmake/stepmake/po-targets.make
-index 8919dab..8a0dd76 100644
---- a/stepmake/stepmake/po-targets.make
-+++ b/stepmake/stepmake/po-targets.make
-@@ -37,10 +37,10 @@ ifneq ($(strip $(ALL_PO_SOURCES)),)
- --keyword=_ --keyword=_f --keyword=_i \
- $(XGETTEXT_FLAGS) $(ALL_PO_SOURCES)
- endif
--endif
- sed -i '1,2d' $(po-outdir)/$(package).po
- sed -i -e 's/^\# This file is distributed.*/$(sed-header)/' $(po-outdir)/$(package).po
- sed -i -e 's/^\"Content-Type: text\/plain.*/$(sed-content)/' $(po-outdir)/$(package).po
-+endif
-
-
- po-update: po
Deleted: lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch
===================================================================
--- lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch 2014-03-25 08:56:33 UTC (rev 108232)
+++ lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch 2014-03-25 08:56:38 UTC (rev 108233)
@@ -1,63 +0,0 @@
-From: Werner Lemberg <wl at gnu.org>
-Date: Thu, 5 Dec 2013 14:01:48 +0000 (+0100)
-Subject: Issue 3694: Use standard inclusion scheme for FreeType headers.
-X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=commitdiff_plain;h=7705e46966bfa05015fb9fb20c68da844ab88028;hp=88435714e762229ebe2715bcf6863eb89c1f8dff
-
-Issue 3694: Use standard inclusion scheme for FreeType headers.
-
-The most recent FreeType release (2.5.1) has changed locations for header
-files. Using the standard way, this is not visible to applications.
----
-
-diff --git a/lily/freetype-error.cc b/lily/freetype-error.cc
-index 00e5cae..88af76c 100644
---- a/lily/freetype-error.cc
-+++ b/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
-
- ;
-
-diff --git a/lily/open-type-font.cc b/lily/open-type-font.cc
-index df6a744..837a1f2 100644
---- a/lily/open-type-font.cc
-+++ b/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"
-diff --git a/lily/pango-font.cc b/lily/pango-font.cc
-index ee986fc..b148a5b 100644
---- a/lily/pango-font.cc
-+++ b/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>
-diff --git a/lily/ttf.cc b/lily/ttf.cc
-index eaeb67a..6d7f97b 100644
---- a/lily/ttf.cc
-+++ b/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"
Deleted: texlive-workaround.patch
===================================================================
--- texlive-workaround.patch 2014-03-25 08:56:33 UTC (rev 108232)
+++ texlive-workaround.patch 2014-03-25 08:56:38 UTC (rev 108233)
@@ -1,88 +0,0 @@
-diff --git a/mf/feta-autometric.mf b/mf/feta-autometric.mf
-index d5cbb7f..b25c4bc 100644
---- a/mf/feta-autometric.mf
-+++ b/mf/feta-autometric.mf
-@@ -149,7 +149,6 @@ def set_char_box (expr b_sharp, w_sharp, d_sharp, h_sharp) =
- & to_bp (w) & " "
- & to_bp (h);
- special "% MF2PT1: font_size " & decimal designsize;
-- special "% MF2PT1: font_slant " & decimal font_slant_;
-
- for fvar = "font_identifier",
- "font_coding_scheme",
-@@ -175,9 +174,6 @@ def set_char_box (expr b_sharp, w_sharp, d_sharp, h_sharp) =
- fi;
- endfor;
-
-- special "% MF2PT1: font_fixed_pitch "
-- & (if font_fixed_pitch_: "1" else: "0" fi);
--
- % this must come after the `font_size' special
- special "% MF2PT1: charwd " & decimal charwd;
- fi;
-diff --git a/mf/mf2pt1.mp b/mf/mf2pt1.mp
-index a8b45aa..c935628 100644
---- a/mf/mf2pt1.mp
-+++ b/mf/mf2pt1.mp
-@@ -61,7 +61,6 @@ def beginchar(expr c,w_sharp,h_sharp,d_sharp) =
- def to_bp (expr num) = decimal (ceiling (num*bp_per_pixel)) enddef;
- special "% MF2PT1: glyph_dimensions 0 " & to_bp (-d) & " " & to_bp(w) & " " & to_bp(h);
- special "% MF2PT1: font_size " & decimal designsize;
-- special "% MF2PT1: font_slant " & decimal font_slant_;
- special "% MF2PT1: charwd " & decimal charwd; % Must come after the |font_size| |special|
- for fvar = "font_identifier", "font_coding_scheme", "font_version",
- "font_comment", "font_family", "font_weight", "font_unique_id",
-@@ -76,8 +75,6 @@ def beginchar(expr c,w_sharp,h_sharp,d_sharp) =
- scantokens ("decimal " & fvar & "_");
- fi;
- endfor;
-- special "% MF2PT1: font_fixed_pitch " &
-- (if font_fixed_pitch_: "1" else: "0" fi);
- enddef;
-
-
-@@ -91,19 +88,6 @@ enddef;
-
-
- %% \begin{explaincode}
--%% Store the value of \mfcomment
--% |font_slant_|, so we can recall it at each |beginchar|.
--%% \end{explaincode}
--
--font_slant_ := 0;
--
--def font_slant expr x =
-- font_slant_ := x;
-- fontdimen 1: x
--enddef;
--
--
--%% \begin{explaincode}
- %% Redefine \mfcomment
- % |bpppix_|, the number of ``big'' points per pixel. \mfcomment
- % This in turn redefines |mm|, |in|, |pt|, and other derived units.
-@@ -141,11 +125,6 @@ forsuffixes fvar = font_underline_position, font_underline_thickness:
- scantokens ("def " & str fvar & " expr x = " & str fvar & "_ := x enddef;");
- endfor;
-
--boolean font_fixed_pitch_;
--font_fixed_pitch_ := false;
--def font_fixed_pitch expr x = font_fixed_pitch_ := x enddef;
--
--
- %% \begin{explaincode}
- %% We'd like to be able to use calligraphic pens. Normally, MetaPost's
- %% output routine does all the work for us of converting these to filled
-diff --git a/scripts/build/mf2pt1.pl b/scripts/build/mf2pt1.pl
-index 95df0f8..20f410b 100644
---- a/scripts/build/mf2pt1.pl
-+++ b/scripts/build/mf2pt1.pl
-@@ -427,7 +427,7 @@ ENDHEADER
- sub get_bboxes ($)
- {
- execute_command 1, ("mpost", "-mem=mf2pt1", "-progname=mpost",
-- "\\mode:=localfont; mag:=$mag; bpppix $bpppix; input $mffile");
-+ "\\mode:=localfont; mag:=$mag; bpppix:=$bpppix; input $mffile");
- opendir (CURDIR, ".") || die "${progname}: $! ($filedir)\n";
- @charfiles = sort
- { ($a=~ /\.(\d+)$/)[0] <=> ($b=~ /\.(\d+)$/)[0] }
More information about the arch-commits
mailing list