unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
* [PATCH] gnu: Add filezilla.
@ 2017-02-09 16:36 rennes
  2017-02-09 16:36 ` [PATCH 1/3] gnu: wxwidgets: Fix for Filezilla client rennes
                   ` (3 more replies)
  0 siblings, 4 replies; 18+ messages in thread
From: rennes @ 2017-02-09 16:36 UTC (permalink / raw)
  To: guix-devel

Hello,
This is a set of patches for Filezilla, a ftp/sftp client.

 [PATCH 1/3] gnu: wxwidgets: Fix for Filezilla client.
 [PATCH 2/3] gnu: Add libfilezilla.
 [PATCH 3/3] gnu: Add filezilla.

Regards

^ permalink raw reply	[flat|nested] 18+ messages in thread

* [PATCH 1/3] gnu: wxwidgets: Fix for Filezilla client.
  2017-02-09 16:36 [PATCH] gnu: Add filezilla rennes
@ 2017-02-09 16:36 ` rennes
  2017-02-16 16:28   ` Leo Famulari
  2017-02-09 16:36 ` [PATCH 2/3] gnu: Add libfilezilla rennes
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 18+ messages in thread
From: rennes @ 2017-02-09 16:36 UTC (permalink / raw)
  To: guix-devel

* gnu/packages/patches/wxwidgets-fix-windowGTK.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
---
 gnu/local.mk                                       |  3 +-
 gnu/packages/patches/wxwidgets-fix-windowGTK.patch | 35 ++++++++++++++++++++++
 gnu/packages/wxwidgets.scm                         |  5 +++-
 3 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 gnu/packages/patches/wxwidgets-fix-windowGTK.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 63ce3af71..d94cede10 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -5,7 +5,7 @@
 # Copyright © 2013, 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
 # Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
 # Copyright © 2016 Kei Kebreau <kei@openmailbox.org>
-# Copyright © 2016 Rene Saavedra <rennes@openmailbox.org>
+# Copyright © 2016, 2017 Rene Saavedra <rennes@openmailbox.org>
 # Copyright © 2016 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@openmailbox.org>
 # Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
 # Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
@@ -957,6 +957,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 000000000..05e2e5819
--- /dev/null
+++ b/gnu/packages/patches/wxwidgets-fix-windowGTK.patch
@@ -0,0 +1,35 @@
+This patch allow Filezilla client to resize window.
+
+Authors: Tim Kosse <tim.kosse@filezilla-project.org>
+Upstream status: This issue was fixed in master branch.
+Ticket: '<http://trac.wxwidgets.org/ticket/17456>'
+
+From 3a52125f81d28fcad5d3c841b94a3e4bad295d9e Mon Sep 17 00:00:00 2001
+From: Tim Kosse <tim.kosse@filezilla-project.org>
+Date: Sun, 20 Mar 2016 10:22:13 +0100
+Subject: [PATCH] Fix wxTopLevelWindowGTK::DoSetSizeHints if a window scale
+factor larger than 1  is set.
+
+In this case, passing INT_MAX as maximum width/height hint
+to gtk_window_set_geometry_hints leads to integer overlows.
+
+Instead, use INT_MAX / 16 which should work with all
+resonable scale factors.
+
+--- a/src/gtk/toplevel.cpp	2014-10-06 16:33:44.000000000 -0500
++++ b/src/gtk/toplevel.cpp	2017-02-07 20:44:07.382988282 -0600
+@@ -1216,8 +1216,12 @@
+     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;
++    // Due to HiDPI UI scale, using INT_MAX leads to integer
++    // overflows when calculating the actual window size.
++    // Divide by 16 to to accomodate crazy high scale factors
++    // without overflowing.
++    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 5285037ff..52fa8184d 100644
--- a/gnu/packages/wxwidgets.scm
+++ b/gnu/packages/wxwidgets.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2016 Theodoros Foradis <theodoros.for@openmailbox.org>
 ;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
+;;; Copyright © 2017 Rene Saavedra <rennes@openmailbox.org>
 ;;;
 ;;; 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)
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [PATCH 2/3] gnu: Add libfilezilla.
  2017-02-09 16:36 [PATCH] gnu: Add filezilla rennes
  2017-02-09 16:36 ` [PATCH 1/3] gnu: wxwidgets: Fix for Filezilla client rennes
@ 2017-02-09 16:36 ` rennes
  2017-02-13  2:26   ` Maxim Cournoyer
  2017-02-09 16:36 ` [PATCH 3/3] gnu: Add filezilla rennes
  2017-03-05  4:15 ` [PATCH] " Leo Famulari
  3 siblings, 1 reply; 18+ messages in thread
From: rennes @ 2017-02-09 16:36 UTC (permalink / raw)
  To: guix-devel

* gnu/packages/ftp.scm (libfilezilla): New variable.
---
 gnu/packages/ftp.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm
index 7380fcfc3..0fef1b160 100644
--- a/gnu/packages/ftp.scm
+++ b/gnu/packages/ftp.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017 Rene Saavedra <rennes@openmailbox.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -26,6 +27,7 @@
   #:use-module (guix packages)
   #:use-module (gnu packages)
   #:use-module (gnu packages autotools)
+  #:use-module (gnu packages check)  
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages readline)
@@ -159,3 +161,25 @@ maintaining a web page or other FTP archive.  It synchronizes a set of
 local files to a remote server by performing uploads and remote deletes
 as required.")
     (license gpl2+)))
+
+(define-public libfilezilla
+  (package
+    (name "libfilezilla")
+    (version "0.9.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://download.filezilla-project.org/"
+                           name "/" name "-" version ".tar.bz2"))
+       (sha256
+        (base32
+         "0340v5xs48f28q2d16ldb9359dkzlhl4l449mgyv3qabnlz2pl21"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("cppunit" ,cppunit)))
+    (home-page "https://lib.filezilla-project.org")
+    (synopsis "Cross-platform C++ library used by Filezilla client")
+    (description
+     "This package offering some basic functionality to build high-performing,
+platform-independent programs.")
+    (license gpl3+)))
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 18+ messages in thread

* [PATCH 3/3] gnu: Add filezilla.
  2017-02-09 16:36 [PATCH] gnu: Add filezilla rennes
  2017-02-09 16:36 ` [PATCH 1/3] gnu: wxwidgets: Fix for Filezilla client rennes
  2017-02-09 16:36 ` [PATCH 2/3] gnu: Add libfilezilla rennes
@ 2017-02-09 16:36 ` rennes
  2017-02-13  2:36   ` Maxim Cournoyer
  2017-03-05  4:15 ` [PATCH] " Leo Famulari
  3 siblings, 1 reply; 18+ messages in thread
From: rennes @ 2017-02-09 16:36 UTC (permalink / raw)
  To: guix-devel

* gnu/packages/ftp.scm (filezilla): New variable.
---
 gnu/packages/ftp.scm | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm
index 0fef1b160..129f04ef6 100644
--- a/gnu/packages/ftp.scm
+++ b/gnu/packages/ftp.scm
@@ -27,12 +27,20 @@
   #:use-module (guix packages)
   #:use-module (gnu packages)
   #:use-module (gnu packages autotools)
-  #:use-module (gnu packages check)  
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages check)
+  #:use-module (gnu packages databases)
+  #:use-module (gnu packages freedesktop)  
   #:use-module (gnu packages gettext)
+  #:use-module (gnu packages libidn)  
   #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages nettle)  
   #:use-module (gnu packages readline)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages tls)
+  #:use-module (gnu packages wxwidgets)
+  #:use-module (gnu packages xml)  
   #:use-module (gnu packages compression))
 
 (define-public lftp
@@ -183,3 +191,41 @@ as required.")
      "This package offering some basic functionality to build high-performing,
 platform-independent programs.")
     (license gpl3+)))
+
+(define-public filezilla
+  (package
+    (name "filezilla")
+    (version "3.24.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://sourceforge.net/projects/" name
+                           "/files/FileZilla_Client/" version
+                           "/FileZilla_" version "_src" ".tar.bz2"))
+       (sha256
+        (base32
+         "1bacrl8lj90hqbh129hpbgqj78k1i84j83rkzn507jnykj4x8p9x"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("gettext" ,gettext-minimal)
+       ("pkg-config" ,pkg-config)
+       ("pugixml" ,pugixml)
+       ("xdg-utils" ,xdg-utils)))
+    (inputs
+     `(("dbus" ,dbus)
+       ("gnutls" ,gnutls)
+       ("gtk+" ,gtk+)
+       ("libfilezilla" ,libfilezilla)
+       ("libidn" ,libidn)
+       ("nettle" ,nettle)
+       ("sqlite" ,sqlite)
+       ("wxwidgets" ,wxwidgets)))
+    (home-page "https://filezilla-project.org")
+    (synopsis "Full-featured graphical FTP/FTPS/SFTP client")
+    (description
+     "Filezilla client supports FTP, FTP over SSL/TLS (FTPS),
+SSH File Transfer Protocol (SFTP), HTTP/1.1, SOCKS5, FTP-Proxy, IPv6
+and others features such as bookmarks, drag and drop, filename filters,
+directory comparison and more.")
+    (license gpl3+)
+    (properties '((upstream-name . "FileZilla")))))
-- 
2.11.0

^ permalink raw reply related	[flat|nested] 18+ messages in thread

* Re: [PATCH 2/3] gnu: Add libfilezilla.
  2017-02-09 16:36 ` [PATCH 2/3] gnu: Add libfilezilla rennes
@ 2017-02-13  2:26   ` Maxim Cournoyer
  2017-02-13  2:41     ` rennes
  0 siblings, 1 reply; 18+ messages in thread
From: Maxim Cournoyer @ 2017-02-13  2:26 UTC (permalink / raw)
  To: rennes; +Cc: guix-devel

Hi,

rennes <rennes@openmailbox.org> writes:

> * gnu/packages/ftp.scm (libfilezilla): New variable.
> ---
>  gnu/packages/ftp.scm | 24 ++++++++++++++++++++++++
>  1 file changed, 24 insertions(+)
>
> diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm
> index 7380fcfc3..0fef1b160 100644
> --- a/gnu/packages/ftp.scm
> +++ b/gnu/packages/ftp.scm
> @@ -3,6 +3,7 @@
>  ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
>  ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
>  ;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
> +;;; Copyright © 2017 Rene Saavedra <rennes@openmailbox.org>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -26,6 +27,7 @@
>    #:use-module (guix packages)
>    #:use-module (gnu packages)
>    #:use-module (gnu packages autotools)
> +  #:use-module (gnu packages check)  
>    #:use-module (gnu packages gettext)
>    #:use-module (gnu packages ncurses)
>    #:use-module (gnu packages readline)
> @@ -159,3 +161,25 @@ maintaining a web page or other FTP archive.  It synchronizes a set of
>  local files to a remote server by performing uploads and remote deletes
>  as required.")
>      (license gpl2+)))
> +
> +(define-public libfilezilla
> +  (package
> +    (name "libfilezilla")
> +    (version "0.9.0")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append "http://download.filezilla-project.org/"
> +                           name "/" name "-" version ".tar.bz2"))
> +       (sha256
> +        (base32
> +         "0340v5xs48f28q2d16ldb9359dkzlhl4l449mgyv3qabnlz2pl21"))))
> +    (build-system gnu-build-system)
> +    (native-inputs
> +     `(("cppunit" ,cppunit)))
> +    (home-page "https://lib.filezilla-project.org")
> +    (synopsis "Cross-platform C++ library used by Filezilla client")
> +    (description
> +     "This package offering some basic functionality to build high-performing,
> +platform-independent programs.")

s/offering/offers/ or s/offering/provides/

> +    (license gpl3+)))

Only license information I could find is the COPYING file which is
GPLv2. I think gpl2+ would be more appropriate.

Maxim

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PATCH 3/3] gnu: Add filezilla.
  2017-02-09 16:36 ` [PATCH 3/3] gnu: Add filezilla rennes
@ 2017-02-13  2:36   ` Maxim Cournoyer
  2017-02-15  5:44     ` rennes
  0 siblings, 1 reply; 18+ messages in thread
From: Maxim Cournoyer @ 2017-02-13  2:36 UTC (permalink / raw)
  To: rennes; +Cc: guix-devel

[-- Attachment #1: Type: text/plain, Size: 3179 bytes --]

Hi,

rennes <rennes@openmailbox.org> writes:

> * gnu/packages/ftp.scm (filezilla): New variable.
> ---
>  gnu/packages/ftp.scm | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
>  1 file changed, 47 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm
> index 0fef1b160..129f04ef6 100644
> --- a/gnu/packages/ftp.scm
> +++ b/gnu/packages/ftp.scm
> @@ -27,12 +27,20 @@
>    #:use-module (guix packages)
>    #:use-module (gnu packages)
>    #:use-module (gnu packages autotools)
> -  #:use-module (gnu packages check)  
> +  #:use-module (gnu packages glib)
> +  #:use-module (gnu packages gtk)

Minor thing, and I'm not sure if we have a convention for this, but it'd
be neat to keep the use-module statements ordered alphabetically.

> +  #:use-module (gnu packages check)
> +  #:use-module (gnu packages databases)
> +  #:use-module (gnu packages freedesktop)  
>    #:use-module (gnu packages gettext)
> +  #:use-module (gnu packages libidn)  
>    #:use-module (gnu packages ncurses)
> +  #:use-module (gnu packages nettle)  
>    #:use-module (gnu packages readline)
>    #:use-module (gnu packages pkg-config)
>    #:use-module (gnu packages tls)
> +  #:use-module (gnu packages wxwidgets)
> +  #:use-module (gnu packages xml)  
>    #:use-module (gnu packages compression))
>  
>  (define-public lftp
> @@ -183,3 +191,41 @@ as required.")
>       "This package offering some basic functionality to build high-performing,
>  platform-independent programs.")
>      (license gpl3+)))
> +
> +(define-public filezilla
> +  (package
> +    (name "filezilla")
> +    (version "3.24.0")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append "https://sourceforge.net/projects/" name
> +                           "/files/FileZilla_Client/" version
> +                           "/FileZilla_" version "_src" ".tar.bz2"))
> +       (sha256
> +        (base32
> +         "1bacrl8lj90hqbh129hpbgqj78k1i84j83rkzn507jnykj4x8p9x"))))
> +    (build-system gnu-build-system)
> +    (native-inputs
> +     `(("gettext" ,gettext-minimal)
> +       ("pkg-config" ,pkg-config)
> +       ("pugixml" ,pugixml)
> +       ("xdg-utils" ,xdg-utils)))
> +    (inputs
> +     `(("dbus" ,dbus)
> +       ("gnutls" ,gnutls)
> +       ("gtk+" ,gtk+)
> +       ("libfilezilla" ,libfilezilla)
> +       ("libidn" ,libidn)
> +       ("nettle" ,nettle)
> +       ("sqlite" ,sqlite)
> +       ("wxwidgets" ,wxwidgets)))
> +    (home-page "https://filezilla-project.org")
> +    (synopsis "Full-featured graphical FTP/FTPS/SFTP client")
> +    (description
> +     "Filezilla client supports FTP, FTP over SSL/TLS (FTPS),
> +SSH File Transfer Protocol (SFTP), HTTP/1.1, SOCKS5, FTP-Proxy, IPv6
> +and others features such as bookmarks, drag and drop, filename filters,
> +directory comparison and more.")
> +    (license gpl3+)

Again, I'm under the impression that this should rather be gpl2+. I'd be
happy to be proven wrong otherwise!

> +    (properties '((upstream-name . "FileZilla")))))

Otherwise LGTM (haven't tested though).

Maxim

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PATCH 2/3] gnu: Add libfilezilla.
  2017-02-13  2:26   ` Maxim Cournoyer
@ 2017-02-13  2:41     ` rennes
  2017-02-13  6:32       ` Maxim Cournoyer
  0 siblings, 1 reply; 18+ messages in thread
From: rennes @ 2017-02-13  2:41 UTC (permalink / raw)
  To: Maxim Cournoyer; +Cc: guix-devel

Hello Maxim,

On 2017-02-12 20:26, Maxim Cournoyer wrote:
> Hi,
> 
offering/offers/ or s/offering/provides/
> 
>> +    (license gpl3+)))
> 
> Only license information I could find is the COPYING file which is
> GPLv2. I think gpl2+ would be more appropriate.
> 

grepping libfilezilla directory, i see glp2 and gpl3:

libfilezilla-0.9.0/config/depcomp:# the Free Software Foundation; either 
version 2, or (at your option)
libfilezilla-0.9.0/config/compile:# the Free Software Foundation; either 
version 2, or (at your option)
libfilezilla-0.9.0/config/missing:# the Free Software Foundation; either 
version 2, or (at your option)
libfilezilla-0.9.0/config/config.guess:# the Free Software Foundation; 
either version 3 of the License, or
libfilezilla-0.9.0/config/ltmain.sh:# the Free Software Foundation; 
either version 2 of the License, or
libfilezilla-0.9.0/config/config.sub:# the Free Software Foundation; 
either version 3 of the License, or
libfilezilla-0.9.0/config/test-driver:# the Free Software Foundation; 
either version 2, or (at your option)
libfilezilla-0.9.0/configure:# published by the Free Software 
Foundation; either version 2 of
libfilezilla-0.9.0/COPYING:    the Free Software Foundation; either 
version 2 of the License, or
libfilezilla-0.9.0/m4/ax_check_link_flag.m4:#   Free Software 
Foundation, either version 3 of the License, or (at your
libfilezilla-0.9.0/m4/ax_check_compile_flag.m4:#   Free Software 
Foundation, either version 3 of the License, or (at your
libfilezilla-0.9.0/m4/libtool.m4:# published by the Free Software 
Foundation; either version 2 of
libfilezilla-0.9.0/m4/ax_append_flag.m4:#   Free Software Foundation, 
either version 3 of the License, or (at your
libfilezilla-0.9.0/README:the Free Software Foundation; either version 2 
of the License, or

Should I put both?
Thanks

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PATCH 2/3] gnu: Add libfilezilla.
  2017-02-13  2:41     ` rennes
@ 2017-02-13  6:32       ` Maxim Cournoyer
  2017-02-15  5:41         ` rennes
  0 siblings, 1 reply; 18+ messages in thread
From: Maxim Cournoyer @ 2017-02-13  6:32 UTC (permalink / raw)
  To: rennes; +Cc: guix-devel

Hi,

rennes@openmailbox.org writes:

> Hello Maxim,
>
> On 2017-02-12 20:26, Maxim Cournoyer wrote:
>> Hi,
>>
> offering/offers/ or s/offering/provides/
>>
>>> +    (license gpl3+)))
>>
>> Only license information I could find is the COPYING file which is
>> GPLv2. I think gpl2+ would be more appropriate.
>>
>
> grepping libfilezilla directory, i see glp2 and gpl3:
>
> libfilezilla-0.9.0/config/depcomp:# the Free Software Foundation;
> either version 2, or (at your option)
> libfilezilla-0.9.0/config/compile:# the Free Software Foundation;
> either version 2, or (at your option)
> libfilezilla-0.9.0/config/missing:# the Free Software Foundation;
> either version 2, or (at your option)
> libfilezilla-0.9.0/config/config.guess:# the Free Software Foundation;
> either version 3 of the License, or
> libfilezilla-0.9.0/config/ltmain.sh:# the Free Software Foundation;
> either version 2 of the License, or
> libfilezilla-0.9.0/config/config.sub:# the Free Software Foundation;
> either version 3 of the License, or

I don't see this in the sources
(https://svn.filezilla-project.org/filezilla/libfilezilla/tags/0.9.0/). I'm
pretty sure those GPLv3 licensed files are part of the GNU
autotools rather than libfilezilla.

> libfilezilla-0.9.0/config/test-driver:# the Free Software Foundation;
> either version 2, or (at your option)
> libfilezilla-0.9.0/configure:# published by the Free Software
> Foundation; either version 2 of
> libfilezilla-0.9.0/COPYING:    the Free Software Foundation; either
> version 2 of the License, or
> libfilezilla-0.9.0/m4/ax_check_link_flag.m4:#   Free Software
> Foundation, either version 3 of the License, or (at your
> libfilezilla-0.9.0/m4/ax_check_compile_flag.m4:#   Free Software
> Foundation, either version 3 of the License, or (at your
> libfilezilla-0.9.0/m4/libtool.m4:# published by the Free Software
> Foundation; either version 2 of
> libfilezilla-0.9.0/m4/ax_append_flag.m4:#   Free Software Foundation,
> either version 3 of the License, or (at your

m4 is part of autotools, which is GPLv3. It's not part of the
libfilezilla project.

> libfilezilla-0.9.0/README:the Free Software Foundation; either version
> 2 of the License, or
>
> Should I put both?
> Thanks

I still think gpl2+ is the most accurate if we want to stick to what
upstream says.

Maxim

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PATCH 2/3] gnu: Add libfilezilla.
  2017-02-13  6:32       ` Maxim Cournoyer
@ 2017-02-15  5:41         ` rennes
  2017-02-15 21:22           ` Maxim Cournoyer
  2017-02-16 16:24           ` Leo Famulari
  0 siblings, 2 replies; 18+ messages in thread
From: rennes @ 2017-02-15  5:41 UTC (permalink / raw)
  To: Maxim Cournoyer; +Cc: guix-devel

[-- Attachment #1: Type: text/plain, Size: 1300 bytes --]

Hello,
Thanks for the explanation about the licenses.

Attachment patch with suggested changes.

> I don't see this in the sources
> (https://svn.filezilla-project.org/filezilla/libfilezilla/tags/0.9.0/). 
> I'm
> pretty sure those GPLv3 licensed files are part of the GNU
> autotools rather than libfilezilla.
> 
>> libfilezilla-0.9.0/config/test-driver:# the Free Software Foundation;
>> either version 2, or (at your option)
>> libfilezilla-0.9.0/configure:# published by the Free Software
>> Foundation; either version 2 of
>> libfilezilla-0.9.0/COPYING:    the Free Software Foundation; either
>> version 2 of the License, or
>> libfilezilla-0.9.0/m4/ax_check_link_flag.m4:#   Free Software
>> Foundation, either version 3 of the License, or (at your
>> libfilezilla-0.9.0/m4/ax_check_compile_flag.m4:#   Free Software
>> Foundation, either version 3 of the License, or (at your
>> libfilezilla-0.9.0/m4/libtool.m4:# published by the Free Software
>> Foundation; either version 2 of
>> libfilezilla-0.9.0/m4/ax_append_flag.m4:#   Free Software Foundation,
>> either version 3 of the License, or (at your
> 
> m4 is part of autotools, which is GPLv3. It's not part of the
> libfilezilla project.
> 
>> libfilezilla-0.9.0/README:the Free Software Foundation; either version
>> 2 of the License, or

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-libfilezilla.patch --]
[-- Type: text/x-diff; name=0001-gnu-Add-libfilezilla.patch, Size: 2019 bytes --]

From 98a4d504c5330ffb27b956e7be6c3f806de7ba8a Mon Sep 17 00:00:00 2001
From: rennes <rennes@openmailbox.org>
Date: Tue, 14 Feb 2017 23:22:07 -0600
Subject: [PATCH 2/3] gnu: Add libfilezilla.

* gnu/packages/ftp.scm (libfilezilla): New variable.
---
 gnu/packages/ftp.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm
index 7380fcfc3..60693aac6 100644
--- a/gnu/packages/ftp.scm
+++ b/gnu/packages/ftp.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017 Rene Saavedra <rennes@openmailbox.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -26,6 +27,7 @@
   #:use-module (guix packages)
   #:use-module (gnu packages)
   #:use-module (gnu packages autotools)
+  #:use-module (gnu packages check)  
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages readline)
@@ -159,3 +161,25 @@ maintaining a web page or other FTP archive.  It synchronizes a set of
 local files to a remote server by performing uploads and remote deletes
 as required.")
     (license gpl2+)))
+
+(define-public libfilezilla
+  (package
+    (name "libfilezilla")
+    (version "0.9.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://download.filezilla-project.org/"
+                           name "/" name "-" version ".tar.bz2"))
+       (sha256
+        (base32
+         "0340v5xs48f28q2d16ldb9359dkzlhl4l449mgyv3qabnlz2pl21"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("cppunit" ,cppunit)))
+    (home-page "https://lib.filezilla-project.org")
+    (synopsis "Cross-platform C++ library used by Filezilla client")
+    (description
+     "This package provides some basic functionality to build high-performing,
+platform-independent programs.")
+    (license gpl2+)))
-- 
2.11.0


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* Re: [PATCH 3/3] gnu: Add filezilla.
  2017-02-13  2:36   ` Maxim Cournoyer
@ 2017-02-15  5:44     ` rennes
  2017-02-15 21:13       ` Maxim Cournoyer
  2017-02-16 16:24       ` Leo Famulari
  0 siblings, 2 replies; 18+ messages in thread
From: rennes @ 2017-02-15  5:44 UTC (permalink / raw)
  To: Maxim Cournoyer; +Cc: guix-devel

[-- Attachment #1: Type: text/plain, Size: 421 bytes --]


> Minor thing, and I'm not sure if we have a convention for this, but 
> it'd
> be neat to keep the use-module statements ordered alphabetically.
> 

Ordered alphabetically!

> 
> Again, I'm under the impression that this should rather be gpl2+. I'd 
> be
> happy to be proven wrong otherwise!
> 
>> +    (properties '((upstream-name . "FileZilla")))))
> 
> Otherwise LGTM (haven't tested though).

Updated patch. Thanks

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0002-gnu-Add-filezilla.patch --]
[-- Type: text/x-diff; name=0002-gnu-Add-filezilla.patch, Size: 2822 bytes --]

From c46abaa7314aac73ad8e7a368e86d91fa126b4d3 Mon Sep 17 00:00:00 2001
From: rennes <rennes@openmailbox.org>
Date: Tue, 14 Feb 2017 23:27:11 -0600
Subject: [PATCH 3/3] gnu: Add filezilla.

* gnu/packages/ftp.scm (filezilla): New variable.
---
 gnu/packages/ftp.scm | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 48 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm
index 60693aac6..ddbf5a08d 100644
--- a/gnu/packages/ftp.scm
+++ b/gnu/packages/ftp.scm
@@ -28,12 +28,20 @@
   #:use-module (gnu packages)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages check)  
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages databases)
+  #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages gettext)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages libidn)
   #:use-module (gnu packages ncurses)
-  #:use-module (gnu packages readline)
+  #:use-module (gnu packages nettle)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages readline)
   #:use-module (gnu packages tls)
-  #:use-module (gnu packages compression))
+  #:use-module (gnu packages wxwidgets)
+  #:use-module (gnu packages xml))
 
 (define-public lftp
   (package
@@ -183,3 +191,41 @@ as required.")
      "This package provides some basic functionality to build high-performing,
 platform-independent programs.")
     (license gpl2+)))
+
+(define-public filezilla
+  (package
+    (name "filezilla")
+    (version "3.24.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://sourceforge.net/projects/" name
+                           "/files/FileZilla_Client/" version
+                           "/FileZilla_" version "_src" ".tar.bz2"))
+       (sha256
+        (base32
+         "1bacrl8lj90hqbh129hpbgqj78k1i84j83rkzn507jnykj4x8p9x"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("gettext" ,gettext-minimal)
+       ("pkg-config" ,pkg-config)
+       ("pugixml" ,pugixml)
+       ("xdg-utils" ,xdg-utils)))
+    (inputs
+     `(("dbus" ,dbus)
+       ("gnutls" ,gnutls)
+       ("gtk+" ,gtk+)
+       ("libfilezilla" ,libfilezilla)
+       ("libidn" ,libidn)
+       ("nettle" ,nettle)
+       ("sqlite" ,sqlite)
+       ("wxwidgets" ,wxwidgets)))
+    (home-page "https://filezilla-project.org")
+    (synopsis "Full-featured graphical FTP/FTPS/SFTP client")
+    (description
+     "Filezilla client supports FTP, FTP over SSL/TLS (FTPS),
+SSH File Transfer Protocol (SFTP), HTTP/1.1, SOCKS5, FTP-Proxy, IPv6
+and others features such as bookmarks, drag and drop, filename filters,
+directory comparison and more.")
+    (license gpl2+)
+    (properties '((upstream-name . "FileZilla")))))
-- 
2.11.0


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* Re: [PATCH 3/3] gnu: Add filezilla.
  2017-02-15  5:44     ` rennes
@ 2017-02-15 21:13       ` Maxim Cournoyer
  2017-02-16 16:24       ` Leo Famulari
  1 sibling, 0 replies; 18+ messages in thread
From: Maxim Cournoyer @ 2017-02-15 21:13 UTC (permalink / raw)
  To: rennes; +Cc: guix-devel

[-- Attachment #1: Type: text/plain, Size: 569 bytes --]

Hi,

While I haven't tried it, the patch looks good to me!

Maxim


On Tue, Feb 14, 2017 at 9:44 PM, <rennes@openmailbox.org> wrote:

>
> Minor thing, and I'm not sure if we have a convention for this, but it'd
>> be neat to keep the use-module statements ordered alphabetically.
>>
>>
> Ordered alphabetically!
>
>
>> Again, I'm under the impression that this should rather be gpl2+. I'd be
>> happy to be proven wrong otherwise!
>>
>> +    (properties '((upstream-name . "FileZilla")))))
>>>
>>
>> Otherwise LGTM (haven't tested though).
>>
>
> Updated patch. Thanks

[-- Attachment #2: Type: text/html, Size: 1383 bytes --]

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PATCH 2/3] gnu: Add libfilezilla.
  2017-02-15  5:41         ` rennes
@ 2017-02-15 21:22           ` Maxim Cournoyer
  2017-02-16 16:24           ` Leo Famulari
  1 sibling, 0 replies; 18+ messages in thread
From: Maxim Cournoyer @ 2017-02-15 21:22 UTC (permalink / raw)
  To: rennes; +Cc: guix-devel

[-- Attachment #1: Type: text/plain, Size: 1421 bytes --]

LGTM!

Maxim


On Tue, Feb 14, 2017 at 9:41 PM, <rennes@openmailbox.org> wrote:

> Hello,
> Thanks for the explanation about the licenses.
>
> Attachment patch with suggested changes.
>
>
> I don't see this in the sources
>> (https://svn.filezilla-project.org/filezilla/libfilezilla/tags/0.9.0/).
>> I'm
>> pretty sure those GPLv3 licensed files are part of the GNU
>> autotools rather than libfilezilla.
>>
>> libfilezilla-0.9.0/config/test-driver:# the Free Software Foundation;
>>> either version 2, or (at your option)
>>> libfilezilla-0.9.0/configure:# published by the Free Software
>>> Foundation; either version 2 of
>>> libfilezilla-0.9.0/COPYING:    the Free Software Foundation; either
>>> version 2 of the License, or
>>> libfilezilla-0.9.0/m4/ax_check_link_flag.m4:#   Free Software
>>> Foundation, either version 3 of the License, or (at your
>>> libfilezilla-0.9.0/m4/ax_check_compile_flag.m4:#   Free Software
>>> Foundation, either version 3 of the License, or (at your
>>> libfilezilla-0.9.0/m4/libtool.m4:# published by the Free Software
>>> Foundation; either version 2 of
>>> libfilezilla-0.9.0/m4/ax_append_flag.m4:#   Free Software Foundation,
>>> either version 3 of the License, or (at your
>>>
>>
>> m4 is part of autotools, which is GPLv3. It's not part of the
>> libfilezilla project.
>>
>> libfilezilla-0.9.0/README:the Free Software Foundation; either version
>>> 2 of the License, or
>>
>>

[-- Attachment #2: Type: text/html, Size: 2364 bytes --]

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PATCH 3/3] gnu: Add filezilla.
  2017-02-15  5:44     ` rennes
  2017-02-15 21:13       ` Maxim Cournoyer
@ 2017-02-16 16:24       ` Leo Famulari
  1 sibling, 0 replies; 18+ messages in thread
From: Leo Famulari @ 2017-02-16 16:24 UTC (permalink / raw)
  To: rennes; +Cc: guix-devel, Maxim Cournoyer

On Tue, Feb 14, 2017 at 11:44:11PM -0600, rennes@openmailbox.org wrote:
> From c46abaa7314aac73ad8e7a368e86d91fa126b4d3 Mon Sep 17 00:00:00 2001
> From: rennes <rennes@openmailbox.org>
> Date: Tue, 14 Feb 2017 23:27:11 -0600
> Subject: [PATCH 3/3] gnu: Add filezilla.
> 
> * gnu/packages/ftp.scm (filezilla): New variable.

LGTM, thanks!

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PATCH 2/3] gnu: Add libfilezilla.
  2017-02-15  5:41         ` rennes
  2017-02-15 21:22           ` Maxim Cournoyer
@ 2017-02-16 16:24           ` Leo Famulari
  1 sibling, 0 replies; 18+ messages in thread
From: Leo Famulari @ 2017-02-16 16:24 UTC (permalink / raw)
  To: rennes; +Cc: guix-devel, Maxim Cournoyer

On Tue, Feb 14, 2017 at 11:41:40PM -0600, rennes@openmailbox.org wrote:
> From 98a4d504c5330ffb27b956e7be6c3f806de7ba8a Mon Sep 17 00:00:00 2001
> From: rennes <rennes@openmailbox.org>
> Date: Tue, 14 Feb 2017 23:22:07 -0600
> Subject: [PATCH 2/3] gnu: Add libfilezilla.
> 
> * gnu/packages/ftp.scm (libfilezilla): New variable.

LGTM, thanks!

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PATCH 1/3] gnu: wxwidgets: Fix for Filezilla client.
  2017-02-09 16:36 ` [PATCH 1/3] gnu: wxwidgets: Fix for Filezilla client rennes
@ 2017-02-16 16:28   ` Leo Famulari
  2017-02-18  0:39     ` rennes
  0 siblings, 1 reply; 18+ messages in thread
From: Leo Famulari @ 2017-02-16 16:28 UTC (permalink / raw)
  To: rennes; +Cc: guix-devel

On Thu, Feb 09, 2017 at 10:36:16AM -0600, rennes wrote:
> * gnu/packages/patches/wxwidgets-fix-windowGTK.patch: New file.
> * gnu/local.mk (dist_patch_DATA): Add it.

I'm unable to apply this patch to the Guix source tree. Please try
recreating it from current master and sending it again.

> diff --git a/gnu/packages/patches/wxwidgets-fix-windowGTK.patch b/gnu/packages/patches/wxwidgets-fix-windowGTK.patch
> new file mode 100644
> index 000000000..05e2e5819
> --- /dev/null
> +++ b/gnu/packages/patches/wxwidgets-fix-windowGTK.patch
> @@ -0,0 +1,35 @@
> +This patch allow Filezilla client to resize window.
> +
> +Authors: Tim Kosse <tim.kosse@filezilla-project.org>
> +Upstream status: This issue was fixed in master branch.
> +Ticket: '<http://trac.wxwidgets.org/ticket/17456>'
> +
> +From 3a52125f81d28fcad5d3c841b94a3e4bad295d9e Mon Sep 17 00:00:00 2001
> +From: Tim Kosse <tim.kosse@filezilla-project.org>
> +Date: Sun, 20 Mar 2016 10:22:13 +0100
> +Subject: [PATCH] Fix wxTopLevelWindowGTK::DoSetSizeHints if a window scale
> +factor larger than 1  is set.
> +
> +In this case, passing INT_MAX as maximum width/height hint
> +to gtk_window_set_geometry_hints leads to integer overlows.
> +
> +Instead, use INT_MAX / 16 which should work with all
> +resonable scale factors.

Okay, thanks!

But, instead of using the proposed patch from the upstream bug report,
we should use the commit that was applied to the appropriate wxWidgets
branch and, if possible, include a link to that commit in their
web-based Git interface.

Can you send an updated patch?

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PATCH 1/3] gnu: wxwidgets: Fix for Filezilla client.
  2017-02-16 16:28   ` Leo Famulari
@ 2017-02-18  0:39     ` rennes
  2017-02-18  1:22       ` rennes
  0 siblings, 1 reply; 18+ messages in thread
From: rennes @ 2017-02-18  0:39 UTC (permalink / raw)
  To: Leo Famulari; +Cc: guix-devel

[-- Attachment #1: Type: text/plain, Size: 680 bytes --]

Hello,

Patch updated according to your suggestions.
Thanks

On 2017-02-16 10:28, Leo Famulari wrote:
> On Thu, Feb 09, 2017 at 10:36:16AM -0600, rennes wrote:
>> * gnu/packages/patches/wxwidgets-fix-windowGTK.patch: New file.
>> * gnu/local.mk (dist_patch_DATA): Add it.
> 
> I'm unable to apply this patch to the Guix source tree. Please try
> recreating it from current master and sending it again.
> 

> But, instead of using the proposed patch from the upstream bug report,
> we should use the commit that was applied to the appropriate wxWidgets
> branch and, if possible, include a link to that commit in their
> web-based Git interface.
> 
> Can you send an updated patch?

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-wxwidgets-Fix-for-Filezilla-client.patch --]
[-- Type: text/x-diff; name=0001-gnu-wxwidgets-Fix-for-Filezilla-client.patch, Size: 3969 bytes --]

From 6b152648c3f56fc370ff4e9e33b745bd11ca6d77 Mon Sep 17 00:00:00 2001
From: rennes <rennes@openmailbox.org>
Date: Fri, 17 Feb 2017 18:14:42 -0600
Subject: [PATCH 1/3] gnu: wxwidgets: Fix for Filezilla client.

* gnu/packages/patches/wxwidgets-fix-windowGTK.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
---
 gnu/local.mk                                       |  3 ++-
 gnu/packages/patches/wxwidgets-fix-windowGTK.patch | 20 ++++++++++++++++++++
 gnu/packages/wxwidgets.scm                         |  5 ++++-
 3 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 gnu/packages/patches/wxwidgets-fix-windowGTK.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 060de2535..681d3fa1b 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -5,7 +5,7 @@
 # Copyright © 2013, 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
 # Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
 # Copyright © 2016, 2017 Kei Kebreau <kei@openmailbox.org>
-# Copyright © 2016 Rene Saavedra <rennes@openmailbox.org>
+# Copyright © 2016, 2017 Rene Saavedra <rennes@openmailbox.org>
 # Copyright © 2016 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@openmailbox.org>
 # Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
 # Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
@@ -971,6 +971,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 000000000..1c0d0704a
--- /dev/null
+++ b/gnu/packages/patches/wxwidgets-fix-windowGTK.patch
@@ -0,0 +1,20 @@
+This patch allow Filezilla client to resize window.
+The patch was adapted from upstream source repository:
+'<http://trac.wxwidgets.org/changeset/4793e5b0a4e189e492287305859b278fed780080/git-wxWidgets>'
+
+Commit: a97553a939b76df1564ffbfe9c919d1da5a34c5a
+
+--- 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 5285037ff..953910652 100644
--- a/gnu/packages/wxwidgets.scm
+++ b/gnu/packages/wxwidgets.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2016 Theodoros Foradis <theodoros.for@openmailbox.org>
 ;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
+;;; Copyright © 2017 Rene Saavedra <rennes@openmailbox.org>
 ;;;
 ;;; 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)
-- 
2.11.0


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* Re: [PATCH 1/3] gnu: wxwidgets: Fix for Filezilla client.
  2017-02-18  0:39     ` rennes
@ 2017-02-18  1:22       ` rennes
  0 siblings, 0 replies; 18+ messages in thread
From: rennes @ 2017-02-18  1:22 UTC (permalink / raw)
  To: Leo Famulari; +Cc: guix-devel

[-- Attachment #1: Type: text/plain, Size: 198 bytes --]

Hello again,
Resend patch, forget run './pre-inst-env guix lint wxwidgets'.

On 2017-02-17 18:39, rennes@openmailbox.org wrote:
> Hello,
> 
> Patch updated according to your suggestions.
> Thanks
> 

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-wxwidgets-Fix-for-Filezilla-client.patch --]
[-- Type: text/x-diff; name=0001-gnu-wxwidgets-Fix-for-Filezilla-client.patch, Size: 3962 bytes --]

From bcb6d42b3f8e4aa06f794c0734c7ec87fa481c04 Mon Sep 17 00:00:00 2001
From: rennes <rennes@openmailbox.org>
Date: Fri, 17 Feb 2017 19:16:36 -0600
Subject: [PATCH 1/3] gnu: wxwidgets: Fix for Filezilla client.

* gnu/packages/patches/wxwidgets-fix-windowGTK.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
---
 gnu/local.mk                                       |  3 ++-
 gnu/packages/patches/wxwidgets-fix-windowGTK.patch | 20 ++++++++++++++++++++
 gnu/packages/wxwidgets.scm                         |  5 ++++-
 3 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 gnu/packages/patches/wxwidgets-fix-windowGTK.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 060de2535..681d3fa1b 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -5,7 +5,7 @@
 # Copyright © 2013, 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
 # Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
 # Copyright © 2016, 2017 Kei Kebreau <kei@openmailbox.org>
-# Copyright © 2016 Rene Saavedra <rennes@openmailbox.org>
+# Copyright © 2016, 2017 Rene Saavedra <rennes@openmailbox.org>
 # Copyright © 2016 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@openmailbox.org>
 # Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
 # Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
@@ -971,6 +971,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 000000000..1c0d0704a
--- /dev/null
+++ b/gnu/packages/patches/wxwidgets-fix-windowGTK.patch
@@ -0,0 +1,20 @@
+This patch allow Filezilla client to resize window.
+The patch was adapted from upstream source repository:
+'<http://trac.wxwidgets.org/changeset/4793e5b0a4e189e492287305859b278fed780080/git-wxWidgets>'
+
+Commit: a97553a939b76df1564ffbfe9c919d1da5a34c5a
+
+--- 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 5285037ff..52fa8184d 100644
--- a/gnu/packages/wxwidgets.scm
+++ b/gnu/packages/wxwidgets.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2016 Theodoros Foradis <theodoros.for@openmailbox.org>
 ;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
+;;; Copyright © 2017 Rene Saavedra <rennes@openmailbox.org>
 ;;;
 ;;; 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)
-- 
2.11.0


^ permalink raw reply related	[flat|nested] 18+ messages in thread

* Re: [PATCH] gnu: Add filezilla.
  2017-02-09 16:36 [PATCH] gnu: Add filezilla rennes
                   ` (2 preceding siblings ...)
  2017-02-09 16:36 ` [PATCH 3/3] gnu: Add filezilla rennes
@ 2017-03-05  4:15 ` Leo Famulari
  3 siblings, 0 replies; 18+ messages in thread
From: Leo Famulari @ 2017-03-05  4:15 UTC (permalink / raw)
  To: rennes; +Cc: guix-devel

On Thu, Feb 09, 2017 at 10:36:15AM -0600, rennes wrote:
> Hello,
> This is a set of patches for Filezilla, a ftp/sftp client.
> 
>  [PATCH 1/3] gnu: wxwidgets: Fix for Filezilla client.
>  [PATCH 2/3] gnu: Add libfilezilla.
>  [PATCH 3/3] gnu: Add filezilla.

Pushed, thanks!

^ permalink raw reply	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2017-03-05  4:15 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-09 16:36 [PATCH] gnu: Add filezilla rennes
2017-02-09 16:36 ` [PATCH 1/3] gnu: wxwidgets: Fix for Filezilla client rennes
2017-02-16 16:28   ` Leo Famulari
2017-02-18  0:39     ` rennes
2017-02-18  1:22       ` rennes
2017-02-09 16:36 ` [PATCH 2/3] gnu: Add libfilezilla rennes
2017-02-13  2:26   ` Maxim Cournoyer
2017-02-13  2:41     ` rennes
2017-02-13  6:32       ` Maxim Cournoyer
2017-02-15  5:41         ` rennes
2017-02-15 21:22           ` Maxim Cournoyer
2017-02-16 16:24           ` Leo Famulari
2017-02-09 16:36 ` [PATCH 3/3] gnu: Add filezilla rennes
2017-02-13  2:36   ` Maxim Cournoyer
2017-02-15  5:44     ` rennes
2017-02-15 21:13       ` Maxim Cournoyer
2017-02-16 16:24       ` Leo Famulari
2017-03-05  4:15 ` [PATCH] " Leo Famulari

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).