[SCM] Debian packaging of libcurses-ui-perl branch, master, updated. 6c807b9c6cfe6a013636de1823eb6bafa732c109
gregor herrmann
gregoa at debian.org
Thu Sep 1 23:36:46 UTC 2011
The following commit has been merged in the master branch:
commit 519df04120c0cbc312451038ca5d20e56a8dbd8f
Author: gregor herrmann <gregoa at debian.org>
Date: Fri Sep 2 01:28:21 2011 +0200
Remove patches, all applied upstream.
diff --git a/debian/patches/01_remove_solaris_hack.patch b/debian/patches/01_remove_solaris_hack.patch
deleted file mode 100755
index 77fb4dc..0000000
--- a/debian/patches/01_remove_solaris_hack.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: no force-feeding keys
- I have a reasonably large application that uses Curses::UI and
- Curses::UI::POE. When keyboard input is buffered because the app is
- blocking, things get out of sync when the app returns - keys get "lost"
- and the app is thereafter "one key behind".
- .
- The problem was eventually narrowed down to the following part of UI.pm:
- .
- # See if there are pending keys on input. If I do not
- # feed them to the application in this way, the screen
- # hangs in case I do a lot of input on my Solaris
- # machine.
- $key = $self->get_key(0);
- $self->feedkey($key) unless $key eq '-1';
- .
- This is something of a hack. On my Linux machine, commenting out the
- above causes correct behaviour, whereby keypresses are buffered and
- dealt with when the app returns from its blocking behaviour. Are you
- sure this isn't a workaround for a Solaris "feature"?
-Author: Antony Gelberg <antony.gelberg at gmail.com>
-Bug: https://rt.cpan.org/Ticket/Display.html?id=51625
-Forwarded: yes
-
---- a/lib/Curses/UI.pm
-+++ b/lib/Curses/UI.pm
-@@ -437,8 +437,13 @@ sub do_one_event(;$)
- # feed them to the application in this way, the screen
- # hangs in case I do a lot of input on my Solaris
- # machine.
-- $key = $self->get_key(0);
-- $self->feedkey($key) unless $key eq '-1';
-+ #
-+ # Removed by Antony Gelberg for Debian - causes lots of problems on my
-+ # Linux box when the app is blocked and input is queued. Plan to contact
-+ # upstream to ask for justification or removal.
-+ #
-+ # $key = $self->get_key(0);
-+ # $self->feedkey($key) unless $key eq '-1';
-
- # Update the screen.
- doupdate();
diff --git a/debian/patches/02_feedkeys.patch b/debian/patches/02_feedkeys.patch
deleted file mode 100755
index 398225a..0000000
--- a/debian/patches/02_feedkeys.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: do not flush in feedkey()
- In a similar vein to #51625, there is an extraneous function call that
- breaks input when keys are buffered. The call to flushkeys() from
- feedkey() simply throws keys away for no discernable reason. Removing
- the call fixes the problem, at least on my system.
-Author: Antony Gelberg <antony.gelberg at gmail.com>
-Bug: https://rt.cpan.org/Ticket/Display.html?id=51644
-Forwarded: yes
-
---- a/lib/Curses/UI.pm
-+++ b/lib/Curses/UI.pm
-@@ -509,7 +509,9 @@ sub feedkey()
- {
- my $self = shift;
- my $key = shift;
-- $self->flushkeys();
-+ # Removed by Antony Gelberg for Debian - again this causes things to get
-+ # out of sync.
-+ #$self->flushkeys();
- $self->{-feedkey} = $key;
- return $self;
- }
diff --git a/debian/patches/pod-spell.patch b/debian/patches/pod-spell.patch
deleted file mode 100644
index edb483f..0000000
--- a/debian/patches/pod-spell.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Description: fix spelling errors in POD
-Author: Damyan Ivanov <dmn at debian.org>
-Bug: https://rt.cpan.org/Ticket/Display.html?id=69224
-Forwarded: yes
-
---- a/lib/Curses/UI.pm
-+++ b/lib/Curses/UI.pm
-@@ -246,7 +246,7 @@ sub schedule_event {
-
- The layout method of Curses::UI tries to find the size of the screen
- then calls the C<layout> method of every contained object (i.e. window
--or widget). It is not normally neccessary to call this method directly.
-+or widget). It is not normally necessary to call this method directly.
-
- =cut
-
-@@ -1373,7 +1373,7 @@ Returns the currently used Curses::UI::C
-
- =item B<set_color> ( OBJECT )
-
--Replaces the currently used Color object with an other. This can be
-+Replaces the currently used Color object with another. This can be
- used to fast change all colors in a Curses::UI application.
-
- =back
---- a/lib/Curses/UI/Container.pm
-+++ b/lib/Curses/UI/Container.pm
-@@ -627,7 +627,7 @@ container. If CLASS does not contain '::
- matches 'Dialog::...' then 'Curses::UI' will be prepended
- to it. This way you do not have to specifiy the full
- class name for widgets that are in the Curses::UI
--hierarchy. It is not neccessary to call "use CLASS"
-+hierarchy. It is not necessary to call "use CLASS"
- yourself. The B<add> method will call the B<usemodule>
- method from Curses::UI to automatically load the module.
-
---- a/lib/Curses/UI/Listbox.pm
-+++ b/lib/Curses/UI/Listbox.pm
-@@ -884,7 +884,7 @@ It will get the widget reference as its
- =item * B<-htmltext> < BOOLEAN >
-
- Make the Listbox parse primitive markup to change the items
--appearence. See above.
-+appearance. See above.
-
-
- =back
---- a/lib/Curses/UI/Widget.pm
-+++ b/lib/Curses/UI/Widget.pm
-@@ -1262,7 +1262,7 @@ option is mainly used in widget building
- =item * B<-userdata> < SCALAR >
-
- This option specifies a user data that can be retrieved with
--the B<userdata>() method. It is usefull to store application's
-+the B<userdata>() method. It is useful to store application's
- internal data that otherwise would not be accessible in callbacks.
-
- =item * B<-border> < BOOLEAN >
diff --git a/debian/patches/prototypes.patch b/debian/patches/prototypes.patch
deleted file mode 100644
index 5ec8211..0000000
--- a/debian/patches/prototypes.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-Description: drop the trailing semicolon after '@' in function prototypes
- they are useless and perl 5.12 emits warnings about them
-Author: Damyan Ivanov <dmn at debian.org>
-Bug: https://rt.cpan.org/Ticket/Display.html?id=68127
-Bug-Debian: http://bugs.debian.org/628128
-Forwarded: yes
-
---- a/lib/Curses/UI/Container.pm
-+++ b/lib/Curses/UI/Container.pm
-@@ -64,7 +64,7 @@ DESTROY()
- }
-
- # Add an object to the container
--sub add($@;)
-+sub add($@)
- {
- my $this = shift;
- my $id = shift;
-@@ -472,7 +472,7 @@ sub event_onblur()
- }
-
-
--sub set_focusorder(@;)
-+sub set_focusorder(@)
- {
- my $this = shift;
- my @order = @_;
-@@ -480,7 +480,7 @@ sub set_focusorder(@;)
- return $this;
- }
-
--sub set_draworder(@;)
-+sub set_draworder(@)
- {
- my $this = shift;
- my @order = @_;
---- a/lib/Curses/UI/Widget.pm
-+++ b/lib/Curses/UI/Widget.pm
-@@ -353,7 +353,7 @@ sub process_padding($;)
- }
- }
-
--sub width_by_windowscrwidth($@;)
-+sub width_by_windowscrwidth($@)
- {
- my $width = shift || 0;
- $width = shift if ref $width; # make $this->width... possible.
-@@ -377,7 +377,7 @@ sub width_by_windowscrwidth($@;)
- return $width;
- }
-
--sub height_by_windowscrheight($@;)
-+sub height_by_windowscrheight($@)
- {
- my $height = shift || 0;
- $height = shift if ref $height; # make $this->height... possible.
-@@ -895,7 +895,7 @@ sub set_routine($$;)
- return $this;
- }
-
--sub set_binding($@;)
-+sub set_binding($@)
- {
- my $this = shift;
- my $routine = shift;
-@@ -921,7 +921,7 @@ sub set_binding($@;)
- return $this;
- }
-
--sub set_mouse_binding($@;)
-+sub set_mouse_binding($@)
- {
- my $this = shift;
- my $routine = shift;
---- a/lib/Curses/UI/Listbox.pm
-+++ b/lib/Curses/UI/Listbox.pm
-@@ -218,7 +218,7 @@ sub add_labels(;$)
- }
-
-
--sub maxlabelwidth(@;)
-+sub maxlabelwidth(@)
- {
- my %args = @_;
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 9070278..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,4 +0,0 @@
-01_remove_solaris_hack.patch
-02_feedkeys.patch
-prototypes.patch
-pod-spell.patch
--
Debian packaging of libcurses-ui-perl
More information about the Pkg-perl-cvs-commits
mailing list