From 5cb5c82f2b6b9db1b309c9cc10b870fe8f645c1b Mon Sep 17 00:00:00 2001 From: Cristian Othón Martínez Vera Date: Thu, 26 Oct 2023 13:07:25 -0600 Subject: net-ftp/filezilla: fix build for x86 without SSE2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When FileZilla is compiled with ```-march=i686``` or ```-mtune=i686``` GCC flags, also tries to compile SSE2 optimized code, but not all x86 CPUs support it. This fix uses CPU_FLAGS_X86 to switch between SSE2 optimized or software emulated code. Closes: https://bugs.gentoo.org/916119 Closes: https://github.com/gentoo/gentoo/pull/33528 Signed-off-by: Cristian Othón Martínez Vera Signed-off-by: Yixun Lan --- net-ftp/filezilla/filezilla-3.65.0-r1.ebuild | 75 ++++++++++++++++++++++++++++ net-ftp/filezilla/filezilla-3.66.0-r1.ebuild | 75 ++++++++++++++++++++++++++++ net-ftp/filezilla/filezilla-3.66.0.ebuild | 72 -------------------------- 3 files changed, 150 insertions(+), 72 deletions(-) create mode 100644 net-ftp/filezilla/filezilla-3.65.0-r1.ebuild create mode 100644 net-ftp/filezilla/filezilla-3.66.0-r1.ebuild delete mode 100644 net-ftp/filezilla/filezilla-3.66.0.ebuild diff --git a/net-ftp/filezilla/filezilla-3.65.0-r1.ebuild b/net-ftp/filezilla/filezilla-3.65.0-r1.ebuild new file mode 100644 index 000000000000..aeb9ad850153 --- /dev/null +++ b/net-ftp/filezilla/filezilla-3.65.0-r1.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +WX_GTK_VER="3.2-gtk3" + +inherit autotools flag-o-matic wxwidgets xdg + +MY_PV="${PV/_/-}" +MY_P="FileZilla_${MY_PV}" + +DESCRIPTION="FTP client with lots of useful features and an intuitive interface" +HOMEPAGE="https://filezilla-project.org/" +SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.xz" +S="${WORKDIR}/${PN}-${MY_PV}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="cpu_flags_x86_sse2 dbus nls test" +RESTRICT="!test? ( test )" + +# pugixml 1.7 minimal dependency is for c++11 proper configuration +RDEPEND=" + >=dev-libs/nettle-3.1:= + >=dev-db/sqlite-3.7 + >=dev-libs/boost-1.76.0:= + >=dev-libs/libfilezilla-0.44.0:= + >=dev-libs/pugixml-1.7 + >=net-libs/gnutls-3.5.7 + x11-libs/wxGTK:${WX_GTK_VER}[X] + x11-misc/xdg-utils + dbus? ( sys-apps/dbus )" +DEPEND="${RDEPEND} + test? ( >=dev-util/cppunit-1.13.0 )" +BDEPEND=" + virtual/pkgconfig + >=sys-devel/libtool-1.4 + nls? ( >=sys-devel/gettext-0.11 )" + +PATCHES=( + "${FILESDIR}"/${PN}-3.22.1-debug.patch + "${FILESDIR}"/${PN}-3.47.0-metainfo.patch + "${FILESDIR}"/${PN}-3.47.0-disable-shellext_conf.patch + "${FILESDIR}"/${PN}-3.52.2-slibtool.patch + "${FILESDIR}"/${PN}-3.60.1-desktop.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + if use x86 && ! use cpu_flags_x86_sse2; then + append-cppflags -D_FORCE_SOFTWARE_SHA + fi + setup-wxwidgets + + local myeconfargs=( + --disable-autoupdatecheck + --with-pugixml=system + $(use_enable nls locales) + $(use_with dbus) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + + # no static archives + find "${ED}" -name '*.la' -delete || die +} diff --git a/net-ftp/filezilla/filezilla-3.66.0-r1.ebuild b/net-ftp/filezilla/filezilla-3.66.0-r1.ebuild new file mode 100644 index 000000000000..cb61885b28b4 --- /dev/null +++ b/net-ftp/filezilla/filezilla-3.66.0-r1.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +WX_GTK_VER="3.2-gtk3" + +inherit autotools flag-o-matic wxwidgets xdg + +MY_PV="${PV/_/-}" +MY_P="FileZilla_${MY_PV}" + +DESCRIPTION="FTP client with lots of useful features and an intuitive interface" +HOMEPAGE="https://filezilla-project.org/" +SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.xz" +S="${WORKDIR}/${PN}-${MY_PV}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="cpu_flags_x86_sse2 dbus nls test" +RESTRICT="!test? ( test )" + +# pugixml 1.7 minimal dependency is for c++11 proper configuration +RDEPEND=" + >=dev-libs/nettle-3.1:= + >=dev-db/sqlite-3.7 + >=dev-libs/boost-1.76.0:= + >=dev-libs/libfilezilla-0.45.0:= + >=dev-libs/pugixml-1.7 + >=net-libs/gnutls-3.5.7 + x11-libs/wxGTK:${WX_GTK_VER}[X] + x11-misc/xdg-utils + dbus? ( sys-apps/dbus )" +DEPEND="${RDEPEND} + test? ( >=dev-util/cppunit-1.13.0 )" +BDEPEND=" + virtual/pkgconfig + >=sys-devel/libtool-1.4 + nls? ( >=sys-devel/gettext-0.11 )" + +PATCHES=( + "${FILESDIR}"/${PN}-3.22.1-debug.patch + "${FILESDIR}"/${PN}-3.47.0-metainfo.patch + "${FILESDIR}"/${PN}-3.47.0-disable-shellext_conf.patch + "${FILESDIR}"/${PN}-3.52.2-slibtool.patch + "${FILESDIR}"/${PN}-3.60.1-desktop.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + if use x86 && ! use cpu_flags_x86_sse2; then + append-cppflags -D_FORCE_SOFTWARE_SHA + fi + setup-wxwidgets + + local myeconfargs=( + --disable-autoupdatecheck + --with-pugixml=system + $(use_enable nls locales) + $(use_with dbus) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + + # no static archives + find "${ED}" -name '*.la' -delete || die +} diff --git a/net-ftp/filezilla/filezilla-3.66.0.ebuild b/net-ftp/filezilla/filezilla-3.66.0.ebuild deleted file mode 100644 index 489c5e4ccac5..000000000000 --- a/net-ftp/filezilla/filezilla-3.66.0.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -WX_GTK_VER="3.2-gtk3" - -inherit autotools wxwidgets xdg - -MY_PV="${PV/_/-}" -MY_P="FileZilla_${MY_PV}" - -DESCRIPTION="FTP client with lots of useful features and an intuitive interface" -HOMEPAGE="https://filezilla-project.org/" -SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.xz" -S="${WORKDIR}/${PN}-${MY_PV}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86" -IUSE="dbus nls test" -RESTRICT="!test? ( test )" - -# pugixml 1.7 minimal dependency is for c++11 proper configuration -RDEPEND=" - >=dev-libs/nettle-3.1:= - >=dev-db/sqlite-3.7 - >=dev-libs/boost-1.76.0:= - >=dev-libs/libfilezilla-0.45.0:= - >=dev-libs/pugixml-1.7 - >=net-libs/gnutls-3.5.7 - x11-libs/wxGTK:${WX_GTK_VER}[X] - x11-misc/xdg-utils - dbus? ( sys-apps/dbus )" -DEPEND="${RDEPEND} - test? ( >=dev-util/cppunit-1.13.0 )" -BDEPEND=" - virtual/pkgconfig - >=sys-devel/libtool-1.4 - nls? ( >=sys-devel/gettext-0.11 )" - -PATCHES=( - "${FILESDIR}"/${PN}-3.22.1-debug.patch - "${FILESDIR}"/${PN}-3.47.0-metainfo.patch - "${FILESDIR}"/${PN}-3.47.0-disable-shellext_conf.patch - "${FILESDIR}"/${PN}-3.52.2-slibtool.patch - "${FILESDIR}"/${PN}-3.60.1-desktop.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - setup-wxwidgets - - local myeconfargs=( - --disable-autoupdatecheck - --with-pugixml=system - $(use_enable nls locales) - $(use_with dbus) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - # no static archives - find "${ED}" -name '*.la' -delete || die -} -- cgit v1.2.3-65-gdbad