mirror of
https://github.com/gentoo-mirror/guru.git
synced 2026-07-18 03:23:20 -04:00
Partial revert "net-libs/libuplink: add 1.10.1"
This partially reverts commit 69970b80ec.
Duplicates net-ftp/filezilla from ::gentoo. This is prohibited per point
11 of the regulations. So drop it. Leave libuplink there.
net-ftp/filezilla::gentoo can be build with EXTRA_ECONF="--enable-storj"
in package.env to enable storj support. A bug should be filed to add the
support (and net-libs/libuplink) to ::gentoo.
Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
This commit is contained in:
@@ -1 +0,0 @@
|
||||
DIST FileZilla_3.69.5_src.tar.xz 4167108 BLAKE2B dc3430a9c64720578f78b5bbcfb50775510660472ad98ab5fd1acd460742af7358a37cf029162df8ce395026c6052cb9526d50ed2611c9c01f89df115f63c32e SHA512 ef31535d8c1ca21c37577f30c2960c3cddec35a993d398460f105e2c8cfecb1c517cc092ce4042e4cde49b255afdeb245db1007d88a6bfdc8901afdde991db82
|
||||
@@ -1,12 +0,0 @@
|
||||
--- filezilla-3.22.1/configure.ac
|
||||
+++ filezilla-3.22.1/configure.ac
|
||||
@@ -36,9 +36,7 @@
|
||||
|
||||
if test "X$GCC" = Xyes; then
|
||||
AX_APPEND_FLAG(-Wall, CFLAGS)
|
||||
- AX_APPEND_FLAG(-g, CFLAGS)
|
||||
AX_APPEND_FLAG(-Wall, CXXFLAGS)
|
||||
- AX_APPEND_FLAG(-g, CXXFLAGS)
|
||||
fi
|
||||
|
||||
# Do this early: Compiler and linker flags to work around a nasty bug in Xcode.
|
||||
@@ -1,13 +0,0 @@
|
||||
diff -Naur filezilla-3.47.2.1.orig/configure.ac filezilla-3.47.2.1/configure.ac
|
||||
--- filezilla-3.47.2.1.orig/configure.ac 2020-03-11 12:24:12.000000000 +0100
|
||||
+++ filezilla-3.47.2.1/configure.ac 2020-05-09 16:09:23.832476049 +0200
|
||||
@@ -130,9 +130,6 @@
|
||||
"$ac_abs_confdir/src/fzshellext/configure" --prefix="$prefix" --exec-prefix="$exec_prefix" --host=i686-w64-mingw32 || exit 1
|
||||
cd "$OLD_DIR/src/fzshellext/64" || exit 1
|
||||
"$ac_abs_confdir/src/fzshellext/configure" --prefix="$prefix" --exec-prefix="$exec_prefix" --host=x86_64-w64-mingw32 || exit 1
|
||||
-else
|
||||
- cd "$OLD_DIR/src/fzshellext/64" || exit 1
|
||||
- "$ac_abs_confdir/src/fzshellext/configure" --disable-shellext || exit 1
|
||||
fi
|
||||
cd "$OLD_DIR"
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
--- filezilla-3.47.0/data/Makefile.am
|
||||
+++ filezilla-3.47.0/data/Makefile.am
|
||||
@@ -75,7 +75,7 @@
|
||||
desktopentrydir = $(datadir)/applications
|
||||
dist_desktopentry_DATA = filezilla.desktop
|
||||
|
||||
-appdatadir = $(datadir)/appdata
|
||||
+appdatadir = $(datadir)/metainfo
|
||||
dist_appdata_DATA = filezilla.appdata.xml
|
||||
|
||||
clean-local:
|
||||
@@ -1,24 +0,0 @@
|
||||
This fixes compilation with slibtool instead of GNU libtool
|
||||
|
||||
--- filezilla-3.52.2/src/engine/Makefile.am
|
||||
+++ filezilla-3.52.2/src/engine/Makefile.am
|
||||
@@ -146,6 +146,8 @@
|
||||
libfzclient_private_la_LDFLAGS += $(LIBFILEZILLA_LIBS)
|
||||
libfzclient_private_la_LDFLAGS += $(IDN_LIB)
|
||||
|
||||
+libfzclient_private_la_LIBADD = $(PUGIXML_LIBS)
|
||||
+
|
||||
dist_noinst_DATA = engine.vcxproj
|
||||
|
||||
CLEANFILES = filezilla.h.gch
|
||||
--- filezilla-3.52.2/src/interface/Makefile.am
|
||||
+++ filezilla-3.52.2/src/interface/Makefile.am
|
||||
@@ -309,7 +309,7 @@
|
||||
|
||||
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)
|
||||
@@ -1,7 +0,0 @@
|
||||
--- a/data/filezilla.desktop 2020-06-04 13:18:01.000000000 +0300
|
||||
+++ b/data/filezilla.desktop 2022-06-16 02:16:03.727229995 +0300
|
||||
@@ -14,3 +14,4 @@
|
||||
Type=Application
|
||||
Categories=Network;FileTransfer;
|
||||
Version=1.0
|
||||
+MimeType=x-scheme-handler/ftp;
|
||||
@@ -1,79 +0,0 @@
|
||||
# Copyright 1999-2025 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 ~arm64"
|
||||
IUSE="cpu_flags_x86_sse2 dbus nls storj 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.51.1:=
|
||||
>=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 )
|
||||
storj? ( net-libs/libuplink )"
|
||||
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
|
||||
)
|
||||
|
||||
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_enable storj)
|
||||
$(use_with dbus)
|
||||
)
|
||||
econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
# no static archives
|
||||
find "${ED}" -name '*.la' -delete || die
|
||||
}
|
||||
@@ -1,24 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>voyageur@gentoo.org</email>
|
||||
<name>Bernard Cafarelli</name>
|
||||
</maintainer>
|
||||
<maintainer type="person">
|
||||
<email>dlan@gentoo.org</email>
|
||||
<name>Yixun Lan</name>
|
||||
</maintainer>
|
||||
<maintainer type="person">
|
||||
<email>david-gentoo@reedfam.email</email>
|
||||
<name>David Reed</name>
|
||||
</maintainer>
|
||||
<use>
|
||||
<flag name="storj">
|
||||
Enable Storj decentralized cloud storage integration using libuplink.
|
||||
</flag>
|
||||
</use>
|
||||
<upstream>
|
||||
<remote-id type="sourceforge">filezilla</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
Reference in New Issue
Block a user