r11216 - in /trunk/libcurses-perl: ./ debian/ hints/
hanska-guest at users.alioth.debian.org
hanska-guest at users.alioth.debian.org
Sun Dec 16 10:33:47 UTC 2007
Author: hanska-guest
Date: Sun Dec 16 10:33:47 2007
New Revision: 11216
URL: http://svn.debian.org/wsvn/?sc=1&rev=11216
Log:
* (NOT RELEASED YET) New upstream release
Removed:
trunk/libcurses-perl/hints/c-darwin-thread-multi-2level.h
Modified:
trunk/libcurses-perl/Curses.c
trunk/libcurses-perl/Curses.pm
trunk/libcurses-perl/MAINTENANCE
trunk/libcurses-perl/debian/changelog
trunk/libcurses-perl/demo
trunk/libcurses-perl/demo.panel
trunk/libcurses-perl/hints/c-MSWin32.borland.h
trunk/libcurses-perl/hints/c-cygwin.h
trunk/libcurses-perl/hints/c-darwin.h
trunk/libcurses-perl/hints/c-irix.ncurses.h
trunk/libcurses-perl/hints/c-isc.h
trunk/libcurses-perl/hints/c-linux.ncurses.h
trunk/libcurses-perl/hints/c-solaris.h
trunk/libcurses-perl/hints/c-sunos.ncurses.h
trunk/libcurses-perl/hints/c-sunos.sysv.h
Modified: trunk/libcurses-perl/Curses.c
URL: http://svn.debian.org/wsvn/trunk/libcurses-perl/Curses.c?rev=11216&op=diff
==============================================================================
--- trunk/libcurses-perl/Curses.c (original)
+++ trunk/libcurses-perl/Curses.c Sun Dec 16 10:33:47 2007
@@ -10,9 +10,32 @@
#include "CursesTyp.h"
#include "c-config.h"
-#include "EXTERN.h"
-#include "perl.h"
-#include "XSUB.h"
+/* c-config.h above includes Ncurses header files that define macro
+ 'instr'. Unfortunately, perl.h (below) also defines 'instr'.
+ Fortunately, we don't need the Curses version -- we use
+ winstr(stdscr, ...) instead. So we undef instr here to avoid a compiler
+ warning about the redeclaration.
+
+ Similarly, c-config.h may define a macro "pad", while the word
+ "pad" is used in perl.h another way, so we undefine it to avoid
+ a nasty syntax error.
+
+ "term.h" pollutes the name space with hundreds of other macros too.
+ We'll probably have to add to this list; maybe someday we should
+ just undef them all, since we don't use them.
+*/
+
+#undef instr
+#undef tab
+
+#include <EXTERN.h>
+#include <perl.h>
+#include <XSUB.h>
+/* I don't know why NEED_sv_2pv_flags is necessary, but ppport.h doesn't
+ work right without it. Maybe a bug in Devel::PPPort?
+*/
+#define NEED_sv_2pv_flags
+#include "ppport.h"
#ifndef C_PANELSUPPORT
# define PANEL int
@@ -28,15 +51,16 @@
# define FIELD int
#endif
-#ifdef __PDCURSES__
-#undef SP
-#endif
+/* Before 1.17 (September 2007), we undefined macro 'SP' here, for
+ the Pdcurses case only. I don't know why, but it caused the build
+ with Pdcurses to fail, so we took it out. 'SP' is
+ defined in Perl's CORE/pp.h via our inclusion of perl.h above.
+*/
/* What a mess. :( */
#ifndef PERL_VERSION
# define PL_sv_undef sv_undef
# define PL_sv_yes sv_yes
-# define PL_na na
#endif
/*
@@ -120,7 +144,7 @@
SV *sv;
{
if (SvPOK(sv)) {
- char *tmp = SvPV(sv,PL_na);
+ char *tmp = SvPV_nolen(sv);
return (chtype)(unsigned char)tmp[0];
}
return (chtype)SvIV(sv);
@@ -145,7 +169,8 @@
SV *sv;
int argnum;
{
- if (sv_isa(sv, "Curses::Field")) { return (FIELD *)SvIV((SV*)SvRV(sv)); }
+ if (sv_derived_from(sv, "Curses::Field"))
+ return (FIELD *)SvIV((SV*)SvRV(sv));
if (argnum >= 0)
croak("argument %d to Curses function '%s' is not a Curses field",
argnum, c_function);
@@ -154,11 +179,14 @@
}
static void
-c_field2sv(sv, val)
-SV *sv;
-FIELD *val;
-{
- sv_setref_pv(sv, "Curses::Field", (void*)val);
+c_field2sv(SV * const svP,
+ FIELD * const fieldP) {
+/*----------------------------------------------------------------------------
+ Make *svP a reference to a scalar whose value is the numerical
+ equivalent of 'fieldP' and which is blessed into the hypothetical
+ package "Curses::Field".
+-----------------------------------------------------------------------------*/
+ sv_setref_pv(svP, "Curses::Field", (void*)fieldP);
}
static FORM *
@@ -166,7 +194,8 @@
SV *sv;
int argnum;
{
- if (sv_isa(sv, "Curses::Form")) { return (FORM *)SvIV((SV*)SvRV(sv)); }
+ if (sv_derived_from(sv, "Curses::Form"))
+ return (FORM *)SvIV((SV*)SvRV(sv));
if (argnum >= 0)
croak("argument %d to Curses function '%s' is not a Curses form",
argnum, c_function);
@@ -187,7 +216,8 @@
SV *sv;
int argnum;
{
- if (sv_isa(sv, "Curses::Item")) { return (ITEM *)SvIV((SV*)SvRV(sv)); }
+ if (sv_derived_from(sv, "Curses::Item"))
+ return (ITEM *)SvIV((SV*)SvRV(sv));
if (argnum >= 0)
croak("argument %d to Curses function '%s' is not a Curses item",
argnum, c_function);
@@ -209,7 +239,8 @@
SV *sv;
int argnum;
{
- if (sv_isa(sv, "Curses::Menu")) { return (MENU *)SvIV((SV*)SvRV(sv)); }
+ if (sv_derived_from(sv, "Curses::Menu"))
+ return (MENU *)SvIV((SV*)SvRV(sv));
if (argnum >= 0)
croak("argument %d to Curses function '%s' is not a Curses menu",
argnum, c_function);
@@ -230,7 +261,8 @@
SV *sv;
int argnum;
{
- if (sv_isa(sv, "Curses::Panel")) { return (PANEL *)SvIV((SV*)SvRV(sv)); }
+ if (sv_derived_from(sv, "Curses::Panel"))
+ return (PANEL *)SvIV((SV*)SvRV(sv));
if (argnum >= 0)
croak("argument %d to Curses function '%s' is not a Curses panel",
argnum, c_function);
@@ -251,7 +283,8 @@
SV *sv;
int argnum;
{
- if (sv_isa(sv, "Curses::Screen")) { return (SCREEN *)SvIV((SV*)SvRV(sv)); }
+ if (sv_derived_from(sv, "Curses::Screen"))
+ return (SCREEN *)SvIV((SV*)SvRV(sv));
if (argnum >= 0)
croak("argument %d to Curses function '%s' is not a Curses screen",
argnum, c_function);
@@ -272,7 +305,7 @@
SV *sv;
int argnum;
{
- if (sv_isa(sv, "Curses::Window")) {
+ if (sv_derived_from(sv, "Curses::Window")) {
WINDOW *ret = (WINDOW *)SvIV((SV*)SvRV(sv));
return ret;
}
Modified: trunk/libcurses-perl/Curses.pm
URL: http://svn.debian.org/wsvn/trunk/libcurses-perl/Curses.pm?rev=11216&op=diff
==============================================================================
--- trunk/libcurses-perl/Curses.pm (original)
+++ trunk/libcurses-perl/Curses.pm Sun Dec 16 10:33:47 2007
@@ -51,7 +51,7 @@
package Curses;
-$VERSION = '1.13'; # Also see Makefile.PL
+$VERSION = '1.20'; # Makefile.PL picks this up
use Carp;
require Exporter;
@@ -254,7 +254,7 @@
Curses::supports_function($function);
- Curses::supports_contsant($constant);
+ Curses::supports_constant($constant);
=head1 DESCRIPTION
Modified: trunk/libcurses-perl/MAINTENANCE
URL: http://svn.debian.org/wsvn/trunk/libcurses-perl/MAINTENANCE?rev=11216&op=diff
==============================================================================
--- trunk/libcurses-perl/MAINTENANCE (original)
+++ trunk/libcurses-perl/MAINTENANCE Sun Dec 16 10:33:47 2007
@@ -14,17 +14,14 @@
- Update HISTORY file with description of new stuff and release date.
- - Copy the changes for the current release in README.
-
- - Update version number in Makefile.PL (search for VERSION).
-
- Update version number in Curses.pm (search for VERSION).
- Make a tarball with something like this:
tar --file=/tmp/Curses-1.07.tgz --gzip --create Curses-1.07
- - Upload via pause.perl.org.
+ - Upload via pause.perl.org. Use "upload a file to CPAN" link.
+ You have to login to make that link appear.
It goes into CPAN in the directory belonging to the user who
uploaded it. PAUSE gives you various options for uploading, tells
@@ -41,3 +38,36 @@
pretty sure this is wrong -- this looks like it's just supposed to be a
private thing used in the build. Someday, we should find a way to stop
this.
+
+
+For Bryan's test system:
+
+ export CURSES_LDFLAGS="-L/usr/link/ncurses -lncurses -ldl"
+ export CURSES_CFLAGS="-I/usr/include/ncurses"
+
+
+GEN
+---
+
+The package is designed to have all the distributed code files
+(Curses.pm, CursesFun.c, etc.) generated by the programs in gen/ .
+This is supposed to handle the myriad Ncurses functions with less
+tedium than manually editing the files.
+
+However, Bryan doesn't know how the Gen stuff works, so he has been
+making the small updates necessary directly to the distributed files.
+But the changes are modest, so it should be possible some day to
+generate new files, diff to see what changed, and put those changes
+into the Gen programs.
+
+
+ppport.h
+--------
+
+You generate this by running the function Devel::PPPort::WriteFile().
+
+There shouldn't be any need to generate a new one unless there are
+updates to the Devel::PPPort package.
+
+A comment in ppport.h says it was generated by Perl 5.006002. That's
+a lie.
Modified: trunk/libcurses-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libcurses-perl/debian/changelog?rev=11216&op=diff
==============================================================================
--- trunk/libcurses-perl/debian/changelog (original)
+++ trunk/libcurses-perl/debian/changelog Sun Dec 16 10:33:47 2007
@@ -1,11 +1,15 @@
-libcurses-perl (1.13-2) UNRELEASED; urgency=low
-
+libcurses-perl (1.20-1) UNRELEASED; urgency=low
+
+ [ David Paleino ]
+ * (NOT RELEASED YET) New upstream release
+
+ [ gregor herrmann ]
* debian/control: Added: Vcs-Svn field (source stanza); Vcs-Browser
field (source stanza); Homepage field (source stanza).
* Set Maintainer to Debian Perl Group.
* Use dist-based URL in debian/watch.
- -- gregor herrmann <gregor+debian at comodo.priv.at> Sat, 01 Dec 2007 18:54:49 +0100
+ -- David Paleino <d.paleino at gmail.com> Sun, 16 Dec 2007 11:26:39 +0100
libcurses-perl (1.13-1) unstable; urgency=low
Modified: trunk/libcurses-perl/demo
URL: http://svn.debian.org/wsvn/trunk/libcurses-perl/demo?rev=11216&op=diff
==============================================================================
--- trunk/libcurses-perl/demo (original)
+++ trunk/libcurses-perl/demo Sun Dec 16 10:33:47 2007
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#! /usr/bin/perl
##
## demo -- do some curses stuff
##
Modified: trunk/libcurses-perl/demo.panel
URL: http://svn.debian.org/wsvn/trunk/libcurses-perl/demo.panel?rev=11216&op=diff
==============================================================================
--- trunk/libcurses-perl/demo.panel (original)
+++ trunk/libcurses-perl/demo.panel Sun Dec 16 10:33:47 2007
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#! /usr/bin/perl
##
## This code contributed by Chris Leach <leachcj at bp.com>
Modified: trunk/libcurses-perl/hints/c-MSWin32.borland.h
URL: http://svn.debian.org/wsvn/trunk/libcurses-perl/hints/c-MSWin32.borland.h?rev=11216&op=diff
==============================================================================
--- trunk/libcurses-perl/hints/c-MSWin32.borland.h (original)
+++ trunk/libcurses-perl/hints/c-MSWin32.borland.h Sun Dec 16 10:33:47 2007
@@ -6,8 +6,16 @@
/* These hints thanks to Gurusamy Sarathy <gsar at engin.umich.edu> */
-#undef SP /* in case this gets pulled in after perl.h */
-#include <pdcurses.h>
+/* We used to include <pdcurses.h>, but users found it is actually
+ installed as <curses.h>. Maybe it changed at some point.
+ 2007.09.29
+*/
+/* We used to undef macro SP, (which is defined by perl.h), but in September
+ 2007, we found that a) SP is needed; and 2) SP doesn't hurt
+ the #includes below.
+*/
+
+#include <curses.h>
#ifdef C_PANELSUPPORT
#include <panel.h>
Modified: trunk/libcurses-perl/hints/c-cygwin.h
URL: http://svn.debian.org/wsvn/trunk/libcurses-perl/hints/c-cygwin.h?rev=11216&op=diff
==============================================================================
--- trunk/libcurses-perl/hints/c-cygwin.h (original)
+++ trunk/libcurses-perl/hints/c-cygwin.h Sun Dec 16 10:33:47 2007
@@ -23,7 +23,6 @@
#endif
#undef bool
-#undef instr
#undef C_LONGNAME
#undef C_LONG0ARGS
Modified: trunk/libcurses-perl/hints/c-darwin.h
URL: http://svn.debian.org/wsvn/trunk/libcurses-perl/hints/c-darwin.h?rev=11216&op=diff
==============================================================================
--- trunk/libcurses-perl/hints/c-darwin.h (original)
+++ trunk/libcurses-perl/hints/c-darwin.h Sun Dec 16 10:33:47 2007
@@ -1,29 +1,31 @@
-/* Hint file for the darwin platform.
- *
- * If this configuration doesn't work, look at the file "c-none.h"
- * for how to set the configuration options.
- */
+/* Hint file for Darwin Kernel Version 7.5.0, ncurses version of
+ libcurses. Based in FreeBSD, ncurses hints file
-/* These hints thanks to Scott Dietrich <sdietrich at emlab.com> */
+ This file came from gene03 at smalltime.com, September 2004.
+*/
-#include <curses.h>
+#include <ncurses.h>
#ifdef C_PANELSUPPORT
#include <panel.h>
#endif
+
#ifdef C_MENUSUPPORT
#include <menu.h>
#endif
+
#ifdef C_FORMSUPPORT
#include <form.h>
#endif
#define C_LONGNAME
-#undef C_LONG0ARGS
-#define C_LONG2ARGS
+#define C_LONG0ARGS
+#undef C_LONG2ARGS
#define C_TOUCHLINE
-#undef C_TOUCH3ARGS
-#define C_TOUCH4ARGS
+#define C_TOUCH3ARGS
+#undef C_TOUCH4ARGS
+
+#undef bool
Modified: trunk/libcurses-perl/hints/c-irix.ncurses.h
URL: http://svn.debian.org/wsvn/trunk/libcurses-perl/hints/c-irix.ncurses.h?rev=11216&op=diff
==============================================================================
--- trunk/libcurses-perl/hints/c-irix.ncurses.h (original)
+++ trunk/libcurses-perl/hints/c-irix.ncurses.h Sun Dec 16 10:33:47 2007
@@ -21,9 +21,6 @@
#include <form.h>
#endif
-/* Defined in both Perl & Ncurses */
-#undef instr
-
#define C_LONGNAME
#define C_LONG0ARGS
#undef C_LONG2ARGS
Modified: trunk/libcurses-perl/hints/c-isc.h
URL: http://svn.debian.org/wsvn/trunk/libcurses-perl/hints/c-isc.h?rev=11216&op=diff
==============================================================================
--- trunk/libcurses-perl/hints/c-isc.h (original)
+++ trunk/libcurses-perl/hints/c-isc.h Sun Dec 16 10:33:47 2007
@@ -18,8 +18,6 @@
#include <form.h>
#endif
-#undef instr
-
#define C_LONGNAME
#define C_LONG0ARGS
#undef C_LONG2ARGS
Modified: trunk/libcurses-perl/hints/c-linux.ncurses.h
URL: http://svn.debian.org/wsvn/trunk/libcurses-perl/hints/c-linux.ncurses.h?rev=11216&op=diff
==============================================================================
--- trunk/libcurses-perl/hints/c-linux.ncurses.h (original)
+++ trunk/libcurses-perl/hints/c-linux.ncurses.h Sun Dec 16 10:33:47 2007
@@ -20,8 +20,6 @@
#include <form.h>
#endif
-#undef instr
-
#define C_LONGNAME
#define C_LONG0ARGS
#undef C_LONG2ARGS
Modified: trunk/libcurses-perl/hints/c-solaris.h
URL: http://svn.debian.org/wsvn/trunk/libcurses-perl/hints/c-solaris.h?rev=11216&op=diff
==============================================================================
--- trunk/libcurses-perl/hints/c-solaris.h (original)
+++ trunk/libcurses-perl/hints/c-solaris.h Sun Dec 16 10:33:47 2007
@@ -20,8 +20,6 @@
#include <form.h>
#endif
-#undef instr
-
#define C_LONGNAME
#define C_LONG0ARGS
#undef C_LONG2ARGS
Modified: trunk/libcurses-perl/hints/c-sunos.ncurses.h
URL: http://svn.debian.org/wsvn/trunk/libcurses-perl/hints/c-sunos.ncurses.h?rev=11216&op=diff
==============================================================================
--- trunk/libcurses-perl/hints/c-sunos.ncurses.h (original)
+++ trunk/libcurses-perl/hints/c-sunos.ncurses.h Sun Dec 16 10:33:47 2007
@@ -20,9 +20,6 @@
#include <form.h>
#endif
-/* Defined in both Perl & Ncurses */
-#undef instr
-
#define C_LONGNAME
#define C_LONG0ARGS
#undef C_LONG2ARGS
Modified: trunk/libcurses-perl/hints/c-sunos.sysv.h
URL: http://svn.debian.org/wsvn/trunk/libcurses-perl/hints/c-sunos.sysv.h?rev=11216&op=diff
==============================================================================
--- trunk/libcurses-perl/hints/c-sunos.sysv.h (original)
+++ trunk/libcurses-perl/hints/c-sunos.sysv.h Sun Dec 16 10:33:47 2007
@@ -7,11 +7,10 @@
/* The combined set of lines below between * vvvv * and * ^^^^ *
* below is one example of how to fix compiler errors between the
* curses include file and the perl include files. It turns out that
- * for the SunOS platform, SysV curses, there were three problems:
+ * for the SunOS platform, SysV curses, there were these problems:
*
* 1) sprintf() was declared as returning different types in <curses.h>
* and "perl.h"
- * 2) "instr" was defined in both <curses.h> and "perl.h"
* 3) Lots of redefined warnings, because <sys/ioctl.h> was included by
* both <curses.h> and "perl.h"
*
@@ -41,7 +40,6 @@
/* vvvv */
#undef sprintf
-#undef instr
#define _sys_ioctl_h
/* ^^^^ */
More information about the Pkg-perl-cvs-commits
mailing list