From c8e82afa70d7a75ce3420abb0a8e1eb906e958f1 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Fri, 30 Mar 2018 16:29:26 -0300 Subject: [PATCH] gtkspell3: rebuild against enchant-2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: #13076 [via git-merge-pr] Signed-off-by: Jürgen Buchmüller --- srcpkgs/gtkspell3/patches/enchant-2.patch | 25 +++++++++++++++++++++++ srcpkgs/gtkspell3/template | 13 ++++++++---- 2 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/gtkspell3/patches/enchant-2.patch diff --git a/srcpkgs/gtkspell3/patches/enchant-2.patch b/srcpkgs/gtkspell3/patches/enchant-2.patch new file mode 100644 index 00000000000..887f1c70b59 --- /dev/null +++ b/srcpkgs/gtkspell3/patches/enchant-2.patch @@ -0,0 +1,25 @@ +Source: Arch Linux +Upstream: Unknown +Reason: Allows compilation with enchant-2 + +--- gtkspell/gtkspell.c ++++ gtkspell/gtkspell.c +@@ -353,7 +353,7 @@ + get_word_extents_from_mark (spell->priv->buffer, &start, &end, spell->priv->mark_click); + word = gtk_text_buffer_get_text (spell->priv->buffer, &start, &end, FALSE); + +- enchant_dict_add_to_pwl (spell->priv->speller, word, strlen (word)); ++ enchant_dict_add (spell->priv->speller, word, strlen (word)); + + gtk_spell_checker_recheck_all (spell); + +@@ -1246,7 +1246,7 @@ + void + gtk_spell_checker_add_to_dictionary (GtkSpellChecker *spell, const gchar *word) + { +- enchant_dict_add_to_pwl (spell->priv->speller, word, strlen (word)); ++ enchant_dict_add (spell->priv->speller, word, strlen (word)); + gtk_spell_checker_recheck_all (spell); + } + + diff --git a/srcpkgs/gtkspell3/template b/srcpkgs/gtkspell3/template index 58f4bfa44e5..b73ab6819fb 100644 --- a/srcpkgs/gtkspell3/template +++ b/srcpkgs/gtkspell3/template @@ -1,19 +1,24 @@ # Template file for 'gtkspell3' pkgname=gtkspell3 version=3.0.9 -revision=2 +revision=3 build_options="gir" build_style=gnu-configure configure_args="--disable-silent-rules" -hostmakedepends="$(vopt_if gir 'gobject-introspection vala-devel') intltool pkg-config" -makedepends="enchant-devel gtk+3-devel" +hostmakedepends="automake intltool libtool pkg-config + $(vopt_if gir 'gobject-introspection vala-devel')" +makedepends="enchant2-devel gtk+3-devel" short_desc="Highlighting and replacement of misspelled words" maintainer="beefcurtains " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://${pkgname}.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/${pkgname::-1}/${version}/${pkgname}-${version}.tar.xz" checksum=a4f4a4a2789f7499563e26d96b22d8085222ebe278da47d026b2de782b8b4d26 +pre_configure() { + sed -i 's|enchant|enchant-2|g' configure +} + # Enable gir and vala for non-cross builds if [ -z "$CROSS_BUILD" ]; then build_options_default="gir"