diff options
Diffstat (limited to 'academic')
| -rw-r--r-- | academic/solfege/Makefile.in_fix.patch | 15 | ||||
| -rw-r--r-- | academic/solfege/Makefile.in_fix_solfege3.14.4.patch | 19 | ||||
| -rw-r--r-- | academic/solfege/python-mpd_fix.patch | 14 | ||||
| -rw-r--r-- | academic/solfege/solfege.1 | 113 | ||||
| -rw-r--r-- | academic/solfege/solfege.SlackBuild | 24 | ||||
| -rw-r--r-- | academic/solfege/solfege.info | 6 |
6 files changed, 151 insertions, 40 deletions
diff --git a/academic/solfege/Makefile.in_fix.patch b/academic/solfege/Makefile.in_fix.patch deleted file mode 100644 index ed4b90528e..0000000000 --- a/academic/solfege/Makefile.in_fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -Patch generated 20081031 by Phillip Warner <pc_warner@yahoo.com> -Permission granted to use this patch as you see fit. - -diff -ru solfege-3.10.4.orig/Makefile.in solfege-3.10.4/Makefile.in ---- solfege-3.10.4.orig/Makefile.in 2008-10-31 11:43:41.000000000 -0500 -+++ solfege-3.10.4/Makefile.in 2008-10-31 11:44:46.000000000 -0500 -@@ -139,7 +139,7 @@ - compileall: - ifneq (x"$(nopycompile)",xYES) - for dir in src mpd soundcard; do\ -- $(PYTHON) -c "import compileall; compileall.compile_dir('$(datadir)/$(PACKAGE)/$$dir')" ;\ -+ $(PYTHON) -c "import compileall; compileall.compile_dir('$(DESTDIR)/$(datadir)/$(PACKAGE)/$(dir)')" ;\ - done - endif - diff --git a/academic/solfege/Makefile.in_fix_solfege3.14.4.patch b/academic/solfege/Makefile.in_fix_solfege3.14.4.patch new file mode 100644 index 0000000000..8fa785fc1f --- /dev/null +++ b/academic/solfege/Makefile.in_fix_solfege3.14.4.patch @@ -0,0 +1,19 @@ +Patch generated 20090609 by Phillip Warner <pc_warner@yahoo.com> +Permission granted to use this patch as you see fit. + +--- solfege-3.14.4.orig/Makefile.in 2009-06-09 05:48:10.000000000 -0500 ++++ solfege-3.14.4/Makefile.in 2009-06-09 23:55:48.000000000 -0500 +@@ -102,13 +102,6 @@ + -include debian-dir/Makefile + -include debian/Makefile + +-%.1: %.1.txt +- txt2man -r "GNU Solfege @VERSION@" -t Solfege -s 1 $< > $@ +- +-# We need src/_version.py because solfege imports it at runtime. +-solfege.1: solfege.1.txt src/_version.py +- LANGUAGE=C $(PYTHON) -c "import tools.buildutil; tools.buildutil.create_manpage()" | txt2man -t Solfege -s 1 > $@ +- + # Unfortunately we still have to manually convert from html to pdf + # using openoffice and "Save as PDF" + prepare-rsync-manual: $(foreach lang,$(USER_MANUAL_LANGUAGES),help/$(lang)/one-big-page.html) help/C/one-big-page.html diff --git a/academic/solfege/python-mpd_fix.patch b/academic/solfege/python-mpd_fix.patch deleted file mode 100644 index e3a2353beb..0000000000 --- a/academic/solfege/python-mpd_fix.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ru solfege-3.10.4-orig/run-solfege.py.in solfege-3.10.4/run-solfege.py.in ---- solfege-3.10.4-orig/run-solfege.py.in 2008-04-29 12:31:56.000000000 -0500 -+++ solfege-3.10.4/run-solfege.py.in 2008-10-31 13:55:37.000000000 -0500 -@@ -31,8 +31,8 @@ - # variables. Example dir: Gehör - prefix = prefix.decode(sys.getfilesystemencoding()) - os.chdir(os.path.join(prefix, "share", "solfege")) --sys.path.append(os.path.join(prefix, "lib", "solfege")) --sys.path.append(os.path.join(prefix, "share", "solfege")) -+sys.path.insert(0, os.path.join(prefix, "lib", "solfege")) -+sys.path.insert(0, os.path.join(prefix, "share", "solfege")) - - import src - import src.cfg diff --git a/academic/solfege/solfege.1 b/academic/solfege/solfege.1 new file mode 100644 index 0000000000..f7008ea805 --- /dev/null +++ b/academic/solfege/solfege.1 @@ -0,0 +1,113 @@ +." Text automatically generated by txt2man +.TH Solfege 1 "06 June 2009" "" "" +.SH NAME +\fBsolfege \fP- GPL'ed ear training software +.SH SYNOPSIS +.nf +.fam C +\fBsolfege\fP [\fIoptions\fP] + +.fam T +.fi +.fam T +.fi +.SH DESCRIPTION +GNU Solfege is a program that let you use your computer to do ear +training. +.SH OPTIONS +This program follow the usual GNU command line syntax, with long +\fIoptions\fP starting with two dashes (`-'). +.TP +.B +\fB-h\fP, \fB--help\fP +show this help message and exit +.TP +.B +\fB-v\fP, \fB--version\fP +.TP +.B +\fB-w\fP, \fB--warranty\fP +Show warranty and copyright. +.TP +.B +\fB--no-splash\fP +Do not show the startup window. +.TP +.B +\fB--verbose-sound-init\fP +Display more info about the sound setup. +.TP +.B +\fB--no-sound\fP +Do not play any sounds. Instead some data is printed +to standard output. Use this for debugging and +porting. +.TP +.B +\fB--debug\fP +Include features used by the Solfege developers to +debug the program. +.TP +.B +\fB--disable-exception-handler\fP +Disable the exception handling in +Gui.standard_exception_handler. +.TP +.B +\fB--no-random\fP +For debugging only: Select questions from lesson files +in sequential order. +.TP +.B +\fB--enable-gtkhtml\fP +Run using gtkhtml2 instead of the built in HTML +viewer. +.TP +.B +\fB--no-cairo-widgets\fP +Do not use the cairo version of input widgets, even if +we run gtk+ 2.8.0 or newer. +.TP +.B +\fB--show-gtk-warnings\fP +Show GtkWarnings and PangoWarnings in the traceback +window. +.RE +.PP + +.SH BUGS +Report bugs to bug-\fBsolfege\fP@gnu.org or http://bugs.solfege.org. +.SH FILES +.TP +.B +/etc/\fBsolfege\fP +if \fBsolfege\fP is installed into /usr, or {prefix}/etc/\fBsolfege\fP +in all other cases. +System administrators can override the values in the +default.config file. The most obvious values you might +want to change is the sound setup. +.TP +.B +~/.solfegerc +This file is used to store most configuration values. While it +is possible to edit the file by hand, everything you need can +and should be done from the gui. +.TP +.B +~/.\fBsolfege\fP +Statistics is stored in subdirectories below this dir. +.SH COPYRIGHT +GNU Solfege is Copyright \[char169] 1999, 2000, 2001, 2002, 2003, +2004, 2005, 2006, 2007, 2008 by Tom Cato Amundsen <tca\[at]gnu.org>. +.PP +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or (at +your option) any later version. +.SH AUTHOR +Main author of GNU Solfege and this manual page is Tom Cato Amundsen +<tca\[at]gnu.org>. For more details, read the AUTHORS file from the +source tarball. +.RE +.PP + diff --git a/academic/solfege/solfege.SlackBuild b/academic/solfege/solfege.SlackBuild index 8939aa8926..4f1a9f7e6b 100644 --- a/academic/solfege/solfege.SlackBuild +++ b/academic/solfege/solfege.SlackBuild @@ -4,7 +4,7 @@ # Written by Phillip Warner <pc_warner@yahoo.com> PRGNAM=solfege -VERSION=${VERSION:-3.10.4} +VERSION=${VERSION:-3.14.4} ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -16,10 +16,13 @@ OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" fi set -e @@ -37,25 +40,30 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# fix Makefile.in so python scripts will compile correctly -patch -p1 < $CWD/Makefile.in_fix.patch - -# This Makes mpd imports work correctly in case python-mpd is installed -patch -p1 < $CWD/python-mpd_fix.patch +# Fix Makefile.in so it does not require txt2man +# We will copy over our own man page +patch -p1 < $CWD/Makefile.in_fix_${PRGNAM}${VERSION}.patch CFLAGS="$SLKCFLAGS" \ CPPFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --mandir=/usr/man CFLAGS="$SLKCFLAGS" make + +# We either had to install this or txt2man +cat $CWD/solfege.1 > $TMP/$PRGNAM-$VERSION/solfege.1 + make install DESTDIR=$PKG ( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null || true + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null ) ( cd $PKG/usr/man diff --git a/academic/solfege/solfege.info b/academic/solfege/solfege.info index 1f8da9c9b0..5cc73465c9 100644 --- a/academic/solfege/solfege.info +++ b/academic/solfege/solfege.info @@ -1,8 +1,8 @@ PRGNAM="solfege" -VERSION="3.10.4" +VERSION="3.14.4" HOMEPAGE="http://www.solfege.org/" -DOWNLOAD="http://downloads.sourceforge.net/solfege/solfege-3.10.4.tar.gz" -MD5SUM="74705388c446a10ed574e68bcd3134d4" +DOWNLOAD="http://downloads.sourceforge.net/solfege/solfege-3.14.4.tar.gz" +MD5SUM="1ad75aebac4bb552c94b64ece8ab48ba" MAINTAINER="Phillip Warner" EMAIL="pc_warner@yahoo.com" APPROVED="dsomero" |