CVS commit: pkgsrc/security/putty

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Wed Aug  1 05:34:18 UTC 2018

Modified Files:
        pkgsrc/security/putty: Makefile distinfo
        pkgsrc/security/putty/patches: patch-unix_gtkwin.c
Added Files:
        pkgsrc/security/putty/patches: patch-unix_gtkdlg.c

Log Message:
putty: fix build after gdk_beep became deprecated.
bump pkgrevision for paranoia.


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 pkgsrc/security/putty/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/security/putty/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/security/putty/patches/patch-unix_gtkdlg.c
cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/putty/patches/patch-unix_gtkwin.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/putty/Makefile
diff -u pkgsrc/security/putty/Makefile:1.52 pkgsrc/security/putty/Makefile:1.53
--- pkgsrc/security/putty/Makefile:1.52 Mon Apr 16 14:35:08 2018
+++ pkgsrc/security/putty/Makefile      Wed Aug  1 05:34:17 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.52 2018/04/16 14:35:08 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2018/08/01 05:34:17 maya Exp $
 #
 
 DISTNAME=      putty-0.69
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    security
 MASTER_SITES=  http://the.earth.li/~sgtatham/putty/${PKGVERSION_NOREV}/
 

Index: pkgsrc/security/putty/distinfo
diff -u pkgsrc/security/putty/distinfo:1.23 pkgsrc/security/putty/distinfo:1.24
--- pkgsrc/security/putty/distinfo:1.23 Thu May  4 12:52:35 2017
+++ pkgsrc/security/putty/distinfo      Wed Aug  1 05:34:17 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2017/05/04 12:52:35 ryoon Exp $
+$NetBSD: distinfo,v 1.24 2018/08/01 05:34:17 maya Exp $
 
 SHA1 (putty-0.69.tar.gz) = f98ec09ecba4d9a4efc66fac5c86078cef27b41a
 RMD160 (putty-0.69.tar.gz) = e120ead901dacd233885adb36afa82aaa10ad469
@@ -8,7 +8,8 @@ SHA1 (patch-ldisc.c) = e4dd89bfb2ddcb47a
 SHA1 (patch-misc.c) = fb7ba23f3c3301181d2ca7666a037f7bb3ac3f7b
 SHA1 (patch-timing.c) = 9dd79fde390878960e97c456628bbd5dcbcd07f9
 SHA1 (patch-unix_Makefile.gtk) = 399636a9b6d445fa0cdd55c7a887efa8f03bdc94
-SHA1 (patch-unix_gtkwin.c) = 110079a07a802f93705c6526a14069491f1c313e
+SHA1 (patch-unix_gtkdlg.c) = 35b60132e3882ebdfeaa5e613a12b2daeb332451
+SHA1 (patch-unix_gtkwin.c) = 0df64e21e96fd9167aaf2bc4cdc9d52d99373218
 SHA1 (patch-unix_uxnet.c) = 2d1c2939721993fe5616c2fe3f1935c03a31bb35
 SHA1 (patch-unix_uxpgnt.c) = b5625b33b940ea2870d3e91d38e2303a80d6887b
 SHA1 (patch-unix_uxucs.c) = a2a5021b515c3bade1126ed062bdc1eece1ca0f9

Index: pkgsrc/security/putty/patches/patch-unix_gtkwin.c
diff -u pkgsrc/security/putty/patches/patch-unix_gtkwin.c:1.4 pkgsrc/security/putty/patches/patch-unix_gtkwin.c:1.5
--- pkgsrc/security/putty/patches/patch-unix_gtkwin.c:1.4       Fri Mar 17 00:11:48 2017
+++ pkgsrc/security/putty/patches/patch-unix_gtkwin.c   Wed Aug  1 05:34:18 2018
@@ -1,8 +1,9 @@
-$NetBSD: patch-unix_gtkwin.c,v 1.4 2017/03/17 00:11:48 maya Exp $
+$NetBSD: patch-unix_gtkwin.c,v 1.5 2018/08/01 05:34:18 maya Exp $
 
 Make the home/end keys work on BSD servers as well as Linux ones
+gdk_beep deprecated, use gdk_display_beep.
 
---- unix/gtkwin.c.orig 2017-02-18 17:10:15.000000000 +0000
+--- unix/gtkwin.c.orig 2017-04-24 13:52:45.000000000 +0000
 +++ unix/gtkwin.c
 @@ -1586,13 +1586,21 @@ gint key_event(GtkWidget *widget, GdkEve
                use_ucsoutput = FALSE;
@@ -30,3 +31,12 @@ Make the home/end keys work on BSD serve
                goto done;
            }
            if (code) {
+@@ -2921,7 +2929,7 @@ void sys_cursor(void *frontend, int x, i
+ void do_beep(void *frontend, int mode)
+ {
+     if (mode == BELL_DEFAULT)
+-      gdk_beep();
++      gdk_display_beep(gdk_display_get_default());
+ }
+ 
+ int char_width(Context ctx, int uc)

Added files:

Index: pkgsrc/security/putty/patches/patch-unix_gtkdlg.c
diff -u /dev/null pkgsrc/security/putty/patches/patch-unix_gtkdlg.c:1.1
--- /dev/null   Wed Aug  1 05:34:18 2018
+++ pkgsrc/security/putty/patches/patch-unix_gtkdlg.c   Wed Aug  1 05:34:18 2018
@@ -0,0 +1,24 @@
+$NetBSD: patch-unix_gtkdlg.c,v 1.1 2018/08/01 05:34:18 maya Exp $
+
+gdk_beep deprecated, replace with gdk_display_beep.
+
+--- unix/gtkdlg.c.orig 2017-04-24 13:52:45.000000000 +0000
++++ unix/gtkdlg.c
+@@ -1037,7 +1037,7 @@ void dlg_set_focus(union control *ctrl, 
+  */
+ void dlg_beep(void *dlg)
+ {
+-    gdk_beep();
++    gdk_display_beep(gdk_display_get_default());
+ }
+ 
+ #if !GTK_CHECK_VERSION(3,0,0)
+@@ -1491,7 +1491,7 @@ static void draglist_move(struct dlgpara
+     if ((index < 0) ||
+       (index == 0 && direction < 0) ||
+       (index == g_list_length(children)-1 && direction > 0)) {
+-      gdk_beep();
++      gdk_display_beep(gdk_display_get_default());
+       return;
+     }
+