Merge lp:~laney/libfriends/gtkspell3-3 into lp:libfriends

[Iain Lane]

Port to the new libgtkspell3-3 API.

Port to the new libgtkspell3-3 API.

I haven't tested this directly as there appear to be no archive rdeps.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:73
http://jenkins.qa.ubuntu.com/job/libfriends-ci/2/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libfriends-raring-amd64-ci/2/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libfriends-ci/2/rebuild

review: Needs Fixing (continuous-integration)

[Iain Lane (laney)]

Why is that happening? Perhaps the bot isn't running with -proposed?

[Iain Lane (laney)]

Wait, raring. Yeah, that won't work.

[Ken VanDine (ken-vandine)]

I've updated the CI config in the friends stack to use saucy

[Ken VanDine (ken-vandine)]

Looks great and works fine. Thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/libfriends-autolanding/2/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libfriends-raring-amd64-autolanding/2/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/libfriends-autolanding/3/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libfriends-saucy-amd64-autolanding/1/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/libfriends-autolanding/4/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libfriends-saucy-amd64-autolanding/2/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/libfriends-autolanding/5/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libfriends-saucy-amd64-autolanding/3/console

review: Needs Fixing (continuous-integration)

[Francis Ginther (fginther)]

There was a hung xvfb process on the pbuilder host. The tests should be updated to use xvfb-run -a to avoid this.

Re-approving.

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'configure.ac'
--- configure.ac	2013-01-15 00:04:45 +0000
+++ configure.ac	2013-05-29 10:15:31 +0000
@@ -187,10 +187,10 @@
 
 if test "x$enable_spell" = "xyes"; then
         PKG_CHECK_MODULES(GTKSPELL,
-                  gtkspell-3.0)
-        AC_SUBST(GTKSPELL_CFLAGS)
-        AC_SUBST(GTKSPELL_CFLAGS)
-        GTKSPELL_PKG="--pkg gtkspell-3.0"
+                  gtkspell3-3.0)
+        AC_SUBST(GTKSPELL_CFLAGS)
+        AC_SUBST(GTKSPELL_CFLAGS)
+        GTKSPELL_PKG="--pkg gtkspell3-3.0"
         AC_SUBST(GTKSPELL_PKG)
 fi
 
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-05-08 05:00:44 +0000
+++ debian/changelog	2013-05-29 10:15:31 +0000
@@ -1,3 +1,9 @@
+libfriends (0.1.2daily13.05.08-0ubuntu2) UNRELEASED; urgency=low
+
+  * Port to gtkspell3-3.
+
+ -- Iain Lane <[e-mail]>  Tue, 28 May 2013 18:22:24 +0100
+
 libfriends (0.1.2daily13.05.08-0ubuntu1) saucy; urgency=low
 
   * Automatic snapshot from revision 69
 
=== modified file 'debian/control'
--- debian/control	2013-03-25 23:38:32 +0000
+++ debian/control	2013-05-29 10:15:31 +0000
@@ -19,7 +19,7 @@
                libgee-dev,
                libgirepository1.0-dev (>= 0.10),
                libgtk-3-dev,
-               libgtkspell-3-dev,
+               libgtkspell3-3-dev,
                libjson-glib-dev,
                libvala-0.18-dev,
                python3-mock,
 
=== modified file 'gtk/entry.vala'
--- gtk/entry.vala	2013-02-07 21:22:17 +0000
+++ gtk/entry.vala	2013-05-29 10:15:31 +0000
@@ -187,15 +187,17 @@
             //dispatcher.connection_changed.connect((source) => {
             //        on_connection_changed (source);});
 
+
 #if HAVE_GTKSPELL
             try
             {
-              var spell = new Gtk.Spell.attach(this, null);
+              var spell = new GtkSpell.Checker().attach(this);
             }
             catch (Error e)
             {
             }
 #endif
+
         }
 
         public void reset () {
 
=== removed file 'vapi/gtkspell-3.0.vapi'
--- vapi/gtkspell-3.0.vapi	2012-12-07 21:38:36 +0000
+++ vapi/gtkspell-3.0.vapi	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-namespace Gtk
-{
-  [CCode (cprefix = "GTKSPELL_ERROR_", cheader_filename = "gtkspell/gtkspell.h")]
-  public errordomain SpeelError
-  {
-    ERROR_BACKEND
-  }
-
-  [Compact]
-  [CCode (cheader_filename = "gtkspell/gtkspell.h", free_function = "")]
-  public class Spell
-  {
-    [CCode (cname = "gtkspell_new_attach")]
-    public Spell.attach (TextView view, string? lang) throws GLib.Error;
-    [CCode (cname = "gtkspell_get_from_text_view")]
-    public static Spell get_from_text_view (TextView view);
-    [CCode (cname = "gtkspell_detach")]
-    public void detach ();
-    [CCode (cname = "gtkspell_set_language")]
-    public bool set_language (string lang) throws GLib.Error;
-    [CCode (cname = "gtkspell_recheck_all")]
-    public void recheck_all ();
-  }
-}