Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (d925d28f76010a372975ab95859fca67ee694bf8)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (d925d28f76010a372975ab95859fca67ee694bf8)
  • Date: Sun, 14 Jan 2007 08:39:48 -0600

GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

audio-libs/lilypond/BUILD | 11 ++---------
audio-libs/lilypond/CONFIGURE | 17 -----------------
audio-libs/lilypond/DETAILS | 4 ++--
audio-libs/lilypond/HISTORY | 6 ++++++
devel/guile/HISTORY | 3 +++
devel/guile/PRE_BUILD | 3 +++
devel/guile/use-syntax.patch | 14 ++++++++++++++
7 files changed, 30 insertions(+), 28 deletions(-)

New commits:
commit d925d28f76010a372975ab95859fca67ee694bf8
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

lilypond: updates and fixes

commit 6f1cc5a931a38e96373e0a68f10216dc4e395265
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

guile: apply a patch, so lilypond is happy

diff --git a/audio-libs/lilypond/BUILD b/audio-libs/lilypond/BUILD
index e95107e..458cd65 100755
--- a/audio-libs/lilypond/BUILD
+++ b/audio-libs/lilypond/BUILD
@@ -1,13 +1,6 @@
sed -i '7326 s,num=`,ver='$(installed_version guile)'\n&,' configure &&
-./configure --build=$BUILD \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
---with-ncsb-dir=/usr/share/ghostscript/fonts \
- $OPTS &&
-
-
-make all &&
+OPTS="$OPTS --with-ncsb-dir=/usr/share/ghostscript/fonts" &&
+default_build &&

if [ $HTMLDOC == y ]
then
diff --git a/audio-libs/lilypond/CONFIGURE b/audio-libs/lilypond/CONFIGURE
index d54b81c..7621128 100755
--- a/audio-libs/lilypond/CONFIGURE
+++ b/audio-libs/lilypond/CONFIGURE
@@ -1,18 +1 @@
-if [ -f /etc/sorcery/local/depends/guile.p ]
-then
- . /etc/sorcery/local/depends/guile.p
-fi
-
-if [ "$G_18" = "y" ]
-then
- message "\n${MESSAGE_COLOR}" \
- "${SPELL} isn't released for guile 1.8, so it may not works\n\n"
-
- if ! query "Would you like to continue?" n;
- then
- message "${MESSAGE_COLOR}Please recast later!\n"
- return 1
- fi
-fi
-
config_query HTMLDOC "Use netpbm and imagemagick to build html documentation
?" y
diff --git a/audio-libs/lilypond/DETAILS b/audio-libs/lilypond/DETAILS
index 0fce83d..bedcfa3 100755
--- a/audio-libs/lilypond/DETAILS
+++ b/audio-libs/lilypond/DETAILS
@@ -1,11 +1,11 @@
SPELL=lilypond
- VERSION=2.10.8
+ VERSION=2.10.11
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=http://download.linuxaudio.org/lilypond/sources/v${VERSION%.*}/$SOURCE
WEB_SITE=http://lilypond.org/web
ENTERED=20050210
-
SOURCE_HASH=sha512:977655300c10b54b9afec686f1d085b6f20902bb709660feb709b1af579d1070f5a38f78ff2fd78653407e15b32da68956b80b34282204876d7fc19da1769de7
+
SOURCE_HASH=sha512:19e611b9482db5915f106d83be5fae4dbe2942696af0929d66f051a3859628ba7fc6276c9d612b42552902300a2cdcd085a4442fc1d052afa7e613894bd2e3cc
LICENSE[0]=GPL
KEYWORDS="music audio libs"
SHORT="Format music notation beautifully"
diff --git a/audio-libs/lilypond/HISTORY b/audio-libs/lilypond/HISTORY
index 7a9820e..e80fde6 100644
--- a/audio-libs/lilypond/HISTORY
+++ b/audio-libs/lilypond/HISTORY
@@ -1,3 +1,9 @@
+2007-01-14 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DETAILS: updated to 2.10.11
+ * BUILD: specify path to the fonts, simplify to fix man/info install
paths
+ * DEPENDS: cleaned up
+ * CONFIGURE: removed the guile 1.8 warning/queries
+
2006-10-11 Maurizio Boriani <baux AT sourcemage.org>
* CONFIGURE: Add warning about guile major update.

diff --git a/devel/guile/HISTORY b/devel/guile/HISTORY
index 2d79618..afea734 100644
--- a/devel/guile/HISTORY
+++ b/devel/guile/HISTORY
@@ -1,3 +1,6 @@
+2007-01-14 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * PRE_BUILD, use-syntax.patch: fixes guile for lilypond
+
2006-11-15 Pol Vinogradov <vin.public AT gmail.com>
* DEPENDS: made gmp dependency optional, builds fine without this
* BUILD: install_rootifying
diff --git a/devel/guile/PRE_BUILD b/devel/guile/PRE_BUILD
new file mode 100755
index 0000000..5b76326
--- /dev/null
+++ b/devel/guile/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SPELL_DIRECTORY/use-syntax.patch
diff --git a/devel/guile/use-syntax.patch b/devel/guile/use-syntax.patch
new file mode 100644
index 0000000..2ff93d5
--- /dev/null
+++ b/devel/guile/use-syntax.patch
@@ -0,0 +1,14 @@
+--- ice-9/boot-9.scm 2007/01/13 21:34:01 1.1
++++ ice-9/boot-9.scm 2007/01/13 21:34:22
+@@ -1768,9 +1768,9 @@
+ (let* ((interface-args (cadr kws))
+ (interface (apply resolve-interface interface-args)))
+ (and (eq? (car kws) #:use-syntax)
+- (or (symbol? (car interface-args))
++ (or (symbol? (caar interface-args))
+ (error "invalid module name for use-syntax"
+- interface-args))
++ (car interface-args)))
+ (set-module-transformer!
+ module
+ (module-ref interface (car



  • [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (d925d28f76010a372975ab95859fca67ee694bf8), Jaka Kranjc, 01/14/2007

Archive powered by MHonArc 2.6.24.

Top of Page