rpms/csound/devel Csound5.03.0.makebuild.patch, NONE, 1.1 csound.spec, 1.12, 1.13

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/csound/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17718

Modified Files:
	csound.spec 
Added Files:
	Csound5.03.0.makebuild.patch 
Log Message:
Resolves: rhbz#428176 make build

Csound5.03.0.makebuild.patch:

--- NEW FILE Csound5.03.0.makebuild.patch ---
diff -ru Csound5.03.0.orig/InOut/widgets.cpp Csound5.03.0/InOut/widgets.cpp
--- Csound5.03.0.orig/InOut/widgets.cpp	2006-11-08 23:45:51.000000000 +0000
+++ Csound5.03.0/InOut/widgets.cpp	2008-01-09 17:42:45.000000000 +0000
@@ -2838,7 +2838,7 @@
   return OK;
 }
 
-static int fl_box(CSOUND *csound, FL_BOX *p)
+static int fl_boxthing(CSOUND *csound, FL_BOX *p)
 {
   char *text = GetString(csound, p->itext, p->XSTRCODE);
   Fl_Box *o =  new Fl_Box((int)*p->ix, (int)*p->iy,
@@ -3885,7 +3885,7 @@
     { "FLsetAlign",     S(FL_TALIGN),           1,  "",     "ii",
         (SUBR) fl_align,                (SUBR) NULL,              (SUBR) NULL },
     { "FLbox",          S(FL_BOX),              1,  "i",    "Tiiiiiii",
-        (SUBR) fl_box,                  (SUBR) NULL,              (SUBR) NULL },
+        (SUBR) fl_boxthing,             (SUBR) NULL,              (SUBR) NULL },
     { "FLvalue",        S(FLVALUE),             1,  "i",    "Tjjjj",
         (SUBR) fl_value,                (SUBR) NULL,              (SUBR) NULL },
     { "FLpanel",        S(FLPANEL),             1,  "",     "Tjjjooo",
--- Csound5.03.0.orig/SConstruct	2008-01-09 18:57:30.000000000 +0000
+++ Csound5.03.0/SConstruct	2008-01-09 18:57:44.000000000 +0000
@@ -351,8 +351,8 @@
 if getPlatform() == 'linux':
     path1 = '/usr/include/python%s' % commonEnvironment['pythonVersion']
     pythonIncludePath = [path1]
-    path1 = '/usr/include/tcl8.4'
-    path2 = '/usr/include/tk8.4'
+    path1 = '/usr/include/tcl8.5'
+    path2 = '/usr/include/tk8.5'
     tclIncludePath = [path1]
     pythonLinkFlags = []
     if commonEnvironment['Word64'] == '1':
@@ -1787,7 +1787,7 @@
         '''))
     elif getPlatform() == 'linux':
         csTclEnvironment.Append(CPPPATH = tclIncludePath)
-        csTclEnvironment.Append(LIBS = ['tcl8.4', 'tk8.4', 'dl', 'pthread'])
+        csTclEnvironment.Append(LIBS = ['tcl8.5', 'tk8.5', 'dl', 'pthread'])
     elif getPlatform() == 'win32':
         csTclEnvironment.Append(LIBS = ['tcl84', 'tk84'])
         csTclEnvironment.Append(LIBS = csoundWindowsLibraries)


Index: csound.spec
===================================================================
RCS file: /cvs/pkgs/rpms/csound/devel/csound.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- csound.spec	4 Jan 2008 02:10:42 -0000	1.12
+++ csound.spec	10 Jan 2008 08:20:53 -0000	1.13
@@ -11,7 +11,7 @@
 Summary:       Csound - sound synthesis language and library
 Name:          csound
 Version:       5.03.0
-Release:       14%{?dist}
+Release:       15%{?dist}
 URL:           http://csound.sourceforge.net/
 License:       LGPL
 Group:         Applications/Multimedia
@@ -43,6 +43,7 @@
 Patch4: csound-5.03.0-default-opcodedir.patch
 Patch5: csound-5.03.0-rtalsa-fix.patch
 Patch6: csound-5.03.0-fltk-fixes.patch
+Patch7: Csound5.03.0.makebuild.patch
 
 %description
 Csound is a sound and music synthesis system, providing facilities for
@@ -188,6 +189,7 @@
 %patch4 -p1 -b .default-opcodedir
 %patch5 -p1 -b .rtalsa-fix
 %patch6 -p1 -b .fltk-fixes
+%patch7 -p1 -b .makebuild
 
 tar xf %{SOURCE1}
 
@@ -406,6 +408,9 @@
 %doc tutorial/*.py
 
 %changelog
+* Thu Jan 10 2008 Caolan McNamara <caolanm at redhat.com> - 5.03.0-15
+- Resolves: rhbz#428176 make build
+
 * Thu Jan 03 2008 Alex Lancaster <alexlan at fedoraproject dot org> - 5.03.0-14
 - Rebuild for new tcl (8.5)