r15030 - in /trunk/libcurses-perl: Curses.c Curses.pm CursesTyp.h HISTORY Makefile Makefile.PL Makefile.old c-config.h cdemo.c debian/changelog hints/c-cygwin.h hints/c-darwin.h hints/c-gnukfreebsd.h hints/c-linux.ncurses.h
gregoa-guest at users.alioth.debian.org
gregoa-guest at users.alioth.debian.org
Sun Feb 17 00:33:28 UTC 2008
Author: gregoa-guest
Date: Sun Feb 17 00:33:27 2008
New Revision: 15030
URL: http://svn.debian.org/wsvn/?sc=1&rev=15030
Log:
New upstream release.
Added:
trunk/libcurses-perl/Makefile
- copied unchanged from r15029, branches/upstream/libcurses-perl/current/Makefile
trunk/libcurses-perl/Makefile.old
- copied unchanged from r15029, branches/upstream/libcurses-perl/current/Makefile.old
trunk/libcurses-perl/c-config.h
- copied unchanged from r15029, branches/upstream/libcurses-perl/current/c-config.h
trunk/libcurses-perl/hints/c-gnukfreebsd.h
- copied unchanged from r15029, branches/upstream/libcurses-perl/current/hints/c-gnukfreebsd.h
Modified:
trunk/libcurses-perl/Curses.c
trunk/libcurses-perl/Curses.pm
trunk/libcurses-perl/CursesTyp.h
trunk/libcurses-perl/HISTORY
trunk/libcurses-perl/Makefile.PL
trunk/libcurses-perl/cdemo.c
trunk/libcurses-perl/debian/changelog
trunk/libcurses-perl/hints/c-cygwin.h
trunk/libcurses-perl/hints/c-darwin.h
trunk/libcurses-perl/hints/c-linux.ncurses.h
Modified: trunk/libcurses-perl/Curses.c
URL: http://svn.debian.org/wsvn/trunk/libcurses-perl/Curses.c?rev=15030&op=diff
==============================================================================
--- trunk/libcurses-perl/Curses.c (original)
+++ trunk/libcurses-perl/Curses.c Sun Feb 17 00:33:27 2008
@@ -16,24 +16,37 @@
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
+ Similarly, c-config.h may define a macro "tab", while the word
+ "tab" 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.
-*/
+
+ "bool" is another, and is more problematic. Sometimes, ncurses.h
+ defines that explicitly and that's bad, but sometimes it does it
+ by including <stdbool.h>, and that's fine. In the former case,
+ we should undefine it now, but in the latter we can't, because then
+ a subsequent #include <stdbool.h> (by something we #include below)
+ won't define bool because stdbool.h has already been included.
+
+ We're going to leave bool alone now and wait for someone to report
+ that it breaks something. With a real example, we can then plan how
+ to work around this unfortunate ncurses.h behavior. We once had a
+ #undef bool.h in the Mac OSX hints file, so someone presumably found
+ it necessary. But we have also had a Mac OSX system on which compile
+ failed _because_ of that undef, for the reason described above.
+ */
#undef instr
#undef tab
-#include <EXTERN.h>
+#include <EXTERN.h> /* Needed by <perl.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?
-*/
+ work right without it. Maybe a bug in Devel::PPPort? */
#define NEED_sv_2pv_flags
#include "ppport.h"
Modified: trunk/libcurses-perl/Curses.pm
URL: http://svn.debian.org/wsvn/trunk/libcurses-perl/Curses.pm?rev=15030&op=diff
==============================================================================
--- trunk/libcurses-perl/Curses.pm (original)
+++ trunk/libcurses-perl/Curses.pm Sun Feb 17 00:33:27 2008
@@ -51,7 +51,7 @@
package Curses;
-$VERSION = '1.20'; # Makefile.PL picks this up
+$VERSION = '1.21'; # Makefile.PL picks this up
use Carp;
require Exporter;
Modified: trunk/libcurses-perl/CursesTyp.h
URL: http://svn.debian.org/wsvn/trunk/libcurses-perl/CursesTyp.h?rev=15030&op=diff
==============================================================================
--- trunk/libcurses-perl/CursesTyp.h (original)
+++ trunk/libcurses-perl/CursesTyp.h Sun Feb 17 00:33:27 2008
@@ -1,20 +1,27 @@
-/* This file can be automatically generated; changes may be lost.
-**
-**
-** CursesTyp.c -- typedef handlers
-**
-** Copyright (c) 1994-2001 William Setzer
-**
-** You may distribute under the terms of either the Artistic License
-** or the GNU General Public License, as specified in the README file.
+/*=============================================================================
+ CursesTyp.h
+===============================================================================
+ Define types that are missing from the Curses library, which other Curses
+ libraries define. This way, we'll have a set of types that we can use
+ regardless of which Curses library we have.
+=============================================================================*/
+
+/* The C_xxx macros are defined by CursesDef.h, which was generated by
+ the build system based on its analysis of the Curses library on this
+ system.
+
+ C_xxx defined means the Curses library header files define type 'xxx'.
*/
#ifndef C_TYPATTR_T
#define attr_t int
#endif
+#if 0
+/* Disabled this in Curses.pm 1.21. Why would we want 'bool' defined? */
#ifndef C_TYPBOOL
#define bool int
+#endif
#endif
#ifndef C_TYPCHTYPE
@@ -33,3 +40,13 @@
#define SCREEN int
#endif
+
+
+/*
+**
+** Copyright (c) 1994-2001 William Setzer
+**
+** You may distribute under the terms of either the Artistic License
+** or the GNU General Public License, as specified in the README file.
+*/
+
Modified: trunk/libcurses-perl/HISTORY
URL: http://svn.debian.org/wsvn/trunk/libcurses-perl/HISTORY?rev=15030&op=diff
==============================================================================
--- trunk/libcurses-perl/HISTORY (original)
+++ trunk/libcurses-perl/HISTORY Sun Feb 17 00:33:27 2008
@@ -10,6 +10,10 @@
Curses itself is much older than the Perl implementation. Curses was
originally only a C programming library.
+
+New in 1.21 (Released February 15, 2008)
+
+ Don't undefine 'bool' macro in c-darwin hints file.
New in 1.20 (Released November 19, 2007)
Modified: trunk/libcurses-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/trunk/libcurses-perl/Makefile.PL?rev=15030&op=diff
==============================================================================
--- trunk/libcurses-perl/Makefile.PL (original)
+++ trunk/libcurses-perl/Makefile.PL Sun Feb 17 00:33:27 2008
@@ -116,6 +116,7 @@
'ncurses' => [ '' , '-lncurses' ],
'default' => 'bsd'
},
+ 'gnukfreebsd' => [ '-I/usr/include/ncurses', '-lncurses' ],
'hpux' => [ '' , '-lcurses -ltermcap' ],
# See INSTALL file for information about a different Curses library on HPUX.
'irix' => {
@@ -200,7 +201,7 @@
#-----------------------------------------------------------------------------
# Return as $$libtypR the type of Curses library we should use:
# 'ncurses', 'ncursesw' or 'bsd'. May be undefined if we don't think
-# we have to choose between the two on this system.
+# we have to choose between the those on this system.
#
# Return as $$incR the -I option we think is appropriate to get the
# Curses interface header files.
@@ -219,8 +220,7 @@
$$libsR = '-lncursesw';
$$libtypR = 'ncursesw';
} else {
- my $guess1 = $guess_cfg->{$OSNAME};
-
+ my $guess1 = $guess_cfg->{$OSNAME};
my $libtyp;
# 'bsd' or 'ncurses'. Undefined if we think
# there's no choice of Curses version on this platform.
@@ -473,8 +473,10 @@
my $ncursesLibSearch;
+$ncursesLibSearch = ''; # initial value
+
while ($libs =~ m{(-L\S+)}g) {
- $ncursesLibSearch .= $1;
+ $ncursesLibSearch .= $1 . ' ';
}
guessPanelMenuFormLibs($ncursesLibSearch, $libType,
@@ -557,12 +559,12 @@
if ($OSNAME eq 'VMS') {
$mf .= <<EOM;
\$(CC) \$(INC) cdemo.c
- \$(LD) cdemo\$(OBJ_EXT), \$(EXTRALIBS), CURSES2.OPT/opt
+ \$(LD) cdemo\$(OBJ_EXT), \$(LDLOADLIBS), CURSES2.OPT/opt
EOM
}
else {
$mf .= <<EOM;
- \$(CC) \$(INC) -o cdemo cdemo.c \$(EXTRALIBS)
+ \$(CC) \$(INC) -o cdemo cdemo.c \$(LDLOADLIBS)
EOM
}
Modified: trunk/libcurses-perl/cdemo.c
URL: http://svn.debian.org/wsvn/trunk/libcurses-perl/cdemo.c?rev=15030&op=diff
==============================================================================
--- trunk/libcurses-perl/cdemo.c (original)
+++ trunk/libcurses-perl/cdemo.c Sun Feb 17 00:33:27 2008
@@ -7,7 +7,6 @@
*/
#include "CursesDef.h"
-#include "CursesTyp.h"
#include "c-config.h"
#ifdef VMS
#include <unistd.h> /* not in perl.h ??? */
@@ -66,7 +65,7 @@
attrset(A_NORMAL);
# endif
#endif
- addstr(" normal (if your curses supports these modes)");
+ addstr(" normal (if your curses can do these modes)");
move(6, 1);
addstr("do12345678901234567890n't worry be happy");
Modified: trunk/libcurses-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libcurses-perl/debian/changelog?rev=15030&op=diff
==============================================================================
--- trunk/libcurses-perl/debian/changelog (original)
+++ trunk/libcurses-perl/debian/changelog Sun Feb 17 00:33:27 2008
@@ -1,3 +1,9 @@
+libcurses-perl (1.21-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- gregor herrmann <gregor+debian at comodo.priv.at> Sun, 17 Feb 2008 01:31:59 +0100
+
libcurses-perl (1.20-2) unstable; urgency=low
[ gregor herrmann ]
Modified: trunk/libcurses-perl/hints/c-cygwin.h
URL: http://svn.debian.org/wsvn/trunk/libcurses-perl/hints/c-cygwin.h?rev=15030&op=diff
==============================================================================
--- trunk/libcurses-perl/hints/c-cygwin.h (original)
+++ trunk/libcurses-perl/hints/c-cygwin.h Sun Feb 17 00:33:27 2008
@@ -22,8 +22,6 @@
#include <form.h>
#endif
-#undef bool
-
#undef C_LONGNAME
#undef C_LONG0ARGS
#undef C_LONG2ARGS
Modified: trunk/libcurses-perl/hints/c-darwin.h
URL: http://svn.debian.org/wsvn/trunk/libcurses-perl/hints/c-darwin.h?rev=15030&op=diff
==============================================================================
--- trunk/libcurses-perl/hints/c-darwin.h (original)
+++ trunk/libcurses-perl/hints/c-darwin.h Sun Feb 17 00:33:27 2008
@@ -27,5 +27,3 @@
#define C_TOUCHLINE
#define C_TOUCH3ARGS
#undef C_TOUCH4ARGS
-
-#undef bool
Modified: trunk/libcurses-perl/hints/c-linux.ncurses.h
URL: http://svn.debian.org/wsvn/trunk/libcurses-perl/hints/c-linux.ncurses.h?rev=15030&op=diff
==============================================================================
--- trunk/libcurses-perl/hints/c-linux.ncurses.h (original)
+++ trunk/libcurses-perl/hints/c-linux.ncurses.h Sun Feb 17 00:33:27 2008
@@ -3,8 +3,6 @@
* If this configuration doesn't work, look at the file "c-none.h"
* for how to set the configuration options.
*/
-
-#undef bool
#include <ncurses.h>
More information about the Pkg-perl-cvs-commits
mailing list