[pkgsrc/trunk]: pkgsrc/mail/sylpheed-gtk2 Add patches for the following probl...

[recht <recht%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/172ef720c117
branches:  trunk
changeset: 476010:172ef720c117
user:      recht <recht%pkgsrc.org@localhost>
date:      Tue Jun 01 17:07:09 2004 +0000

description:
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

diffstat:

 mail/sylpheed-gtk2/Makefile         |   4 ++--
 mail/sylpheed-gtk2/distinfo         |   4 +++-
 mail/sylpheed-gtk2/patches/patch-aa |  26 ++++++++++++++++++++++++++
 mail/sylpheed-gtk2/patches/patch-ab |  32 ++++++++++++++++++++++++++++++++
 4 files changed, 63 insertions(+), 3 deletions(-)

diffs (92 lines):

diff -r 64cc11e36dad -r 172ef720c117 mail/sylpheed-gtk2/Makefile
--- a/mail/sylpheed-gtk2/Makefile       Tue Jun 01 17:02:05 2004 +0000
+++ b/mail/sylpheed-gtk2/Makefile       Tue Jun 01 17:07:09 2004 +0000
@@ -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 -r 64cc11e36dad -r 172ef720c117 mail/sylpheed-gtk2/distinfo
--- a/mail/sylpheed-gtk2/distinfo       Tue Jun 01 17:02:05 2004 +0000
+++ b/mail/sylpheed-gtk2/distinfo       Tue Jun 01 17:07:09 2004 +0000
@@ -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 -r 64cc11e36dad -r 172ef720c117 mail/sylpheed-gtk2/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/sylpheed-gtk2/patches/patch-aa       Tue Jun 01 17:07:09 2004 +0000
@@ -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 -r 64cc11e36dad -r 172ef720c117 mail/sylpheed-gtk2/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/sylpheed-gtk2/patches/patch-ab       Tue Jun 01 17:07:09 2004 +0000
@@ -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;