Fri Mar 29 00:06:00 PDT 2013

3 files changed, 112 insertions, 5 deletions

diff --git a/community/gtranslator/PKGBUILD b/community/gtranslator/PKGBUILD
index c9f2b8b40..82881fd7c 100644
--- a/community/gtranslator/PKGBUILD
+++ b/community/gtranslator/PKGBUILD
@@ -1,28 +1,34 @@
-# $Id: PKGBUILD 87027 2013-03-25 19:19:12Z bpiotrowski $
+# $Id: PKGBUILD 87242 2013-03-28 21:28:56Z bgyorgy $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 # Contributor: Christer Solskogen (solskogen@carebears.mine.nu)
 
 pkgname=gtranslator
 pkgver=2.91.6
-pkgrel=2
+pkgrel=3
 pkgdesc="An enhanced gettext po file editor for the GNOME"
 arch=('i686' 'x86_64')
 url="http://projects.gnome.org/gtranslator/"
 license=('GPL')
 depends=('desktop-file-utils' 'gdl' 'gettext' 'gtksourceview3' 'gtkspell3' 'iso-codes' 'libgda' 'libpeas' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'dconf')
-makedepends=('intltool' 'itstool' 'gnome-doc-utils' 'gucharmap' 'json-glib')
+makedepends=('intltool' 'itstool' 'gnome-doc-utils' 'gucharmap' 'json-glib' 'gnome-common' 'yelp-tools')
 optdepends=('gucharmap: for charmap plugin'
             'json-glib: for open-tran plugin')
 options=('!libtool')
 install=$pkgname.install
 changelog=$pkgname.changelog
-source=(http://ftp.acc.umu.se/pub/GNOME/sources/$pkgname/2.91/$pkgname-$pkgver.tar.xz)
-sha256sums=('a1fd4b17b1f32cc7223a31d34e34f95b20acc7b5a23768351a34ff0b7a4bcdf6')
+source=(http://ftp.acc.umu.se/pub/GNOME/sources/$pkgname/2.91/$pkgname-$pkgver.tar.xz
+        gtkspell3-port.patch)
+sha256sums=('a1fd4b17b1f32cc7223a31d34e34f95b20acc7b5a23768351a34ff0b7a4bcdf6'
+            '29afb55c692869cbd47d0181ddd93acdd53f5b236ebabd9a96a983da66d4cb9d')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
+  # Port to the new gtkspell3
+  patch -Np1 -i "$srcdir/gtkspell3-port.patch"
+
+  autoreconf -fi
   ./configure --prefix=/usr --sysconfdir=/etc --disable-schemas-compile
   make
 }
diff --git a/community/gtranslator/gtkspell3-port.patch b/community/gtranslator/gtkspell3-port.patch
new file mode 100644
index 000000000..e12e3a9d6
--- /dev/null
+++ b/community/gtranslator/gtkspell3-port.patch
@@ -0,0 +1,97 @@
+From cf33d8761dbfc7f6c8b27c3146efcad81f8fbde9 Mon Sep 17 00:00:00 2001
+From: Kalev Lember <kalevlember@gmail.com>
+Date: Sun, 13 Jan 2013 13:19:40 +0000
+Subject: Port to gtkspell3
+
+https://bugzilla.gnome.org/show_bug.cgi?id=691655
+---
+diff --git a/configure.ac b/configure.ac
+index c1ba5b6..3fe9c46 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -84,7 +84,7 @@ GDL_REQUIRED=3.6.0
+ GDA_REQUIRED=4.2.3
+ PEAS_REQUIRED=1.2.0
+ GDICT_OPTIONAL=0.11.0
+-GTKSPELL_OPTIONAL=2.99.99
++GTKSPELL_OPTIONAL=3.0.0
+ JSON_GLIB_OPTIONAL=0.12.0
+ 
+ AC_ARG_WITH(gda,
+@@ -174,14 +174,14 @@ dnl -------------------------------------------------------------------
+ dnl Check for gtkspell >= 3.0 and use it if found
+ dnl -------------------------------------------------------------------
+ have_gtkspell=no
+-AC_ARG_WITH(gtkspell3,
++AC_ARG_WITH(gtkspell,
+             AS_HELP_STRING([--with-gtkspell],[Build with spell support]),,
+             with_gtkspell=auto)
+ 
+ if test x"$with_gtkspell" != "xno"
+ then
+         PKG_CHECK_MODULES([GTKSPELL], [
+-                gtkspell-3.0 >= $GTKSPELL_OPTIONAL
++                gtkspell3-3.0 >= $GTKSPELL_OPTIONAL
+         ], have_gtkspell=yes, have_gtkspell=no)
+ 
+         if test x"$have_gtkspell" = "xyes"
+@@ -339,7 +339,7 @@ if [ test x"$have_gtkspell" = "xyes" ]; then
+ 	echo "Building spell support: ................................YES"
+ else
+ 	echo "Building spell support: ................................NO"
+-		echo "        Requires gtkspell >= $GTKSPELL_OPTIONAL"
++		echo "        Requires gtkspell3 >= $GTKSPELL_OPTIONAL"
+ fi
+ 
+ echo "
+diff --git a/src/gtr-view.c b/src/gtr-view.c
+index 59f18e8..b9c4f6a 100644
+--- a/src/gtr-view.c
++++ b/src/gtr-view.c
+@@ -65,7 +65,7 @@ struct _GtrViewPrivate
+   gchar *search_text;
+ 
+ #ifdef HAVE_GTKSPELL
+-  GtkSpell *spell;
++  GtkSpellChecker *spell;
+ #endif
+ };
+ 
+@@ -75,11 +75,10 @@ gtr_attach_gtkspell (GtrView * view)
+ {
+   GError *error = NULL;
+   gchar *errortext = NULL;
+-  view->priv->spell = NULL;
+ 
+-  view->priv->spell =
+-    gtkspell_new_attach (GTK_TEXT_VIEW (view), NULL, &error);
+-  if (view->priv->spell == NULL)
++  view->priv->spell = gtk_spell_checker_new ();
++  gtk_spell_checker_set_language (view->priv->spell, NULL, &error);
++  if (error)
+     {
+       g_warning (_("gtkspell error: %s\n"), error->message);
+       errortext =
+@@ -90,6 +89,11 @@ gtr_attach_gtkspell (GtrView * view)
+       g_error_free (error);
+       g_free (errortext);
+     }
++  else
++    {
++      gtk_spell_checker_attach (view->priv->spell,
++                                GTK_TEXT_VIEW (view));
++    }
+ }
+ #endif
+ 
+@@ -263,7 +267,7 @@ gtr_view_enable_spellcheck (GtrView * view, gboolean enable)
+ #ifdef HAVE_GTKSPELL
+       if (!view->priv->spell)
+         return;
+-      gtkspell_detach (view->priv->spell);
++      gtk_spell_checker_detach (view->priv->spell);
+ #endif
+     }
+ }
+--
+cgit v0.9.1
diff --git a/community/gtranslator/gtranslator.changelog b/community/gtranslator/gtranslator.changelog
index 9dbf32879..393b0e71c 100644
--- a/community/gtranslator/gtranslator.changelog
+++ b/community/gtranslator/gtranslator.changelog
@@ -1,3 +1,7 @@
+2013-03-28 Balló György <ballogyor+arch at gmail dot com>
+	* gtranslator 2.91.6-3
+	rebuild for the new gtkspell3
+
 2013-01-18 Jaroslav Lichtblau (Dragonlord) <dragonlord@aur.archlinux.org>
 	* gtranslator 2.91.6-1