[gentoo-commits] repo/gentoo:master commit in: net-ftp/filezilla/, net-ftp/filezilla/files/

["Bernard Cafarelli" <voyageur@gentoo.org>]

commit:     b74372d2f26ea0096a563f4455aee1aacb657163
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 22 18:56:21 2023 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Wed Feb 22 19:00:44 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b74372d2

net-ftp/filezilla: handle new wxGTK versioning

Closes: https://bugs.gentoo.org/895642
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>

 .../files/filezilla-3.63.1-wxversion.patch         | 28 ++++++++++++++++++++++
 net-ftp/filezilla/filezilla-3.63.1.ebuild          |  1 +
 2 files changed, 29 insertions(+)

diff --git a/net-ftp/filezilla/files/filezilla-3.63.1-wxversion.patch b/net-ftp/filezilla/files/filezilla-3.63.1-wxversion.patch
new file mode 100644
index 000000000000..2e7658b703a4
--- /dev/null
+++ b/net-ftp/filezilla/files/filezilla-3.63.1-wxversion.patch
@@ -0,0 +1,28 @@
+diff -Naur filezilla-3.63.1.orig/m4/wxwin.m4 filezilla-3.63.1/m4/wxwin.m4
+--- filezilla-3.63.1.orig/m4/wxwin.m4	2020-06-04 12:18:02.000000000 +0200
++++ filezilla-3.63.1/m4/wxwin.m4	2023-02-22 19:38:22.620243565 +0100
+@@ -216,18 +216,18 @@
+ 
+     WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null`
+     wx_config_major_version=`echo $WX_VERSION | \
+-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\1/'`
+     wx_config_minor_version=`echo $WX_VERSION | \
+-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\2/'`
+     wx_config_micro_version=`echo $WX_VERSION | \
+-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\3/'`
+ 
+     wx_requested_major_version=`echo $min_wx_version | \
+-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\1/'`
+     wx_requested_minor_version=`echo $min_wx_version | \
+-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\2/'`
+     wx_requested_micro_version=`echo $min_wx_version | \
+-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\3/'`
+ 
+     _WX_PRIVATE_CHECK_VERSION([$wx_requested_major_version],
+                               [$wx_requested_minor_version],

diff --git a/net-ftp/filezilla/filezilla-3.63.1.ebuild b/net-ftp/filezilla/filezilla-3.63.1.ebuild
index e6832f8a78e9..43c5a48aba4d 100644
--- a/net-ftp/filezilla/filezilla-3.63.1.ebuild
+++ b/net-ftp/filezilla/filezilla-3.63.1.ebuild
@@ -44,6 +44,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.47.0-disable-shellext_conf.patch
 	"${FILESDIR}"/${PN}-3.52.2-slibtool.patch
 	"${FILESDIR}"/${PN}-3.60.1-desktop.patch
+	"${FILESDIR}"/${PN}-3.63.1-wxversion.patch
 )
 
 src_prepare() {