Unbreak with new gspell.

reported by nigel@
This commit is contained in:
ajacoutot 2015-12-14 20:22:35 +00:00
parent f7f84bb44e
commit c7b9f11c01
3 changed files with 87 additions and 6 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.37 2015/11/24 06:12:25 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.38 2015/12/14 20:22:35 ajacoutot Exp $
COMMENT= integrated LaTeX environment for GNOME
GNOME_PROJECT= latexila
GNOME_VERSION= 3.18.1
REVISION= 0
REVISION= 1
CATEGORIES= editors print
@ -32,7 +32,8 @@ RUN_DEPENDS= devel/gsettings-desktop-schemas \
devel/xdg-utils # xdg-open(1)
LIB_DEPENDS= devel/libgee \
textproc/gspell
textproc/gspell \
x11/gtksourceview3
MODGNOME_TOOLS= desktop-file-utils gobject-introspection \
gtk-update-icon-cache vala yelp

View File

@ -1,12 +1,42 @@
$OpenBSD: patch-src_document_view_vala,v 1.1 2015/11/24 06:12:25 ajacoutot Exp $
$OpenBSD: patch-src_document_view_vala,v 1.2 2015/12/14 20:22:35 ajacoutot Exp $
From 7a4af7e94f1ccebe51c2aed73bc7740113eed45c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Wilmet?= <swilmet@gnome.org>
Date: Fri, 20 Nov 2015 18:40:37 +0100
Subject: Adapt code for GspellLanguageChooserDialog change
--- src/document_view.vala.orig Thu Oct 15 15:33:20 2015
+++ src/document_view.vala Tue Nov 24 07:10:08 2015
From 92e6b33fe0731009268292e201dd009a3f28fbf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Wilmet?= <swilmet@gnome.org>
Date: Fri, 27 Nov 2015 18:35:48 +0100
Subject: Adapt code for GspellLanguage API changes
From 7141859a103aa5b64a99fd27113ff0110fac2c04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Wilmet?= <swilmet@gnome.org>
Date: Sun, 13 Dec 2015 18:56:51 +0100
Subject: spell: update parameter type of gspell_inline_checker_gtv_new()
--- src/document_view.vala.orig Mon Dec 14 21:09:00 2015
+++ src/document_view.vala Mon Dec 14 21:09:19 2015
@@ -251,14 +251,14 @@ public class DocumentView : Gtk.SourceView
{
Document doc = get_buffer () as Document;
- string? lang_key = doc.get_metadata (METADATA_ATTRIBUTE_SPELL_LANGUAGE);
- if (lang_key == null)
- lang_key = _editor_settings.get_string ("spell-checking-language");
+ string? lang_code = doc.get_metadata (METADATA_ATTRIBUTE_SPELL_LANGUAGE);
+ if (lang_code == null)
+ lang_code = _editor_settings.get_string ("spell-checking-language");
- if (lang_key[0] == '\0')
+ if (lang_code[0] == '\0')
return null;
- return Gspell.Language.from_key (lang_key);
+ return Gspell.Language.lookup (lang_code);
}
public void setup_inline_spell_checker ()
@@ -299,7 +299,10 @@ public class DocumentView : Gtk.SourceView
Gspell.LanguageChooserDialog dialog =
@ -19,3 +49,22 @@ Subject: Adapt code for GspellLanguageChooserDialog change
dialog.run ();
@@ -317,7 +320,7 @@ public class DocumentView : Gtk.SourceView
unowned Gspell.Language? lang = _spell_checker.get_language ();
if (lang != null)
- doc.set_metadata (METADATA_ATTRIBUTE_SPELL_LANGUAGE, lang.to_key ());
+ doc.set_metadata (METADATA_ATTRIBUTE_SPELL_LANGUAGE, lang.get_code ());
else
doc.set_metadata (METADATA_ATTRIBUTE_SPELL_LANGUAGE, null);
}
@@ -347,8 +350,7 @@ public class DocumentView : Gtk.SourceView
if (_inline_spell_checker == null)
{
_inline_spell_checker =
- new Gspell.InlineCheckerGtv (this.buffer as Gtk.SourceBuffer,
- _spell_checker);
+ new Gspell.InlineCheckerGtv (this.buffer, _spell_checker);
_inline_spell_checker.attach_view (this);

View File

@ -0,0 +1,31 @@
$OpenBSD: patch-src_preferences_dialog_vala,v 1.1 2015/12/14 20:22:35 ajacoutot Exp $
From 92e6b33fe0731009268292e201dd009a3f28fbf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Wilmet?= <swilmet@gnome.org>
Date: Fri, 27 Nov 2015 18:35:48 +0100
Subject: Adapt code for GspellLanguage API changes
--- src/preferences_dialog.vala.orig Thu Oct 1 15:00:41 2015
+++ src/preferences_dialog.vala Mon Dec 14 21:09:04 2015
@@ -309,7 +309,7 @@ public class PreferencesDialog : Dialog
if (selected_lang != null)
{
editor_settings.set_string ("spell-checking-language",
- selected_lang.to_key ());
+ selected_lang.get_code ());
}
else
editor_settings.set_string ("spell-checking-language", "");
@@ -331,9 +331,9 @@ public class PreferencesDialog : Dialog
Gspell.LanguageChooserButton spell_language_button)
{
unowned Gspell.Language? lang = null;
- string lang_key = editor_settings.get_string ("spell-checking-language");
- if (lang_key[0] != '\0')
- lang = Gspell.Language.from_key (lang_key);
+ string lang_code = editor_settings.get_string ("spell-checking-language");
+ if (lang_code[0] != '\0')
+ lang = Gspell.Language.lookup (lang_code);
Gspell.Checker checker = new Gspell.Checker (lang);
spell_language_button.set_language (checker.get_language ());