Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (b668e0bb440d12248463446c31904fa6eedc4a80)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (b668e0bb440d12248463446c31904fa6eedc4a80)
  • Date: Fri, 14 Apr 2017 19:12:53 +0000

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

audio-libs/lilypond/0001-use-guile-config1.patch | 20 ++++++++++++--------
audio-libs/lilypond/DETAILS | 4 ++--
audio-libs/lilypond/HISTORY | 4 ++++
3 files changed, 18 insertions(+), 10 deletions(-)

New commits:
commit b668e0bb440d12248463446c31904fa6eedc4a80
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

audio-libs/lilypond: version 2.19.59

diff --git a/audio-libs/lilypond/0001-use-guile-config1.patch
b/audio-libs/lilypond/0001-use-guile-config1.patch
index cacee35..c90740b 100644
--- a/audio-libs/lilypond/0001-use-guile-config1.patch
+++ b/audio-libs/lilypond/0001-use-guile-config1.patch
@@ -1,6 +1,6 @@
-From b0b88595db1e8bd44f83dbbdf0a8e0b008ec51d1 Mon Sep 17 00:00:00 2001
+From e7a117a8e30e15d3db845e12131bfdd8244b4799 Mon Sep 17 00:00:00 2001
From: Florian Franzmann <bwlf AT bandrate.org>
-Date: Wed, 25 Jan 2017 21:43:01 +0100
+Date: Fri, 14 Apr 2017 17:40:18 +0200
Subject: [PATCH] use guile-config1

---
@@ -8,10 +8,10 @@ Subject: [PATCH] use guile-config1
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
-index c9f0093..937916f 100644
+index bd41673..bf8c2f5 100644
--- a/aclocal.m4
+++ b/aclocal.m4
-@@ -640,12 +640,12 @@ AC_DEFUN([STEPMAKE_GUILE_FLAGS], [
+@@ -653,16 +653,16 @@ AC_DEFUN([STEPMAKE_GUILE_FLAGS], [
# If missing, add entry to missing-list ($1, one of 'OPTIONAL', 'REQUIRED')
AC_DEFUN(STEPMAKE_GUILE_DEVEL, [
## First, let's just see if we can find Guile at all.
@@ -23,11 +23,15 @@ index c9f0093..937916f 100644
- guile_config="guile-config"
+ guile_config="guile-config1"
found="no"
-- for r in $GUILE_CONFIG $target_guile_config $host_guile_config
$build_guile_config guile-config guile2-config guile2.0-config
guile-2.0-config guile1-config guile1.9-config guile1.8-config guile-1-config
guile-1.9-config guile-1.8-config; do
-+ for r in $GUILE_CONFIG $target_guile_config $host_guile_config
$build_guile_config guile-config guile2-config guile2.0-config
guile-2.0-config guile1-config guile1.9-config guile1.8-config guile-1-config
guile-1.9-config guile-1.8-config guile-config1; do
+ for r in $GUILE_CONFIG \
+ $target_guile_config $host_guile_config $build_guile_config \
+ guile-config guile-2.2-config guile2.2-config guile2-config \
+ guile2.0-config guile-2.0-config guile1-config guile1.9-config \
+- guile1.8-config guile-1-config guile-1.9-config guile-1.8-config; \
++ guile1.8-config guile-1-config guile-1.9-config guile-1.8-config
guile-config1; \
+ do
exe=`STEPMAKE_GET_EXECUTABLE($r)`
if ! $exe --version > /dev/null 2>&1 ; then
- continue
--
-2.11.0
+2.12.0

diff --git a/audio-libs/lilypond/DETAILS b/audio-libs/lilypond/DETAILS
index e66c539..9c3ed7d 100755
--- a/audio-libs/lilypond/DETAILS
+++ b/audio-libs/lilypond/DETAILS
@@ -3,8 +3,8 @@ if [[ $LILYPOND_BRANCH == "stable" ]]; then
VERSION=2.18.2

SOURCE_HASH=sha512:0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6
else
- VERSION=2.19.58
-
SOURCE_HASH=sha512:e5117a02c0a18b335fc74aa864c8432fe8dcf91691ad592cae7991e1097063397b82bdfbab6b24439e0027ce946059f2169534d998e63f2230fcbbba0fcc8e91
+ VERSION=2.19.59
+
SOURCE_HASH=sha512:b915667bf3e86c8ee4be0519e4d351cb7f5e38354a882607ef3547467f9a56fcffd9bbdf40bbd1381624d5e8803c23a42ac5cdc95707a874c064493da369257a
fi
SOURCE="$SPELL-$VERSION.tar.gz"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/audio-libs/lilypond/HISTORY b/audio-libs/lilypond/HISTORY
index fbd60c5..6c72c0b 100644
--- a/audio-libs/lilypond/HISTORY
+++ b/audio-libs/lilypond/HISTORY
@@ -1,3 +1,7 @@
+2017-04-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: devel version 2.19.59
+ * 0001-use-guile-config1.patch: refresh
+
2017-03-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: devel version 2.19.58




  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (b668e0bb440d12248463446c31904fa6eedc4a80), Florian Franzmann, 04/14/2017

Archive powered by MHonArc 2.6.24.

Top of Page