From 236f7ce9638c79b9ff594552540f3f5a2cbd8703 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 29 Mar 2013 00:06:00 -0700 Subject: Fri Mar 29 00:06:00 PDT 2013 --- community/almanah/PKGBUILD | 16 +++-- community/almanah/update-gtkspell3-support.patch | 90 ++++++++++++++++++++++++ 2 files changed, 101 insertions(+), 5 deletions(-) create mode 100644 community/almanah/update-gtkspell3-support.patch (limited to 'community/almanah') diff --git a/community/almanah/PKGBUILD b/community/almanah/PKGBUILD index 36e6b4f35..9bf7cba30 100644 --- a/community/almanah/PKGBUILD +++ b/community/almanah/PKGBUILD @@ -1,22 +1,28 @@ -# $Id: PKGBUILD 79128 2012-10-30 23:07:30Z heftig $ +# $Id: PKGBUILD 87238 2013-03-28 21:27:02Z bgyorgy $ # Maintainer: Balló György pkgname=almanah -pkgver=0.10.0 +pkgver=0.10.1 pkgrel=1 pkgdesc="Small GTK+ application to allow you to keep a diary of your life" arch=('i686' 'x86_64') url="http://live.gnome.org/Almanah_Diary" license=('GPL') -depends=('evolution-data-server>=3.6.0' 'gtkspell3' 'libcryptui' 'xdg-utils') +depends=('evolution-data-server' 'gtkspell3' 'libcryptui' 'xdg-utils') makedepends=('intltool') install=$pkgname.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('fd213b53ca2a9832df868ee44ed7c446cd6b320651e2f2d10e0a0c98aa3bfced') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + update-gtkspell3-support.patch) +sha256sums=('122789c1baea1713102b200c0401d25395ec177a66ae22635d3ae2fecc1f08bd' + '60fedd6be05ef2619c3b50539b9fdc717480e4f03a2920d8b68b09e63dc7e7db') build() { cd "$srcdir/$pkgname-$pkgver" + # Port to the new gtkspell3 + patch -Np1 -i "$srcdir/update-gtkspell3-support.patch" + + autoreconf -fi ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --disable-schemas-compile make diff --git a/community/almanah/update-gtkspell3-support.patch b/community/almanah/update-gtkspell3-support.patch new file mode 100644 index 000000000..aa2a81159 --- /dev/null +++ b/community/almanah/update-gtkspell3-support.patch @@ -0,0 +1,90 @@ +From 114c4f78ac9882be51c4154751760bd4fea48403 Mon Sep 17 00:00:00 2001 +From: Álvaro Peña +Date: Wed, 06 Feb 2013 10:12:54 +0000 +Subject: Update GtkSpell 3 support + +--- +diff --git a/configure.ac b/configure.ac +index b89ba74..fbe6889 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -95,7 +95,7 @@ AC_SUBST(EVO_LIBS) + + dnl Spell checking + if test $spell_checking = "true"; then +- PKG_CHECK_MODULES(SPELL_CHECKING, gtkspell-3.0) ++ PKG_CHECK_MODULES(SPELL_CHECKING, gtkspell3-3.0) + AC_SUBST(SPELL_CHECKING_CFLAGS) + AC_SUBST(SPELL_CHECKING_LIBS) + fi +diff --git a/src/main-window.c b/src/main-window.c +index fb931e1..2fe01ef 100644 +--- a/src/main-window.c ++++ b/src/main-window.c +@@ -1109,7 +1109,7 @@ mw_calendar_day_selected_cb (AlmanahCalendarButton *calendar_button, AlmanahMain + AlmanahEventManager *event_manager; + GDate calendar_date; + #ifdef ENABLE_SPELL_CHECKING +- GtkSpell *gtkspell; ++ GtkSpellChecker *gtkspell; + #endif /* ENABLE_SPELL_CHECKING */ + AlmanahMainWindowPrivate *priv = main_window->priv; + AlmanahEntry *entry; +@@ -1166,9 +1166,9 @@ mw_calendar_day_selected_cb (AlmanahCalendarButton *calendar_button, AlmanahMain + + #ifdef ENABLE_SPELL_CHECKING + /* Ensure the spell-checking is updated */ +- gtkspell = gtkspell_get_from_text_view (priv->entry_view); ++ gtkspell = gtk_spell_checker_get_from_text_view (priv->entry_view); + if (gtkspell != NULL) { +- gtkspell_recheck_all (gtkspell); ++ gtk_spell_checker_recheck_all (gtkspell); + gtk_widget_queue_draw (GTK_WIDGET (priv->entry_view)); + } + #endif /* ENABLE_SPELL_CHECKING */ +@@ -1326,13 +1326,13 @@ enable_spell_checking (AlmanahMainWindow *self, GError **error) + { + AlmanahApplication *application; + GSettings *settings; +- GtkSpell *gtkspell; ++ GtkSpellChecker *gtkspell; + gchar *spelling_language; + GtkTextTagTable *table; + GtkTextTag *tag; + + /* Bail out if spell checking's already enabled */ +- if (gtkspell_get_from_text_view (self->priv->entry_view) != NULL) ++ if (gtk_spell_checker_get_from_text_view (self->priv->entry_view) != NULL) + return TRUE; + + /* If spell checking wasn't already enabled, we have a dummy gtkspell-misspelled text tag to destroy */ +@@ -1353,7 +1353,9 @@ enable_spell_checking (AlmanahMainWindow *self, GError **error) + spelling_language = NULL; + } + +- gtkspell = gtkspell_new_attach (self->priv->entry_view, spelling_language, error); ++ gtkspell = gtk_spell_checker_new (); ++ gtk_spell_checker_set_language (gtkspell, spelling_language, error); ++ gtk_spell_checker_attach (gtkspell, self->priv->entry_view); + g_free (spelling_language); + + if (gtkspell == NULL) +@@ -1364,13 +1366,13 @@ enable_spell_checking (AlmanahMainWindow *self, GError **error) + static void + disable_spell_checking (AlmanahMainWindow *self) + { +- GtkSpell *gtkspell; ++ GtkSpellChecker *gtkspell; + GtkTextTagTable *table; + GtkTextTag *tag; + +- gtkspell = gtkspell_get_from_text_view (self->priv->entry_view); ++ gtkspell = gtk_spell_checker_get_from_text_view (self->priv->entry_view); + if (gtkspell != NULL) +- gtkspell_detach (gtkspell); ++ gtk_spell_checker_detach (gtkspell); + + /* Remove the old gtkspell-misspelling text tag */ + table = gtk_text_buffer_get_tag_table (self->priv->entry_buffer); +-- +cgit v0.9.1 -- cgit v1.2.3-54-g00ecf