From fae46e179243d526ca3f4f78974a9cb86d9ca951 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sun, 27 Dec 2015 13:21:46 +0100 Subject: [PATCH] - updated to 3.18.2 - added gspell patch (adapt to gspell 0.2.x) --- latexila-gspell.patch | 63 +++++++++++++++++++++++++++++++++++++++++++ latexila.spec | 10 ++++--- 2 files changed, 69 insertions(+), 4 deletions(-) create mode 100644 latexila-gspell.patch diff --git a/latexila-gspell.patch b/latexila-gspell.patch new file mode 100644 index 0000000..5fcc18d --- /dev/null +++ b/latexila-gspell.patch @@ -0,0 +1,63 @@ +--- latexila-3.18.2/configure.ac.orig 2015-12-19 17:38:19.000000000 +0100 ++++ latexila-3.18.2/configure.ac 2015-12-27 10:52:50.120826126 +0100 +@@ -102,10 +102,6 @@ + AC_MSG_ERROR([gspell-1 ${GSPELL_REQUIRED_VERSION} required.]) + fi + +-if ! pkg-config --max-version=0.1.99 gspell-1; then +- AC_MSG_ERROR([gspell-1 ${GSPELL_REQUIRED_VERSION} required.]) +-fi +- + if ! pkg-config gsettings-desktop-schemas; then + AC_MSG_ERROR([gsettings-desktop-schemas required.]) + fi +--- latexila-3.18.2/src/document_view.vala.orig 2015-12-19 17:37:05.000000000 +0100 ++++ latexila-3.18.2/src/document_view.vala 2015-12-27 12:57:40.387178476 +0100 +@@ -258,7 +258,7 @@ + if (lang_key[0] == '\0') + return null; + +- return Gspell.Language.from_key (lang_key); ++ return Gspell.Language.lookup (lang_key); + } + + public void setup_inline_spell_checker () +@@ -299,7 +299,8 @@ + + Gspell.LanguageChooserDialog dialog = + new Gspell.LanguageChooserDialog (this.get_toplevel () as Window, +- _spell_checker.get_language ()); ++ _spell_checker.get_language (), ++ DialogFlags.MODAL | DialogFlags.DESTROY_WITH_PARENT); + + dialog.run (); + +@@ -317,7 +318,7 @@ + + 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); + } +--- latexila-3.18.2/src/preferences_dialog.vala.orig 2015-12-19 17:37:05.000000000 +0100 ++++ latexila-3.18.2/src/preferences_dialog.vala 2015-12-27 13:05:46.810491380 +0100 +@@ -309,7 +309,7 @@ + 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", ""); +@@ -333,7 +333,7 @@ + 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); ++ lang = Gspell.Language.lookup (lang_key); + + Gspell.Checker checker = new Gspell.Checker (lang); + spell_language_button.set_language (checker.get_language ()); diff --git a/latexila.spec b/latexila.spec index d58e5d0..57b3352 100644 --- a/latexila.spec +++ b/latexila.spec @@ -1,12 +1,13 @@ Summary: Integrated LaTeX Environment for the GNOME desktop Summary(pl.UTF-8): Zintegrowane środowisko LaTeXowe dla GNOME Name: latexila -Version: 3.18.1 +Version: 3.18.2 Release: 1 License: GPL v3+ Group: X11/Applications Source0: http://ftp.gnome.org/pub/GNOME/sources/latexila/3.18/%{name}-%{version}.tar.xz -# Source0-md5: 951f2f2f14ad9ce18b8470ffef998de3 +# Source0-md5: 9fe44a13d9a574a07dd70a9cd5cf5d6a +Patch0: %{name}-gspell.patch URL: https://wiki.gnome.org/Apps/LaTeXila BuildRequires: autoconf >= 2.64 BuildRequires: automake >= 1:1.12.5 @@ -15,8 +16,7 @@ BuildRequires: glib2-devel >= 1:2.40 BuildRequires: gnome-common BuildRequires: gobject-introspection-devel >= 1.30.0 BuildRequires: gsettings-desktop-schemas-devel -BuildRequires: gspell-devel >= 0.1 -BuildRequires: gspell-devel < 0.2 +BuildRequires: gspell-devel >= 0.2 BuildRequires: gtk+3-devel >= 3.14 BuildRequires: gtk-doc >= 1.14 BuildRequires: gtksourceview3-devel >= 3.18 @@ -27,6 +27,7 @@ BuildRequires: pkgconfig BuildRequires: rpmbuild(macros) >= 1.581 BuildRequires: tar >= 1:1.22 BuildRequires: vala >= 2:0.26 +BuildRequires: vala-gspell >= 0.2 BuildRequires: xz BuildRequires: yelp-tools Requires(post,postun): desktop-file-utils @@ -49,6 +50,7 @@ LaTeXila to zintegrowane środowisko LaTeXowe dla GNOME. %prep %setup -q +%patch0 -p1 %build %{__libtoolize} -- 2.44.0