Attachment #897385 for bug #927178

View | Details | Raw Unified | Return to bug 927178
Collapse All | Expand All




https://bugs.gentoo.org/927178#c3

No upstream bug link -- their trac was temporarily down so I had to send the
report in via email.

Revision exported from:

```
svn diff -c 11167 https://svn.filezilla-project.org/svn/FileZilla3
```

https://svn.filezilla-project.org/filezilla?view=revision&revision=11167


Index: trunk/src/engine/storj/delete.cpp
===================================================================
--- trunk/src/engine/storj/delete.cpp	(revision 11166)

# Copyright 1999-2024 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.47.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
	>=dev-build/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
	# backport patch for ODR
	"${FILESDIR}"/filezilla-3.67.0-odr.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
}
- 

Return to bug 927178

Line 0 Link Here

(-)a/net-ftp/filezilla/filezilla-3.66.5.ebuild (-2 / +20 lines)
		1	https://bugs.gentoo.org/927178#c3
		2
		3	No upstream bug link -- their trac was temporarily down so I had to send the
		4	report in via email.
		5
		6	Revision exported from:
		7
		8	```
		9	svn diff -c 11167 https://svn.filezilla-project.org/svn/FileZilla3
		10	```
		11
		12	https://svn.filezilla-project.org/filezilla?view=revision&revision=11167
		13
		14
		15	Index: trunk/src/engine/storj/delete.cpp
		16	===================================================================
		17	--- trunk/src/engine/storj/delete.cpp (revision 11166)
Lines 1-75 Link Here
1	# Copyright 1999-2024 Gentoo Authors	1	# Copyright 1999-2024 Gentoo Authors
2	# Distributed under the terms of the GNU General Public License v2	2	# Distributed under the terms of the GNU General Public License v2
3		3
4	EAPI=8	4	EAPI=8
5		5
6	WX_GTK_VER="3.2-gtk3"	6	WX_GTK_VER="3.2-gtk3"
7		7
8	inherit autotools flag-o-matic wxwidgets xdg	8	inherit autotools flag-o-matic wxwidgets xdg
9		9
10	MY_PV="${PV/_/-}"	10	MY_PV="${PV/_/-}"
11	MY_P="FileZilla_${MY_PV}"	11	MY_P="FileZilla_${MY_PV}"
12		12
13	DESCRIPTION="FTP client with lots of useful features and an intuitive interface"	13	DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
14	HOMEPAGE="https://filezilla-project.org/"	14	HOMEPAGE="https://filezilla-project.org/"
15	SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.xz"	15	SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.xz"
16	S="${WORKDIR}/${PN}-${MY_PV}"	16	S="${WORKDIR}/${PN}-${MY_PV}"
17		17
18	LICENSE="GPL-2"	18	LICENSE="GPL-2"
19	SLOT="0"	19	SLOT="0"
20	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"	20	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
21	IUSE="cpu_flags_x86_sse2 dbus nls test"	21	IUSE="cpu_flags_x86_sse2 dbus nls test"
22	RESTRICT="!test? ( test )"	22	RESTRICT="!test? ( test )"
23		23
24	# pugixml 1.7 minimal dependency is for c++11 proper configuration	24	# pugixml 1.7 minimal dependency is for c++11 proper configuration
25	RDEPEND="	25	RDEPEND="
26	>=dev-libs/nettle-3.1:=	26	>=dev-libs/nettle-3.1:=
27	>=dev-db/sqlite-3.7	27	>=dev-db/sqlite-3.7
28	>=dev-libs/boost-1.76.0:=	28	>=dev-libs/boost-1.76.0:=
29	>=dev-libs/libfilezilla-0.46.0:=	29	>=dev-libs/libfilezilla-0.47.0:=
30	>=dev-libs/pugixml-1.7	30	>=dev-libs/pugixml-1.7
31	>=net-libs/gnutls-3.5.7	31	>=net-libs/gnutls-3.5.7
32	x11-libs/wxGTK:${WX_GTK_VER}[X]	32	x11-libs/wxGTK:${WX_GTK_VER}[X]
33	x11-misc/xdg-utils	33	x11-misc/xdg-utils
34	dbus? ( sys-apps/dbus )"	34	dbus? ( sys-apps/dbus )"
35	DEPEND="${RDEPEND}	35	DEPEND="${RDEPEND}
36	test? ( >=dev-util/cppunit-1.13.0 )"	36	test? ( >=dev-util/cppunit-1.13.0 )"
37	BDEPEND="	37	BDEPEND="
38	virtual/pkgconfig	38	virtual/pkgconfig
39	>=dev-build/libtool-1.4	39	>=dev-build/libtool-1.4
40	nls? ( >=sys-devel/gettext-0.11 )"	40	nls? ( >=sys-devel/gettext-0.11 )"
41		41
42	PATCHES=(	42	PATCHES=(
43	"${FILESDIR}"/${PN}-3.22.1-debug.patch	43	"${FILESDIR}"/${PN}-3.22.1-debug.patch
44	"${FILESDIR}"/${PN}-3.47.0-metainfo.patch	44	"${FILESDIR}"/${PN}-3.47.0-metainfo.patch
45	"${FILESDIR}"/${PN}-3.47.0-disable-shellext_conf.patch	45	"${FILESDIR}"/${PN}-3.47.0-disable-shellext_conf.patch
46	"${FILESDIR}"/${PN}-3.52.2-slibtool.patch	46	"${FILESDIR}"/${PN}-3.52.2-slibtool.patch
47	"${FILESDIR}"/${PN}-3.60.1-desktop.patch	47	"${FILESDIR}"/${PN}-3.60.1-desktop.patch
		48	# backport patch for ODR
		49	"${FILESDIR}"/filezilla-3.67.0-odr.patch
48	)	50	)
49		51
50	src_prepare() {	52	src_prepare() {
51	default	53	default
52	eautoreconf	54	eautoreconf
53	}	55	}
54		56
55	src_configure() {	57	src_configure() {
56	if use x86 && ! use cpu_flags_x86_sse2; then	58	if use x86 && ! use cpu_flags_x86_sse2; then
57	append-cppflags -D_FORCE_SOFTWARE_SHA	59	append-cppflags -D_FORCE_SOFTWARE_SHA
58	fi	60	fi
59	setup-wxwidgets	61	setup-wxwidgets
60		62
61	local myeconfargs=(	63	local myeconfargs=(
62	--disable-autoupdatecheck	64	--disable-autoupdatecheck
63	--with-pugixml=system	65	--with-pugixml=system
64	$(use_enable nls locales)	66	$(use_enable nls locales)
65	$(use_with dbus)	67	$(use_with dbus)
66	)	68	)
67	econf "${myeconfargs[@]}"	69	econf "${myeconfargs[@]}"
68	}	70	}
69		71
70	src_install() {	72	src_install() {
71	default	73	default
72		74
73	# no static archives	75	# no static archives
74	find "${ED}" -name '*.la' -delete \|\| die	76	find "${ED}" -name '*.la' -delete \|\| die
75	}	77	}
76	-