Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (2ac7de54c22da18be7bb22a955626d0b584c86b6)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (2ac7de54c22da18be7bb22a955626d0b584c86b6)
  • Date: Fri, 19 Dec 2008 03:16:27 -0600

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

mail/sylpheed/CONFLICTS | 2
mail/sylpheed/DEPENDS | 54 ++++++++++++++----------
mail/sylpheed/DETAILS | 20 ++++-----
mail/sylpheed/HISTORY | 5 ++
mail/sylpheed/INSTALL | 2
mail/sylpheed/PRE_BUILD | 4 -
mail/sylpheed/patch-gtk | 50 -----------------------
mail/sylpheed/patch-gtkspell | 93
-------------------------------------------
mail/sylpheed/patch-socket | 53 ------------------------
9 files changed, 48 insertions(+), 235 deletions(-)

New commits:
commit 2ac7de54c22da18be7bb22a955626d0b584c86b6
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

sylpheed: => 2.6.0

diff --git a/mail/sylpheed/CONFLICTS b/mail/sylpheed/CONFLICTS
index f96e351..d009dc5 100755
--- a/mail/sylpheed/CONFLICTS
+++ b/mail/sylpheed/CONFLICTS
@@ -1,2 +1,2 @@
-conflicts sylpheed-claws
+conflicts sylpheed-claws &&
conflicts sylpheed-gtk2
diff --git a/mail/sylpheed/DEPENDS b/mail/sylpheed/DEPENDS
index 9b46111..fe703ec 100755
--- a/mail/sylpheed/DEPENDS
+++ b/mail/sylpheed/DEPENDS
@@ -1,33 +1,41 @@
if [[ $SYLPHEED_GTK2 == y ]]; then
depends GTK2
else
- depends gtk+ &&
- optional_depends "gdk-pixbuf" "" "" "for built-in image view support"
+ depends gtk+ &&
+ optional_depends gdk-pixbuf "" "" "for built-in image view support"
fi &&

-optional_depends "compface" "" "" "for X-Face support" &&
+optional_depends compface \
+ "--enable-compface" \
+ "--disable-compface" \
+ "for X-Face support" &&

-optional_depends "jpilot" \
- "--enable-jpilot" \
- "" \
- "for jpilot support" &&
+optional_depends jpilot \
+ "--enable-jpilot" \
+ "--disable-jpilot" \
+ "for jpilot support" &&

-optional_depends "openldap" \
- "--enable-ldap" \
- "" \
- "for ldap support" &&
+optional_depends openldap \
+ "--enable-ldap" \
+ "--disable-ldap" \
+ "for LDAP support" &&

-optional_depends "gpgme" \
- "--enable-gpgme" \
- "--disable-gpgme" \
- "for encrypted email" &&
+optional_depends gpgme \
+ "--enable-gpgme" \
+ "--disable-gpgme" \
+ "for encrypted email" &&

-optional_depends "openssl" \
- "--enable-ssl" \
- "" \
- "for ssl support" &&
+optional_depends openssl \
+ "--enable-ssl" \
+ "--disable-ssl" \
+ "for SSL support" &&

-optional_depends "gtkspell" \
- " --enable-gtkspell" \
- "--disable-gtkspell" \
- "for spell checking"
+optional_depends gtkspell \
+ "--enable-gtkspell" \
+ "--disable-gtkspell" \
+ "for spell checking" &&
+
+optional_depends oniguruma \
+ "--enable-oniguruma" \
+ "--disable-oniguruma" \
+ "use Oniguruma instead of system's regex"
diff --git a/mail/sylpheed/DETAILS b/mail/sylpheed/DETAILS
index 87c4cea..be93e69 100755
--- a/mail/sylpheed/DETAILS
+++ b/mail/sylpheed/DETAILS
@@ -3,23 +3,23 @@ if [[ $SYLPHEED_GTK2 == n ]]; then
VERSION=1.0.6

SOURCE_HASH=sha512:2b94979b671ef63b62040ed6b394368536a4817de910407cdfcdadc891e77a6752a6b547c0c1fdaa5360bd4c3b6c0a497f3d75bb17476a0ee37f7c4b5f18136e
else
- VERSION=2.5.0
-
SOURCE_HASH=sha512:6695823def18ef232690f1a6ddd46826440b6897c0932545a9e33d8ca7b2262f19f51100cc78381277c68d2e5f1d4fcf32e6e7e2813e3954f1cbf9ee451fbca3
+ VERSION=2.6.0
+
SOURCE_HASH=sha512:b0a64822d82cc2107f4311fdcb75bef9f66e6a58abd46632fd44c187dcf0c3b8748f1e5d763ce5c28e3313efc1dc854dae077ee0df4735754664ee442914f42d
SECURITY_PATCH=1
fi
SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://sylpheed.sraoss.jp/$SPELL/v${VERSION%.*}/$SOURCE
WEB_SITE=http://sylpheed.sraoss.jp/en/
ENTERED=20011031
LICENSE[0]=GPL
KEYWORDS="reader email mail"
- SHORT="E-mail client (& news reader) based on GTK or GTK+2."
+ SHORT="e-mail client (& news reader) based on GTK or GTK+2"
cat << EOF
-Sylpheed is a GTK/GTK+2 based, lightweight, and fast email client. Almost
-all commands are accessible with the keyboard. It also has many
-features such as multiple accounts, POP3/APOP support, thread display,
-and multipart MIME. One of Sylpheed's future goals is to be fully
-internationalized. The messages are managed in the MH format, so
-you'll be able to use it together with another mailer that uses the MH
format.
+Sylpheed is a GTK/GTK+2 based, lightweight, and fast email client. Almost all
+commands are accessible with the keyboard. It also has many features such as
+multiple accounts, POP3/APOP support, thread display, and multipart MIME. One
+of Sylpheed's future goals is to be fully internationalized. The messages are
+managed in the MH format, so you'll be able to use it together with another
+mailer that uses the MH format.
EOF
diff --git a/mail/sylpheed/HISTORY b/mail/sylpheed/HISTORY
index 41280fd..c3e510c 100644
--- a/mail/sylpheed/HISTORY
+++ b/mail/sylpheed/HISTORY
@@ -1,3 +1,8 @@
+2008-12-19 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.6.0; fixed descs; quoting paths
+ * DEPENDS: added missing deps, flags; cleaned up
+ * INSTALL: quoting paths
+
2008-11-26 Vlad Glagolev <stealth AT sourcemage.org>
* PRE_BUILD: fixed libsylph to not redefine SOCK_NONBLOCK, which would
conflict with /usr/include/bits/socket.h; compilation with new GTK+2
diff --git a/mail/sylpheed/INSTALL b/mail/sylpheed/INSTALL
index d484c10..e211d6d 100755
--- a/mail/sylpheed/INSTALL
+++ b/mail/sylpheed/INSTALL
@@ -1,3 +1,3 @@
default_install &&

-install -m 644 sylpheed.png $INSTALL_ROOT/usr/share/pixmaps
+install -m 644 sylpheed.png "$INSTALL_ROOT/usr/share/pixmaps"
diff --git a/mail/sylpheed/PRE_BUILD b/mail/sylpheed/PRE_BUILD
index 82c11a8..15a08ae 100755
--- a/mail/sylpheed/PRE_BUILD
+++ b/mail/sylpheed/PRE_BUILD
@@ -1,10 +1,6 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-patch -p0 < "$SPELL_DIRECTORY/patch-gtkspell" &&
-patch -p0 < "$SPELL_DIRECTORY/patch-socket" &&
-patch -p0 < "$SPELL_DIRECTORY/patch-gtk" &&
-
if [[ $NO_USERAGENT == y ]]; then
patch -p0 < "$SPELL_DIRECTORY/patch-src_compose_c"
fi
diff --git a/mail/sylpheed/patch-gtk b/mail/sylpheed/patch-gtk
deleted file mode 100644
index da140f1..0000000
--- a/mail/sylpheed/patch-gtk
+++ /dev/null
@@ -1,50 +0,0 @@
---- src/addr_compl.c.orig 2008-03-13 08:15:07.000000000 +0100
-+++ src/addr_compl.c 2008-06-10 14:54:24.000000000 +0200
-@@ -30,6 +30,7 @@
- #include <gtk/gtkwindow.h>
- #include <gtk/gtkentry.h>
- #include <gtk/gtkeditable.h>
-+#include <gtk/gtk.h>
- #include <gtk/gtkclist.h>
- #include <gtk/gtkscrolledwindow.h>
-
---- src/editgroup.c.orig 2007-03-28 03:30:15.000000000 +0200
-+++ src/editgroup.c 2008-06-10 14:57:20.000000000 +0200
-@@ -27,6 +27,7 @@
- #include <glib/gi18n.h>
- #include <gdk/gdkkeysyms.h>
- #include <gtk/gtkwindow.h>
-+#include <gtk/gtk.h>
- #include <gtk/gtkclist.h>
- #include <gtk/gtkvbox.h>
- #include <gtk/gtkstatusbar.h>
---- src/prefs_display_items.c.orig 2007-09-20 04:17:58.000000000 +0200
-+++ src/prefs_display_items.c 2008-06-10 14:37:44.000000000 +0200
-@@ -30,6 +30,7 @@
- #include <gtk/gtkwindow.h>
- #include <gtk/gtkvbox.h>
- #include <gtk/gtkhbox.h>
-+#include <gtk/gtk.h>
- #include <gtk/gtkclist.h>
- #include <gtk/gtkbutton.h>
- #include <gtk/gtkstock.h>
---- src/prefs_summary_column.c.orig 2007-09-12 08:56:55.000000000 +0200
-+++ src/prefs_summary_column.c 2008-06-10 14:36:12.000000000 +0200
-@@ -30,6 +30,7 @@
- #include <gtk/gtkwindow.h>
- #include <gtk/gtkvbox.h>
- #include <gtk/gtkhbox.h>
-+#include <gtk/gtk.h>
- #include <gtk/gtkclist.h>
- #include <gtk/gtkbutton.h>
- #include <gtk/gtkstock.h>
---- src/select-keys.c.orig 2008-05-16 11:19:55.000000000 +0200
-+++ src/select-keys.c 2008-06-10 14:58:13.000000000 +0200
-@@ -33,6 +33,7 @@
- #include <gtk/gtkscrolledwindow.h>
- #include <gtk/gtkvbox.h>
- #include <gtk/gtkhbox.h>
-+#include <gtk/gtk.h>
- #include <gtk/gtkclist.h>
- #include <gtk/gtklabel.h>
- #include <gtk/gtkentry.h>
diff --git a/mail/sylpheed/patch-gtkspell b/mail/sylpheed/patch-gtkspell
deleted file mode 100644
index c737b2a..0000000
--- a/mail/sylpheed/patch-gtkspell
+++ /dev/null
@@ -1,93 +0,0 @@
---- src/compose.c 2007-09-28 07:46:21.000000000 +0200
-+++ src/compose.c 2007-12-24 23:15:31.000000000 +0100
-@@ -67,7 +67,7 @@
- #if USE_GTKSPELL
- # include <gtk/gtkradiomenuitem.h>
- # include <gtkspell/gtkspell.h>
--# include <aspell.h>
-+# include <enchant/enchant.h>
- #endif
-
- #include <stdio.h>
-@@ -4889,6 +4889,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 */
-
-@@ -5320,26 +5321,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();
-
-@@ -5499,6 +5504,7 @@
- AttachInfo *ainfo;
- GtkTextBuffer *buffer;
- GtkClipboard *clipboard;
-+ GSList *cur;
-
- compose_list = g_list_remove(compose_list, compose);
-
-@@ -5510,6 +5516,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
-
---- src/compose.h 2007-07-12 04:56:58.000000000 +0200
-+++ src/compose.h 2007-12-24 23:03:27.000000000 +0100
-@@ -135,6 +135,7 @@
- #if USE_GTKSPELL
- GtkWidget *spell_menu;
- gchar *spell_lang;
-+ GSList *spell_dict_list;
- gboolean check_spell;
- #endif
-
\ No newline at end of file
diff --git a/mail/sylpheed/patch-socket b/mail/sylpheed/patch-socket
deleted file mode 100644
index a38dbed..0000000
--- a/mail/sylpheed/patch-socket
+++ /dev/null
@@ -1,53 +0,0 @@
---- libsylph/socket.c.orig 2008-02-15 09:32:49.000000000 +0100
-+++ libsylph/socket.c 2008-08-28 19:01:35.000000000 +0200
-@@ -383,9 +383,9 @@
- sock = sock_find_from_fd(fd);
- if (sock) {
- if (nonblock) {
-- SOCK_SET_FLAGS(sock->flags, SOCK_NONBLOCK);
-+ SOCK_SET_FLAGS(sock->flags, LIBSYLPH_SOCK_NONBLOCK);
- } else {
-- SOCK_UNSET_FLAGS(sock->flags, SOCK_NONBLOCK);
-+ SOCK_UNSET_FLAGS(sock->flags, LIBSYLPH_SOCK_NONBLOCK);
- }
- }
- debug_print("set nonblocking mode to %d\n", nonblock);
-@@ -418,9 +418,9 @@
- ret = set_nonblocking_mode(sock->sock, nonblock);
- if (ret == 0) {
- if (nonblock) {
-- SOCK_SET_FLAGS(sock->flags, SOCK_NONBLOCK);
-+ SOCK_SET_FLAGS(sock->flags, LIBSYLPH_SOCK_NONBLOCK);
- } else {
-- SOCK_UNSET_FLAGS(sock->flags, SOCK_NONBLOCK);
-+ SOCK_UNSET_FLAGS(sock->flags, LIBSYLPH_SOCK_NONBLOCK);
- }
- }
-
-@@ -950,7 +950,7 @@
- sockinfo->hostname = g_strdup(conn_data->hostname);
- sockinfo->port = conn_data->port;
- sockinfo->state = CONN_ESTABLISHED;
-- sockinfo->flags = SOCK_NONBLOCK;
-+ sockinfo->flags = LIBSYLPH_SOCK_NONBLOCK;
-
- sock_list = g_list_prepend(sock_list, sockinfo);
-
---- libsylph/socket.h.orig 2007-06-11 10:06:45.000000000 +0200
-+++ libsylph/socket.h 2008-08-28 19:01:34.000000000 +0200
-@@ -46,13 +46,13 @@
-
- typedef enum
- {
-- SOCK_NONBLOCK = 1 << 0,
-+ LIBSYLPH_SOCK_NONBLOCK = 1 << 0,
- SOCK_CHECK_IO = 1 << 1
- } SockFlags;
-
- #define SOCK_SET_FLAGS(flags, set) { (flags) |= (set); }
- #define SOCK_UNSET_FLAGS(flags, set) { (flags) &= ~(set); }
--#define SOCK_IS_NONBLOCK(flags) ((flags & SOCK_NONBLOCK) != 0)
-+#define SOCK_IS_NONBLOCK(flags) ((flags &
LIBSYLPH_SOCK_NONBLOCK) != 0)
- #define SOCK_IS_CHECK_IO(flags) ((flags & SOCK_CHECK_IO) != 0)
-
- typedef gint (*SockConnectFunc) (SockInfo *sock,



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (2ac7de54c22da18be7bb22a955626d0b584c86b6), Vlad Glagolev, 12/19/2008

Archive powered by MHonArc 2.6.24.

Top of Page