--- Begin Message ---
Package: gedit-r-plugin
Version: 0.8.0.2-Gtk3-Python3-1
Severity: important
Tags: patch
User: [email protected]
Usertags: origin-ubuntu vivid ubuntu-patch
Hi
The R plugin isn't compatible with Vte 2.91. If the use has
gir1.2-vte-2.91 installed then it won't work. I didn't test this
explicitly in Debian but we have the same version in Ubuntu and there's
no reason for this to be specific to us.
I'd have just forwarded this upstream but I don't have a SF account and
their git tree there looks out of date from the web view.
This might not be appropriate for the freeze; a solution you could use
there would be to force Vte 2.90 to be used, like:
import gi
gi.require_version("Vte", "2.90")
Cheers,
--
Iain Lane [ [email protected] ]
Debian Developer [ [email protected] ]
Ubuntu Developer [ [email protected] ]
diff -Nru gedit-r-plugin-0.8.0.2-Gtk3-Python3/debian/changelog gedit-r-plugin-0.8.0.2-Gtk3-Python3/debian/changelog
diff -Nru gedit-r-plugin-0.8.0.2-Gtk3-Python3/debian/control gedit-r-plugin-0.8.0.2-Gtk3-Python3/debian/control
--- gedit-r-plugin-0.8.0.2-Gtk3-Python3/debian/control 2014-02-01 13:35:46.000000000 +0000
+++ gedit-r-plugin-0.8.0.2-Gtk3-Python3/debian/control 2014-11-18 14:47:44.000000000 +0000
@@ -11,7 +11,7 @@
Package: gedit-r-plugin
Architecture: all
-Depends: ${misc:Depends}, gedit (>= 3.7.1), python-vte, python, gir1.2-vte-2.90
+Depends: ${misc:Depends}, gedit (>= 3.7.1), python, gir1.2-vte-2.91
Recommends: r-base-core
Enhances: gedit
Description: Gedit plugin for R statistical computing language
diff -Nru gedit-r-plugin-0.8.0.2-Gtk3-Python3/debian/patches/series gedit-r-plugin-0.8.0.2-Gtk3-Python3/debian/patches/series
--- gedit-r-plugin-0.8.0.2-Gtk3-Python3/debian/patches/series 2013-12-01 10:34:07.000000000 +0000
+++ gedit-r-plugin-0.8.0.2-Gtk3-Python3/debian/patches/series 2014-11-18 13:35:29.000000000 +0000
@@ -1 +1,2 @@
changeDataDirectory.patch
+vte-2.91-port
diff -Nru gedit-r-plugin-0.8.0.2-Gtk3-Python3/debian/patches/vte-2.91-port gedit-r-plugin-0.8.0.2-Gtk3-Python3/debian/patches/vte-2.91-port
--- gedit-r-plugin-0.8.0.2-Gtk3-Python3/debian/patches/vte-2.91-port 1970-01-01 01:00:00.000000000 +0100
+++ gedit-r-plugin-0.8.0.2-Gtk3-Python3/debian/patches/vte-2.91-port 2014-11-18 13:37:40.000000000 +0000
@@ -0,0 +1,79 @@
+Description: Port to vte 2.91 API
+Author: Iain Lane <[email protected]>
+
+--- gedit-r-plugin-0.8.0.2-Gtk3-Python3.orig/RCtrl.py
++++ gedit-r-plugin-0.8.0.2-Gtk3-Python3/RCtrl.py
+@@ -236,7 +236,7 @@ class RGeditTerminal(Gtk.HBox):
+ self.pack_start(self.vteTabs, True, True, 0)
+
+ self._scrollbar = Gtk.VScrollbar()
+- self._scrollbar.set_adjustment(self._vte.adjustment)
++ self._scrollbar.set_adjustment(Gtk.Scrollable.get_vadjustment(self._vte))
+ self._scrollbar.show()
+ self._vteTab1.pack_start(self._scrollbar, False, False, 0)
+
+@@ -247,7 +247,7 @@ class RGeditTerminal(Gtk.HBox):
+ self._vte.connect("child-exited", self.vte1_child_exited)
+ #self._vte.connect("commit", self.on_vte_committed)
+
+- self._vte1_shell_PID = self._vte.fork_command_full( Vte.PtyFlags.DEFAULT, None, [shell_command_name], None, GLib.SpawnFlags.CHILD_INHERITS_STDIN | GLib.SpawnFlags.SEARCH_PATH, None, None )[1]
++ self._vte1_shell_PID = self._vte.spawn_sync ( Vte.PtyFlags.DEFAULT, None, [shell_command_name], None, GLib.SpawnFlags.CHILD_INHERITS_STDIN | GLib.SpawnFlags.SEARCH_PATH, None, None, None )[1]
+
+ # Is it a special Ctrl+C (used to implement the Ctrl+Q/ESC key in the R console):
+ self.special_ctrl_c = False
+@@ -303,12 +303,14 @@ class RGeditTerminal(Gtk.HBox):
+ if self._plugin.prefs['foreground'+str(tab_number)] == None:
+ fg = style.text[Gtk.StateType.NORMAL]
+ else:
+- fg = Gdk.color_parse(self._plugin.prefs['foreground'+str(tab_number)])
++ fg = Gdk.RGBA()
++ fg.parse(self._plugin.prefs['foreground'+str(tab_number)])
+
+ if self._plugin.prefs['background'+str(tab_number)] == None:
+ bg = style.base[Gtk.StateType.NORMAL]
+ else:
+- bg = Gdk.color_parse(self._plugin.prefs['background'+str(tab_number)])
++ bg = Gdk.RGBA()
++ bg.parse(self._plugin.prefs['background'+str(tab_number)])
+
+ palette = []
+ if isinstance(fg,tuple):
+@@ -355,10 +357,7 @@ class RGeditTerminal(Gtk.HBox):
+
+ _vteN.set_scroll_on_output(self._plugin.prefs['scroll_on_output'])
+
+- _vteN.set_word_chars(self._plugin.prefs['word_chars'])
+-
+- _vteN.set_emulation(self._plugin.prefs['emulation'])
+- _vteN.set_visible_bell(self._plugin.prefs['visible_bell'])
++ _vteN.set_audible_bell(self._plugin.prefs['visible_bell'])
+
+ def on_vte_key_press(self, term, event):
+ if event.get_state() is None:
+@@ -678,7 +677,7 @@ class RGeditTerminal(Gtk.HBox):
+ self._vte2_page_number = self.vteTabs.get_n_pages()-1
+
+ self._scrollbar2 = Gtk.VScrollbar()
+- self._scrollbar2.set_adjustment(self._vte2.adjustment)
++ self._scrollbar2.set_adjustment(Gtk.Scrollable.get_vadjustment(self._vte2.adjustment))
+ self._scrollbar2.show()
+ self._vteTab2.pack_start(self._scrollbar2, False, False, 0)
+
+@@ -687,7 +686,7 @@ class RGeditTerminal(Gtk.HBox):
+ self._vte2.connect("popup-menu", self.on_vte_popup_menu)
+ self._vte2.connect("child-exited", self.on_vte2_exited)
+
+- self._vte2_shell_PID = self._vte2.fork_command_full( Vte.PtyFlags.DEFAULT, None, [shell_command_name], None, GLib.SpawnFlags.CHILD_INHERITS_STDIN | GLib.SpawnFlags.SEARCH_PATH, None, None )[1]
++ self._vte2_shell_PID = self._vte2.spawn_sync( Vte.PtyFlags.DEFAULT, None, [shell_command_name], None, GLib.SpawnFlags.CHILD_INHERITS_STDIN | GLib.SpawnFlags.SEARCH_PATH, None, None, None )[1]
+
+ self.set_profile(2,profile)
+ self._vte2.feed_child(self.get_profile_attribute(2,'cmd')+"\n", -1) # open R
+@@ -740,7 +739,7 @@ class RGeditTerminal(Gtk.HBox):
+ self._vte3.connect("popup-menu", self.on_vte_popup_menu)
+ self._vte3.connect("child-exited", self.on_vte3_exited)
+
+- self._vte3_shell_PID = self._vte3.fork_command_full( Vte.PtyFlags.DEFAULT, None, [shell_command_name], None, GLib.SpawnFlags.CHILD_INHERITS_STDIN | GLib.SpawnFlags.SEARCH_PATH, None, None )[1]
++ self._vte3_shell_PID = self._vte3.spawn_sync ( Vte.PtyFlags.DEFAULT, None, [shell_command_name], None, GLib.SpawnFlags.CHILD_INHERITS_STDIN | GLib.SpawnFlags.SEARCH_PATH, None, None, None )[1]
+
+ self.set_profile(3,profile)
+ self._vte3.feed_child(self.get_profile_attribute(3,'cmd')+"\n", -1) # open R
--- End Message ---
