[arch-commits] Commit in lilypond/repos (14 files)

Sergej Pupykin spupykin at nymeria.archlinux.org
Tue Mar 25 08:56:50 UTC 2014 

    Date: Tuesday, March 25, 2014 @ 09:56:50
  Author: spupykin
Revision: 108234

archrelease: copy trunk to community-i686, community-x86_64

Added:
  lilypond/repos/community-i686/PKGBUILD
    (from rev 108233, lilypond/trunk/PKGBUILD)
  lilypond/repos/community-i686/lilypond.install
    (from rev 108233, lilypond/trunk/lilypond.install)
  lilypond/repos/community-x86_64/PKGBUILD
    (from rev 108233, lilypond/trunk/PKGBUILD)
  lilypond/repos/community-x86_64/lilypond.install
    (from rev 108233, lilypond/trunk/lilypond.install)
Deleted:
  lilypond/repos/community-i686/PKGBUILD
  lilypond/repos/community-i686/lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch
  lilypond/repos/community-i686/lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch
  lilypond/repos/community-i686/lilypond.install
  lilypond/repos/community-i686/texlive-workaround.patch
  lilypond/repos/community-x86_64/PKGBUILD
  lilypond/repos/community-x86_64/lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch
  lilypond/repos/community-x86_64/lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch
  lilypond/repos/community-x86_64/lilypond.install
  lilypond/repos/community-x86_64/texlive-workaround.patch

------------------------------------------------------------------------------+
 /PKGBUILD                                                                    |  100 ++++++++++
 /lilypond.install                                                            |   96 +++++++++
 community-i686/PKGBUILD                                                      |   54 -----
 community-i686/lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch   |   29 --
 community-i686/lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch   |   63 ------
 community-i686/lilypond.install                                              |   48 ----
 community-i686/texlive-workaround.patch                                      |   88 --------
 community-x86_64/PKGBUILD                                                    |   54 -----
 community-x86_64/lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch |   29 --
 community-x86_64/lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch |   63 ------
 community-x86_64/lilypond.install                                            |   48 ----
 community-x86_64/texlive-workaround.patch                                    |   88 --------
 12 files changed, 196 insertions(+), 564 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2014-03-25 08:56:38 UTC (rev 108233)
+++ community-i686/PKGBUILD	2014-03-25 08:56:50 UTC (rev 108234)
@@ -1,54 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer: Geoffroy Carrier <geoffroy at archlinux.org>
-# Contributor: William Rea <sillywilly at gmail.com>
-# Contributor: Robert Emil Berge <filoktetes at linuxophic.org>
-
-pkgname=lilypond
-pkgver=2.18.0
-pkgrel=1
-pkgdesc="An automated music engraving system"
-arch=('i686' 'x86_64')
-url="http://lilypond.org"
-license=('GPL')
-depends=('guile1.8' 'python2' 'texlive-core' 'ghostscript' 'pango' 'fontconfig')
-makedepends=('flex' 'bison' 'gettext' 'mftrace' 'texinfo' 'fontforge' 't1utils'
-	     'gsfonts' 'texi2html')
-options=('emptydirs')
-#install=lilypond.install
-source=(http://download.linuxaudio.org/lilypond/sources/v2.18/$pkgname-$pkgver.tar.gz)
-md5sums=('5696fec935c616fb437693bed477cc27')
-
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # python2 fix
-  for file in $(find . -name '*.py' -print); do
-    sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file
-    sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
-  done
-
-  sed -i 's|GUILE_CFLAGS=.*|GUILE_CFLAGS="`pkg-config --cflags guile-1.8`"|' configure
-  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() {
-  cd "$srcdir/$pkgname-$pkgver"
-  export PYTHON=/usr/bin/python2
-  export GUILE=/usr/bin/guile1.8
-  export GUILE_CONFIG=/usr/bin/guile-config1.8
-  export LDFLAGS="$LDFLAGS -lpthread"
-  ./configure --prefix=/usr --disable-documentation
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" vimdir="/usr/share/vim/vimfiles" install
-}

Copied: lilypond/repos/community-i686/PKGBUILD (from rev 108233, lilypond/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2014-03-25 08:56:50 UTC (rev 108234)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: Geoffroy Carrier <geoffroy at archlinux.org>
+# Contributor: William Rea <sillywilly at gmail.com>
+# Contributor: Robert Emil Berge <filoktetes at linuxophic.org>
+
+pkgname=lilypond
+pkgver=2.18.2
+pkgrel=1
+pkgdesc="An automated music engraving system"
+arch=('i686' 'x86_64')
+url="http://lilypond.org"
+license=('GPL')
+depends=('guile1.8' 'python2' 'texlive-core' 'ghostscript' 'pango' 'fontconfig')
+makedepends=('flex' 'bison' 'gettext' 'mftrace' 'texinfo' 'fontforge' 't1utils'
+	     'gsfonts' 'texi2html')
+options=('emptydirs')
+install=lilypond.install
+source=(http://download.linuxaudio.org/lilypond/sources/v2.18/$pkgname-$pkgver.tar.gz)
+md5sums=('3c4bcbb708d12644668b32bfe82ebf25')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # python2 fix
+  for file in $(find . -name '*.py' -print); do
+    sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file
+    sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
+  done
+
+  sed -i 's|GUILE_CFLAGS=.*|GUILE_CFLAGS="`pkg-config --cflags guile-1.8`"|' configure
+  sed -i 's|GUILE_LDFLAGS=.*|GUILE_LDFLAGS="`pkg-config --libs guile-1.8`"|' configure
+
+  rm -rf lily/out/ python/out/
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  export PYTHON=/usr/bin/python2
+  export GUILE=/usr/bin/guile1.8
+  export GUILE_CONFIG=/usr/bin/guile-config1.8
+  export LDFLAGS="$LDFLAGS -lpthread"
+  ./configure --prefix=/usr --disable-documentation
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" vimdir="/usr/share/vim/vimfiles" install
+}

Deleted: community-i686/lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch
===================================================================
--- community-i686/lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch	2014-03-25 08:56:38 UTC (rev 108233)
+++ community-i686/lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch	2014-03-25 08:56:50 UTC (rev 108234)
@@ -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: community-i686/lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch
===================================================================
--- community-i686/lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch	2014-03-25 08:56:38 UTC (rev 108233)
+++ community-i686/lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch	2014-03-25 08:56:50 UTC (rev 108234)
@@ -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: community-i686/lilypond.install
===================================================================
--- community-i686/lilypond.install	2014-03-25 08:56:38 UTC (rev 108233)
+++ community-i686/lilypond.install	2014-03-25 08:56:50 UTC (rev 108234)
@@ -1,48 +0,0 @@
-infodir=usr/share/info
-filelist=(music-glossary.info
-	lilypond-web.info
-	lilypond-contributor.info
-	lilypond-contributor.info-1
-	lilypond-contributor.info-2
-	lilypond-internals.info-1
-	lilypond-internals.info-2
-	lilypond-internals.info-3
-	lilypond-internals.info-4
-	lilypond-internals.info-5
-	lilypond-notation.info-1
-	lilypond-notation.info-2
-	lilypond-notation.info-3
-	lilypond-notation.info-4
-	lilypond-notation.info-5
-	lilypond-notation.info-6
-	lilypond-usage.info
-	lilypond-learning.info
-	lilypond-web.info-1
-	lilypond-web.info-2
-	lilypond-internals.info
-	lilypond-essay.info
-	lilypond-notation.info
-	lilypond-learning.info-1
-	lilypond-learning.info-2
-	lilypond-extending.info
-	lilypond-changes.info)
-
-post_install() {
-  [[ -x usr/bin/install-info ]] || return 0
-  for file in "${filelist[@]}"; do
-    install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install "$1"
-}
-
-pre_remove() {
-  [[ -x usr/bin/install-info ]] || return 0
-  for file in "${filelist[@]}"; do
-    install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
-  done
-}
-
-# vim:set ts=2 sw=2 et:

Copied: lilypond/repos/community-i686/lilypond.install (from rev 108233, lilypond/trunk/lilypond.install)
===================================================================
--- community-i686/lilypond.install	                        (rev 0)
+++ community-i686/lilypond.install	2014-03-25 08:56:50 UTC (rev 108234)
@@ -0,0 +1,48 @@
+infodir=usr/share/info
+filelist=(music-glossary.info
+	lilypond-web.info
+	lilypond-contributor.info
+	lilypond-contributor.info-1
+	lilypond-contributor.info-2
+	lilypond-internals.info-1
+	lilypond-internals.info-2
+	lilypond-internals.info-3
+	lilypond-internals.info-4
+	lilypond-internals.info-5
+	lilypond-notation.info-1
+	lilypond-notation.info-2
+	lilypond-notation.info-3
+	lilypond-notation.info-4
+	lilypond-notation.info-5
+	lilypond-notation.info-6
+	lilypond-usage.info
+	lilypond-learning.info
+	lilypond-web.info-1
+	lilypond-web.info-2
+	lilypond-internals.info
+	lilypond-essay.info
+	lilypond-notation.info
+	lilypond-learning.info-1
+	lilypond-learning.info-2
+	lilypond-extending.info
+	lilypond-changes.info)
+
+post_install() {
+  [[ -x usr/bin/install-info ]] || return 0
+  for file in "${filelist[@]}"; do
+    install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install "$1"
+}
+
+pre_remove() {
+  [[ -x usr/bin/install-info ]] || return 0
+  for file in "${filelist[@]}"; do
+    install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
+  done
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: community-i686/texlive-workaround.patch
===================================================================
--- community-i686/texlive-workaround.patch	2014-03-25 08:56:38 UTC (rev 108233)
+++ community-i686/texlive-workaround.patch	2014-03-25 08:56:50 UTC (rev 108234)
@@ -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] }

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2014-03-25 08:56:38 UTC (rev 108233)
+++ community-x86_64/PKGBUILD	2014-03-25 08:56:50 UTC (rev 108234)
@@ -1,54 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer: Geoffroy Carrier <geoffroy at archlinux.org>
-# Contributor: William Rea <sillywilly at gmail.com>
-# Contributor: Robert Emil Berge <filoktetes at linuxophic.org>
-
-pkgname=lilypond
-pkgver=2.18.0
-pkgrel=1
-pkgdesc="An automated music engraving system"
-arch=('i686' 'x86_64')
-url="http://lilypond.org"
-license=('GPL')
-depends=('guile1.8' 'python2' 'texlive-core' 'ghostscript' 'pango' 'fontconfig')
-makedepends=('flex' 'bison' 'gettext' 'mftrace' 'texinfo' 'fontforge' 't1utils'
-	     'gsfonts' 'texi2html')
-options=('emptydirs')
-#install=lilypond.install
-source=(http://download.linuxaudio.org/lilypond/sources/v2.18/$pkgname-$pkgver.tar.gz)
-md5sums=('5696fec935c616fb437693bed477cc27')
-
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # python2 fix
-  for file in $(find . -name '*.py' -print); do
-    sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file
-    sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
-  done
-
-  sed -i 's|GUILE_CFLAGS=.*|GUILE_CFLAGS="`pkg-config --cflags guile-1.8`"|' configure
-  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() {
-  cd "$srcdir/$pkgname-$pkgver"
-  export PYTHON=/usr/bin/python2
-  export GUILE=/usr/bin/guile1.8
-  export GUILE_CONFIG=/usr/bin/guile-config1.8
-  export LDFLAGS="$LDFLAGS -lpthread"
-  ./configure --prefix=/usr --disable-documentation
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" vimdir="/usr/share/vim/vimfiles" install
-}

Copied: lilypond/repos/community-x86_64/PKGBUILD (from rev 108233, lilypond/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2014-03-25 08:56:50 UTC (rev 108234)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: Geoffroy Carrier <geoffroy at archlinux.org>
+# Contributor: William Rea <sillywilly at gmail.com>
+# Contributor: Robert Emil Berge <filoktetes at linuxophic.org>
+
+pkgname=lilypond
+pkgver=2.18.2
+pkgrel=1
+pkgdesc="An automated music engraving system"
+arch=('i686' 'x86_64')
+url="http://lilypond.org"
+license=('GPL')
+depends=('guile1.8' 'python2' 'texlive-core' 'ghostscript' 'pango' 'fontconfig')
+makedepends=('flex' 'bison' 'gettext' 'mftrace' 'texinfo' 'fontforge' 't1utils'
+	     'gsfonts' 'texi2html')
+options=('emptydirs')
+install=lilypond.install
+source=(http://download.linuxaudio.org/lilypond/sources/v2.18/$pkgname-$pkgver.tar.gz)
+md5sums=('3c4bcbb708d12644668b32bfe82ebf25')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # python2 fix
+  for file in $(find . -name '*.py' -print); do
+    sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file
+    sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
+  done
+
+  sed -i 's|GUILE_CFLAGS=.*|GUILE_CFLAGS="`pkg-config --cflags guile-1.8`"|' configure
+  sed -i 's|GUILE_LDFLAGS=.*|GUILE_LDFLAGS="`pkg-config --libs guile-1.8`"|' configure
+
+  rm -rf lily/out/ python/out/
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  export PYTHON=/usr/bin/python2
+  export GUILE=/usr/bin/guile1.8
+  export GUILE_CONFIG=/usr/bin/guile-config1.8
+  export LDFLAGS="$LDFLAGS -lpthread"
+  ./configure --prefix=/usr --disable-documentation
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" vimdir="/usr/share/vim/vimfiles" install
+}

Deleted: community-x86_64/lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch
===================================================================
--- community-x86_64/lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch	2014-03-25 08:56:38 UTC (rev 108233)
+++ community-x86_64/lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch	2014-03-25 08:56:50 UTC (rev 108234)
@@ -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: community-x86_64/lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch
===================================================================
--- community-x86_64/lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch	2014-03-25 08:56:38 UTC (rev 108233)
+++ community-x86_64/lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch	2014-03-25 08:56:50 UTC (rev 108234)
@@ -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: community-x86_64/lilypond.install
===================================================================
--- community-x86_64/lilypond.install	2014-03-25 08:56:38 UTC (rev 108233)
+++ community-x86_64/lilypond.install	2014-03-25 08:56:50 UTC (rev 108234)
@@ -1,48 +0,0 @@
-infodir=usr/share/info
-filelist=(music-glossary.info
-	lilypond-web.info
-	lilypond-contributor.info
-	lilypond-contributor.info-1
-	lilypond-contributor.info-2
-	lilypond-internals.info-1
-	lilypond-internals.info-2
-	lilypond-internals.info-3
-	lilypond-internals.info-4
-	lilypond-internals.info-5
-	lilypond-notation.info-1
-	lilypond-notation.info-2
-	lilypond-notation.info-3
-	lilypond-notation.info-4
-	lilypond-notation.info-5
-	lilypond-notation.info-6
-	lilypond-usage.info
-	lilypond-learning.info
-	lilypond-web.info-1
-	lilypond-web.info-2
-	lilypond-internals.info
-	lilypond-essay.info
-	lilypond-notation.info
-	lilypond-learning.info-1
-	lilypond-learning.info-2
-	lilypond-extending.info
-	lilypond-changes.info)
-
-post_install() {
-  [[ -x usr/bin/install-info ]] || return 0
-  for file in "${filelist[@]}"; do
-    install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install "$1"
-}
-
-pre_remove() {
-  [[ -x usr/bin/install-info ]] || return 0
-  for file in "${filelist[@]}"; do
-    install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
-  done
-}
-
-# vim:set ts=2 sw=2 et:

Copied: lilypond/repos/community-x86_64/lilypond.install (from rev 108233, lilypond/trunk/lilypond.install)
===================================================================
--- community-x86_64/lilypond.install	                        (rev 0)
+++ community-x86_64/lilypond.install	2014-03-25 08:56:50 UTC (rev 108234)
@@ -0,0 +1,48 @@
+infodir=usr/share/info
+filelist=(music-glossary.info
+	lilypond-web.info
+	lilypond-contributor.info
+	lilypond-contributor.info-1
+	lilypond-contributor.info-2
+	lilypond-internals.info-1
+	lilypond-internals.info-2
+	lilypond-internals.info-3
+	lilypond-internals.info-4
+	lilypond-internals.info-5
+	lilypond-notation.info-1
+	lilypond-notation.info-2
+	lilypond-notation.info-3
+	lilypond-notation.info-4
+	lilypond-notation.info-5
+	lilypond-notation.info-6
+	lilypond-usage.info
+	lilypond-learning.info
+	lilypond-web.info-1
+	lilypond-web.info-2
+	lilypond-internals.info
+	lilypond-essay.info
+	lilypond-notation.info
+	lilypond-learning.info-1
+	lilypond-learning.info-2
+	lilypond-extending.info
+	lilypond-changes.info)
+
+post_install() {
+  [[ -x usr/bin/install-info ]] || return 0
+  for file in "${filelist[@]}"; do
+    install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install "$1"
+}
+
+pre_remove() {
+  [[ -x usr/bin/install-info ]] || return 0
+  for file in "${filelist[@]}"; do
+    install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
+  done
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: community-x86_64/texlive-workaround.patch
===================================================================
--- community-x86_64/texlive-workaround.patch	2014-03-25 08:56:38 UTC (rev 108233)
+++ community-x86_64/texlive-workaround.patch	2014-03-25 08:56:50 UTC (rev 108234)
@@ -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