Skip to Content.
Sympa Menu

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

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 (33aabbc3e37ec5e7aef95ccc7f88a809080beb5e)
  • Date: Sun, 14 Jan 2007 05:37:04 -0600

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

audio-libs/lilypond/BUILD | 2 ++
audio-libs/lilypond/DEPENDS | 6 +++++-
audio-libs/lilypond/DETAILS | 6 +++---
libs/clucene/HISTORY | 4 ++++
libs/clucene/PRE_BUILD | 4 ++++
libs/sword/DEPENDS | 13 ++++++++++++-
libs/sword/DETAILS | 4 ++--
libs/sword/HISTORY | 7 +++++++
8 files changed, 39 insertions(+), 7 deletions(-)

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

sword: update and missing dep addition #13404

commit 2f2470282c3a383c6380ca1bb7d27a3f0b3a3477
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

clucene: fix rogue include installation path

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

wip

diff --git a/audio-libs/lilypond/BUILD b/audio-libs/lilypond/BUILD
index 34726a3..e95107e 100755
--- a/audio-libs/lilypond/BUILD
+++ b/audio-libs/lilypond/BUILD
@@ -1,7 +1,9 @@
+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 &&


diff --git a/audio-libs/lilypond/DEPENDS b/audio-libs/lilypond/DEPENDS
index 50d17e7..5638c85 100755
--- a/audio-libs/lilypond/DEPENDS
+++ b/audio-libs/lilypond/DEPENDS
@@ -4,11 +4,15 @@ depends flex &&
depends tetex &&
depends texinfo &&
depends gcc &&
+depends g++ &&
depends python &&
+depends fontconfig &&
depends bison &&
-depends xdvi &&
depends POSTSCRIPT-INTERPRETER &&
depends fontforge &&
+depends pango &&
+depends freetype2 &&
+depends perl &&

if [ $HTMLDOC == y ]
then
diff --git a/audio-libs/lilypond/DETAILS b/audio-libs/lilypond/DETAILS
index 90c0f53..0fce83d 100755
--- a/audio-libs/lilypond/DETAILS
+++ b/audio-libs/lilypond/DETAILS
@@ -1,11 +1,11 @@
SPELL=lilypond
- VERSION=2.6.5
+ VERSION=2.10.8
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://lilypond.org/download/v2.6/$SOURCE
+
SOURCE_URL[0]=http://download.linuxaudio.org/lilypond/sources/v${VERSION%.*}/$SOURCE
WEB_SITE=http://lilypond.org/web
ENTERED=20050210
-
SOURCE_HASH=sha512:39874766599e27183feaf0b1676521ff33293717edf497e862734b46a68120dfb9fba82dba8a01472ce924e84fe6ed205ec22da134c33cb8b947bbdc27c4eb9a
+
SOURCE_HASH=sha512:977655300c10b54b9afec686f1d085b6f20902bb709660feb709b1af579d1070f5a38f78ff2fd78653407e15b32da68956b80b34282204876d7fc19da1769de7
LICENSE[0]=GPL
KEYWORDS="music audio libs"
SHORT="Format music notation beautifully"
diff --git a/libs/clucene/HISTORY b/libs/clucene/HISTORY
index 5be743f..40adbc4 100644
--- a/libs/clucene/HISTORY
+++ b/libs/clucene/HISTORY
@@ -1,3 +1,7 @@
+2007-01-14 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * PRE_BUILD: added to fix clucene-config.h being installed in
/usr/lib,
+ was breaking sword
+
2006-11-25 Treeve Jelbert <treeve AT pi.be>
* DETAILS: version 0.9.16a

diff --git a/libs/clucene/PRE_BUILD b/libs/clucene/PRE_BUILD
new file mode 100755
index 0000000..ff4e824
--- /dev/null
+++ b/libs/clucene/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sed -i '/clucene_configdir = \$(libdir)/ s,libdir,includedir,' \
+ src/CLucene/Makefile.am src/Makefile.in
diff --git a/libs/sword/DEPENDS b/libs/sword/DEPENDS
index 7ac6582..4ab8624 100755
--- a/libs/sword/DEPENDS
+++ b/libs/sword/DEPENDS
@@ -1,2 +1,13 @@
depends g++ &&
-depends curl
+
+optional_depends curl --with-curl --without-curl "for remote install
support" &&
+
+optional_depends clucene \
+ "--with-lucene" \
+ "--without-lucene" \
+ "include lucene support for searching" &&
+
+optional_depends icu \
+ "--with-icu" \
+ "--without-icu" \
+ "use ICU for unicode"
diff --git a/libs/sword/DETAILS b/libs/sword/DETAILS
index 25d738c..24f9f0e 100755
--- a/libs/sword/DETAILS
+++ b/libs/sword/DETAILS
@@ -1,9 +1,9 @@
SPELL=sword
- VERSION=1.5.8
+ VERSION=1.5.9
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=http://www.crosswire.org/ftpmirror/pub/sword/source/v1.5/$SOURCE
-
SOURCE_HASH=sha512:98b64ac0d7a3fc22077f7d75d530a9275dabd95bfd518566e6429aca30fcbe10c40fcb7987f3aa3408a384c706f4d5f9c007c84661e414d79ce51444609d5620
+
SOURCE_HASH=sha512:990532a6e1e9ff35d974442dd24dd0af9203110a78e552370bf52c80830f98deeae88d986ecbd88418a464124a0070150387d51edc9dad4ff2610b5f85745c6c
WEB_SITE=http://www.crosswire.org/sword/index.jsp
ENTERED=20040909
LICENSE[0]=GPL
diff --git a/libs/sword/HISTORY b/libs/sword/HISTORY
index 3829c30..09ccdf0 100644
--- a/libs/sword/HISTORY
+++ b/libs/sword/HISTORY
@@ -1,3 +1,10 @@
+2007-01-14 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DEPENDS: made curl optional, added clucene; fix #13404
+
+2007-01-13 James Robinson <contact_us__ AT hotmail.com>
+ * DETAILS: Updated to 1.5.9
+ * DEPENDS: Added optional icu
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.





Archive powered by MHonArc 2.6.24.

Top of Page