Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
devel:languages:tcl
blt25
blt.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File blt.patch of Package blt25
diff -rupN blt2.5/demos/Makefile.in blt2.5-keep/demos/Makefile.in --- blt2.5/demos/Makefile.in 2009-05-09 18:27:27.000000000 +0200 +++ blt2.5-keep/demos/Makefile.in 2014-01-21 09:02:29.577436337 +0100 @@ -6,7 +6,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ version = @BLT_VERSION@ libdir = @libdir@ -scriptdir = $(prefix)/lib/blt$(version) +scriptdir = @libdir@/blt$(version) destdir = $(scriptdir)/demos srcdir = @srcdir@ @@ -78,8 +78,8 @@ mkdirs: if test -d $(INSTALL_ROOT)"$$i" ; then \ : ; \ else \ - echo " mkdir $(INSTALL_ROOT)$$i" ; \ - mkdir $(INSTALL_ROOT)"$$i" ; \ + echo " mkdir -p $(INSTALL_ROOT)$$i" ; \ + mkdir -p $(INSTALL_ROOT)"$$i" ; \ fi ; \ done diff -rupN blt2.5/generic/bltInit.c blt2.5-keep/generic/bltInit.c --- blt2.5/generic/bltInit.c 2011-01-05 20:55:16.000000000 +0100 +++ blt2.5-keep/generic/bltInit.c 2014-01-21 13:10:47.346984289 +0100 @@ -562,11 +562,11 @@ Blt_Init(interp) Blt_RegisterArrayObj(interp); bltNaN = MakeNaN(); #ifdef USE_BLT_STUBS - if (Tcl_PkgProvideEx(interp, "BLT", BLT_PATCH_LEVEL, &bltStubs) != TCL_OK) { + if (Tcl_PkgProvideEx(interp, "BLT", BLT_VERSION /* BLT_PATCH_LEVEL*/, &bltStubs) != TCL_OK) { return TCL_ERROR; } #else - if (Tcl_PkgProvideEx(interp, "BLT", BLT_PATCH_LEVEL, NULL) != TCL_OK) { + if (Tcl_PkgProvideEx(interp, "BLT", BLT_VERSION /*BLT_PATCH_LEVEL */, NULL) != TCL_OK) { return TCL_ERROR; } #endif diff -rupN blt2.5/generic/bltInt.h blt2.5-keep/generic/bltInt.h --- blt2.5/generic/bltInt.h 2010-12-10 23:41:18.000000000 +0100 +++ blt2.5-keep/generic/bltInt.h 2014-01-21 08:31:55.087339053 +0100 @@ -26,6 +26,10 @@ #ifndef _BLT_INT_H #define _BLT_INT_H +#define USE_INTERP_ERRORLINE +#define USE_INTERP_RESULT +#define TkCopyAndGlobalEval(interp,command) Tcl_EvalEx(interp,command,-1,TCL_EVAL_GLOBAL) + #ifdef WIN32 #define STRICT #define WIN32_LEAN_AND_MEAN diff -rupN blt2.5/generic/bltNsUtil.c blt2.5-keep/generic/bltNsUtil.c --- blt2.5/generic/bltNsUtil.c 2010-11-29 21:15:30.000000000 +0100 +++ blt2.5-keep/generic/bltNsUtil.c 2014-01-21 09:30:55.967373824 +0100 @@ -28,6 +28,8 @@ #include "bltInt.h" #include "bltList.h" +#include <tclInt.h> + /* Namespace related routines */ /* diff -rupN blt2.5/generic/bltWindow.c blt2.5-keep/generic/bltWindow.c --- blt2.5/generic/bltWindow.c 2010-06-04 08:21:46.000000000 +0200 +++ blt2.5-keep/generic/bltWindow.c 2014-01-21 17:30:29.917039227 +0100 @@ -873,7 +873,7 @@ Blt_GetParent(display, window) Window window; { HWND hWnd; - hWnd = GetWindowHandle(window); + hWnd = GetWindowHandle((Tk_Window) window); return (Window)hWnd; } diff -rupN blt2.5/generic/Makefile-cyg.in blt2.5-keep/generic/Makefile-cyg.in --- blt2.5/generic/Makefile-cyg.in 2009-05-09 18:27:09.000000000 +0200 +++ blt2.5-keep/generic/Makefile-cyg.in 2014-01-21 16:24:41.801595836 +0100 @@ -54,7 +54,7 @@ TCL_ONLY_LIBS = @TCL_ONLY_LIB_SPECS@ @EX N_OBJS = bltTed.o V3_OBJS = bltTri.o bltGrMt.o -TK_OBJS = tkButton.o tkFrame.o tkScrollbar.o +TK_OBJS = tkButton.o tkFrame.o bltScrollbar.o GRAPH_OBJS = bltGrAxis.o \ bltGrBar.o \ @@ -91,8 +91,9 @@ TCL_ONLY_OBJS = bltAlloc.o \ bltWatch.o \ bltWinPipe.o \ bltWinUtil.o \ - bltWinDde.o \ - pure_api.o + bltWinDde.o + +# pure_api.o DEMO_OBJS = tkConsole.o bltWinMain.o diff -rupN blt2.5/generic/Makefile.in blt2.5-keep/generic/Makefile.in --- blt2.5/generic/Makefile.in 2010-12-11 00:39:42.000000000 +0100 +++ blt2.5-keep/generic/Makefile.in 2014-01-21 09:03:10.131323051 +0100 @@ -13,7 +13,7 @@ CC = @CC@ CFLAGS = @CFLAGS@ DEFINES = @DEFINES@ EXTRA_CFLAGS = @GCCFLAGS@ -LDFLAGS = @LDFLAGS@ @LD_RUN_PATH@ +LDFLAGS = @LDFLAGS@ version = @BLT_MAJOR_VERSION@@BLT_MINOR_VERSION@ # ------------------------------------------------------------------------ @@ -229,8 +229,8 @@ mkdirs: if test -d $(INSTALL_ROOT)$$i ; then \ : ; \ else \ - echo " mkdir $(INSTALL_ROOT)$$i" ; \ - mkdir $(INSTALL_ROOT)$$i ; \ + echo " mkdir -p $(INSTALL_ROOT)$$i" ; \ + mkdir -p $(INSTALL_ROOT)$$i ; \ fi ; \ done diff -rupN blt2.5/generic/shared/Makefile.in blt2.5-keep/generic/shared/Makefile.in --- blt2.5/generic/shared/Makefile.in 2009-05-09 18:27:20.000000000 +0200 +++ blt2.5-keep/generic/shared/Makefile.in 2014-01-21 09:03:47.370301816 +0100 @@ -14,11 +14,11 @@ CFLAGS = @CFLAGS@ EXTRA_CFLAGS = @GCCFLAGS@ @SHLIB_CFLAGS@ DEFINES = @DEFINES@ DEF_BLTINIT = -DBLT_LIBRARY=\"$(scriptdir)\" -SHLIB_LD_FLAGS = @SHLIB_LD_FLAGS@ @LD_RUN_PATH@ +SHLIB_LD_FLAGS = @SHLIB_LD_FLAGS@ SHLIB_TCL_ONLY_LIB_SPECS = @SHLIB_TCL_ONLY_LIB_SPECS@ SHLIB_LIB_SPECS = @SHLIB_LIB_SPECS@ SHLIB_LD = @SHLIB_LD@ -LDFLAGS = @LDFLAGS@ @LD_RUN_PATH@ +LDFLAGS = @LDFLAGS@ prefix = @prefix@ exec_prefix = @exec_prefix@ diff -rupN blt2.5/generic/tkConsole.c blt2.5-keep/generic/tkConsole.c --- blt2.5/generic/tkConsole.c 2009-05-09 18:27:05.000000000 +0200 +++ blt2.5-keep/generic/tkConsole.c 2014-01-21 16:55:18.112129003 +0100 @@ -37,7 +37,7 @@ static Tcl_Interp *gStdoutInterp = NULL; #if (TCL_VERSION_NUMBER >= _VERSION(8,1,1)) #define HAVE_UTF 1 -extern void TclInitSubsystems _ANSI_ARGS_((CONST char *argv0)); +// extern void Tcl_FindExecutable _ANSI_ARGS_((CONST char *argv0)); #else #endif @@ -114,7 +114,7 @@ TkConsoleCreate() Tcl_Channel consoleChannel; #ifdef HAVE_UTF - TclInitSubsystems(NULL); + Tcl_FindExecutable(NULL); #endif consoleChannel = Tcl_CreateChannel(&consoleChannelType, "console0", (ClientData)TCL_STDIN, TCL_READABLE); diff -rupN blt2.5/library/Makefile.in blt2.5-keep/library/Makefile.in --- blt2.5/library/Makefile.in 2011-01-05 20:52:47.000000000 +0100 +++ blt2.5-keep/library/Makefile.in 2014-01-21 09:10:54.519651533 +0100 @@ -60,15 +60,15 @@ install: mkdirs pkgIndex for i in $(miscFiles) ; do \ $(INSTALL_DATA) $(srcdir)/$$i $(INSTALL_ROOT)$(scriptdir) ; \ done - $(INSTALL_DATA) pkgIndex.tcl $(scriptdir) + $(INSTALL_DATA) pkgIndex.tcl $(INSTALL_ROOT)$(scriptdir) mkdirs: @for i in $(instdirs) ; do \ if test -d $(INSTALL_ROOT)$$i ; then \ : ; \ else \ - echo " mkdir $(INSTALL_ROOT)$$i" ; \ - mkdir $(INSTALL_ROOT)$$i ; \ + echo " mkdir -p $(INSTALL_ROOT)$$i" ; \ + mkdir -p $(INSTALL_ROOT)$$i ; \ fi ; \ done diff -rupN blt2.5/library/pkgIndex.tcl.in blt2.5-keep/library/pkgIndex.tcl.in --- blt2.5/library/pkgIndex.tcl.in 2011-01-05 19:27:39.000000000 +0100 +++ blt2.5-keep/library/pkgIndex.tcl.in 2014-01-28 07:18:20.843837820 +0100 @@ -34,19 +34,18 @@ proc LoadBLT25 { version dir } { global tcl_platform foreach name [list $name1 $name2] { + set library [file join "$dir" $name] if { $tcl_platform(platform) == "unix" } { - set library [file join $dir $name] if { ![file exists $library] } { # Try the parent directory. - set library [file join [file dirname $dir] $name] + set library [file join [file dirname "$dir"] $name] } if { ![file exists $library] } { # Default to the path generated at compilation. set library [file join "%LIB_DIR%" $name] } - } else { - set library $name } + puts "BLT $version: Looking for \"$library\"" if { ![file exists $library] } continue load $library BLT } @@ -54,6 +53,6 @@ proc LoadBLT25 { version dir } { set version "%VERSION%" -package ifneeded BLT $version [list LoadBLT25 $version $dir] +package ifneeded BLT $version [list LoadBLT25 $version "$dir"] # End of package index file diff -rupN blt2.5/Makefile.in blt2.5-keep/Makefile.in --- blt2.5/Makefile.in 2010-07-03 01:01:38.000000000 +0200 +++ blt2.5-keep/Makefile.in 2014-01-21 09:21:49.729989911 +0100 @@ -13,7 +13,7 @@ bindir = @bindir@ includedir = @includedir@ libdir = @libdir@ version = @BLT_VERSION@ -scriptdir = $(prefix)/lib/blt$(version) +scriptdir = @libdir@/blt$(version) instdirs = $(prefix) \ $(exec_prefix) \ @@ -47,17 +47,17 @@ install-all: (cd library; $(MAKE) install) (cd man; $(MAKE) install) (cd demos; $(MAKE) install) - $(INSTALL_DATA) $(srcdir)/README $(INSTALL_DIR)$(scriptdir) - $(INSTALL_DATA) $(srcdir)/PROBLEMS $(INSTALL_DIR)$(scriptdir) - $(INSTALL_DATA) $(srcdir)/NEWS $(INSTALL_DIR)$(scriptdir) + $(INSTALL_DATA) $(srcdir)/README $(INSTALL_ROOT)$(scriptdir) + $(INSTALL_DATA) $(srcdir)/PROBLEMS $(INSTALL_ROOT)$(scriptdir) + $(INSTALL_DATA) $(srcdir)/NEWS $(INSTALL_ROOT)$(scriptdir) mkdirs: @for i in $(instdirs) ; do \ if test -d $(INSTALL_ROOT)$$i ; then \ : ; \ else \ - echo " mkdir $(INSTALL_ROOT)$$i" ; \ - mkdir $(INSTALL_ROOT)$$i ; \ + echo " mkdir -p $(INSTALL_ROOT)$$i" ; \ + mkdir -p $(INSTALL_ROOT)$$i ; \ fi ; \ done diff -rupN blt2.5/man/Makefile.in blt2.5-keep/man/Makefile.in --- blt2.5/man/Makefile.in 2009-05-09 18:27:38.000000000 +0200 +++ blt2.5-keep/man/Makefile.in 2014-01-21 08:46:28.804476811 +0100 @@ -51,8 +51,8 @@ mkdirs: if test -d $(INSTALL_ROOT)$$i ; then \ : ; \ else \ - echo " mkdir $(INSTALL_ROOT)$$i" ; \ - mkdir $(INSTALL_ROOT)$$i ; \ + echo " mkdir -p $(INSTALL_ROOT)$$i" ; \ + mkdir -p $(INSTALL_ROOT)$$i ; \ fi ; \ done
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
