[packages/blt] - rel 3; fix build with tcl/tk 8.6

arekm arekm at pld-linux.org
Tue Jun 3 10:49:32 CEST 2014


commit e67f33c5393d2280d9e32bc426d618003d678a1d
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue Jun 3 10:49:30 2014 +0200

    - rel 3; fix build with tcl/tk 8.6

 blt-tcl86.patch | 20 ++++++++++++++++++++
 blt.spec        |  5 ++++-
 2 files changed, 24 insertions(+), 1 deletion(-)
---
diff --git a/blt.spec b/blt.spec
index cbf9d1b..197ce1c 100644
--- a/blt.spec
+++ b/blt.spec
@@ -6,7 +6,7 @@ Summary(ru.UTF-8):	Расширение набора Tk, включая граф
 Summary(uk.UTF-8):	Розширення набору Tk, включаючи графічні примітиви, менеджери геометрії і т.і
 Name:		blt
 Version:	2.4z
-Release:	2
+Release:	3
 License:	MIT
 Group:		Development/Tools
 Source0:	http://dl.sourceforge.net/blt/BLT%{version}.tar.gz
@@ -22,6 +22,7 @@ Patch7:		%{name}-tcl85.patch
 Patch8:		%{name}-decl.patch
 Patch9:		%{name}-link.patch
 Patch10:	%{name}-64bit.patch
+Patch11:	%{name}-tcl86.patch
 URL:		http://blt.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -128,11 +129,13 @@ Programas que demonstram as características do BLT.
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p0
 
 %build
 cp -f /usr/share/automake/config.* cf
 %{__autoconf}
 %configure \
+	CFLAGS="-DUSE_INTERP_RESULT %{rpmcflags}" \
 	--with-tcllibs=%{_libdir} \
 	--with-tklibs=%{_libdir}
 
diff --git a/blt-tcl86.patch b/blt-tcl86.patch
new file mode 100644
index 0000000..f956c09
--- /dev/null
+++ b/blt-tcl86.patch
@@ -0,0 +1,20 @@
+--- src/tkButton.c.orig	2013-01-04 23:24:45.000000000 -0500
++++ src/tkButton.c	2013-01-04 23:28:29.000000000 -0500
+@@ -526,8 +526,6 @@
+ static Blt_TileChangedProc TileChangedProc;
+ static Tcl_CmdProc ButtonCmd, LabelCmd, CheckbuttonCmd, RadiobuttonCmd;
+ 
+-EXTERN int TkCopyAndGlobalEval _ANSI_ARGS_((Tcl_Interp *interp, char *script));
+-
+ #if (TK_MAJOR_VERSION > 4)
+ EXTERN void TkComputeAnchor _ANSI_ARGS_((Tk_Anchor anchor, Tk_Window tkwin, 
+ 	int padX, int padY, int innerWidth, int innerHeight, int *xPtr, 
+@@ -1890,7 +1888,7 @@
+ 	}
+     }
+     if ((butPtr->type != TYPE_LABEL) && (butPtr->command != NULL)) {
+-	return TkCopyAndGlobalEval(butPtr->interp, butPtr->command);
++	return Tcl_EvalObjEx(butPtr->interp, butPtr->command, TCL_EVAL_GLOBAL);
+     }
+     return TCL_OK;
+ }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/blt.git/commitdiff/e67f33c5393d2280d9e32bc426d618003d678a1d



More information about the pld-cvs-commit mailing list