Hello community, here is the log from the commit of package nxtvepg checked in at Wed Apr 9 00:39:05 CEST 2008. -------- --- nxtvepg/nxtvepg.changes 2008-02-04 16:25:45.000000000 +0100 +++ nxtvepg/nxtvepg.changes 2008-04-08 13:56:34.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Apr 8 13:25:12 CEST 2008 - mmarek@suse.cz + +- don't hardcode {TCL,TK}_LIBRARY_PATH, tcl knows it's installation + paths already +- added patch to fix a crash with new Tcl/Tk + +------------------------------------------------------------------- New: ---- nxtvepg-2.8.0-threadfix.patch nxtvepg-no-hardcoded-tcl-dir.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nxtvepg.spec ++++++ --- /var/tmp/diff_new_pack.zf7203/_old 2008-04-09 00:38:49.000000000 +0200 +++ /var/tmp/diff_new_pack.zf7203/_new 2008-04-09 00:38:49.000000000 +0200 @@ -10,6 +10,7 @@ # norootforbuild + Name: nxtvepg BuildRequires: tk-devel xorg-x11-devel Url: http://nxtvepg.sourceforge.net/ @@ -17,12 +18,14 @@ Group: Hardware/TV AutoReqProv: on Version: 2.8.0 -Release: 1 +Release: 14 Summary: Nextview EPG Decoder and Browser Source0: %{name}-%{version}.tar.bz2 Source1: rc.nxtvepg Patch1: nxtvepg-Makefile.patch -Patch2: nxtvepg-2.8.0-strict-aliasing.patch +Patch2: nxtvepg-no-hardcoded-tcl-dir.patch +Patch3: nxtvepg-2.8.0-strict-aliasing.patch +Patch4: nxtvepg-2.8.0-threadfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -52,6 +55,8 @@ %setup -q %patch1 %patch2 +%patch3 +%patch4 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -93,6 +98,10 @@ %insserv_cleanup %changelog +* Tue Apr 08 2008 mmarek@suse.cz +- don't hardcode {TCL,TK}_LIBRARY_PATH, tcl knows it's installation + paths already +- added patch to fix a crash with new Tcl/Tk * Mon Feb 04 2008 mmarek@suse.cz - updated to version 2.8.0 * import and merge of EPG data from XMLTV files ++++++ nxtvepg-2.8.0-threadfix.patch ++++++ --- epgui/epgmain.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- epgui/epgmain.c.orig +++ epgui/epgmain.c @@ -2168,15 +2168,15 @@ int main( int argc, char *argv[] ) if ( IS_GUI_MODE(mainOpts) || IS_DUMP_MODE(mainOpts) ) { + // initialize Tcl interpreter and compile all scripts + // Tk is only initialized if a GUI will be opened + ui_init(argc, argv, IS_GUI_MODE(mainOpts)); + #ifndef WIN32 exitAsyncHandler = Tcl_AsyncCreate(AsyncHandler_AppTerminate, NULL); signalAsyncHandler = Tcl_AsyncCreate(AsyncHandler_Signalled, NULL); #endif - // initialize Tcl interpreter and compile all scripts - // Tk is only initialized if a GUI will be opened - ui_init(argc, argv, IS_GUI_MODE(mainOpts)); - encIso88591 = Tcl_GetEncoding(interp, "iso8859-1"); RcFile_Init(); ++++++ nxtvepg-Makefile.patch ++++++ --- /var/tmp/diff_new_pack.zf7203/_old 2008-04-09 00:38:49.000000000 +0200 +++ /var/tmp/diff_new_pack.zf7203/_new 2008-04-09 00:38:49.000000000 +0200 @@ -1,6 +1,6 @@ --- - Makefile | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) + Makefile | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) --- Makefile.orig +++ Makefile @@ -13,14 +13,12 @@ # if you have perl and/or flex set their path here, else just leave them alone PERL = /usr/bin/perl -@@ -76,8 +76,8 @@ DEFS += -DX11_APP_DEFAULTS=\"$(resdir) - #INCS += -I/usr/local/tcl/tcl8.0/generic -I/usr/local/tcl/tk8.0/generic +@@ -58,7 +58,7 @@ FLEX = /usr/bin/flex + YACC = /usr/bin/yacc - # path to Tcl/Tk script library (note Tk is sometimes in X11/lib/tk#.#) --TK_LIBRARY_PATH = /usr/lib/tk$(TCL_VER) --TCL_LIBRARY_PATH = /usr/lib/tcl$(TCL_VER) -+TK_LIBRARY_PATH = /usr/share/tcl/tk$(TCL_VER) -+TCL_LIBRARY_PATH = /usr/share/tcl/tcl$(TCL_VER) - DEFS += -DTK_LIBRARY_PATH=\"$(TK_LIBRARY_PATH)\" - DEFS += -DTCL_LIBRARY_PATH=\"$(TCL_LIBRARY_PATH)\" + # select Tcl/Tk version (8.5 recommended due to modernized widget appearence) +-TCL_VER := $(shell echo 'puts [package require Tcl]' | tclsh) ++TCL_VER := $(shell echo 'puts [info tclversion]' | tclsh) + #TCL_VER = 8.5 + ifeq ($(shell test -d /usr/include/tcl$(TCL_VER) && echo YES),YES) ++++++ nxtvepg-no-hardcoded-tcl-dir.patch ++++++ --- Makefile | 13 ++----------- epgui/epgmain.c | 17 +++++++++++------ tvsim/tvsim_main.c | 17 +++++++++++------ tvsim/vbirec_main.c | 17 +++++++++++------ 4 files changed, 35 insertions(+), 29 deletions(-) --- Makefile.orig +++ Makefile @@ -78,8 +78,8 @@ DEFS += -DX11_APP_DEFAULTS=\"$(resdir) # path to Tcl/Tk script library (note Tk is sometimes in X11/lib/tk#.#) TK_LIBRARY_PATH = /usr/lib/tk$(TCL_VER) TCL_LIBRARY_PATH = /usr/lib/tcl$(TCL_VER) -DEFS += -DTK_LIBRARY_PATH=\"$(TK_LIBRARY_PATH)\" -DEFS += -DTCL_LIBRARY_PATH=\"$(TCL_LIBRARY_PATH)\" +#DEFS += -DTK_LIBRARY_PATH=\"$(TK_LIBRARY_PATH)\" +#DEFS += -DTCL_LIBRARY_PATH=\"$(TCL_LIBRARY_PATH)\" # enable use of multi-threading DEFS += -DUSE_THREADS @@ -295,15 +295,6 @@ tcl_headers_tvsim: $(addprefix $(BUILD_D $(BUILD_DIR)/tcl2c: tcl2c.c $(CC) $(CFLAGS) -o $(BUILD_DIR)/tcl2c tcl2c.c -$(TCL_LIBRARY_PATH)/tclIndex $(TK_LIBRARY_PATH)/tclIndex : - @if [ ! -f $(TCL_LIBRARY_PATH) -o ! -f $(TK_LIBRARY_PATH) ] ; then \ - echo "$(@D) is not a valid Tcl/Tk library directory"; \ - echo "Check the definitions of TCL_LIBRARY_PATH and TK_LIBRARY_PATH"; \ - false; \ - fi - -epgui/loadtcl.c :: $(TCL_LIBRARY_PATH)/tclIndex $(TK_LIBRARY_PATH)/tclIndex - .PHONY: bak bak: cd .. && tar cvf /tmp/pc.tar -X pc/tar-ex pc ttx --- epgui/epgmain.c.orig +++ epgui/epgmain.c @@ -107,11 +107,7 @@ #include "epgui/epgmain.h" -#ifndef USE_PRECOMPILED_TCL_LIBS -# if !defined(TCL_LIBRARY_PATH) || !defined(TK_LIBRARY_PATH) -# error "Must define both TK_ and TCL_LIBRARY_PATH" -# endif -#else +#ifdef USE_PRECOMPILED_TCL_LIBS # define TCL_LIBRARY_PATH "." # define TK_LIBRARY_PATH "." #endif @@ -1991,8 +1987,12 @@ static int ui_init( int argc, char **arg } Tcl_SetVar(interp, "argv0", argv[0], TCL_GLOBAL_ONLY); +#ifdef TCL_LIBRARY_PATH Tcl_SetVar(interp, "tcl_library", TCL_LIBRARY_PATH, TCL_GLOBAL_ONLY); +#endif +#ifdef TK_LIBRARY_PATH Tcl_SetVar(interp, "tk_library", TK_LIBRARY_PATH, TCL_GLOBAL_ONLY); +#endif Tcl_SetVar(interp, "tcl_interactive", "0", TCL_GLOBAL_ONLY); #ifndef WIN32 @@ -2020,7 +2020,12 @@ static int ui_init( int argc, char **arg { #ifndef USE_PRECOMPILED_TCL_LIBS fprintf(stderr, "Failed to initialise the Tk library at '%s' - exiting.\nTk error message: %s\n", - TK_LIBRARY_PATH, Tcl_GetStringResult(interp)); +#ifdef TK_LIBRARY_PATH + TK_LIBRARY_PATH, +#else + "<default Tk library path>", +#endif + Tcl_GetStringResult(interp)); exit(1); #endif } --- tvsim/tvsim_main.c.orig +++ tvsim/tvsim_main.c @@ -83,11 +83,7 @@ # define TCL_EVAL_CONST(INTERP, SCRIPT) Tcl_VarEval(INTERP, "uplevel #0 {", (char *) SCRIPT, "}", NULL) #endif -#ifndef USE_PRECOMPILED_TCL_LIBS -# if !defined(TCL_LIBRARY_PATH) || !defined(TK_LIBRARY_PATH) -# error "Must define both TK_ and TCL_LIBRARY_PATH" -# endif -#else +#ifdef USE_PRECOMPILED_TCL_LIBS # define TCL_LIBRARY_PATH "." # define TK_LIBRARY_PATH "." # include "epgtcl/tcl_libs.h" @@ -1969,8 +1965,12 @@ static int ui_init( int argc, char **arg Tcl_SetVar(interp, "argv0", argv[0], TCL_GLOBAL_ONLY); #endif +#ifdef TCL_LIBRARY_PATH Tcl_SetVar(interp, "tcl_library", TCL_LIBRARY_PATH, TCL_GLOBAL_ONLY); +#endif +#ifdef TK_LIBRARY_PATH Tcl_SetVar(interp, "tk_library", TK_LIBRARY_PATH, TCL_GLOBAL_ONLY); +#endif Tcl_SetVar(interp, "tcl_interactive", "0", TCL_GLOBAL_ONLY); Tcl_SetVar(interp, "TVSIM_VERSION", TVSIM_VERSION_STR, TCL_GLOBAL_ONLY); @@ -1986,7 +1986,12 @@ static int ui_init( int argc, char **arg { #ifndef USE_PRECOMPILED_TCL_LIBS fprintf(stderr, "Failed to initialise the Tk library at '%s' - exiting.\nTk error message: %s\n", - TK_LIBRARY_PATH, Tcl_GetStringResult(interp)); +#ifdef TK_LIBRARY_PATH + TK_LIBRARY_PATH, +#else + "<default Tk library path>", +#endif + Tcl_GetStringResult(interp)); exit(1); #endif } --- tvsim/vbirec_main.c.orig +++ tvsim/vbirec_main.c @@ -80,11 +80,7 @@ # define TCL_EVAL_CONST(INTERP, SCRIPT) Tcl_VarEval(INTERP, (char *) SCRIPT, NULL) #endif -#ifndef USE_PRECOMPILED_TCL_LIBS -# if !defined(TCL_LIBRARY_PATH) || !defined(TK_LIBRARY_PATH) -# error "Must define both TK_ and TCL_LIBRARY_PATH" -# endif -#else +#ifdef USE_PRECOMPILED_TCL_LIBS # define TCL_LIBRARY_PATH "." # define TK_LIBRARY_PATH "." # include "epgtcl/tcl_libs.h" @@ -1136,8 +1132,12 @@ static int ui_init( int argc, char **arg } Tcl_SetVar(interp, "argv0", argv[0], TCL_GLOBAL_ONLY); +#ifdef TCL_LIBRARY_PATH Tcl_SetVar(interp, "tcl_library", TCL_LIBRARY_PATH, TCL_GLOBAL_ONLY); +#endif +#ifdef TK_LIBRARY_PATH Tcl_SetVar(interp, "tk_library", TK_LIBRARY_PATH, TCL_GLOBAL_ONLY); +#endif Tcl_SetVar(interp, "tcl_interactive", "0", TCL_GLOBAL_ONLY); Tcl_SetVar(interp, "TVSIM_VERSION", TVSIM_VERSION_STR, TCL_GLOBAL_ONLY); @@ -1155,7 +1155,12 @@ static int ui_init( int argc, char **arg { #ifndef USE_PRECOMPILED_TCL_LIBS fprintf(stderr, "Failed to initialise the Tk library at '%s' - exiting.\nTk error message: %s\n", - TK_LIBRARY_PATH, Tcl_GetStringResult(interp)); +#ifdef TK_LIBRARY_PATH + TK_LIBRARY_PATH, +#else + "<default Tk library path>", +#endif + Tcl_GetStringResult(interp)); exit(1); #endif } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org