SOURCES: solfege-desktop.patch, solfege-fix.patch - updated for 3.6.4

[qboosh]

Author: qboosh                       Date: Sun Dec 10 21:36:46 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 3.6.4

---- Files affected:
SOURCES:
   solfege-desktop.patch (1.2 -> 1.3) , solfege-fix.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SOURCES/solfege-desktop.patch
diff -u SOURCES/solfege-desktop.patch:1.2 SOURCES/solfege-desktop.patch:1.3
--- SOURCES/solfege-desktop.patch:1.2	Thu Nov  4 12:59:08 2004
+++ SOURCES/solfege-desktop.patch	Sun Dec 10 22:36:41 2006
@@ -1,16 +1,14 @@
---- solfege-2.1.3/solfege.desktop~	Wed Jul 14 22:27:23 2004
-+++ solfege-2.1.3/solfege.desktop	Wed Jul 14 22:33:52 2004
-@@ -1,6 +1,11 @@
+--- solfege-3.6.4/solfege.desktop.orig	2006-12-08 11:16:31.000000000 +0100
++++ solfege-3.6.4/solfege.desktop	2006-12-10 21:36:10.363695050 +0100
+@@ -1,8 +1,10 @@
  [Desktop Entry]
+ Encoding=UTF-8
  Name=GNU Solfege
--Exec=solfege
--Terminal=0
 +Comment=Solfege eartraining program
 +Comment[pl]=Program do ćwiczenia słuchu Solfege
-+Exec=solfegfalse
-+Terminal=false
+ Exec=solfege
+ Terminal=false
  Type=Application
  Icon=solfege.png
-+Categories=GTK;Music;
-+Encoding=UTF-8
-+# vi: encoding=utf-8
+-Categories=GNOME;Application;AudioVideo;Audio;Education;
++Categories=GTK;GNOME;AudioVideo;Audio;Education;

================================================================
Index: SOURCES/solfege-fix.patch
diff -u SOURCES/solfege-fix.patch:1.4 SOURCES/solfege-fix.patch:1.5
--- SOURCES/solfege-fix.patch:1.4	Sat Mar 27 20:30:06 2004
+++ SOURCES/solfege-fix.patch	Sun Dec 10 22:36:41 2006
@@ -1,20 +1,9 @@
---- solfege-1.9.99/acinclude.m4.orig	2003-07-31 23:56:09.000000000 +0200
-+++ solfege-1.9.99/acinclude.m4	2003-08-24 15:24:20.626449328 +0200
-@@ -253,7 +253,7 @@
- 
- AC_DEFUN([MY_SWIG_TEST],
-   [
--  $SWIG -version > tmpswig 2&>tmpswig
-+  $SWIG -version > tmpswig 2>tmpswig
-   if grep "SWIG Version 1.3" tmpswig
-   then
-     [$1="1.3"]
---- solfege-1.9.99/configure.ac.orig	2003-07-31 23:56:09.000000000 +0200
-+++ solfege-1.9.99/configure.ac	2003-08-24 15:30:01.854574768 +0200
-@@ -124,9 +124,9 @@
+--- solfege-3.6.4/configure.ac.orig	2006-12-08 11:16:31.000000000 +0100
++++ solfege-3.6.4/configure.ac	2006-12-10 21:33:51.459779366 +0100
+@@ -126,9 +126,9 @@
  
  dnl Checks for libraries.
- if test x"$ENABLE_TUNER" = x"yes"; then
+ if test "x$ENABLE_TUNER" = xyes; then
 -    AC_DEFINE(ENABLE_TUNER)
 +    AC_DEFINE(ENABLE_TUNER, , [the microphone experiment])
      AC_CHECK_LIB(rfftw, rfftw, [
@@ -23,3 +12,14 @@
          LIBS="$LIBS -lfftw -lrfftw"], ,-lfftw)
  fi
  
+--- solfege-3.6.4/soundcard/Makefile.orig	2006-12-08 11:16:31.000000000 +0100
++++ solfege-3.6.4/soundcard/Makefile	2006-12-10 22:01:39.994863763 +0100
+@@ -25,7 +25,7 @@
+ 
+ easy-dist-files += soundcard/solfege_c_midi_wrap.c
+ 
+-CFLAGS:=$(CFLAGS) -I/usr/src/linux/include -Wall -pedantic -fPIC
++CFLAGS:=$(CFLAGS) -Wall -pedantic -fPIC
+ CC:=$(CC) $(CFLAGS) -DHAVE_CONFIG_H 
+ 
+ ifeq ($(ENABLE_OSS_SOUND),yes)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/solfege-desktop.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SOURCES/solfege-fix.patch?r1=1.4&r2=1.5&f=u