[arch-commits] Commit in sylpheed/repos (4 files)
Alexander Fehr
alexanderf at archlinux.org
Sat Dec 20 00:28:41 UTC 2008
Date: Friday, December 19, 2008 @ 19:28:41
Author: alexanderf
Revision: 21981
Merged revisions 21979 via svnmerge from
svn+ssh://archlinux.org/srv/svn-packages/sylpheed/trunk
........
r21979 | alexanderf | 2008-12-20 01:24:26 +0100 (Sa, 20 Dez 2008) | 1 line
upgpkg: sylpheed 2.6.0-1
........
Modified:
sylpheed/repos/extra-x86_64/ (properties)
sylpheed/repos/extra-x86_64/ChangeLog
sylpheed/repos/extra-x86_64/PKGBUILD
Deleted:
sylpheed/repos/extra-x86_64/sylpheed-enchant.patch
------------------------+
ChangeLog | 6 ++
PKGBUILD | 10 +---
sylpheed-enchant.patch | 95 -----------------------------------------------
3 files changed, 9 insertions(+), 102 deletions(-)
Property changes on: sylpheed/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
- /sylpheed/trunk:1-5828
+ /sylpheed/trunk:1-21980
Modified: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog 2008-12-20 00:26:37 UTC (rev 21980)
+++ extra-x86_64/ChangeLog 2008-12-20 00:28:41 UTC (rev 21981)
@@ -1,3 +1,9 @@
+2008-12-19 Alexander Fehr <pizzapunk gmail com>
+
+ * sylpheed-2.6.0-1:
+ New upstream release.
+ Removed enchant patch.
+
2008-07-20 Alexander Fehr <pizzapunk gmail com>
* sylpheed-2.5.0-1:
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2008-12-20 00:26:37 UTC (rev 21980)
+++ extra-x86_64/PKGBUILD 2008-12-20 00:28:41 UTC (rev 21981)
@@ -3,7 +3,7 @@
# Contributor: dorphell <dorphell at archlinux.org>
pkgname=sylpheed
-pkgver=2.5.0
+pkgver=2.6.0
pkgrel=1
pkgdesc="Lightweight and user-friendly e-mail client"
arch=('i686' 'x86_64')
@@ -11,16 +11,12 @@
license=('GPL')
depends=('gpgme' 'gtkspell')
makedepends=('compface')
-source=(http://sylpheed.sraoss.jp/sylpheed/v2.5/sylpheed-$pkgver.tar.bz2
- sylpheed-enchant.patch)
-md5sums=('a6fc9e9c2a33876fddb33f25f40b820f'
- 'f7cef235fa9e8c366be36286fa5314d0')
+source=(http://sylpheed.sraoss.jp/sylpheed/v2.6/sylpheed-$pkgver.tar.bz2)
+md5sums=('5b7ed03b106e2a0d300b103652dd34c2')
build() {
cd "$srcdir/sylpheed-$pkgver"
- patch -Np1 -i "$srcdir/sylpheed-enchant.patch" || return 1
-
./configure --prefix=/usr --enable-ldap || return 1
make || return 1
make DESTDIR="$pkgdir" install || return 1
Deleted: extra-x86_64/sylpheed-enchant.patch
===================================================================
--- extra-x86_64/sylpheed-enchant.patch 2008-12-20 00:26:37 UTC (rev 21980)
+++ extra-x86_64/sylpheed-enchant.patch 2008-12-20 00:28:41 UTC (rev 21981)
@@ -1,95 +0,0 @@
-diff -ur sylpheed-2.5.0.orig/src/compose.c sylpheed-2.5.0/src/compose.c
---- sylpheed-2.5.0.orig/src/compose.c 2008-05-16 11:23:12.000000000 +0200
-+++ sylpheed-2.5.0/src/compose.c 2008-07-19 23:34:22.000000000 +0200
-@@ -69,7 +69,7 @@
- #if USE_GTKSPELL
- # include <gtk/gtkradiomenuitem.h>
- # include <gtkspell/gtkspell.h>
--# include <aspell.h>
-+# include <enchant/enchant.h>
- #endif
-
- #include <stdio.h>
-@@ -5295,6 +5295,7 @@
- #ifdef USE_GTKSPELL
- compose->check_spell = prefs_common.check_spell;
- compose->spell_lang = g_strdup(prefs_common.spell_lang);
-+ compose->spell_dict_list = NULL;
- compose->spell_menu = spell_menu;
- #endif /* USE_GTKSPELL */
-
-@@ -5734,26 +5735,30 @@
- #if USE_GTKSPELL
- static void compose_set_spell_lang_menu(Compose *compose)
- {
-- AspellConfig *config;
-- AspellDictInfoList *dlist;
-- AspellDictInfoEnumeration *dels;
-- const AspellDictInfo *entry;
-+ EnchantBroker* eb;
- GSList *dict_list = NULL, *menu_list = NULL, *cur;
- GtkWidget *menu;
- gboolean lang_set = FALSE;
-
-- config = new_aspell_config();
-- dlist = get_aspell_dict_info_list(config);
-- delete_aspell_config(config);
--
-- dels = aspell_dict_info_list_elements(dlist);
-- while ((entry = aspell_dict_info_enumeration_next(dels)) != 0) {
-- dict_list = g_slist_append(dict_list, (gchar *)entry->name);
-- if (compose->spell_lang != NULL &&
-- g_ascii_strcasecmp(compose->spell_lang, entry->name) == 0)
-- lang_set = TRUE;
-+ void enchDictDescCb (const char * const lang_tag,
-+ const char * const provider_name,
-+ const char * const provider_desc,
-+ const char * const provider_file,
-+ void * user_data)
-+ {
-+ dict_list = g_slist_append(dict_list, g_strdup((gchar*)lang_tag));
-+ }
-+
-+ eb = enchant_broker_init();
-+ enchant_broker_list_dicts (eb, enchDictDescCb, &dict_list);
-+ compose->spell_dict_list = dict_list;
-+ enchant_broker_free(eb);
-+
-+ for (cur = dict_list; cur!=NULL; cur = cur->next) {
-+ if (compose->spell_lang != NULL &&
-+ g_ascii_strcasecmp(compose->spell_lang, cur->data) == 0)
-+ lang_set = TRUE;
- }
-- delete_aspell_dict_info_enumeration(dels);
-
- menu = gtk_menu_new();
-
-@@ -5913,6 +5918,7 @@
- AttachInfo *ainfo;
- GtkTextBuffer *buffer;
- GtkClipboard *clipboard;
-+ GSList *cur;
-
- compose_list = g_list_remove(compose_list, compose);
-
-@@ -5924,6 +5930,9 @@
- address_completion_end(compose->window);
-
- #if USE_GTKSPELL
-+ for (cur = compose->spell_dict_list; cur!=NULL; cur = cur->next) {
-+ g_free((gchar*)cur->data);
-+ }
- g_free(compose->spell_lang);
- #endif
-
-diff -ur sylpheed-2.5.0.orig/src/compose.h sylpheed-2.5.0/src/compose.h
---- sylpheed-2.5.0.orig/src/compose.h 2008-05-08 10:37:28.000000000 +0200
-+++ sylpheed-2.5.0/src/compose.h 2008-07-19 23:34:22.000000000 +0200
-@@ -135,6 +135,7 @@
- #if USE_GTKSPELL
- GtkWidget *spell_menu;
- gchar *spell_lang;
-+ GSList *spell_dict_list;
- gboolean check_spell;
- #endif
-
More information about the arch-commits
mailing list