Merge updates from master

This commit is contained in:
Repository mirror & CI
2026-05-06 03:45:54 +00:00
8 changed files with 204 additions and 0 deletions

View File

@@ -1,3 +1,4 @@
DIST libfilezilla-0.54.0.tar.xz 568840 BLAKE2B fc1c8005bedf0417b091e7d43f159f0a19f6cb61ebbae02aa893d901a3ed9fb91635a5de84507a38a42e277e25c0566ac2ac7e44934f349102d0ae03d49393b1 SHA512 9c365946de1ae45b6ab17d0fbe271664ae84378383cbb7ea380fe46e300f1a2b6991781882c35d63308e0f5ceca941fd6d61f75124dd22cee51feb84d7fec3e5
DIST libfilezilla-0.54.1.tar.xz 569064 BLAKE2B 48ea93e8732c256d2b7579e2bcde424e7f5128b5d020c5ec1248f2f00d0196e1e9daf9c37a91f286fd7084c7174da67b92cd53a694cbfde5033fab38e9378ca4 SHA512 9f123cc74ad158fd2510fdd067fe6983feb01f787acc983d86d5d81065a9b042614a9c4cd7aecd9f77178482e0327f17623d2019d9269bceb33be887b0dc7d7f
DIST libfilezilla-0.55.2.tar.xz 569668 BLAKE2B 34d095b19d7cf620ea787f64fa2eb1a0bbff8f16110b0008e3d29bc1db668721e0afea3b0e4c314ef295f979905eb772db18e583c093ea643cf18750ea9a86d1 SHA512 01f46d2192f1aea18083fd033fb6d0db3405d9f6d59de056ff81779dea98c01b7c3e988ef4271d03694cd9cc760ad7d5209a6d2ade7c6c4952aad6b7cca9686e
DIST libfilezilla-0.55.5.tar.xz 570664 BLAKE2B 673fc5b452424b4be81b0f4c75e7c494d19665f1a55a1eef5bec7324f50ac3024523c3cf7116a3e93c466c1a5eacfe220fa035cc2e0979ba4bb7cd8b5258dcd7 SHA512 e5654757630ef6fae1b3fbef04b8fca7e3122585cf9274131af7e18127363b143ce91a277721da54ebf67245f31422e8351fe0c419f533360ff86c419c2473ea

View File

@@ -0,0 +1,64 @@
# Copyright 1999-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit autotools flag-o-matic
DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
HOMEPAGE="https://lib.filezilla-project.org/"
# Broken URL behind CDN
SRC_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}/${P}.tar.xz"
LICENSE="GPL-2+"
SLOT="0/57" # libfilezilla.so version
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
RDEPEND="
dev-libs/nettle:0=
>=net-libs/gnutls-3.5.7:=
virtual/libcrypt:=
"
DEPEND="${RDEPEND}
test? ( dev-util/cppunit )"
BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${PN}-0.37.1-pthread.patch
"${FILESDIR}"/${PN}-0.41.0-gcc13.patch
"${FILESDIR}"/${PN}-0.51.1-musl.patch
)
pkg_pretend() {
if [[ ${MERGE_TYPE} != binary ]]; then
if ! test-flag-CXX -std=c++14; then
eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
eerror "to gcc-4.9 or an equivalent version supporting C++14."
die "Currently active compiler does not support -std=c++14"
fi
fi
}
src_prepare() {
default
# we patch configure.ac
eautoreconf
}
src_configure() {
if use ppc || use arm || use hppa; then
# bug 727652
append-libs -latomic
fi
econf --disable-static
}
src_install() {
default
find "${ED}" -type f -name "*.la" -delete || die
}

View File

@@ -1,2 +1,3 @@
DIST FileZilla_3.69.5_src.tar.xz 4167108 BLAKE2B dc3430a9c64720578f78b5bbcfb50775510660472ad98ab5fd1acd460742af7358a37cf029162df8ce395026c6052cb9526d50ed2611c9c01f89df115f63c32e SHA512 ef31535d8c1ca21c37577f30c2960c3cddec35a993d398460f105e2c8cfecb1c517cc092ce4042e4cde49b255afdeb245db1007d88a6bfdc8901afdde991db82
DIST FileZilla_3.69.6_src.tar.xz 4166148 BLAKE2B 7e2c229f688879a773f7b45ce530eff00c2fcbac02941a6ee2ff71f1f9ca69a704efaa57a88c2c34548c21ef42427646c2bd6afa50750fea2033f1d9ccd5e6d7 SHA512 4986ac95aa510fa4e44584afecb46f352bdf1330a65d37df9919f5a620dc2f1e927a148b564eb93a4a7afdc553c46e0626e54edd6c9953b8a9f0853942426908
DIST FileZilla_3.70.4_src.tar.xz 3564240 BLAKE2B d4ef89ee55bd1f3e4605fc3e923a1d52ed76b59f78639f30f1e0d6343857db68188316033cf4d09cea8decdd713e396971d2b714ff3f36ec1dc16bbb4b928f09 SHA512 26f95f28fd0c8687ab35cea975d6994a9c61b3fed542ae406ce945b41db43db83858e8341968c44babebebcc9c6b98719e1b3f7671aca6060e087065b548147a

View File

@@ -0,0 +1,26 @@
diff --git a/src/engine/Makefile.am b/src/engine/Makefile.am
index 90671dd..72a95ad 100644
--- a/src/engine/Makefile.am
+++ b/src/engine/Makefile.am
@@ -156,6 +156,8 @@ if FZ_MAC
libfzclient_private_la_LDFLAGS += -framework CoreServices
endif
+libfzclient_private_la_LIBADD = $(PUGIXML_LIBS)
+
CLEANFILES = filezilla.h.gch
DISTCLEANFILES = ./$(DEPDIR)/filezilla.Po
diff --git a/src/interface/Makefile.am b/src/interface/Makefile.am
index 60937a8..438b099 100644
--- a/src/interface/Makefile.am
+++ b/src/interface/Makefile.am
@@ -310,7 +310,7 @@ filezilla_LDFLAGS += $(PUGIXML_LIBS)
if HAVE_DBUS
filezilla_DEPENDENCIES += ../dbus/libfzdbus.a
-filezilla_LDFLAGS += ../dbus/libfzdbus.a $(LIBDBUS_LIBS)
+filezilla_LDADD = ../dbus/libfzdbus.a $(LIBDBUS_LIBS)
endif
filezilla_LDFLAGS += $(WX_LIBS)

View File

@@ -0,0 +1,78 @@
# Copyright 1999-2026 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/"
# Broken URL behind CDN
SRC_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}/${MY_P}_src.tar.xz"
S="${WORKDIR}/${PN}-${MY_PV}"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64"
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.55.0:=
>=dev-libs/pugixml-1.7
>=net-libs/fzssh-1.1.9:=
>=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.70.4-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
}

1
net-libs/fzssh/Manifest Normal file
View File

@@ -0,0 +1 @@
DIST fzssh-1.2.1.tar.xz 111228 BLAKE2B 33034445739c8df1db0ce2499a8247b30cd540e5b9fb770e2cf45b2d1caafb58a442ec205e0a838b634385fcd8346d511db2964cd2a60f9213d05f01f122c74f SHA512 cf0483badc5cbdf0303fdc72647ea77e54937c1dd68bf997e1d8c7609d8424afb58649a21a94b319d51d60aaf03a755fd3ab95cf27543465360eaff1c95a8602

View File

@@ -0,0 +1,22 @@
# Copyright 2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit meson
DESCRIPTION="A SSH/SFTP library based on libfilezilla"
HOMEPAGE="https://fzssh.filezilla-project.org/"
SRC_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0/12" # libfzssh.so version
KEYWORDS="~amd64"
DEPEND="
>=dev-libs/libfilezilla-0.55.3
>=dev-libs/gmp-6.2
>=dev-libs/nettle-3.10
app-crypt/argon2
"
RDEPEND="${DEPEND}"
BDEPEND=""

View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>dlan@gentoo.org</email>
<name>Yixun Lan</name>
</maintainer>
<upstream>
<remote-id type="sourceforge">filezilla</remote-id>
</upstream>
</pkgmetadata>