diff options
| author | recht <recht> | 2004-06-01 17:07:09 +0000 |
|---|---|---|
| committer | recht <recht> | 2004-06-01 17:07:09 +0000 |
| commit | ffebca87b48fceeade99c808b6a9962c1f3df1f2 (patch) | |
| tree | 26aed3b5be912f169658886498708b9a2ddc7051 | |
| parent | 330b6024bdac336ba67d8c0884e55e05fa7c8a70 (diff) | |
| download | pkgsrc-ffebca87b48fceeade99c808b6a9962c1f3df1f2.tar.gz | |
Add patches for the following problems:
- Fix loading empty preference keys
http://sourceforge.net/tracker/index.php?func=detail&aid=917661&group_id=88198&atid=585816
- Do not load ~/.gtkrc
http://sourceforge.net/tracker/index.php?func=detail&aid=883617&group_id=88198&atid=585814
via FreeBSD ports
Bump PKGREVISION to 3
| -rw-r--r-- | mail/sylpheed-gtk2/Makefile | 4 | ||||
| -rw-r--r-- | mail/sylpheed-gtk2/distinfo | 4 | ||||
| -rw-r--r-- | mail/sylpheed-gtk2/patches/patch-aa | 26 | ||||
| -rw-r--r-- | mail/sylpheed-gtk2/patches/patch-ab | 32 |
4 files changed, 63 insertions, 3 deletions
diff --git a/mail/sylpheed-gtk2/Makefile b/mail/sylpheed-gtk2/Makefile index 7871fe3b39b..1c9199705ba 100644 --- a/mail/sylpheed-gtk2/Makefile +++ b/mail/sylpheed-gtk2/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.13 2004/04/17 11:08:12 xtraeme Exp $ +# $NetBSD: Makefile,v 1.14 2004/06/01 17:07:09 recht Exp $ # DISTNAME= sylpheed-0.9.9-gtk2-20040229 PKGNAME= sylpheed-gtk2-0.9.9 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= mail x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sylpheed-gtk2/} diff --git a/mail/sylpheed-gtk2/distinfo b/mail/sylpheed-gtk2/distinfo index d38ef1a9938..4c2ef721959 100644 --- a/mail/sylpheed-gtk2/distinfo +++ b/mail/sylpheed-gtk2/distinfo @@ -1,4 +1,6 @@ -$NetBSD: distinfo,v 1.3 2004/03/03 23:16:26 minskim Exp $ +$NetBSD: distinfo,v 1.4 2004/06/01 17:07:09 recht Exp $ SHA1 (sylpheed-0.9.9-gtk2-20040229.tar.gz) = 1073d3524de2583b0f441f036b80fbe06365f8d4 Size (sylpheed-0.9.9-gtk2-20040229.tar.gz) = 3275909 bytes +SHA1 (patch-aa) = a02ce94641b1b75dd050973e282f43af7d4aa505 +SHA1 (patch-ab) = 45ba070adbf51358a5bcbc3f1f77f4ed0df8ddc0 diff --git a/mail/sylpheed-gtk2/patches/patch-aa b/mail/sylpheed-gtk2/patches/patch-aa new file mode 100644 index 00000000000..2a70ca8cb63 --- /dev/null +++ b/mail/sylpheed-gtk2/patches/patch-aa @@ -0,0 +1,26 @@ +$NetBSD: patch-aa,v 1.1 2004/06/01 17:07:09 recht Exp $ + +--- src/main.c.orig Sun Apr 18 17:22:45 2004 ++++ src/main.c Sun Apr 18 17:23:11 2004 +@@ -194,21 +194,6 @@ + + srandom((gint)time(NULL)); + +- /* parse gtkrc files */ +- userrc = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, ".gtkrc", +- NULL); +- gtk_rc_parse(userrc); +- g_free(userrc); +- userrc = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, ".gtk", +- G_DIR_SEPARATOR_S, "gtkrc", NULL); +- gtk_rc_parse(userrc); +- g_free(userrc); +- userrc = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, "gtkrc", NULL); +- gtk_rc_parse(userrc); +- g_free(userrc); +- +- gtk_rc_parse("./gtkrc"); +- + userrc = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, MENU_RC, NULL); + gtk_accel_map_load (userrc); + g_free(userrc); diff --git a/mail/sylpheed-gtk2/patches/patch-ab b/mail/sylpheed-gtk2/patches/patch-ab new file mode 100644 index 00000000000..bfb15892a58 --- /dev/null +++ b/mail/sylpheed-gtk2/patches/patch-ab @@ -0,0 +1,32 @@ +$NetBSD: patch-ab,v 1.1 2004/06/01 17:07:09 recht Exp $ + +--- src/prefs.c.orig Fri Jan 23 12:08:46 2004 ++++ src/prefs.c Fri Jan 23 12:16:37 2004 +@@ -109,17 +109,18 @@ + case P_STRING: + { + #warning FIXME_GTK2 +- gchar *tmp; ++ gchar *tmp = NULL; + +- tmp = *value ? +- conv_codeset_strdup(value, +- conv_get_current_charset_str(), +- CS_UTF_8) +- : g_strdup(""); +- if (!tmp) { +- g_warning("faild to convert character set."); +- tmp = g_strdup(value); ++ if (*value) { ++ tmp = conv_codeset_strdup(value, ++ conv_get_current_charset_str(), ++ CS_UTF_8); ++ if (!tmp) { ++ g_warning("failed to convert character set."); ++ tmp = g_strdup(value); ++ } + } ++ + g_free(*((gchar **)param[i].data)); + *((gchar **)param[i].data) = tmp; + break; |