Hello community,
here is the log from the commit of package newt for openSUSE:Factory
checked in at Mon Feb 7 22:14:29 CET 2011.
--------
--- newt/newt.changes 2010-02-01 13:07:57.000000000 +0100
+++ /mounts/work_src_done/STABLE/newt/newt.changes 2011-02-04 20:26:31.000000000 +0100
@@ -1,0 +2,14 @@
+Fri Feb 4 19:08:58 UTC 2011 - lars@linux-schulserver.de
+
+- update to 0.52.12:
+ + fix whiptail --gauge and its description in man page (#620083)
+ + remove space after \n in whiptail texts (#620083)
+ + remove NLS code from snack (#599608)
+ + expose more keys to python as shortcuts in dialogs (Jakob Kemi)
+ + release python global-thread-lock during dialog displays (Jakob Kemi)
+ + fix warnings in whiptcl.c and include Tcl_PkgProvide() call (Mikhail T.)
+ + don't NULL deref when an invalid array is specified in checkboxtree
+ (Arnaldo Carvalho de Melo)
+- build on older distributions by owning locale/as
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
newt-0.52.11.tar.bz2
New:
----
newt-0.52.12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ newt.spec ++++++
--- /var/tmp/diff_new_pack.SzFCed/_old 2011-02-07 22:14:17.000000000 +0100
+++ /var/tmp/diff_new_pack.SzFCed/_new 2011-02-07 22:14:17.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package newt (Version 0.52.11)
+# spec file for package newt
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,8 +21,8 @@
Name: newt
Summary: Nifty Erik's Windowing Toolkit
-Version: 0.52.11
-Release: 2
+Version: 0.52.12
+Release: 1
License: LGPLv2.1+
Group: System/Libraries
Url: https://fedorahosted.org/newt/
@@ -213,6 +213,11 @@
%doc %{_defaultdocdir}/%{name}/COPYING
%{_bindir}/whiptail
%{_mandir}/man1/whiptail.1*
+%if 0%{?suse_version} <= 1020
+%dir %{_datadir}/locale/as
+%dir %{_datadir}/locale/as/LC_MESSAGES
+%{_datadir}/locale/as/LC_MESSAGES/*
+%endif
%files -n libnewt0_52
%defattr (-,root,root)
++++++ newt-0.52.11.tar.bz2 -> newt-0.52.12.tar.bz2 ++++++
++++ 4917 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/newt-0.52.11/checkboxtree.c new/newt-0.52.12/checkboxtree.c
--- old/newt-0.52.11/checkboxtree.c 2009-09-24 17:03:09.000000000 +0200
+++ new/newt-0.52.12/checkboxtree.c 2010-08-06 13:45:34.000000000 +0200
@@ -203,6 +203,8 @@
i++;
if (i < numIndexes) {
+ if (item == NULL)
+ return -1;
curList = item->branch;
listPtr = &item->branch;
if (!curList && (i + 1 != numIndexes)) return -1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/newt-0.52.11/config.h.in new/newt-0.52.12/config.h.in
--- old/newt-0.52.11/config.h.in 2009-09-24 17:04:29.000000000 +0200
+++ new/newt-0.52.12/config.h.in 2010-08-06 13:46:46.000000000 +0200
@@ -51,6 +51,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/newt-0.52.11/dialogboxes.c new/newt-0.52.12/dialogboxes.c
--- old/newt-0.52.11/dialogboxes.c 2009-09-24 17:03:09.000000000 +0200
+++ new/newt-0.52.12/dialogboxes.c 2010-08-06 13:45:34.000000000 +0200
@@ -74,24 +74,29 @@
}
}
+static void cleanNewlines(char *text)
+{
+ char *p, *q;
+
+ for (p = q = text; *p; p++, q++)
+ if (*p == '\\' && p[1] == 'n') {
+ p++;
+ *q = '\n';
+ } else
+ *q = *p;
+ *q = '\0';
+}
+
static newtComponent textbox(int maxHeight, int width, const char * text,
int flags, int * height) {
newtComponent tb;
int sFlag = (flags & FLAG_SCROLL_TEXT) ? NEWT_FLAG_SCROLL : 0;
int i;
- char * buf, * dst;
- const char * src;
+ char *buf;
- dst = buf = alloca(strlen(text) + 1);
- src = text;
- while (*src) {
- if (*src == '\\' && *(src + 1) == 'n') {
- src += 2;
- *dst++ = '\n';
- } else
- *dst++ = *src++;
- }
- *dst++ = '\0';
+ buf = alloca(strlen(text) + 1);
+ strcpy(buf, text);
+ cleanNewlines(buf);
tb = newtTextbox(1, 0, width, maxHeight, NEWT_FLAG_WRAP | sFlag);
newtTextboxSetText(tb, buf);
@@ -153,19 +158,28 @@
do {
if (!fgets(buf + i, sizeof(buf) - 1 - i, f))
continue;
- buf[strlen(buf) - 1] = '\0';
- if (!strcmp(buf + i, "XXX")) {
+ if (!strcmp(buf + i, "XXX\n")) {
*(buf + i) = '\0';
break;
}
i = strlen(buf);
} while (!feof(f));
+ if (i > 0)
+ buf[strlen(buf) - 1] = '\0';
+ else
+ buf[0] = '\0';
+
+ cleanNewlines(buf);
newtTextboxSetText(tb, buf);
+
+ arg = buf3;
+ } else {
+ arg = buf;
}
- val = strtoul(buf, &end, 10);
- if (*buf && !*end) {
+ val = strtoul(arg, &end, 10);
+ if (!*end) {
newtScaleSet(scale, val);
newtDrawForm(form);
newtRefresh();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/newt-0.52.11/newt.spec new/newt-0.52.12/newt.spec
--- old/newt-0.52.11/newt.spec 2009-09-24 17:03:09.000000000 +0200
+++ new/newt-0.52.12/newt.spec 2010-08-06 13:45:34.000000000 +0200
@@ -1,12 +1,12 @@
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
Summary: A library for text mode user interfaces
Name: newt
-Version: 0.52.11
+Version: 0.52.12
Release: 1%{?dist}
License: LGPLv2
Group: System Environment/Libraries
URL: https://fedorahosted.org/newt/
-Source: https://fedorahosted.org/releases/n/e/newt/newt-%{version}.tar.gz
+Source: https://fedorahosted.org/released/newt/newt-%{version}.tar.gz
BuildRequires: popt-devel python-devel slang-devel
BuildRequires: docbook-utils
Provides: snack = %{version}-%{release}
@@ -104,6 +104,24 @@
%{python_sitearch}/*.py*
%changelog
+* Fri Aug 06 2010 Miroslav Lichvar - 0.52.12-1
+- fix whiptail --gauge and its description in man page (#620083)
+- remove space after \n in whiptail texts (#620083)
+- remove NLS code from snack (#599608)
+- expose more keys to python as shortcuts in dialogs (Jakob Kemi)
+- release python global-thread-lock during dialog displays (Jakob Kemi)
+- fix warnings in whiptcl.c and include Tcl_PkgProvide() call (Mikhail T.)
+- don't NULL deref when an invalid array is specified in checkboxtree
+ (Arnaldo Carvalho de Melo)
+
+* Wed Jul 21 2010 David Malcolm - 0.52.11-3
+- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
+
+* Thu Jan 7 2010 Hans de Goede - 0.52.11-2
+- Change python_sitearch macro to use %%global as the new rpm will break
+ using %%define here, see:
+ https://www.redhat.com/archives/fedora-devel-list/2010-January/msg00093.html
+
* Thu Sep 24 2009 Miroslav Lichvar - 0.52.11-1
- fix buffer overflow in textbox when reflowing (#523955, CVE-2009-2905)
- use full textbox width when reflowing and allow minimal width 1
Files old/newt-0.52.11/po/ast.mo and new/newt-0.52.12/po/ast.mo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/newt-0.52.11/po/ast.po new/newt-0.52.12/po/ast.po
--- old/newt-0.52.11/po/ast.po 2009-09-24 17:03:09.000000000 +0200
+++ new/newt-0.52.12/po/ast.po 2010-08-06 13:45:34.000000000 +0200
@@ -1,34 +1,31 @@
-# Spanish translations for newt
+# Asturian translations for newt
# Copyright (C) 2003 Free Software Foundation
# This file is distributed under the same license as the newt package.
-# Alastair McKinstry , 2003
+# Astur , 2009
msgid ""
msgstr ""
"Project-Id-Version: newt 0.51.4\n"
-"Report-Msgid-Bugs-To: mckinstry@debian.org\n"
-"POT-Creation-Date: 2005-11-22 09:35+0100\n"
-"PO-Revision-Date: 2009-03-09 07:36+0100\n"
-"Last-Translator: Marcos Alvarez Costales \n"
-"Language-Team: Spanish \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-09-14 16:03+0200\n"
+"PO-Revision-Date: 2009-10-24 15:20+0100\n"
+"Last-Translator: astur \n"
+"Language-Team: Asturian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
-#: dialogboxes.c:43
-#: dialogboxes.c:48
-#: dialogboxes.c:493
+#: ../dialogboxes.c:43 ../dialogboxes.c:48 ../dialogboxes.c:493
msgid "Ok"
msgstr "Aceutar"
-#: dialogboxes.c:51
+#: ../dialogboxes.c:51
msgid "Cancel"
msgstr "Encaboxar"
-#: dialogboxes.c:498
+#: ../dialogboxes.c:498
msgid "Yes"
msgstr "S�"
-#: dialogboxes.c:500
+#: ../dialogboxes.c:500
msgid "No"
msgstr "Non"
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/newt-0.52.11/snack.py new/newt-0.52.12/snack.py
--- old/newt-0.52.11/snack.py 2009-09-24 17:03:09.000000000 +0200
+++ new/newt-0.52.12/snack.py 2010-08-06 13:45:34.000000000 +0200
@@ -294,10 +294,17 @@
"F4" : _snack.KEY_F4, "F5" : _snack.KEY_F5, "F6" : _snack.KEY_F6,
"F7" : _snack.KEY_F7, "F8" : _snack.KEY_F8, "F9" : _snack.KEY_F9,
"F10" : _snack.KEY_F10, "F11" : _snack.KEY_F11,
- "F12" : _snack.KEY_F12, "ESC" : _snack.KEY_ESC , " " : ord(" ") }
+ "F12" : _snack.KEY_F12, "ESC" : _snack.KEY_ESC,
+ "ENTER": _snack.KEY_ENTER, "SUSPEND" : _snack.KEY_SUSPEND,
+ "BACKSPACE": _snack.KEY_BACKSPACE, "DELETE": _snack.KEY_DELETE,
+ "INSERT": _snack.KEY_INSERT,
+ " " : ord(" ") }
for n in hotkeys.keys():
hotkeys[hotkeys[n]] = n
+for o,c in [ (ord(c),c) for c in string.ascii_letters+string.digits ]:
+ hotkeys[c] = o
+ hotkeys[o] = c
class Form:
""" Base Form class, from which Grid, etc. inherit
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/newt-0.52.11/snackmodule.c new/newt-0.52.12/snackmodule.c
--- old/newt-0.52.11/snackmodule.c 2009-09-24 17:03:09.000000000 +0200
+++ new/newt-0.52.12/snackmodule.c 2010-08-06 13:45:34.000000000 +0200
@@ -356,11 +356,15 @@
static void helpCallbackMarshall(newtComponent co, void * data) {
PyObject * args, * result;
+ PyGILState_STATE _state = PyGILState_Ensure();
+
args = Py_BuildValue("(O)", data);
result = PyEval_CallObject(helpCallback.cb, args);
Py_DECREF (args);
Py_XDECREF(result);
+ PyGILState_Release(_state);
+
return;
}
@@ -368,6 +372,8 @@
struct callbackStruct * scs = data;
PyObject * args, * result;
+ PyGILState_STATE _state = PyGILState_Ensure();
+
if (scs->data) {
args = Py_BuildValue("(O)", scs->data);
result = PyEval_CallObject(scs->cb, args);
@@ -382,6 +388,8 @@
Py_XDECREF(result);
+ PyGILState_Release(_state);
+
return;
}
@@ -389,6 +397,8 @@
struct callbackStruct * scs = data;
PyObject * args, * result;
+ PyGILState_STATE _state = PyGILState_Ensure();
+
if (scs->data) {
args = Py_BuildValue("(O)", scs->data);
result = PyEval_CallObject(scs->cb, args);
@@ -403,6 +413,8 @@
Py_XDECREF(result);
+ PyGILState_Release(_state);
+
return;
}
@@ -563,7 +575,9 @@
if (!PyArg_ParseTuple(args, "ss|s", &title, &text, &okbutton))
return NULL;
+ Py_BEGIN_ALLOW_THREADS
newtWinMessage(title, okbutton, text);
+ Py_END_ALLOW_THREADS
Py_INCREF(Py_None);
return Py_None;
@@ -579,7 +593,9 @@
&cancelbutton))
return NULL;
+ Py_BEGIN_ALLOW_THREADS
rc = newtWinChoice(title, okbutton, cancelbutton, text);
+ Py_END_ALLOW_THREADS
return Py_BuildValue("i", rc);
}
@@ -592,7 +608,9 @@
&button3))
return NULL;
+ Py_BEGIN_ALLOW_THREADS
rc = newtWinTernary(title, button1, button2, button3, text);
+ Py_END_ALLOW_THREADS
return Py_BuildValue("i", rc);
}
@@ -883,7 +901,9 @@
static PyObject * formRun(snackForm * s, PyObject * args) {
struct newtExitStruct result;
+ Py_BEGIN_ALLOW_THREADS
newtFormRun(s->fo, &result);
+ Py_END_ALLOW_THREADS
if (result.reason == NEWT_EXIT_HOTKEY)
return Py_BuildValue("(si)", "hotkey", result.u.key);
@@ -1287,12 +1307,6 @@
void init_snack(void) {
PyObject * d, * m;
-#ifdef ENABLE_NLS
- setlocale (LC_ALL, "");
- bindtextdomain (PACKAGE, LOCALEDIR);
- textdomain (PACKAGE);
-#endif
-
m = Py_InitModule("_snack", snackModuleMethods);
d = PyModule_GetDict(m);
@@ -1313,6 +1327,21 @@
PyDict_SetItemString(d, "FORM_EXIT_TIMER", PyString_FromString("timer"));
PyDict_SetItemString(d, "FORM_EXIT_FDREADY", PyString_FromString("fdready"));
+ PyDict_SetItemString(d, "KEY_TAB", PyInt_FromLong(NEWT_KEY_TAB));
+ PyDict_SetItemString(d, "KEY_ENTER", PyInt_FromLong(NEWT_KEY_ENTER));
+ PyDict_SetItemString(d, "KEY_SUSPEND", PyInt_FromLong(NEWT_KEY_SUSPEND));
+ PyDict_SetItemString(d, "KEY_UP", PyInt_FromLong(NEWT_KEY_UP));
+ PyDict_SetItemString(d, "KEY_DOWN", PyInt_FromLong(NEWT_KEY_DOWN));
+ PyDict_SetItemString(d, "KEY_LEFT", PyInt_FromLong(NEWT_KEY_LEFT));
+ PyDict_SetItemString(d, "KEY_RIGHT", PyInt_FromLong(NEWT_KEY_RIGHT));
+ PyDict_SetItemString(d, "KEY_BACKSPACE", PyInt_FromLong(NEWT_KEY_BKSPC));
+ PyDict_SetItemString(d, "KEY_DELETE", PyInt_FromLong(NEWT_KEY_DELETE));
+ PyDict_SetItemString(d, "KEY_HOME", PyInt_FromLong(NEWT_KEY_HOME));
+ PyDict_SetItemString(d, "KEY_END", PyInt_FromLong(NEWT_KEY_END));
+ PyDict_SetItemString(d, "KEY_UNTAB", PyInt_FromLong(NEWT_KEY_UNTAB));
+ PyDict_SetItemString(d, "KEY_PAGEUP", PyInt_FromLong(NEWT_KEY_PGUP));
+ PyDict_SetItemString(d, "KEY_PAGEGDOWN", PyInt_FromLong(NEWT_KEY_PGDN));
+ PyDict_SetItemString(d, "KEY_INSERT", PyInt_FromLong(NEWT_KEY_INSERT));
PyDict_SetItemString(d, "KEY_F1", PyInt_FromLong(NEWT_KEY_F1));
PyDict_SetItemString(d, "KEY_F2", PyInt_FromLong(NEWT_KEY_F2));
PyDict_SetItemString(d, "KEY_F3", PyInt_FromLong(NEWT_KEY_F3));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/newt-0.52.11/whiptail.1 new/newt-0.52.12/whiptail.1
--- old/newt-0.52.11/whiptail.1 2009-09-24 17:03:09.000000000 +0200
+++ new/newt-0.52.12/whiptail.1 2010-08-06 13:45:34.000000000 +0200
@@ -271,8 +271,8 @@
.RB "A " gauge " box displays a meter along the bottom of the box.
The meter indicates a percentage. New percentages are read from
standard input, one integer per line. The meter is updated
-to reflect each new percentage. If stdin is XXX, then subsequent
-lines up to another XXX are used for a new prompt.
+to reflect each new percentage. If stdin is XXX, the first following line is
+a percentage and subsequent lines up to another XXX are used for a new prompt.
The gauge exits when EOF is reached on stdin.
.SH NOTES
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/newt-0.52.11/whiptail.c new/newt-0.52.12/whiptail.c
--- old/newt-0.52.11/whiptail.c 2009-09-24 17:03:09.000000000 +0200
+++ new/newt-0.52.12/whiptail.c 2010-08-06 13:45:34.000000000 +0200
@@ -129,15 +129,15 @@
*/
void cleanNewlines (char *text)
{
- char *p = text;
- while (*p) {
- if ((*p == '\\') && (*(p+1) == 'n')) {
- *p = '\n';
- *(p+1) = ' ';
- } else {
- p++;
- }
- }
+ char *p, *q;
+
+ for (p = q = text; *p; p++, q++)
+ if (*p == '\\' && p[1] == 'n') {
+ p++;
+ *q = '\n';
+ } else
+ *q = *p;
+ *q = '\0';
}
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/newt-0.52.11/whiptcl.c new/newt-0.52.12/whiptcl.c
--- old/newt-0.52.11/whiptcl.c 2009-09-24 17:03:09.000000000 +0200
+++ new/newt-0.52.12/whiptcl.c 2010-08-06 13:45:34.000000000 +0200
@@ -5,8 +5,8 @@
#include "nls.h"
#include "dialogboxes.h"
#include "newt.h"
-#include "popt.h"
-#include "tcl.h"
+#include
+#include
enum mode { MODE_NONE, MODE_MSGBOX, MODE_YESNO, MODE_CHECKLIST, MODE_INPUTBOX,
MODE_RADIOLIST, MODE_MENU };
@@ -19,21 +19,21 @@
#define OPT_RADIOLIST 1006
static char * setBacktext(ClientData data, Tcl_Interp * interp,
- char * name1, char * name2, int flags);
+ const char * name1, const char * name2, int flags);
static char * setHelptext(ClientData data, Tcl_Interp * interp,
- char * name1, char * name2, int flags);
+ const char * name1, const char * name2, int flags);
static char * setFullButtons(ClientData data, Tcl_Interp * interp,
- char * name1, char * name2, int flags);
+ const char * name1, const char * name2, int flags);
static int wtFinish(ClientData clientData, Tcl_Interp * interp, int argc,
- char ** argv) {
+ const char ** argv) {
newtFinished();
return TCL_OK;
}
static int wtInit(ClientData clientData, Tcl_Interp * interp, int argc,
- char ** argv) {
+ const char ** argv) {
newtInit();
newtCls();
@@ -238,7 +238,7 @@
break;
case MODE_NONE:
- /* this can't happen */
+ ; /* this can't happen */
break;
}
@@ -258,7 +258,7 @@
}
static char * setBacktext(ClientData data, Tcl_Interp * interp,
- char * name1, char * name2, int flags) {
+ const char * name1, const char * name2, int flags) {
static char blankLine[81] = " "
" ";
@@ -270,8 +270,8 @@
}
static char * setHelptext(ClientData data, Tcl_Interp * interp,
- char * name1, char * name2, int flags) {
- char * text = Tcl_GetVar(interp, "whiptcl_helpline", TCL_GLOBAL_ONLY);
+ const char * name1, const char * name2, int flags) {
+ const char * text = Tcl_GetVar(interp, "whiptcl_helpline", TCL_GLOBAL_ONLY);
if (!text)
text = "";
@@ -285,8 +285,8 @@
}
static char * setFullButtons(ClientData data, Tcl_Interp * interp,
- char * name1, char * name2, int flags) {
- char * val = Tcl_GetVar(interp, "whiptcl_fullbuttons", TCL_GLOBAL_ONLY);
+ const char * name1, const char * name2, int flags) {
+ const char * val = Tcl_GetVar(interp, "whiptcl_fullbuttons", TCL_GLOBAL_ONLY);
int rc;
int state;
@@ -305,5 +305,7 @@
Tcl_CreateCommand(interp, "whiptcl_init", wtInit, NULL, NULL);
Tcl_CreateCommand(interp, "whiptcl_cmd", (Tcl_CmdProc *) wtCmd, NULL, NULL);
+ Tcl_PkgProvide(interp, "Whip", VERSION);
+
return TCL_OK;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org