summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authordholland <dholland>2012-05-07 01:14:14 +0000
committerdholland <dholland>2012-05-07 01:14:14 +0000
commit168398f6e088d0b2ef756857bae1be437ac9e0ca (patch)
tree2945311635e7c09a906b9112ab9ee1c4531fa7c5 /security
parent2f64268a886389a9f33abbb651c07787046bac02 (diff)
downloadpkgsrc-168398f6e088d0b2ef756857bae1be437ac9e0ca.tar.gz
Fix build with latest glib2. (not the usual thing, either)
Diffstat (limited to 'security')
-rw-r--r--security/putty/distinfo3
-rw-r--r--security/putty/patches/patch-unix_gtkfont_c87
2 files changed, 89 insertions, 1 deletions
diff --git a/security/putty/distinfo b/security/putty/distinfo
index d314af0c739..067e9a8fbfb 100644
--- a/security/putty/distinfo
+++ b/security/putty/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2012/02/22 15:30:20 wiz Exp $
+$NetBSD: distinfo,v 1.12 2012/05/07 01:14:14 dholland Exp $
SHA1 (putty-0.62.tar.gz) = 5898438614117ee7e3704fc3f30a3c4bf2041380
RMD160 (putty-0.62.tar.gz) = 48324416005eb4b14654fc9e0e14d39f20971507
@@ -7,6 +7,7 @@ SHA1 (patch-import.c) = c2dc26aa851a326ea89e782ef93ae7bfdc916366
SHA1 (patch-ldisc.c) = e4dd89bfb2ddcb47aad46cc7c311f424aa6ab6be
SHA1 (patch-terminal.c) = 48c3c928711bf7f461c0fd66490b0412f165f75b
SHA1 (patch-unix_Makefile.gtk) = 0ad8226e2ad8e6e40d3eb9ddef4b22e7d07b7895
+SHA1 (patch-unix_gtkfont_c) = 0e57d4f49466ac73fb0d8cc8efb635e6f8a37f44
SHA1 (patch-unix_gtkwin.c) = ead5e3dea292e6054afa3b9b1a9bc93fc1aff642
SHA1 (patch-unix_uxnet.c) = 50e39093ece97b189da4a736713b59ed72c162d9
SHA1 (patch-windows_window.c) = 0c9f4ad5870e63793278d6f04cae88154611e596
diff --git a/security/putty/patches/patch-unix_gtkfont_c b/security/putty/patches/patch-unix_gtkfont_c
new file mode 100644
index 00000000000..49f62a63ba6
--- /dev/null
+++ b/security/putty/patches/patch-unix_gtkfont_c
@@ -0,0 +1,87 @@
+$NetBSD: patch-unix_gtkfont_c,v 1.1 2012/05/07 01:14:15 dholland Exp $
+
+Fix build with latest glib2.
+
+--- unix/gtkfont.c~ 2010-08-10 17:21:25.000000000 +0000
++++ unix/gtkfont.c
+@@ -524,21 +524,21 @@ static void x11font_enum_fonts(GtkWidget
+ style = p;
+ p += sprintf(p, "%s", components[2][0] ? components[2] :
+ "regular");
+- if (!g_strcasecmp(components[3], "i"))
++ if (!g_ascii_strcasecmp(components[3], "i"))
+ p += sprintf(p, " italic");
+- else if (!g_strcasecmp(components[3], "o"))
++ else if (!g_ascii_strcasecmp(components[3], "o"))
+ p += sprintf(p, " oblique");
+- else if (!g_strcasecmp(components[3], "ri"))
++ else if (!g_ascii_strcasecmp(components[3], "ri"))
+ p += sprintf(p, " reverse italic");
+- else if (!g_strcasecmp(components[3], "ro"))
++ else if (!g_ascii_strcasecmp(components[3], "ro"))
+ p += sprintf(p, " reverse oblique");
+- else if (!g_strcasecmp(components[3], "ot"))
++ else if (!g_ascii_strcasecmp(components[3], "ot"))
+ p += sprintf(p, " other-slant");
+- if (components[4][0] && g_strcasecmp(components[4], "normal"))
++ if (components[4][0] && g_ascii_strcasecmp(components[4], "normal"))
+ p += sprintf(p, " %s", components[4]);
+- if (!g_strcasecmp(components[10], "m"))
++ if (!g_ascii_strcasecmp(components[10], "m"))
+ p += sprintf(p, " [M]");
+- if (!g_strcasecmp(components[10], "c"))
++ if (!g_ascii_strcasecmp(components[10], "c"))
+ p += sprintf(p, " [C]");
+ if (components[5][0])
+ p += sprintf(p, " %s", components[5]);
+@@ -550,23 +550,23 @@ static void x11font_enum_fonts(GtkWidget
+ */
+ p++;
+ stylekey = p;
+- if (!g_strcasecmp(components[2], "medium") ||
+- !g_strcasecmp(components[2], "regular") ||
+- !g_strcasecmp(components[2], "normal") ||
+- !g_strcasecmp(components[2], "book"))
++ if (!g_ascii_strcasecmp(components[2], "medium") ||
++ !g_ascii_strcasecmp(components[2], "regular") ||
++ !g_ascii_strcasecmp(components[2], "normal") ||
++ !g_ascii_strcasecmp(components[2], "book"))
+ weightkey = 0;
+- else if (!g_strncasecmp(components[2], "demi", 4) ||
+- !g_strncasecmp(components[2], "semi", 4))
++ else if (!g_ascii_strncasecmp(components[2], "demi", 4) ||
++ !g_ascii_strncasecmp(components[2], "semi", 4))
+ weightkey = 1;
+ else
+ weightkey = 2;
+- if (!g_strcasecmp(components[3], "r"))
++ if (!g_ascii_strcasecmp(components[3], "r"))
+ slantkey = 0;
+- else if (!g_strncasecmp(components[3], "r", 1))
++ else if (!g_ascii_strncasecmp(components[3], "r", 1))
+ slantkey = 2;
+ else
+ slantkey = 1;
+- if (!g_strcasecmp(components[4], "normal"))
++ if (!g_ascii_strcasecmp(components[4], "normal"))
+ setwidthkey = 0;
+ else
+ setwidthkey = 1;
+@@ -774,7 +774,7 @@ static int pangofont_check_desc_makes_se
+
+ matched = FALSE;
+ for (i = 0; i < nfamilies; i++) {
+- if (!g_strcasecmp(pango_font_family_get_name(families[i]),
++ if (!g_ascii_strcasecmp(pango_font_family_get_name(families[i]),
+ pango_font_description_get_family(desc))) {
+ matched = TRUE;
+ break;
+@@ -1393,7 +1393,7 @@ static int strnullcasecmp(const char *a,
+ /*
+ * Otherwise, ordinary strcasecmp.
+ */
+- return g_strcasecmp(a, b);
++ return g_ascii_strcasecmp(a, b);
+ }
+
+ static int fontinfo_realname_compare(void *av, void *bv)