Accepting request 492472 from home:namtrac:branches:X11:Utilities

- Update to new upstream release 0.69
  * You can now explicitly configure SSH terminal mode settings
    not to be sent to the server, if your server objects to them.
- Switch to gtk+3 interface.

OBS-URL: https://build.opensuse.org/request/show/492472
OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/putty?expand=0&rev=34

gtk-buildfix.patch

@@ -0,0 +1,20 @@
+X-Git-Url: https://git.tartarus.org/?p=simon%2Fputty.git;a=blobdiff_plain;f=unix%2Fgtkwin.c;h=bca6daa43c2911e7912be8a57131684b7050d541;hp=69e335094c8eaf8546e402c674923da712f1ebd2;hb=230f7d56284a703c65c4fecf7e6f23b791043f81;hpb=fb023da0fdcbfca104b39c2315a79186d7254c99
+
+diff --git a/unix/gtkwin.c b/unix/gtkwin.c
+index 69e3350..bca6daa 100644
+--- a/unix/gtkwin.c
++++ b/unix/gtkwin.c
+@@ -2188,11 +2188,11 @@ void set_gtk_widget_background(GtkWidget *widget, const GdkColor *col)
+     free(data);
+     free(col_css);
+ #else
+-    if (gtk_widget_get_window(win)) {
++    if (gtk_widget_get_window(widget)) {
+         /* For GTK1, which doesn't have a 'const' on
+          * gdk_window_set_background's second parameter type. */
+         GdkColor col_mutable = *col;
+-        gdk_window_set_background(gtk_widget_get_window(win), &col_mutable);
++        gdk_window_set_background(gtk_widget_get_window(widget), &col_mutable);
+     }
+ #endif
+ }

putty-0.68.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7ba256f46e5a353cafe811ce7914d0e22a52bdfc0e6e2d183ad28b5af44cd09c
-size 2114499

putty-0.69.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b7dad241ff01b0cbb9dc4c1471ec7cacf8f08d98a581aeb2f336da3c0eb96ad1
+size 2122306

putty-03-config.diff

@@ -10,10 +10,10 @@
  windows/windefs.c |    2 +-
  3 files changed, 36 insertions(+), 23 deletions(-)
 
-Index: putty-0.68/settings.c
+Index: putty-0.69/settings.c
 ===================================================================
---- putty-0.68.orig/settings.c
+--- putty-0.69.orig/settings.c
-+++ putty-0.68/settings.c
++++ putty-0.69/settings.c
 @@ -13,8 +13,8 @@ static const struct keyvalwhere cipherna
      { "aes",        CIPHER_AES,             -1, -1 },
      { "chacha20",   CIPHER_CHACHA20,        CIPHER_AES, +1 },
@@ -24,16 +24,16 @@ Index: putty-0.68/settings.c
      { "arcfour",    CIPHER_ARCFOUR,         -1, -1 },
      { "des",        CIPHER_DES,             -1, -1 }
  };
-@@ -746,7 +746,7 @@ void load_open_settings(void *sesskey, C
+@@ -749,7 +749,7 @@ void load_open_settings(void *sesskey, C
      }
      gppi(sesskey, "TCPNoDelay", 1, conf, CONF_tcp_nodelay);
      gppi(sesskey, "TCPKeepalives", 0, conf, CONF_tcp_keepalives);
 -    gpps(sesskey, "TerminalType", "xterm", conf, CONF_termtype);
 +    gpps(sesskey, "TerminalType", "linux", conf, CONF_termtype);
      gpps(sesskey, "TerminalSpeed", "38400,38400", conf, CONF_termspeed);
-     if (!gppmap(sesskey, "TerminalModes", conf, CONF_ttymodes)) {
+     if (gppmap(sesskey, "TerminalModes", conf, CONF_ttymodes)) {
- 	/* This hardcodes a big set of defaults in any new saved
+ 	/*
-@@ -870,10 +870,10 @@ void load_open_settings(void *sesskey, C
+@@ -917,10 +917,10 @@ void load_open_settings(void *sesskey, C
      gppi(sesskey, "PassiveTelnet", 0, conf, CONF_passive_telnet);
      gppi(sesskey, "BackspaceIsDelete", 1, conf, CONF_bksp_is_delete);
      gppi(sesskey, "RXVTHomeEnd", 0, conf, CONF_rxvt_homeend);
@@ -46,7 +46,7 @@ Index: putty-0.68/settings.c
      gppi(sesskey, "NoRemoteResize", 0, conf, CONF_no_remote_resize);
      gppi(sesskey, "NoAltScreen", 0, conf, CONF_no_alt_screen);
      gppi(sesskey, "NoRemoteWinTitle", 0, conf, CONF_no_remote_wintitle);
-@@ -894,9 +894,9 @@ void load_open_settings(void *sesskey, C
+@@ -941,9 +941,9 @@ void load_open_settings(void *sesskey, C
      gppi(sesskey, "ApplicationKeypad", 0, conf, CONF_app_keypad);
      gppi(sesskey, "NetHackKeypad", 0, conf, CONF_nethack_keypad);
      gppi(sesskey, "AltF4", 1, conf, CONF_alt_f4);
@@ -58,7 +58,7 @@ Index: putty-0.68/settings.c
      gppi(sesskey, "CtrlAltKeys", 1, conf, CONF_ctrlaltkeys);
  #ifdef OSX_META_KEY_CONFIG
      gppi(sesskey, "OSXOptionMeta", 1, conf, CONF_osx_option_meta);
-@@ -908,12 +908,12 @@ void load_open_settings(void *sesskey, C
+@@ -955,12 +955,12 @@ void load_open_settings(void *sesskey, C
      gppi(sesskey, "LocalEdit", AUTO, conf, CONF_localedit);
      gpps(sesskey, "Answerback", "PuTTY", conf, CONF_answerback);
      gppi(sesskey, "AlwaysOnTop", 0, conf, CONF_alwaysontop);
@@ -74,7 +74,7 @@ Index: putty-0.68/settings.c
      /* pedantic compiler tells me I can't use conf, CONF_beep as an int * :-) */
      gppi(sesskey, "Beep", 1, conf, CONF_beep);
      gppi(sesskey, "BeepInd", 0, conf, CONF_beep_ind);
-@@ -947,10 +947,10 @@ void load_open_settings(void *sesskey, C
+@@ -994,10 +994,10 @@ void load_open_settings(void *sesskey, C
      gppi(sesskey, "CRImpliesLF", 0, conf, CONF_crhaslf);
      gppi(sesskey, "DisableArabicShaping", 0, conf, CONF_arabicshaping);
      gppi(sesskey, "DisableBidi", 0, conf, CONF_bidi);
@@ -87,7 +87,7 @@ Index: putty-0.68/settings.c
      gppfont(sesskey, "Font", conf, CONF_font);
      gppi(sesskey, "FontQuality", FQ_DEFAULT, conf, CONF_font_quality);
      gppi(sesskey, "FontVTMode", VT_UNICODE, conf, CONF_vtmode);
-@@ -962,11 +962,28 @@ void load_open_settings(void *sesskey, C
+@@ -1009,11 +1009,28 @@ void load_open_settings(void *sesskey, C
  
      for (i = 0; i < 22; i++) {
  	static const char *const defaults[] = {
@@ -121,7 +121,7 @@ Index: putty-0.68/settings.c
  	};
  	char buf[20], *buf2;
  	int c0, c1, c2;
-@@ -1014,7 +1031,7 @@ void load_open_settings(void *sesskey, C
+@@ -1061,7 +1078,7 @@ void load_open_settings(void *sesskey, C
       * The empty default for LineCodePage will be converted later
       * into a plausible default for the locale.
       */
@@ -130,11 +130,11 @@ Index: putty-0.68/settings.c
      gppi(sesskey, "CJKAmbigWide", 0, conf, CONF_cjk_ambig_wide);
      gppi(sesskey, "UTF8Override", 1, conf, CONF_utf8_override);
      gpps(sesskey, "Printer", "", conf, CONF_printer);
-Index: putty-0.68/unix/unix.h
+Index: putty-0.69/unix/unix.h
 ===================================================================
---- putty-0.68.orig/unix/unix.h
+--- putty-0.69.orig/unix/unix.h
-+++ putty-0.68/unix/unix.h
++++ putty-0.69/unix/unix.h
-@@ -249,10 +249,6 @@ int so_peercred(int fd, int *pid, int *u
+@@ -257,10 +257,6 @@ int so_peercred(int fd, int *pid, int *u
  /*
   * Default font setting, which can vary depending on NOT_X_WINDOWS.
   */
@@ -146,10 +146,10 @@ Index: putty-0.68/unix/unix.h
 +#define DEFAULT_GTK_FONT "client:Monospace 14"
  
  #endif
-Index: putty-0.68/windows/windefs.c
+Index: putty-0.69/windows/windefs.c
 ===================================================================
---- putty-0.68.orig/windows/windefs.c
+--- putty-0.69.orig/windows/windefs.c
-+++ putty-0.68/windows/windefs.c
++++ putty-0.69/windows/windefs.c
 @@ -9,7 +9,7 @@
  FontSpec *platform_default_fontspec(const char *name)
  {

putty.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue May  2 12:11:41 UTC 2017 - idonmez@suse.com
+
+- Update to new upstream release 0.69
+  * You can now explicitly configure SSH terminal mode settings
+    not to be sent to the server, if your server objects to them.
+- Switch to gtk+3 interface.
+
 -------------------------------------------------------------------
 Wed Mar 15 08:26:13 UTC 2017 - jengelh@inai.de
 

putty.spec

@@ -17,7 +17,7 @@
 
 
 Name:           putty
-Version:        0.68
+Version:        0.69
 Release:        0
 Summary:        GTK-based terminal emulator program
 License:        MIT
@@ -30,9 +30,10 @@ Source:         http://the.earth.li/~sgtatham/putty/latest/%name-%version.tar.gz
 Source2:        http://the.earth.li/~sgtatham/putty/latest/%name-%version.tar.gz.gpg
 Source4:        %name.keyring
 Patch1:         putty-03-config.diff
+Patch2:         gtk-buildfix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  ImageMagick
-BuildRequires:  gtk2-devel
+BuildRequires:  gtk3-devel
 BuildRequires:  krb5-devel
 BuildRequires:  update-desktop-files
 Conflicts:      pssh
@@ -44,7 +45,8 @@ serial console client.
 
 %prep
 %setup -q
-%patch -P 1 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 %configure