[arch-commits] Commit in sylpheed/repos (5 files)
Alexander Fehr
alexanderf at archlinux.org
Mon Jul 21 12:22:49 UTC 2008
Date: Monday, July 21, 2008 @ 08:22:49
Author: alexanderf
Revision: 5829
Merged revisions 2-5828 via svnmerge from
svn+ssh://archlinux.org/home/svn-packages/sylpheed/trunk
........
r356 | aaron | 2008-04-19 00:56:27 +0200 (Sa, 19 Apr 2008) | 1 line
Added svn:keywords to all PKGBUILDs
........
r5827 | alexanderf | 2008-07-21 14:09:59 +0200 (Mo, 21 Jul 2008) | 1 line
upgpkg: sylpheed 2.5.0-1
........
Added:
sylpheed/repos/extra-x86_64/ChangeLog
(from rev 5827, sylpheed/trunk/ChangeLog)
sylpheed/repos/extra-x86_64/sylpheed-enchant.patch
(from rev 5827, sylpheed/trunk/sylpheed-enchant.patch)
Modified:
sylpheed/repos/extra-x86_64/ (properties)
sylpheed/repos/extra-x86_64/PKGBUILD
Deleted:
sylpheed/repos/extra-x86_64/sylpheed-2.2-replace-aspell-with-enchant.diff
-----------------------------------------------+
ChangeLog | 11 ++
PKGBUILD | 39 ++++-----
sylpheed-2.2-replace-aspell-with-enchant.diff | 102 ------------------------
sylpheed-enchant.patch | 95 ++++++++++++++++++++++
4 files changed, 125 insertions(+), 122 deletions(-)
Property changes on: sylpheed/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
- /sylpheed/trunk:1
+ /sylpheed/trunk:1-5828
Copied: sylpheed/repos/extra-x86_64/ChangeLog (from rev 5827, sylpheed/trunk/ChangeLog)
===================================================================
--- extra-x86_64/ChangeLog (rev 0)
+++ extra-x86_64/ChangeLog 2008-07-21 12:22:49 UTC (rev 5829)
@@ -0,0 +1,11 @@
+2008-07-20 Alexander Fehr <pizzapunk gmail com>
+
+ * sylpheed-2.5.0-1:
+ New upstream release.
+ New maintainer.
+ Changed url.
+ Changed license to GPL.
+ Added compface (X-Face) support.
+ Removed install commands for desktop and pixmap file.
+ Updated enchant patch.
+ Added ChangeLog.
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2008-07-21 12:19:36 UTC (rev 5828)
+++ extra-x86_64/PKGBUILD 2008-07-21 12:22:49 UTC (rev 5829)
@@ -1,28 +1,27 @@
# $Id$
-# Maintainer: Alexander Baldeck <alexander at archlinux.org>
+# Maintainer: Alexander Fehr <pizzapunk gmail com>
# Contributor: dorphell <dorphell at archlinux.org>
+
pkgname=sylpheed
-pkgver=2.4.8
+pkgver=2.5.0
pkgrel=1
-pkgdesc="A GTK+ based, lightweight, and fast email client"
-arch=(i686 x86_64)
-url="http://sylpheed.good-day.net/"
+pkgdesc="Lightweight and user-friendly e-mail client"
+arch=('i686' 'x86_64')
+url="http://sylpheed.sraoss.jp/en/"
+license=('GPL')
depends=('gpgme' 'gtkspell')
-license=('GPL' 'LGPL')
-makedepends=('pkgconfig')
-source=(http://sylpheed.sraoss.jp/${pkgname}/v2.4/${pkgname}-${pkgver}.tar.bz2 \
- sylpheed-2.2-replace-aspell-with-enchant.diff)
-url="http://sylpheed.good-day.net/"
+makedepends=('compface')
+source=(http://sylpheed.sraoss.jp/sylpheed/v2.5/sylpheed-$pkgver.tar.bz2
+ sylpheed-enchant.patch)
+md5sums=('a6fc9e9c2a33876fddb33f25f40b820f'
+ 'f7cef235fa9e8c366be36286fa5314d0')
build() {
- cd ${startdir}/src/${pkgname}-${pkgver}
- patch -Np1 -i ${startdir}/src/sylpheed-2.2-replace-aspell-with-enchant.diff || return 1
- ./configure --prefix=/usr --enable-ssl --enable-gpgme --enable-ldap
+ 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=${startdir}/pkg install
- mkdir -p ${startdir}/pkg/usr/share/{applications,pixmaps}
- install -m644 sylpheed.desktop $startdir/pkg/usr/share/applications/
- install -m644 sylpheed.png $startdir/pkg/usr/share/pixmaps/
-}
-md5sums=('97fcbaa1e278849408ab1d628d4d1af7'
- '0f4074345f62ede519f0b65730e4b762')
+ make DESTDIR="$pkgdir" install || return 1
+}
Deleted: extra-x86_64/sylpheed-2.2-replace-aspell-with-enchant.diff
===================================================================
--- extra-x86_64/sylpheed-2.2-replace-aspell-with-enchant.diff 2008-07-21 12:19:36 UTC (rev 5828)
+++ extra-x86_64/sylpheed-2.2-replace-aspell-with-enchant.diff 2008-07-21 12:22:49 UTC (rev 5829)
@@ -1,102 +0,0 @@
-diff -ur sylpheed-2.2.0.orig/src/compose.c sylpheed-2.2.0/src/compose.c
---- sylpheed-2.2.0.orig/src/compose.c 2006-02-07 11:53:05.000000000 +0900
-+++ sylpheed-2.2.0/src/compose.c 2006-02-15 23:40:01.000000000 +0900
-@@ -64,7 +64,7 @@
- #if USE_GTKSPELL
- # include <gtk/gtkradiomenuitem.h>
- # include <gtkspell/gtkspell.h>
--# include <aspell.h>
-+# include <enchant/enchant.h>
- #endif
-
- #include <stdio.h>
-@@ -459,6 +459,9 @@
- GtkWidget *widget);
- static void compose_set_spell_lang_cb (GtkWidget *widget,
- gpointer data);
-+static void compose_list_dicts_cb (const char *lang_tag,
-+ const char *provider_name, const char *provider_desc,
-+ const char *provider_file, void *user_data);
- #endif
-
- static void compose_attach_drag_received_cb (GtkWidget *widget,
-@@ -4874,33 +4877,34 @@
- }
-
- #if USE_GTKSPELL
-+static void compose_list_dicts_cb(const char *lang_tag,
-+ const char *provider_name, const char *provider_desc,
-+ const char *provider_file, void *user_data)
-+{
-+ GQueue *queue = (GQueue *)user_data;
-+
-+ if (g_queue_index(queue, (gconstpointer)lang_tag) == -1) {
-+ g_queue_push_tail(queue, g_strdup(lang_tag));
-+ }
-+}
-+
- static void compose_set_spell_lang_menu(Compose *compose)
- {
-- AspellConfig *config;
-- AspellDictInfoList *dlist;
-- AspellDictInfoEnumeration *dels;
-- const AspellDictInfo *entry;
-+ EnchantBroker *broker;
-+ GQueue *langs;
- 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;
-- }
-- delete_aspell_dict_info_enumeration(dels);
-+ broker = enchant_broker_init();
-+ langs = g_queue_new();
-+ enchant_broker_list_dicts(broker, compose_list_dicts_cb, langs);
-+ enchant_broker_free(broker);
-
- menu = gtk_menu_new();
-
-- for (cur = dict_list; cur != NULL; cur = cur->next) {
-- gchar *dict = (gchar *)cur->data;
-+ while (g_queue_get_length(langs) > 0) {
-+ gchar *dict = g_queue_pop_head(langs);
- GtkWidget *item;
-
- if (dict == NULL) continue;
-@@ -4910,13 +4914,16 @@
- (GTK_RADIO_MENU_ITEM(item));
- if (compose->spell_lang != NULL &&
- g_ascii_strcasecmp(compose->spell_lang, dict) == 0)
-+ {
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(item), TRUE);
-+ lang_set = TRUE;
-+ }
- gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
- g_signal_connect(G_OBJECT(item), "activate",
- G_CALLBACK(compose_set_spell_lang_cb),
- compose);
-- g_object_set_data(G_OBJECT(item), "spell-lang", dict);
-+ g_object_set_data_full(G_OBJECT(item), "spell-lang", dict, g_free);
- gtk_widget_show(item);
-
- if (!lang_set && g_ascii_strcasecmp("en", dict) == 0)
-@@ -4924,6 +4931,8 @@
- (GTK_CHECK_MENU_ITEM(item), TRUE);
- }
-
-+ g_queue_free(langs);
-+
- gtk_widget_show(menu);
- gtk_menu_item_set_submenu(GTK_MENU_ITEM(compose->spell_menu), menu);
- }
Copied: sylpheed/repos/extra-x86_64/sylpheed-enchant.patch (from rev 5827, sylpheed/trunk/sylpheed-enchant.patch)
===================================================================
--- extra-x86_64/sylpheed-enchant.patch (rev 0)
+++ extra-x86_64/sylpheed-enchant.patch 2008-07-21 12:22:49 UTC (rev 5829)
@@ -0,0 +1,95 @@
+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