diff options
| -rw-r--r-- | nonprism/empathy/PKGBUILD | 24 | ||||
| -rw-r--r-- | nonprism/empathy/enchant-2.patch | 39 |
2 files changed, 54 insertions, 9 deletions
diff --git a/nonprism/empathy/PKGBUILD b/nonprism/empathy/PKGBUILD index 0eae9cf62..c7b7c003c 100644 --- a/nonprism/empathy/PKGBUILD +++ b/nonprism/empathy/PKGBUILD @@ -1,13 +1,17 @@ -# $Id: PKGBUILD 290827 2017-03-14 10:00:45Z heftig $ +# $Id$ # Contributor (Arch): Ionut Biru <ibiru@archlinux.org> +# Contributor: Andreas Grapentin <andreas@grapentin.org> # Contributor: André Silva <emulatorman@hyperbola.info> +# parabola changes and rationale +# - removed geoclue2 support + pkgname=empathy -pkgver=3.12.12+111+g3300c6deb -pkgrel=1.nonprism2 +pkgver=3.25.90+34+g78f4d4fda +pkgrel=3.nonprism1 pkgdesc="A GNOME instant messaging client using the Telepathy framework, without geoclue2 support" url="https://wiki.gnome.org/Apps/Empathy" -arch=(i686 x86_64) +arch=(x86_64 i686 armv7h) license=(GPL2) depends=(clutter-gst clutter-gtk folks gcr iso-codes libcanberra libpulse webkit2gtk telepathy-farstream telepathy-glib telepathy-logger telepathy-mission-control @@ -16,14 +20,14 @@ makedepends=(intltool itstool docbook-xsl python gnome-common git) optdepends=('telepathy-gabble: XMPP/Jabber support' 'telepathy-idle: IRC support' 'telepathy-salut: Link-local XMPP support' - 'telepathy-rakia: SIP support' 'telepathy-haze: libpurple support') -groups=(gnome) -_commit=3300c6deb7be1209ca38657c03e15ea729df2ae9 # master +_commit=78f4d4fdadd7da67e063c2905649f6a6015ef8f9 # master source=("git+https://git.gnome.org/browse/empathy#commit=$_commit" - "git+https://git.gnome.org/browse/telepathy-account-widgets") + "git+https://git.gnome.org/browse/telepathy-account-widgets" + enchant-2.patch) sha256sums=('SKIP' - 'SKIP') + 'SKIP' + 'f177f0dfc242018dd52e312637f513fd08f64aa991b45930cc3ea9a2576f795e') pkgver() { cd $pkgname @@ -37,6 +41,8 @@ prepare() { git config --local submodule.telepathy-account-widgets.url "$srcdir/telepathy-account-widgets" git submodule update + patch -Np1 -i ../enchant-2.patch + NOCONFIGURE=1 ./autogen.sh } diff --git a/nonprism/empathy/enchant-2.patch b/nonprism/empathy/enchant-2.patch new file mode 100644 index 000000000..f80a52216 --- /dev/null +++ b/nonprism/empathy/enchant-2.patch @@ -0,0 +1,39 @@ + configure.ac | 4 ++-- + libempathy-gtk/empathy-spell.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git c/configure.ac i/configure.ac +index 7aeb6b31c..31e5b847b 100644 +--- c/configure.ac ++++ i/configure.ac +@@ -72,7 +72,7 @@ WEBKIT_REQUIRED=2.10.0 + GOA_REQUIRED=3.5.1 + + # Optional deps +-ENCHANT_REQUIRED=1.2.0 ++ENCHANT_REQUIRED=2.2.0 + GEOCLUE_REQUIRED=2.1.0 + GEOCODE_GLIB_REQUIRED=0.99.1 + ISO_CODES_REQUIRED=0.35 +@@ -307,7 +307,7 @@ AC_ARG_ENABLE(spell, + if test "x$enable_spell" != "xno"; then + PKG_CHECK_MODULES(ENCHANT, + [ +- enchant >= $ENCHANT_REQUIRED, ++ enchant-2 >= $ENCHANT_REQUIRED, + iso-codes >= $ISO_CODES_REQUIRED + ], have_enchant="yes", have_enchant="no") + +diff --git c/libempathy-gtk/empathy-spell.c i/libempathy-gtk/empathy-spell.c +index 27f27f902..bb0159fd8 100644 +--- c/libempathy-gtk/empathy-spell.c ++++ i/libempathy-gtk/empathy-spell.c +@@ -424,7 +424,7 @@ empathy_spell_add_to_dictionary (const gchar *code, + if (lang == NULL) + return; + +- enchant_dict_add_to_pwl (lang->speller, word, strlen (word)); ++ enchant_dict_add (lang->speller, word, strlen (word)); + } + + #else /* not HAVE_ENCHANT */ |