Date: Wednesday, March 18, 2015 @ 07:53:56 Author: jlichtblau Revision: 129452
upgpkg: gtranslator 2.91.7-1 Modified: gtranslator/trunk/PKGBUILD gtranslator/trunk/gtranslator.changelog Deleted: gtranslator/trunk/gtkspell3-port.patch -----------------------+ PKGBUILD | 25 ++++-------- gtkspell3-port.patch | 97 ------------------------------------------------ gtranslator.changelog | 23 ++++++----- 3 files changed, 22 insertions(+), 123 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-03-18 02:23:55 UTC (rev 129451) +++ PKGBUILD 2015-03-18 06:53:56 UTC (rev 129452) @@ -1,12 +1,12 @@ # $Id$ -# Maintainer: Jaroslav Lichtblau <[email protected]> +# Maintainer: Jaroslav Lichtblau <[email protected]> # Maintainer: Alexander Rødseth <[email protected]> # Contributor: Hugo Doria <[email protected]> # Contributor: Christer Solskogen ([email protected]) pkgname=gtranslator -pkgver=2.91.6 -pkgrel=4 +pkgver=2.91.7 +pkgrel=1 pkgdesc='Enhanced gettext po file editor for the GNOME' arch=('x86_64' 'i686') url='http://projects.gnome.org/gtranslator/' @@ -15,18 +15,13 @@ makedepends=('intltool' 'itstool' 'gnome-doc-utils' 'gucharmap' 'json-glib' 'gnome-common' 'yelp-tools') optdepends=('gucharmap: for charmap plugin' 'json-glib: for open-tran plugin') -install="$pkgname.install" -source=("http://ftp.acc.umu.se/pub/GNOME/sources/$pkgname/2.91/$pkgname-$pkgver.tar.xz"; - 'gtkspell3-port.patch') -sha256sums=('a1fd4b17b1f32cc7223a31d34e34f95b20acc7b5a23768351a34ff0b7a4bcdf6' - '29afb55c692869cbd47d0181ddd93acdd53f5b236ebabd9a96a983da66d4cb9d') +install=$pkgname.install +source=(http://ftp.acc.umu.se/pub/GNOME/sources/$pkgname/2.91/$pkgname-$pkgver.tar.xz) +sha256sums=('2b25b45b33e4aa856953b4a5da1d98bd51a343ddb479aeae3934bfe0c3651f9d') build() { - cd "$srcdir/$pkgname-$pkgver" + 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 @@ -33,9 +28,7 @@ } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "${srcdir}"/$pkgname-$pkgver - make DESTDIR="$pkgdir" install + make DESTDIR="${pkgdir}" install } - -# vim:set ts=2 sw=2 et: Deleted: gtkspell3-port.patch =================================================================== --- gtkspell3-port.patch 2015-03-18 02:23:55 UTC (rev 129451) +++ gtkspell3-port.patch 2015-03-18 06:53:56 UTC (rev 129452) @@ -1,97 +0,0 @@ -From cf33d8761dbfc7f6c8b27c3146efcad81f8fbde9 Mon Sep 17 00:00:00 2001 -From: Kalev Lember <[email protected]> -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 Modified: gtranslator.changelog =================================================================== --- gtranslator.changelog 2015-03-18 02:23:55 UTC (rev 129451) +++ gtranslator.changelog 2015-03-18 06:53:56 UTC (rev 129452) @@ -1,8 +1,11 @@ +2015-03-18 Jaroslav Lichtblau (Dragonlord) <[email protected]> + * gtranslator 2.91.7-1 + 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) <[email protected]> +2013-01-18 Jaroslav Lichtblau (Dragonlord) <[email protected]> * gtranslator 2.91.6-1 2012-11-05 Balló György <ballogyor+arch at gmail dot com> @@ -10,10 +13,10 @@ rebuild for gdl 3.6 tempolary disable dockbar, because layout loading is completely broken with gdl 3.6 -2012-07-30 Jaroslav Lichtblau (Dragonlord) <[email protected]> +2012-07-30 Jaroslav Lichtblau (Dragonlord) <[email protected]> * gtranslator 2.91.5-1 -2012-05-12 Jaroslav Lichtblau (Dragonlord) <[email protected]> +2012-05-12 Jaroslav Lichtblau (Dragonlord) <[email protected]> * gtranslator 2.91.4-1 2012-04-23 Jan Alexander Steffens (heftig) <[email protected]> @@ -29,25 +32,25 @@ remove unused libunique dependency remove broken dictionary plugin -2012-03-18 Jaroslav Lichtblau <[email protected]> +2012-03-18 Jaroslav Lichtblau <[email protected]> * gtranslator 2.90.8-1 -2011-10-28 Jaroslav Lichtblau (Dragonlord) <[email protected]> +2011-10-28 Jaroslav Lichtblau (Dragonlord) <[email protected]> * gtranslator 2.90.7-1 -2011-08-20 Jaroslav Lichtblau (Dragonlord) <[email protected]> +2011-08-20 Jaroslav Lichtblau (Dragonlord) <[email protected]> * gtranslator 2.90.5-1 -2011-05-12 Jaroslav Lichtblau (Dragonlord) <[email protected]> +2011-05-12 Jaroslav Lichtblau (Dragonlord) <[email protected]> * gtranslator 2.90.3-1 -2011-01-09 Jaroslav Lichtblau (Dragonlord) <[email protected]> +2011-01-09 Jaroslav Lichtblau (Dragonlord) <[email protected]> * gtranslator-1.9.13-1 -2010-08-30 Jaroslav Lichtblau (Dragonlord) <[email protected]> +2010-08-30 Jaroslav Lichtblau (Dragonlord) <[email protected]> * gtranslator-1.9.11-1 -2010-02-23 Jaroslav Lichtblau (Dragonlord) <[email protected]> +2010-02-23 Jaroslav Lichtblau (Dragonlord) <[email protected]> * gtranslator-1.9.7-1 2007-06-19 Eric Belanger (Snowman) <[email protected]>
