From 486a4706de0af20d8b88fd23df12254ec3454af9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Tue, 23 Dec 2014 00:07:01 +0000 Subject: [PATCH] - updated to 8.4.3 --- fixInterpResult.patch | 60 +++++++++++++++++++++++++++++++++++++++++++ tix-tcl85_hack.patch | 11 -------- tix.spec | 29 ++++++++++++--------- 3 files changed, 77 insertions(+), 23 deletions(-) create mode 100644 fixInterpResult.patch delete mode 100644 tix-tcl85_hack.patch diff --git a/fixInterpResult.patch b/fixInterpResult.patch new file mode 100644 index 0000000..21179dd --- /dev/null +++ b/fixInterpResult.patch @@ -0,0 +1,60 @@ +Index: tix-8.4.3/PyTix-2.0/2.0/_tkinter.c +=================================================================== +--- tix-8.4.3.orig/PyTix-2.0/2.0/_tkinter.c ++++ tix-8.4.3/PyTix-2.0/2.0/_tkinter.c +@@ -41,6 +41,7 @@ Copyright (C) 1994 Steen Lumholt. + #define MAC_TCL + #endif + ++#define USE_INTERP_RESULT 1 + #include + #include + #ifdef WITH_TIX +Index: tix-8.4.3/PyTix-2.0/2.0/tkappinit.c +=================================================================== +--- tix-8.4.3.orig/PyTix-2.0/2.0/tkappinit.c ++++ tix-8.4.3/PyTix-2.0/2.0/tkappinit.c +@@ -12,6 +12,7 @@ + it explicitly, e.g. tkapp.eval("load {} Blt"). + */ + ++#define USE_INTERP_RESULT 1 + #include + #include + +Index: tix-8.4.3/generic/tix.h +=================================================================== +--- tix-8.4.3.orig/generic/tix.h ++++ tix-8.4.3/generic/tix.h +@@ -27,6 +27,7 @@ extern "C" { + #endif + + #ifndef _TK ++#define USE_INTERP_RESULT 1 + #include + #endif + +Index: tix-8.4.3/generic/tixPort.h +=================================================================== +--- tix-8.4.3.orig/generic/tixPort.h ++++ tix-8.4.3/generic/tixPort.h +@@ -19,6 +19,7 @@ + #define _TIX_PORT_H_ + + #ifndef _TCL ++#define USE_INTERP_RESULT 1 + #include "tcl.h" + #endif + +Index: tix-8.4.3/generic/tixUtils.c +=================================================================== +--- tix-8.4.3.orig/generic/tixUtils.c ++++ tix-8.4.3/generic/tixUtils.c +@@ -13,6 +13,7 @@ + * $Id: tixUtils.c,v 1.13 2008/02/28 04:29:17 hobbs Exp $ + */ + ++#define USE_INTERP_RESULT 1 + #include + #include + #include diff --git a/tix-tcl85_hack.patch b/tix-tcl85_hack.patch deleted file mode 100644 index 5112243..0000000 --- a/tix-tcl85_hack.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- tix-8.1.4/generic/tixWidget.c~ 2000-05-17 11:08:42.000000000 +0000 -+++ tix-8.1.4/generic/tixWidget.c 2005-04-21 12:59:18.719293888 +0000 -@@ -228,7 +228,7 @@ - Tcl_SetVar2(interp, "errorCode", NULL, oldErrorCode, - TCL_GLOBAL_ONLY); - } -- iPtr->flags |= ERR_IN_PROGRESS; -+/* iPtr->flags |= ERR_IN_PROGRESS; */ - } - if (rootCmd) { - ckfree(rootCmd); diff --git a/tix.spec b/tix.spec index 05bed5c..aedde65 100644 --- a/tix.spec +++ b/tix.spec @@ -5,15 +5,15 @@ Summary(fr.UTF-8): Nombreux meta-widgets (comme les bloc-notes) pour Tk Summary(pl.UTF-8): Wiele widgetów (takich jak notepad) dla Tk Summary(tr.UTF-8): Tk için ek arayüz elemanları (not defterleri v.b.) Name: tix -Version: %{major}.0 -Release: 2 +Version: %{major}.3 +Release: 1 Epoch: 1 License: BSD Group: Development/Languages/Tcl -Source0: http://dl.sourceforge.net/tix/%{name}-%{version}.tar.gz -# Source0-md5: 7fcd84a1a6e27e432cb07284b7a34317 +Source0: http://download.sourceforge.net/tix/Tix%{version}-src.tar.gz +# Source0-md5: 2b8bf4b10a852264678182652f477e59 Patch0: %{name}-scriptpaths.patch -Patch1: %{name}-tcl85_hack.patch +Patch2: fixInterpResult.patch URL: http://tix.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake @@ -77,9 +77,9 @@ Tix - demo programs. Tix - programy demostracjne. %prep -%setup -q +%setup -q -n Tix%{version} %patch0 -p1 -%patch1 -p1 +%patch2 -p1 %build %{__aclocal} -I tclconfig @@ -99,6 +99,10 @@ install -d $RPM_BUILD_ROOT{%{_mandir},%{_examplesdir}/%{name}-%{version}} install -d $RPM_BUILD_ROOT%{_mandir}/mann install man/*.n $RPM_BUILD_ROOT%{_mandir}/mann +install -d $RPM_BUILD_ROOT%{_datadir}/groff/current/tmac +sed -i -e 's/.so man.macros/.mso tix.tmac/g' $RPM_BUILD_ROOT%{_mandir}/mann/*.n +install man/man.macros $RPM_BUILD_ROOT%{_datadir}/groff/current/tmac/tix.tmac + cp -af demos $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} rm -f $RPM_BUILD_ROOT%{_libdir}/Tix%{major}/bitmaps/mktransgif.tcl* @@ -109,16 +113,17 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) %doc ABOUT.html ChangeLog README.txt index.html license.terms docs/FAQ.html -%dir %{_libdir}/Tix%{major} -%attr(755,root,root) %{_libdir}/Tix%{major}/libTix%{major}.so -%{_libdir}/Tix%{major}/*.tcl -%{_libdir}/Tix%{major}/bitmaps -%{_libdir}/Tix%{major}/pref +%dir %{_libdir}/Tix%{version} +%attr(755,root,root) %{_libdir}/Tix%{version}/libTix%{version}.so +%{_libdir}/Tix%{version}/*.tcl +%{_libdir}/Tix%{version}/bitmaps +%{_libdir}/Tix%{version}/pref %files devel %defattr(644,root,root,755) %doc docs/*.txt docs/{pdf,tix-book} %{_mandir}/mann/* +%{_datadir}/groff/current/tmac/tix.tmac %files demo %defattr(644,root,root,755) -- 2.44.0