From 45faf00bca6c5727dc39bc04a85d631b5d7cbc6b Mon Sep 17 00:00:00 2001 From: John Marino Date: Thu, 13 Mar 2014 23:10:04 +0000 Subject: [PATCH] devel/gps: More tweaks to prepare for gcc49 GCC had a couple of "ambiguous" complaints as well as an overlapping variable used for both in and out. Fix these nits before gcc49 comes in. --- ...ch-src__editor_src_src__editor__buffer.adb | 11 +++++++++++ ...atch-src__editor_src_src__editor__view.adb | 19 +++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 devel/gps/files/patch-src__editor_src_src__editor__buffer.adb create mode 100644 devel/gps/files/patch-src__editor_src_src__editor__view.adb diff --git a/devel/gps/files/patch-src__editor_src_src__editor__buffer.adb b/devel/gps/files/patch-src__editor_src_src__editor__buffer.adb new file mode 100644 index 000000000000..03c5432f17e3 --- /dev/null +++ b/devel/gps/files/patch-src__editor_src_src__editor__buffer.adb @@ -0,0 +1,11 @@ +--- src_editor/src/src_editor_buffer.adb.orig 2012-09-28 15:42:43.000000000 +0000 ++++ src_editor/src/src_editor_buffer.adb +@@ -5820,7 +5820,7 @@ package body Src_Editor_Buffer is + + while Result + and then not Ends_Line (Iter) +- and then Is_Space (Get_Char (Iter)) ++ and then Glib.Unicode.Is_Space (Gtk.Text_Iter.Get_Char (Iter)) + loop + Forward_Char (Iter, Result); + Offset := Offset + 1; diff --git a/devel/gps/files/patch-src__editor_src_src__editor__view.adb b/devel/gps/files/patch-src__editor_src_src__editor__view.adb new file mode 100644 index 000000000000..f841b8c11c3f --- /dev/null +++ b/devel/gps/files/patch-src__editor_src_src__editor__view.adb @@ -0,0 +1,19 @@ +--- src_editor/src/src_editor_view.adb.orig 2012-07-02 09:23:20.000000000 +0000 ++++ src_editor/src/src_editor_view.adb +@@ -1789,6 +1789,7 @@ package body Src_Editor_View is + is + View : constant Source_View := Source_View (Widget); + Dummy_Gint : Gint; ++ Dummy2_Gint : Gint; + W, H, D : Gint; + Button_Y : Gint; + Lower, Upper : Gdouble; +@@ -1807,7 +1808,7 @@ package body Src_Editor_View is + Button_Y := Gint (Get_Y (Event)); + + Get_Geometry +- (Get_Window (View.Area), Dummy_Gint, Dummy_Gint, W, H, D); ++ (Get_Window (View.Area), Dummy_Gint, Dummy2_Gint, W, H, D); + + Adj := Get_Vadjustment (View.Scroll); + Lower := Get_Lower (Adj);