[packages/compat-ncurses5.git] / ncurses-ada_fixes.patch

diff -ur Ada95.orig/samples/ncurses2-acs_and_scroll.adb Ada95/samples/ncurses2-acs_and_scroll.adb
--- Ada95.orig/samples/ncurses2-acs_and_scroll.adb	2006-06-25 16:24:40.000000000 +0200
+++ Ada95/samples/ncurses2-acs_and_scroll.adb	2008-05-29 13:03:23.000000000 +0200
@@ -527,11 +527,11 @@
                current := current.last;
             end if;
          when Character'Pos ('F') mod 16#20#  => --  Ctrl('F')
-            if current /= null and HaveScroll (current.wind) then
+            if current /= null and then HaveScroll (current.wind) then
                Scroll (current.wind, 1);
             end if;
          when Character'Pos ('B') mod 16#20#  => --  Ctrl('B')
-            if current /= null and HaveScroll (current.wind) then
+            if current /= null and then HaveScroll (current.wind) then
             --  The C version of Scroll may return ERR which is ignored
             --  we need to avoid the exception
             --  with the 'and HaveScroll(current.wind)'
diff -ur Ada95.orig/samples/ncurses2-genericputs.adb Ada95/samples/ncurses2-genericputs.adb
--- Ada95.orig/samples/ncurses2-genericputs.adb	2006-06-25 16:24:40.000000000 +0200
+++ Ada95/samples/ncurses2-genericputs.adb	2008-05-29 13:11:28.000000000 +0200
@@ -39,15 +39,10 @@
 --  $Date$
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
-with Ada.Text_IO;
-with Ada.Strings.Bounded;
 
 with Terminal_Interface.Curses; use Terminal_Interface.Curses;
 with Terminal_Interface.Curses.Aux; use Terminal_Interface.Curses.Aux;
 
-with Interfaces.C;
-with Interfaces.C.Strings;
-
 package body ncurses2.genericPuts is
 
    procedure myGet (Win : in  Window := Standard_Window;
diff -ur Ada95.orig/samples/ncurses2-m.adb Ada95/samples/ncurses2-m.adb
--- Ada95.orig/samples/ncurses2-m.adb	2008-05-29 12:41:18.000000000 +0200
+++ Ada95/samples/ncurses2-m.adb	2008-05-29 13:02:57.000000000 +0200
@@ -64,7 +64,6 @@
 with ncurses2.color_edit;
 with ncurses2.slk_test;
 with ncurses2.acs_display;
-with ncurses2.color_edit;
 with ncurses2.acs_and_scroll;
 with ncurses2.flushinp_test;
 with ncurses2.test_sgr_attributes;
diff -ur Ada95.orig/samples/ncurses2-util.adb Ada95/samples/ncurses2-util.adb
--- Ada95.orig/samples/ncurses2-util.adb	2006-06-25 16:24:40.000000000 +0200
+++ Ada95/samples/ncurses2-util.adb	2008-05-29 13:05:00.000000000 +0200
@@ -39,9 +39,6 @@
 --  $Date$
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
-with Terminal_Interface.Curses;
-
-with Ada.Text_IO;
 
 pragma Warnings (Off);
 with Terminal_Interface.Curses.Aux;
diff -ur Ada95.orig/samples/sample-helpers.adb Ada95/samples/sample-helpers.adb
--- Ada95.orig/samples/sample-helpers.adb	2006-06-25 16:30:22.000000000 +0200
+++ Ada95/samples/sample-helpers.adb	2008-05-29 12:54:23.000000000 +0200
@@ -39,7 +39,6 @@
 --  $Date$
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
-with Terminal_Interface.Curses;
 
 with Sample.Explanation; use Sample.Explanation;
 
diff -ur Ada95.orig/samples/sample-my_field_type.adb Ada95/samples/sample-my_field_type.adb
--- Ada95.orig/samples/sample-my_field_type.adb	2006-06-25 16:30:22.000000000 +0200
+++ Ada95/samples/sample-my_field_type.adb	2008-05-29 12:54:54.000000000 +0200
@@ -39,7 +39,6 @@
 --  $Date$
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
-with Terminal_Interface.Curses.Forms;
 
 --  This is a very simple user defined field type. It accepts only a
 --  defined character as input into the field.
diff -ur Ada95.orig/src/terminal_interface-curses-forms-field_types.adb Ada95/src/terminal_interface-curses-forms-field_types.adb
--- Ada95.orig/src/terminal_interface-curses-forms-field_types.adb	2006-06-25 16:24:40.000000000 +0200
+++ Ada95/src/terminal_interface-curses-forms-field_types.adb	2008-05-29 12:57:14.000000000 +0200
@@ -39,7 +39,6 @@
 --  $Date$
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
-with Interfaces.C;
 with Terminal_Interface.Curses.Aux; use Terminal_Interface.Curses.Aux;
 with Ada.Unchecked_Deallocation;
 with Ada.Unchecked_Conversion;
diff -ur Ada95.orig/src/terminal_interface-curses-forms-field_types-user.adb Ada95/src/terminal_interface-curses-forms-field_types-user.adb
--- Ada95.orig/src/terminal_interface-curses-forms-field_types-user.adb	2006-06-25 16:24:40.000000000 +0200
+++ Ada95/src/terminal_interface-curses-forms-field_types-user.adb	2008-05-29 12:57:32.000000000 +0200
@@ -40,7 +40,6 @@
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with Ada.Unchecked_Conversion;
-with Interfaces.C;
 with Terminal_Interface.Curses.Aux; use Terminal_Interface.Curses.Aux;
 
 package body Terminal_Interface.Curses.Forms.Field_Types.User is
diff -ur Ada95.orig/src/terminal_interface-curses-forms-field_types-user-choice.adb Ada95/src/terminal_interface-curses-forms-field_types-user-choice.adb
--- Ada95.orig/src/terminal_interface-curses-forms-field_types-user-choice.adb	2006-06-25 16:24:40.000000000 +0200
+++ Ada95/src/terminal_interface-curses-forms-field_types-user-choice.adb	2008-05-29 13:02:13.000000000 +0200
@@ -40,7 +40,6 @@
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
 with Ada.Unchecked_Conversion;
-with Interfaces.C;
 with Terminal_Interface.Curses.Aux; use Terminal_Interface.Curses.Aux;
 
 package body Terminal_Interface.Curses.Forms.Field_Types.User.Choice is
diff -ur Ada95.orig/src/terminal_interface-curses-mouse.adb Ada95/src/terminal_interface-curses-mouse.adb
--- Ada95.orig/src/terminal_interface-curses-mouse.adb	2004-08-21 23:37:00.000000000 +0200
+++ Ada95/src/terminal_interface-curses-mouse.adb	2008-05-29 12:53:46.000000000 +0200
@@ -39,7 +39,6 @@
 --  $Date$
 --  Binding Version 01.00
 ------------------------------------------------------------------------------
-with System;
 
 with Terminal_Interface.Curses.Aux; use Terminal_Interface.Curses.Aux;
 with Interfaces.C; use Interfaces.C;
Commit	Line	Data
6092df87	1	diff -ur Ada95.orig/samples/ncurses2-acs_and_scroll.adb Ada95/samples/ncurses2-acs_and_scroll.adb
	2	--- Ada95.orig/samples/ncurses2-acs_and_scroll.adb 2006-06-25 16:24:40.000000000 +0200
	3	+++ Ada95/samples/ncurses2-acs_and_scroll.adb 2008-05-29 13:03:23.000000000 +0200
	4	@@ -527,11 +527,11 @@
	5	current := current.last;
	6	end if;
	7	when Character'Pos ('F') mod 16#20# => -- Ctrl('F')
	8	- if current /= null and HaveScroll (current.wind) then
	9	+ if current /= null and then HaveScroll (current.wind) then
	10	Scroll (current.wind, 1);
	11	end if;
	12	when Character'Pos ('B') mod 16#20# => -- Ctrl('B')
	13	- if current /= null and HaveScroll (current.wind) then
	14	+ if current /= null and then HaveScroll (current.wind) then
	15	-- The C version of Scroll may return ERR which is ignored
	16	-- we need to avoid the exception
	17	-- with the 'and HaveScroll(current.wind)'
	18	diff -ur Ada95.orig/samples/ncurses2-genericputs.adb Ada95/samples/ncurses2-genericputs.adb
	19	--- Ada95.orig/samples/ncurses2-genericputs.adb 2006-06-25 16:24:40.000000000 +0200
	20	+++ Ada95/samples/ncurses2-genericputs.adb 2008-05-29 13:11:28.000000000 +0200
	21	@@ -39,15 +39,10 @@
	22	-- $Date$
	23	-- Binding Version 01.00
	24	------------------------------------------------------------------------------
	25	-with Ada.Text_IO;
	26	-with Ada.Strings.Bounded;
	27
	28	with Terminal_Interface.Curses; use Terminal_Interface.Curses;
	29	with Terminal_Interface.Curses.Aux; use Terminal_Interface.Curses.Aux;
	30
	31	-with Interfaces.C;
	32	-with Interfaces.C.Strings;
	33	-
	34	package body ncurses2.genericPuts is
	35
	36	procedure myGet (Win : in Window := Standard_Window;
	37	diff -ur Ada95.orig/samples/ncurses2-m.adb Ada95/samples/ncurses2-m.adb
	38	--- Ada95.orig/samples/ncurses2-m.adb 2008-05-29 12:41:18.000000000 +0200
	39	+++ Ada95/samples/ncurses2-m.adb 2008-05-29 13:02:57.000000000 +0200
	40	@@ -64,7 +64,6 @@
	41	with ncurses2.color_edit;
	42	with ncurses2.slk_test;
	43	with ncurses2.acs_display;
	44	-with ncurses2.color_edit;
	45	with ncurses2.acs_and_scroll;
	46	with ncurses2.flushinp_test;
	47	with ncurses2.test_sgr_attributes;
	48	diff -ur Ada95.orig/samples/ncurses2-util.adb Ada95/samples/ncurses2-util.adb
	49	--- Ada95.orig/samples/ncurses2-util.adb 2006-06-25 16:24:40.000000000 +0200
	50	+++ Ada95/samples/ncurses2-util.adb 2008-05-29 13:05:00.000000000 +0200
	51	@@ -39,9 +39,6 @@
	52	-- $Date$
	53	-- Binding Version 01.00
	54	------------------------------------------------------------------------------
	55	-with Terminal_Interface.Curses;
	56	-
	57	-with Ada.Text_IO;
	58
	59	pragma Warnings (Off);
	60	with Terminal_Interface.Curses.Aux;
	61	diff -ur Ada95.orig/samples/sample-helpers.adb Ada95/samples/sample-helpers.adb
	62	--- Ada95.orig/samples/sample-helpers.adb 2006-06-25 16:30:22.000000000 +0200
	63	+++ Ada95/samples/sample-helpers.adb 2008-05-29 12:54:23.000000000 +0200
	64	@@ -39,7 +39,6 @@
65	-- $Date$
66	-- Binding Version 01.00
67	------------------------------------------------------------------------------
68	-with Terminal_Interface.Curses;
69
70	with Sample.Explanation; use Sample.Explanation;
71
72	diff -ur Ada95.orig/samples/sample-my_field_type.adb Ada95/samples/sample-my_field_type.adb
73	--- Ada95.orig/samples/sample-my_field_type.adb 2006-06-25 16:30:22.000000000 +0200
74	+++ Ada95/samples/sample-my_field_type.adb 2008-05-29 12:54:54.000000000 +0200
75	@@ -39,7 +39,6 @@
76	-- $Date$
77	-- Binding Version 01.00
78	------------------------------------------------------------------------------
79	-with Terminal_Interface.Curses.Forms;
80
81	-- This is a very simple user defined field type. It accepts only a
82	-- defined character as input into the field.
83	diff -ur Ada95.orig/src/terminal_interface-curses-forms-field_types.adb Ada95/src/terminal_interface-curses-forms-field_types.adb
84	--- Ada95.orig/src/terminal_interface-curses-forms-field_types.adb 2006-06-25 16:24:40.000000000 +0200
85	+++ Ada95/src/terminal_interface-curses-forms-field_types.adb 2008-05-29 12:57:14.000000000 +0200
86	@@ -39,7 +39,6 @@
87	-- $Date$
88	-- Binding Version 01.00
89	------------------------------------------------------------------------------
90	-with Interfaces.C;
91	with Terminal_Interface.Curses.Aux; use Terminal_Interface.Curses.Aux;
92	with Ada.Unchecked_Deallocation;
93	with Ada.Unchecked_Conversion;
94	diff -ur Ada95.orig/src/terminal_interface-curses-forms-field_types-user.adb Ada95/src/terminal_interface-curses-forms-field_types-user.adb
95	--- Ada95.orig/src/terminal_interface-curses-forms-field_types-user.adb 2006-06-25 16:24:40.000000000 +0200
96	+++ Ada95/src/terminal_interface-curses-forms-field_types-user.adb 2008-05-29 12:57:32.000000000 +0200
97	@@ -40,7 +40,6 @@
98	-- Binding Version 01.00
99	------------------------------------------------------------------------------
100	with Ada.Unchecked_Conversion;
101	-with Interfaces.C;
102	with Terminal_Interface.Curses.Aux; use Terminal_Interface.Curses.Aux;
103
104	package body Terminal_Interface.Curses.Forms.Field_Types.User is
105	diff -ur Ada95.orig/src/terminal_interface-curses-forms-field_types-user-choice.adb Ada95/src/terminal_interface-curses-forms-field_types-user-choice.adb
106	--- Ada95.orig/src/terminal_interface-curses-forms-field_types-user-choice.adb 2006-06-25 16:24:40.000000000 +0200
107	+++ Ada95/src/terminal_interface-curses-forms-field_types-user-choice.adb 2008-05-29 13:02:13.000000000 +0200
108	@@ -40,7 +40,6 @@
109	-- Binding Version 01.00
110	------------------------------------------------------------------------------
111	with Ada.Unchecked_Conversion;
112	-with Interfaces.C;
113	with Terminal_Interface.Curses.Aux; use Terminal_Interface.Curses.Aux;
114
115	package body Terminal_Interface.Curses.Forms.Field_Types.User.Choice is
116	diff -ur Ada95.orig/src/terminal_interface-curses-mouse.adb Ada95/src/terminal_interface-curses-mouse.adb
117	--- Ada95.orig/src/terminal_interface-curses-mouse.adb 2004-08-21 23:37:00.000000000 +0200
118	+++ Ada95/src/terminal_interface-curses-mouse.adb 2008-05-29 12:53:46.000000000 +0200
119	@@ -39,7 +39,6 @@
120	-- $Date$
121	-- Binding Version 01.00
122	------------------------------------------------------------------------------
123	-with System;
124
125	with Terminal_Interface.Curses.Aux; use Terminal_Interface.Curses.Aux;
126	with Interfaces.C; use Interfaces.C;