From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 19A5B15800F for ; Wed, 22 Feb 2023 19:00:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 543CAE076B; Wed, 22 Feb 2023 19:00:50 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 35EACE076B for ; Wed, 22 Feb 2023 19:00:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2F3D933BF5D for ; Wed, 22 Feb 2023 19:00:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AC66475 for ; Wed, 22 Feb 2023 19:00:46 +0000 (UTC) From: "Bernard Cafarelli" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Bernard Cafarelli" Message-ID: <1677092444.b74372d2f26ea0096a563f4455aee1aacb657163.voyageur@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-ftp/filezilla/, net-ftp/filezilla/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-ftp/filezilla/files/filezilla-3.63.1-wxversion.patch net-ftp/filezilla/filezilla-3.63.1.ebuild X-VCS-Directories: net-ftp/filezilla/ net-ftp/filezilla/files/ X-VCS-Committer: voyageur X-VCS-Committer-Name: Bernard Cafarelli X-VCS-Revision: b74372d2f26ea0096a563f4455aee1aacb657163 X-VCS-Branch: master Date: Wed, 22 Feb 2023 19:00:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ffe635fe-020b-4420-84f0-52f05a2a334f X-Archives-Hash: cbd82ce0204c3cb9f2cc02b6aad3495d commit: b74372d2f26ea0096a563f4455aee1aacb657163 Author: Bernard Cafarelli gentoo org> AuthorDate: Wed Feb 22 18:56:21 2023 +0000 Commit: Bernard Cafarelli gentoo 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 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() {