01/04: gnu: wxwidgets: Fix for Filezilla client.

[Leo Famulari]

lfam pushed a commit to branch master
in repository guix.

commit 40c611a41df35877c91a6b1ef66bdc84e6355ec7
Author: rennes <address@hidden>
Date:   Fri Feb 17 19:16:36 2017 -0600

    gnu: wxwidgets: Fix for Filezilla client.
    
    * gnu/packages/patches/wxwidgets-fix-windowGTK.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Add it.
    
    Signed-off-by: Leo Famulari <address@hidden>
---
 gnu/local.mk                                       |  3 ++-
 gnu/packages/patches/wxwidgets-fix-windowGTK.patch | 18 ++++++++++++++++++
 gnu/packages/wxwidgets.scm                         |  5 ++++-
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index a44c407..c88892d 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -5,7 +5,7 @@
 # Copyright © 2013, 2014, 2015, 2016 Mark H Weaver <address@hidden>
 # Copyright © 2016 Chris Marusich <address@hidden>
 # Copyright © 2016, 2017 Kei Kebreau <address@hidden>
-# Copyright © 2016 Rene Saavedra <address@hidden>
+# Copyright © 2016, 2017 Rene Saavedra <address@hidden>
 # Copyright © 2016 Adonay "adfeno" Felipe Nogueira 
<https://libreplanet.org/wiki/User:Adfeno> <address@hidden>
 # Copyright © 2016, 2017 Ricardo Wurmus <address@hidden>
 # Copyright © 2016 Ben Woodcroft <address@hidden>
@@ -976,6 +976,7 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/wordnet-CVE-2008-2149.patch                     \
   %D%/packages/patches/wordnet-CVE-2008-3908-pt1.patch                 \
   %D%/packages/patches/wordnet-CVE-2008-3908-pt2.patch                 \
+  %D%/packages/patches/wxwidgets-fix-windowGTK.patch           \
   %D%/packages/patches/xdotool-fix-makefile.patch               \
   %D%/packages/patches/xf86-video-ark-remove-mibstore.patch    \
   %D%/packages/patches/xf86-video-ast-remove-mibstore.patch    \
diff --git a/gnu/packages/patches/wxwidgets-fix-windowGTK.patch 
b/gnu/packages/patches/wxwidgets-fix-windowGTK.patch
new file mode 100644
index 0000000..1255835
--- /dev/null
+++ b/gnu/packages/patches/wxwidgets-fix-windowGTK.patch
@@ -0,0 +1,18 @@
+This patch allow Filezilla client to resize window.
+The patch was adapted from upstream source repository:
+'<http://trac.wxwidgets.org/changeset/4793e5b0a4e189e492287305859b278fed780080/git-wxWidgets>'
+
+--- a/src/gtk/toplevel.cpp     2014-10-06 16:33:44.000000000 -0500
++++ b/src/gtk/toplevel.cpp     2017-02-16 21:33:27.779907810 -0600
+@@ -1216,8 +1216,9 @@
+     int hints_mask = GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE;
+     hints.min_width = 1;
+     hints.min_height = 1;
+-    hints.max_width = INT_MAX;
+-    hints.max_height = INT_MAX;
++    // using INT_MAX for size will lead to integer overflow with HiDPI scaling
++    hints.max_width = INT_MAX / 16;
++    hints.max_height = INT_MAX / 16;    
+     const int decorSize_x = m_decorSize.left + m_decorSize.right;
+     const int decorSize_y = m_decorSize.top + m_decorSize.bottom;
+     if (minSize.x > decorSize_x)
diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm
index 5285037..52fa818 100644
--- a/gnu/packages/wxwidgets.scm
+++ b/gnu/packages/wxwidgets.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2016 Ricardo Wurmus <address@hidden>
 ;;; Copyright © 2016 Theodoros Foradis <address@hidden>
 ;;; Copyright © 2016 Danny Milosavljevic <address@hidden>
+;;; Copyright © 2017 Rene Saavedra <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -50,7 +51,9 @@
                            "releases/download/v" version
                            "/wxWidgets-" version ".tar.bz2"))
        (sha256
-        (base32 "0paq27brw4lv8kspxh9iklpa415mxi8zc117vbbbhfjgapf7js1l"))))
+        (base32 "0paq27brw4lv8kspxh9iklpa415mxi8zc117vbbbhfjgapf7js1l"))
+       (patches (search-patches
+                 "wxwidgets-fix-windowGTK.patch"))))
     (build-system glib-or-gtk-build-system)
     (inputs
      `(("glu" ,glu)