[gedit-plugins] We need the new VTE API/ABI to run

Debarshi Ray rishi at fedoraproject.org
Wed Nov 5 10:45:57 UTC 2014


commit a2cd9a1b2a07b15c5d1685e75afd8258b477f425
Author: Debarshi Ray <debarshir at gnome.org>
Date:   Wed Nov 5 11:45:56 2014 +0100

    We need the new VTE API/ABI to run
    
    - Carry an upstream patch to pick up a last-minute VTE API break

 0001-terminal-fix-for-api-break.patch |   34 +++++++++++++++++++++++++++++++++
 gedit-plugins.spec                    |   10 +++++++-
 2 files changed, 42 insertions(+), 2 deletions(-)
---
diff --git a/0001-terminal-fix-for-api-break.patch b/0001-terminal-fix-for-api-break.patch
new file mode 100644
index 0000000..2c77ac4
--- /dev/null
+++ b/0001-terminal-fix-for-api-break.patch
@@ -0,0 +1,34 @@
+From 83063fca300a905db8f4c4f70d4b264e5e4f3785 Mon Sep 17 00:00:00 2001
+From: Ignacio Casal Quinteiro <icq at gnome.org>
+Date: Mon, 3 Nov 2014 08:16:31 +0100
+Subject: [PATCH] terminal: fix for api break
+
+---
+ plugins/terminal/terminal.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/plugins/terminal/terminal.py b/plugins/terminal/terminal.py
+index f6d7eb5..3606b79 100644
+--- a/plugins/terminal/terminal.py
++++ b/plugins/terminal/terminal.py
+@@ -36,7 +36,7 @@ except:
+ class GeditTerminal(Vte.Terminal):
+ 
+     defaults = {
+-        'visible_bell'          : False,
++        'audible_bell'          : False,
+     }
+ 
+     TARGET_URI_LIST = 200
+@@ -144,7 +144,7 @@ class GeditTerminal(Vte.Terminal):
+         self.set_allow_bold(self.profile_settings.get_boolean("allow-bold"))
+         self.set_scroll_on_keystroke(self.profile_settings.get_boolean("scroll-on-keystroke"))
+         self.set_scroll_on_output(self.profile_settings.get_boolean("scroll-on-output"))
+-        self.set_visible_bell(self.defaults['visible_bell'])
++        self.set_audible_bell(self.defaults['audible_bell'])
+ 
+         if self.profile_settings.get_boolean("scrollback-unlimited"):
+             lines = -1
+-- 
+2.1.0
+
diff --git a/gedit-plugins.spec b/gedit-plugins.spec
index 4b672f2..c7d93c5 100644
--- a/gedit-plugins.spec
+++ b/gedit-plugins.spec
@@ -12,7 +12,7 @@
 
 Name:           gedit-plugins
 Version:        3.14.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Plugins for gedit
 
 Group:          Applications/Editors
@@ -20,6 +20,7 @@ License:        GPLv2+
 URL:            http://live.gnome.org/GeditPlugins
 Source0:        http://download.gnome.org/sources/%{name}/3.14/%{name}-%{version}.tar.xz
 Patch0:         gedit-plugins-disable-python3.patch
+Patch1:         0001-terminal-fix-for-api-break.patch
 
 BuildRequires:  gedit-devel
 BuildRequires:  gnome-doc-utils
@@ -169,7 +170,7 @@ The gedit synctex plugin.
 %package -n     gedit-plugin-terminal
 Summary:        gedit terminal plugin
 Requires:       %{name}-data = %{version}-%{release}
-Requires:       vte3 >= 0.27.90-2.fc15
+Requires:       vte291
 %description -n gedit-plugin-terminal
 The gedit terminal plugin.
 
@@ -200,6 +201,7 @@ The gedit zeitgeist plugin.
 %if !%{with_python3}
 %patch0 -p1 -b .disable-python3
 %endif
+%patch1 -p1 -b .vte
 
 %build
 %if %{with_zeitgeist}
@@ -356,6 +358,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %{_datadir}/appdata/gedit-zeitgeist.metainfo.xml
 
 %changelog
+* Wed Nov 05 2014 Debarshi Ray <rishi at fedoraproject.org> - 3.14.0-2
+- We need the new VTE API/ABI to run
+- Carry an upstream patch to pick up a last-minute VTE API break
+
 * Mon Sep 22 2014 Kalev Lember <kalevlember at gmail.com> - 3.14.0-1
 - Update to 3.14.0
 


More information about the scm-commits mailing list