rpms/ds9/devel ds9-tcl85.patch,NONE,1.1 ds9.spec,1.4,1.5

[Sergio Pascual (sergiopr)]

Author: sergiopr

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

Modified Files:
	ds9.spec 
Added Files:
	ds9-tcl85.patch 
Log Message:
* Thu Jan 03 2008 Sergio Pascual <sergiopr at fedoraproject.org> 5.0-8
- Added patch to build with tcl 8.5


ds9-tcl85.patch:

--- NEW FILE ds9-tcl85.patch ---
diff -ur saods9/htmlwidget/makemake.tcl.in saods9.new/htmlwidget/makemake.tcl.in
--- saods9/htmlwidget/makemake.tcl.in	2005-11-09 01:06:08.000000000 +0100
+++ saods9.new/htmlwidget/makemake.tcl.in	2008-01-04 14:32:25.000000000 +0100
@@ -360,9 +360,7 @@
 
 # A target to build everything.
 #
-set all ${PFX}hwish${TEXE}
-lappend all ${PFX}hv${TEXE}
-lappend all ${PFX}ss${TEXE}
+set all libtkhtml.a
 if {"@ENABLE_SHLIB@"=="1"} {
   lappend all tkhtml at TARGET_SHLIB_EXT@
 #  lappend all tkhtml.so
diff -ur saods9/saotk/util/tkpostscript.h saods9.new/saotk/util/tkpostscript.h
--- saods9/saotk/util/tkpostscript.h	2008-01-04 14:35:46.000000000 +0100
+++ saods9.new/saotk/util/tkpostscript.h	2008-01-04 14:34:16.000000000 +0100
@@ -4,6 +4,7 @@
 
 // this is copied from tkCanvPs.c
 
+#include <tk-private/generic/tkInt.h>
 #include <tk-private/generic/tkCanvas.h>
 
 typedef struct TkPostscriptInfo {
diff -ur saods9/ds9/Makefile saods9.new/ds9/Makefile
--- saods9/ds9/Makefile	2008-01-04 16:35:16.000000000 +0100
+++ saods9.new/ds9/Makefile	2008-01-04 16:33:40.000000000 +0100
@@ -224,7 +224,7 @@
 	-L$(X11LIB) -lX11 \
 	-ldl -lpthread \
 	-L../lib -lsaotk -ltkhtml -ltkmpeg -liis -lcheckdns  \
-	-ltk -ltcl -L${LIBDIR}/blt2.4 -lBLT24 \
+	-ltk -ltcl -L${LIBDIR}/tcl8.5/blt2.4 -lBLT24 \
 	-lfuntools -lwcs -lz
 endif
 
diff -ur saods9/saotk/colorbar/Makefile saods9.new/saotk/colorbar/Makefile
--- saods9/saotk/colorbar/Makefile	2006-09-05 19:20:15.000000000 +0200
+++ saods9.new/saotk/colorbar/Makefile	2008-01-04 16:30:51.000000000 +0100
@@ -2,7 +2,7 @@
 
 CXXFLAGS = $(CXXOPT) \
 	-I. -I.. -I../widget -I../vector -I../util \
-	-I../../include -I$(X11INCLUDE)
+	-I../../include -I$(X11INCLUDE) -I/usr/include/tk-private/unix
 
 SS	= \
 	cbgrid.C \
diff -ur saods9/saotk/frame/Makefile saods9.new/saotk/frame/Makefile
--- saods9/saotk/frame/Makefile	2008-01-04 16:35:16.000000000 +0100
+++ saods9.new/saotk/frame/Makefile	2008-01-04 16:30:26.000000000 +0100
@@ -4,7 +4,8 @@
 CXXFLAGS = $(CXXOPT) -w \
 	-I. -I.. -I../widget -I../vector -I../list -I../fitsy++ -I../util \
 	-I../../include -I$(X11INCLUDE) \
-	-I/usr/include/funtools/util -I/usr/include/blt\
+	-I/usr/include/funtools/util -I/usr/include/blt \
+	-I/usr/include/tk-private/unix\
 	-I../../$(ASTDIR)
 
 SS	= \


Index: ds9.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ds9/devel/ds9.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ds9.spec	3 Jan 2008 13:54:26 -0000	1.4
+++ ds9.spec	4 Jan 2008 15:51:04 -0000	1.5
@@ -20,6 +20,7 @@
 Source4: ds9-generate-tarball.sh
 Patch0: ds9-external.patch
 Patch1: ds9-flex.patch
+Patch2: ds9-tcl85.patch
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires: zlib-devel funtools-devel
@@ -44,6 +45,7 @@
 %{__cp} %{SOURCE3} saotk/util
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__cp} %{SOURCE2} make.include
@@ -87,8 +89,11 @@
 
 
 %changelog
+* Thu Jan 03 2008 Sergio Pascual <sergiopr at fedoraproject.org> 5.0-8
+- Added patch to build with tcl 8.5
+
 * Thu Jan 03 2008 Sergio Pascual <sergiopr at fedoraproject.org> 5.0-7
-- Rebuilt for tcl 8.5
+- Rebuilt for tcl 8.5 (failled)
 
 * Sat Dec 08 2007 Sergio Pascual <sergiopr at fedoraproject.org> 5.0-6
 - Fixed problems with TCL package loading