* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libfilezilla/files/, dev-libs/libfilezilla/
@ 2017-09-17 10:24 Sergei Trofimovich
0 siblings, 0 replies; 5+ messages in thread
From: Sergei Trofimovich @ 2017-09-17 10:24 UTC (permalink / raw
To: gentoo-commits
commit: 032c84c9d3b226b882e5f4f13552754fe8e38804
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 17 10:22:37 2017 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Sep 17 10:24:10 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=032c84c9
dev-libs/libfilezilla: backported pkg-config cppunit detection, bug #630094
libfilezilla-0.9.2/m4/cppunit.m4 relies on cppunit-config tool presence.
In 1.14.0 cppunit-config was removed and the only way to setup cppunit
environment is to use pkg-config.
Upstream fixed it in revision 8441. I've applied extracted patch as-is:
svn diff -r 8440:8441
And not tests link and pass fine against both cppunit 1.13 and 1.14
Reported-by: Toralf Förster
Closes: https://bugs.gentoo.org/630094
Package-Manager: Portage-2.3.8, Repoman-2.3.3
.../libfilezilla-0.9.2-cppunit-pkgconfig.patch | 428 +++++++++++++++++++++
dev-libs/libfilezilla/libfilezilla-0.9.2.ebuild | 11 +-
2 files changed, 438 insertions(+), 1 deletion(-)
diff --git a/dev-libs/libfilezilla/files/libfilezilla-0.9.2-cppunit-pkgconfig.patch b/dev-libs/libfilezilla/files/libfilezilla-0.9.2-cppunit-pkgconfig.patch
new file mode 100644
index 00000000000..7c33fdbbe4a
--- /dev/null
+++ b/dev-libs/libfilezilla/files/libfilezilla-0.9.2-cppunit-pkgconfig.patch
@@ -0,0 +1,428 @@
+https://bugs.gentoo.org/630094
+Extrtacted as:
+ svn diff -r 8440:8441
+
+Index: m4/cppunit.m4
+===================================================================
+--- a/m4/cppunit.m4 (revision 8440)
++++ b/m4/cppunit.m4 (nonexistent)
+@@ -1,89 +0,0 @@
+-dnl
+-dnl AM_PATH_CPPUNIT(MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+-dnl
+-AC_DEFUN([AM_PATH_CPPUNIT],
+-[
+-
+-AC_ARG_WITH(cppunit-prefix,[ --with-cppunit-prefix=PFX Prefix where CppUnit is installed (optional)],
+- cppunit_config_prefix="$withval", cppunit_config_prefix="")
+-AC_ARG_WITH(cppunit-exec-prefix,[ --with-cppunit-exec-prefix=PFX Exec prefix where CppUnit is installed (optional)],
+- cppunit_config_exec_prefix="$withval", cppunit_config_exec_prefix="")
+-
+- if test x$cppunit_config_exec_prefix != x ; then
+- cppunit_config_args="$cppunit_config_args --exec-prefix=$cppunit_config_exec_prefix"
+- if test x${CPPUNIT_CONFIG+set} != xset ; then
+- CPPUNIT_CONFIG=$cppunit_config_exec_prefix/bin/cppunit-config
+- fi
+- fi
+- if test x$cppunit_config_prefix != x ; then
+- cppunit_config_args="$cppunit_config_args --prefix=$cppunit_config_prefix"
+- if test x${CPPUNIT_CONFIG+set} != xset ; then
+- CPPUNIT_CONFIG=$cppunit_config_prefix/bin/cppunit-config
+- fi
+- fi
+-
+- AC_PATH_PROG(CPPUNIT_CONFIG, cppunit-config, no)
+- cppunit_version_min=$1
+-
+- AC_MSG_CHECKING(for Cppunit - version >= $cppunit_version_min)
+- no_cppunit=""
+- if test "$CPPUNIT_CONFIG" = "no" ; then
+- AC_MSG_RESULT(no)
+- no_cppunit=yes
+- else
+- CPPUNIT_CFLAGS=`$CPPUNIT_CONFIG --cflags`
+- CPPUNIT_LIBS=`$CPPUNIT_CONFIG --libs`
+- cppunit_version=`$CPPUNIT_CONFIG --version`
+-
+- cppunit_major_version=`echo $cppunit_version | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+- cppunit_minor_version=`echo $cppunit_version | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+- cppunit_micro_version=`echo $cppunit_version | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+-
+- cppunit_major_min=`echo $cppunit_version_min | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+- if test "x${cppunit_major_min}" = "x" ; then
+- cppunit_major_min=0
+- fi
+-
+- cppunit_minor_min=`echo $cppunit_version_min | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+- if test "x${cppunit_minor_min}" = "x" ; then
+- cppunit_minor_min=0
+- fi
+-
+- cppunit_micro_min=`echo $cppunit_version_min | \
+- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+- if test "x${cppunit_micro_min}" = "x" ; then
+- cppunit_micro_min=0
+- fi
+-
+- cppunit_version_proper=`expr \
+- $cppunit_major_version \> $cppunit_major_min \| \
+- $cppunit_major_version \= $cppunit_major_min \& \
+- $cppunit_minor_version \> $cppunit_minor_min \| \
+- $cppunit_major_version \= $cppunit_major_min \& \
+- $cppunit_minor_version \= $cppunit_minor_min \& \
+- $cppunit_micro_version \>= $cppunit_micro_min `
+-
+- if test "$cppunit_version_proper" = "1" ; then
+- AC_MSG_RESULT([$cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version])
+- else
+- AC_MSG_RESULT(no)
+- no_cppunit=yes
+- fi
+- fi
+-
+- if test "x$no_cppunit" = x ; then
+- ifelse([$2], , :, [$2])
+- else
+- CPPUNIT_CFLAGS=""
+- CPPUNIT_LIBS=""
+- ifelse([$3], , :, [$3])
+- fi
+-
+- AC_SUBST(CPPUNIT_CFLAGS)
+- AC_SUBST(CPPUNIT_LIBS)
+-])
+
+Property changes on: m4/cppunit.m4
+___________________________________________________________________
+Deleted: svn:eol-style
+## -1 +0,0 ##
+-native
+\ No newline at end of property
+Index: m4/pkg.m4
+===================================================================
+--- a/m4/pkg.m4 (nonexistent)
++++ b/m4/pkg.m4 (revision 8441)
+@@ -0,0 +1,275 @@
++# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
++# serial 12 (pkg-config-0.29.2)
++
++dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
++dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
++dnl
++dnl This program is free software; you can redistribute it and/or modify
++dnl it under the terms of the GNU General Public License as published by
++dnl the Free Software Foundation; either version 2 of the License, or
++dnl (at your option) any later version.
++dnl
++dnl This program is distributed in the hope that it will be useful, but
++dnl WITHOUT ANY WARRANTY; without even the implied warranty of
++dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++dnl General Public License for more details.
++dnl
++dnl You should have received a copy of the GNU General Public License
++dnl along with this program; if not, write to the Free Software
++dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++dnl 02111-1307, USA.
++dnl
++dnl As a special exception to the GNU General Public License, if you
++dnl distribute this file as part of a program that contains a
++dnl configuration script generated by Autoconf, you may include it under
++dnl the same distribution terms that you use for the rest of that
++dnl program.
++
++dnl PKG_PREREQ(MIN-VERSION)
++dnl -----------------------
++dnl Since: 0.29
++dnl
++dnl Verify that the version of the pkg-config macros are at least
++dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
++dnl installed version of pkg-config, this checks the developer's version
++dnl of pkg.m4 when generating configure.
++dnl
++dnl To ensure that this macro is defined, also add:
++dnl m4_ifndef([PKG_PREREQ],
++dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
++dnl
++dnl See the "Since" comment for each macro you use to see what version
++dnl of the macros you require.
++m4_defun([PKG_PREREQ],
++[m4_define([PKG_MACROS_VERSION], [0.29.2])
++m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
++ [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
++])dnl PKG_PREREQ
++
++dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
++dnl ----------------------------------
++dnl Since: 0.16
++dnl
++dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
++dnl first found in the path. Checks that the version of pkg-config found
++dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
++dnl used since that's the first version where most current features of
++dnl pkg-config existed.
++AC_DEFUN([PKG_PROG_PKG_CONFIG],
++[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
++m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
++m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
++AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
++AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
++
++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
++ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
++fi
++if test -n "$PKG_CONFIG"; then
++ _pkg_min_version=m4_default([$1], [0.9.0])
++ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
++ AC_MSG_RESULT([yes])
++ else
++ AC_MSG_RESULT([no])
++ PKG_CONFIG=""
++ fi
++fi[]dnl
++])dnl PKG_PROG_PKG_CONFIG
++
++dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
++dnl -------------------------------------------------------------------
++dnl Since: 0.18
++dnl
++dnl Check to see whether a particular set of modules exists. Similar to
++dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
++dnl
++dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
++dnl only at the first occurence in configure.ac, so if the first place
++dnl it's called might be skipped (such as if it is within an "if", you
++dnl have to call PKG_CHECK_EXISTS manually
++AC_DEFUN([PKG_CHECK_EXISTS],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
++if test -n "$PKG_CONFIG" && \
++ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
++ m4_default([$2], [:])
++m4_ifvaln([$3], [else
++ $3])dnl
++fi])
++
++dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
++dnl ---------------------------------------------
++dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
++dnl pkg_failed based on the result.
++m4_define([_PKG_CONFIG],
++[if test -n "$$1"; then
++ pkg_cv_[]$1="$$1"
++ elif test -n "$PKG_CONFIG"; then
++ PKG_CHECK_EXISTS([$3],
++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes ],
++ [pkg_failed=yes])
++ else
++ pkg_failed=untried
++fi[]dnl
++])dnl _PKG_CONFIG
++
++dnl _PKG_SHORT_ERRORS_SUPPORTED
++dnl ---------------------------
++dnl Internal check to see if pkg-config supports short errors.
++AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi[]dnl
++])dnl _PKG_SHORT_ERRORS_SUPPORTED
++
++
++dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
++dnl [ACTION-IF-NOT-FOUND])
++dnl --------------------------------------------------------------
++dnl Since: 0.4.0
++dnl
++dnl Note that if there is a possibility the first call to
++dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
++dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
++AC_DEFUN([PKG_CHECK_MODULES],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
++AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
++AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
++
++pkg_failed=no
++AC_MSG_CHECKING([for $2])
++
++_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
++_PKG_CONFIG([$1][_LIBS], [libs], [$2])
++
++m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
++and $1[]_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.])
++
++if test $pkg_failed = yes; then
++ AC_MSG_RESULT([no])
++ _PKG_SHORT_ERRORS_SUPPORTED
++ if test $_pkg_short_errors_supported = yes; then
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
++ else
++ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
++
++ m4_default([$4], [AC_MSG_ERROR(
++[Package requirements ($2) were not met:
++
++$$1_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++_PKG_TEXT])[]dnl
++ ])
++elif test $pkg_failed = untried; then
++ AC_MSG_RESULT([no])
++ m4_default([$4], [AC_MSG_FAILURE(
++[The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++_PKG_TEXT
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
++ ])
++else
++ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
++ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
++ AC_MSG_RESULT([yes])
++ $3
++fi[]dnl
++])dnl PKG_CHECK_MODULES
++
++
++dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
++dnl [ACTION-IF-NOT-FOUND])
++dnl ---------------------------------------------------------------------
++dnl Since: 0.29
++dnl
++dnl Checks for existence of MODULES and gathers its build flags with
++dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
++dnl and VARIABLE-PREFIX_LIBS from --libs.
++dnl
++dnl Note that if there is a possibility the first call to
++dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
++dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
++dnl configure.ac.
++AC_DEFUN([PKG_CHECK_MODULES_STATIC],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
++_save_PKG_CONFIG=$PKG_CONFIG
++PKG_CONFIG="$PKG_CONFIG --static"
++PKG_CHECK_MODULES($@)
++PKG_CONFIG=$_save_PKG_CONFIG[]dnl
++])dnl PKG_CHECK_MODULES_STATIC
++
++
++dnl PKG_INSTALLDIR([DIRECTORY])
++dnl -------------------------
++dnl Since: 0.27
++dnl
++dnl Substitutes the variable pkgconfigdir as the location where a module
++dnl should install pkg-config .pc files. By default the directory is
++dnl $libdir/pkgconfig, but the default can be changed by passing
++dnl DIRECTORY. The user can override through the --with-pkgconfigdir
++dnl parameter.
++AC_DEFUN([PKG_INSTALLDIR],
++[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
++m4_pushdef([pkg_description],
++ [pkg-config installation directory @<:@]pkg_default[@:>@])
++AC_ARG_WITH([pkgconfigdir],
++ [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
++ [with_pkgconfigdir=]pkg_default)
++AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
++m4_popdef([pkg_default])
++m4_popdef([pkg_description])
++])dnl PKG_INSTALLDIR
++
++
++dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
++dnl --------------------------------
++dnl Since: 0.27
++dnl
++dnl Substitutes the variable noarch_pkgconfigdir as the location where a
++dnl module should install arch-independent pkg-config .pc files. By
++dnl default the directory is $datadir/pkgconfig, but the default can be
++dnl changed by passing DIRECTORY. The user can override through the
++dnl --with-noarch-pkgconfigdir parameter.
++AC_DEFUN([PKG_NOARCH_INSTALLDIR],
++[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
++m4_pushdef([pkg_description],
++ [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
++AC_ARG_WITH([noarch-pkgconfigdir],
++ [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
++ [with_noarch_pkgconfigdir=]pkg_default)
++AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
++m4_popdef([pkg_default])
++m4_popdef([pkg_description])
++])dnl PKG_NOARCH_INSTALLDIR
++
++
++dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
++dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
++dnl -------------------------------------------
++dnl Since: 0.28
++dnl
++dnl Retrieves the value of the pkg-config variable for the given module.
++AC_DEFUN([PKG_CHECK_VAR],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
++AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
++
++_PKG_CONFIG([$1], [variable="][$3]["], [$2])
++AS_VAR_COPY([$1], [pkg_cv_][$1])
++
++AS_VAR_IF([$1], [""], [$5], [$4])dnl
++])dnl PKG_CHECK_VAR
+
+Property changes on: m4/pkg.m4
+___________________________________________________________________
+Added: svn:eol-style
+## -0,0 +1 ##
++native
+\ No newline at end of property
+Index: configure.ac
+===================================================================
+--- a/configure.ac (revision 8440)
++++ b/configure.ac (revision 8441)
+@@ -178,13 +178,21 @@
+ fi
+ fi
+
++# Require pkg-config
++# ------------------
++PKG_PROG_PKG_CONFIG
+
++# Do not abort while not having runtime dependency
++#if test -z "$PKG_CONFIG"; then
++# AC_MSG_ERROR([pkg-config not found. pkg-config is required to check for some dependencies.])
++#fi
++
++
+ # CppUnit tests
+ # -------------
+
+-AM_PATH_CPPUNIT([1.10.2], [has_cppunit="yes"])
++PKG_CHECK_MODULES(CPPUNIT, [cppunit >= 1.13.0], [has_cppunit=yes],[:])
+
+-
+ # Doxygen
+ # -------
+
+@@ -195,7 +203,6 @@
+ # ----------------------------
+
+ AM_CONDITIONAL(USE_RESOURCEFILE, test "$use_resourcefile" = "true")
+-AM_CONDITIONAL(HAS_CPPUNIT, [test "$has_cppunit" = "yes"])
+
+ AC_CONFIG_FILES(
+ Makefile
diff --git a/dev-libs/libfilezilla/libfilezilla-0.9.2.ebuild b/dev-libs/libfilezilla/libfilezilla-0.9.2.ebuild
index 221991c1845..902b8f0163b 100644
--- a/dev-libs/libfilezilla/libfilezilla-0.9.2.ebuild
+++ b/dev-libs/libfilezilla/libfilezilla-0.9.2.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit flag-o-matic
+inherit autotools flag-o-matic
DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
HOMEPAGE="https://lib.filezilla-project.org/"
@@ -18,6 +18,8 @@ RDEPEND=""
DEPEND="${RDEPEND}
test? ( dev-util/cppunit )"
+PATCHES=("${FILESDIR}"/${PN}-0.9.2-cppunit-pkgconfig.patch)
+
pkg_pretend() {
if [[ ${MERGE_TYPE} != binary ]]; then
if ! test-flag-CXX -std=c++14; then
@@ -28,3 +30,10 @@ pkg_pretend() {
fi
fi
}
+
+src_prepare() {
+ default
+
+ # cppunit patch changes .m4
+ eautoreconf
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libfilezilla/files/, dev-libs/libfilezilla/
@ 2018-08-10 22:53 Bernard Cafarelli
0 siblings, 0 replies; 5+ messages in thread
From: Bernard Cafarelli @ 2018-08-10 22:53 UTC (permalink / raw
To: gentoo-commits
commit: 6eac248b7a27d1f00166fe2841fcd3e3c71250a7
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 10 22:52:47 2018 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Fri Aug 10 22:52:47 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6eac248b
dev-libs/libfilezilla: drop old
Package-Manager: Portage-2.3.45, Repoman-2.3.10
dev-libs/libfilezilla/Manifest | 3 -
.../libfilezilla-0.9.2-cppunit-pkgconfig.patch | 428 ---------------------
dev-libs/libfilezilla/libfilezilla-0.11.2.ebuild | 30 --
dev-libs/libfilezilla/libfilezilla-0.9.1.ebuild | 30 --
dev-libs/libfilezilla/libfilezilla-0.9.2.ebuild | 39 --
5 files changed, 530 deletions(-)
diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index 74fe7bdae59..fe91e3d13c7 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -1,5 +1,2 @@
-DIST libfilezilla-0.11.2.tar.bz2 396032 BLAKE2B 68285a458c026ead9d0ab413e0638a45a451fd34d3284ff205d33e878f8c5e43fd4b3c92a5742d539383cbe0738c7e8d783c7523362ab744e9fc4d01d71dc932 SHA512 a2242fd67a054d47a938011c07a074f7e6d4a8fd7352b88411db1302d24a908a7b39ea76cd38cfe63765eb522476da4ccc22164884f9563e263a9e0895e7217f
DIST libfilezilla-0.12.3.tar.bz2 398275 BLAKE2B 0ba30e64b6aeae0bed58913248992b7152b389fc560291174388196a02a583dcbc485c9fb9680e0541e788c2d6691a6050f465e8719c2c3e7974eb5fd293bf8a SHA512 a08343a418b4147b42d38afd04c66a26c405770109818b48a291c127a5fde6c98515b716990fb056b319c3be859f44060d4ee83e96ec5c4bfa40c755ddc01bba
DIST libfilezilla-0.13.0.tar.bz2 398773 BLAKE2B e25f15bc4ec6a5aff119352535721f44bad3020342dd15e471cd228b6b2a6db221a4a099a4884c3a6215074547ced186f23fc243e066b04afdfaa5f54f245c0f SHA512 cb7950febf72a6d13f3ec3961d32ac281e8437e881155f9fb26820d6deb2a1d59ed5a18c08cb59a75d9527a8a9fda2f502a96dda4045f361dcbae522c1e1b26f
-DIST libfilezilla-0.9.1.tar.bz2 383315 BLAKE2B 0cade4316662d64b9a0eb6abd586355236bc2c3d73f3d2ad84fe857a25e593027bbb090f57c8656b8c06ae40d126d93b8310fb0642e2e73d3cace7e560c86837 SHA512 bbcd826675e9c3e2f8cf1cea4da01434a66359ae816efdc5c981fbfebde0b73ce44a6d37546196fc00cb118d9b4d7772b73e30f8d5a78294f97b9899e9ba3393
-DIST libfilezilla-0.9.2.tar.bz2 383522 BLAKE2B e70d23a67a8c365d06692dc27cf76543db75200ebb808e9ad91be95dafb8df2c7603c23e249405b056b7c44bffc527fd84d5a4052e704db63135fb93876d916f SHA512 f825d116e252786801115189f9966ba7ab8663863d921cce530569a172ab33dbc31234d6286b0b3e6edc19ec0a5ba009788382ec5d5359f97a9cb10f30715f88
diff --git a/dev-libs/libfilezilla/files/libfilezilla-0.9.2-cppunit-pkgconfig.patch b/dev-libs/libfilezilla/files/libfilezilla-0.9.2-cppunit-pkgconfig.patch
deleted file mode 100644
index 7c33fdbbe4a..00000000000
--- a/dev-libs/libfilezilla/files/libfilezilla-0.9.2-cppunit-pkgconfig.patch
+++ /dev/null
@@ -1,428 +0,0 @@
-https://bugs.gentoo.org/630094
-Extrtacted as:
- svn diff -r 8440:8441
-
-Index: m4/cppunit.m4
-===================================================================
---- a/m4/cppunit.m4 (revision 8440)
-+++ b/m4/cppunit.m4 (nonexistent)
-@@ -1,89 +0,0 @@
--dnl
--dnl AM_PATH_CPPUNIT(MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
--dnl
--AC_DEFUN([AM_PATH_CPPUNIT],
--[
--
--AC_ARG_WITH(cppunit-prefix,[ --with-cppunit-prefix=PFX Prefix where CppUnit is installed (optional)],
-- cppunit_config_prefix="$withval", cppunit_config_prefix="")
--AC_ARG_WITH(cppunit-exec-prefix,[ --with-cppunit-exec-prefix=PFX Exec prefix where CppUnit is installed (optional)],
-- cppunit_config_exec_prefix="$withval", cppunit_config_exec_prefix="")
--
-- if test x$cppunit_config_exec_prefix != x ; then
-- cppunit_config_args="$cppunit_config_args --exec-prefix=$cppunit_config_exec_prefix"
-- if test x${CPPUNIT_CONFIG+set} != xset ; then
-- CPPUNIT_CONFIG=$cppunit_config_exec_prefix/bin/cppunit-config
-- fi
-- fi
-- if test x$cppunit_config_prefix != x ; then
-- cppunit_config_args="$cppunit_config_args --prefix=$cppunit_config_prefix"
-- if test x${CPPUNIT_CONFIG+set} != xset ; then
-- CPPUNIT_CONFIG=$cppunit_config_prefix/bin/cppunit-config
-- fi
-- fi
--
-- AC_PATH_PROG(CPPUNIT_CONFIG, cppunit-config, no)
-- cppunit_version_min=$1
--
-- AC_MSG_CHECKING(for Cppunit - version >= $cppunit_version_min)
-- no_cppunit=""
-- if test "$CPPUNIT_CONFIG" = "no" ; then
-- AC_MSG_RESULT(no)
-- no_cppunit=yes
-- else
-- CPPUNIT_CFLAGS=`$CPPUNIT_CONFIG --cflags`
-- CPPUNIT_LIBS=`$CPPUNIT_CONFIG --libs`
-- cppunit_version=`$CPPUNIT_CONFIG --version`
--
-- cppunit_major_version=`echo $cppunit_version | \
-- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-- cppunit_minor_version=`echo $cppunit_version | \
-- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-- cppunit_micro_version=`echo $cppunit_version | \
-- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
--
-- cppunit_major_min=`echo $cppunit_version_min | \
-- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-- if test "x${cppunit_major_min}" = "x" ; then
-- cppunit_major_min=0
-- fi
--
-- cppunit_minor_min=`echo $cppunit_version_min | \
-- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-- if test "x${cppunit_minor_min}" = "x" ; then
-- cppunit_minor_min=0
-- fi
--
-- cppunit_micro_min=`echo $cppunit_version_min | \
-- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-- if test "x${cppunit_micro_min}" = "x" ; then
-- cppunit_micro_min=0
-- fi
--
-- cppunit_version_proper=`expr \
-- $cppunit_major_version \> $cppunit_major_min \| \
-- $cppunit_major_version \= $cppunit_major_min \& \
-- $cppunit_minor_version \> $cppunit_minor_min \| \
-- $cppunit_major_version \= $cppunit_major_min \& \
-- $cppunit_minor_version \= $cppunit_minor_min \& \
-- $cppunit_micro_version \>= $cppunit_micro_min `
--
-- if test "$cppunit_version_proper" = "1" ; then
-- AC_MSG_RESULT([$cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version])
-- else
-- AC_MSG_RESULT(no)
-- no_cppunit=yes
-- fi
-- fi
--
-- if test "x$no_cppunit" = x ; then
-- ifelse([$2], , :, [$2])
-- else
-- CPPUNIT_CFLAGS=""
-- CPPUNIT_LIBS=""
-- ifelse([$3], , :, [$3])
-- fi
--
-- AC_SUBST(CPPUNIT_CFLAGS)
-- AC_SUBST(CPPUNIT_LIBS)
--])
-
-Property changes on: m4/cppunit.m4
-___________________________________________________________________
-Deleted: svn:eol-style
-## -1 +0,0 ##
--native
-\ No newline at end of property
-Index: m4/pkg.m4
-===================================================================
---- a/m4/pkg.m4 (nonexistent)
-+++ b/m4/pkg.m4 (revision 8441)
-@@ -0,0 +1,275 @@
-+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-+# serial 12 (pkg-config-0.29.2)
-+
-+dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-+dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
-+dnl
-+dnl This program is free software; you can redistribute it and/or modify
-+dnl it under the terms of the GNU General Public License as published by
-+dnl the Free Software Foundation; either version 2 of the License, or
-+dnl (at your option) any later version.
-+dnl
-+dnl This program is distributed in the hope that it will be useful, but
-+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
-+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+dnl General Public License for more details.
-+dnl
-+dnl You should have received a copy of the GNU General Public License
-+dnl along with this program; if not, write to the Free Software
-+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+dnl 02111-1307, USA.
-+dnl
-+dnl As a special exception to the GNU General Public License, if you
-+dnl distribute this file as part of a program that contains a
-+dnl configuration script generated by Autoconf, you may include it under
-+dnl the same distribution terms that you use for the rest of that
-+dnl program.
-+
-+dnl PKG_PREREQ(MIN-VERSION)
-+dnl -----------------------
-+dnl Since: 0.29
-+dnl
-+dnl Verify that the version of the pkg-config macros are at least
-+dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
-+dnl installed version of pkg-config, this checks the developer's version
-+dnl of pkg.m4 when generating configure.
-+dnl
-+dnl To ensure that this macro is defined, also add:
-+dnl m4_ifndef([PKG_PREREQ],
-+dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
-+dnl
-+dnl See the "Since" comment for each macro you use to see what version
-+dnl of the macros you require.
-+m4_defun([PKG_PREREQ],
-+[m4_define([PKG_MACROS_VERSION], [0.29.2])
-+m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
-+ [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
-+])dnl PKG_PREREQ
-+
-+dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
-+dnl ----------------------------------
-+dnl Since: 0.16
-+dnl
-+dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
-+dnl first found in the path. Checks that the version of pkg-config found
-+dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
-+dnl used since that's the first version where most current features of
-+dnl pkg-config existed.
-+AC_DEFUN([PKG_PROG_PKG_CONFIG],
-+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
-+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
-+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
-+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
-+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
-+
-+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-+fi
-+if test -n "$PKG_CONFIG"; then
-+ _pkg_min_version=m4_default([$1], [0.9.0])
-+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-+ AC_MSG_RESULT([yes])
-+ else
-+ AC_MSG_RESULT([no])
-+ PKG_CONFIG=""
-+ fi
-+fi[]dnl
-+])dnl PKG_PROG_PKG_CONFIG
-+
-+dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-+dnl -------------------------------------------------------------------
-+dnl Since: 0.18
-+dnl
-+dnl Check to see whether a particular set of modules exists. Similar to
-+dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
-+dnl
-+dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-+dnl only at the first occurence in configure.ac, so if the first place
-+dnl it's called might be skipped (such as if it is within an "if", you
-+dnl have to call PKG_CHECK_EXISTS manually
-+AC_DEFUN([PKG_CHECK_EXISTS],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+if test -n "$PKG_CONFIG" && \
-+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-+ m4_default([$2], [:])
-+m4_ifvaln([$3], [else
-+ $3])dnl
-+fi])
-+
-+dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-+dnl ---------------------------------------------
-+dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
-+dnl pkg_failed based on the result.
-+m4_define([_PKG_CONFIG],
-+[if test -n "$$1"; then
-+ pkg_cv_[]$1="$$1"
-+ elif test -n "$PKG_CONFIG"; then
-+ PKG_CHECK_EXISTS([$3],
-+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
-+ test "x$?" != "x0" && pkg_failed=yes ],
-+ [pkg_failed=yes])
-+ else
-+ pkg_failed=untried
-+fi[]dnl
-+])dnl _PKG_CONFIG
-+
-+dnl _PKG_SHORT_ERRORS_SUPPORTED
-+dnl ---------------------------
-+dnl Internal check to see if pkg-config supports short errors.
-+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi[]dnl
-+])dnl _PKG_SHORT_ERRORS_SUPPORTED
-+
-+
-+dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-+dnl [ACTION-IF-NOT-FOUND])
-+dnl --------------------------------------------------------------
-+dnl Since: 0.4.0
-+dnl
-+dnl Note that if there is a possibility the first call to
-+dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
-+dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-+AC_DEFUN([PKG_CHECK_MODULES],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-+
-+pkg_failed=no
-+AC_MSG_CHECKING([for $2])
-+
-+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-+
-+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-+and $1[]_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.])
-+
-+if test $pkg_failed = yes; then
-+ AC_MSG_RESULT([no])
-+ _PKG_SHORT_ERRORS_SUPPORTED
-+ if test $_pkg_short_errors_supported = yes; then
-+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
-+ else
-+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-+
-+ m4_default([$4], [AC_MSG_ERROR(
-+[Package requirements ($2) were not met:
-+
-+$$1_PKG_ERRORS
-+
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-+
-+_PKG_TEXT])[]dnl
-+ ])
-+elif test $pkg_failed = untried; then
-+ AC_MSG_RESULT([no])
-+ m4_default([$4], [AC_MSG_FAILURE(
-+[The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-+
-+_PKG_TEXT
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
-+ ])
-+else
-+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-+ AC_MSG_RESULT([yes])
-+ $3
-+fi[]dnl
-+])dnl PKG_CHECK_MODULES
-+
-+
-+dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-+dnl [ACTION-IF-NOT-FOUND])
-+dnl ---------------------------------------------------------------------
-+dnl Since: 0.29
-+dnl
-+dnl Checks for existence of MODULES and gathers its build flags with
-+dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
-+dnl and VARIABLE-PREFIX_LIBS from --libs.
-+dnl
-+dnl Note that if there is a possibility the first call to
-+dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
-+dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
-+dnl configure.ac.
-+AC_DEFUN([PKG_CHECK_MODULES_STATIC],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+_save_PKG_CONFIG=$PKG_CONFIG
-+PKG_CONFIG="$PKG_CONFIG --static"
-+PKG_CHECK_MODULES($@)
-+PKG_CONFIG=$_save_PKG_CONFIG[]dnl
-+])dnl PKG_CHECK_MODULES_STATIC
-+
-+
-+dnl PKG_INSTALLDIR([DIRECTORY])
-+dnl -------------------------
-+dnl Since: 0.27
-+dnl
-+dnl Substitutes the variable pkgconfigdir as the location where a module
-+dnl should install pkg-config .pc files. By default the directory is
-+dnl $libdir/pkgconfig, but the default can be changed by passing
-+dnl DIRECTORY. The user can override through the --with-pkgconfigdir
-+dnl parameter.
-+AC_DEFUN([PKG_INSTALLDIR],
-+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
-+m4_pushdef([pkg_description],
-+ [pkg-config installation directory @<:@]pkg_default[@:>@])
-+AC_ARG_WITH([pkgconfigdir],
-+ [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
-+ [with_pkgconfigdir=]pkg_default)
-+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
-+m4_popdef([pkg_default])
-+m4_popdef([pkg_description])
-+])dnl PKG_INSTALLDIR
-+
-+
-+dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
-+dnl --------------------------------
-+dnl Since: 0.27
-+dnl
-+dnl Substitutes the variable noarch_pkgconfigdir as the location where a
-+dnl module should install arch-independent pkg-config .pc files. By
-+dnl default the directory is $datadir/pkgconfig, but the default can be
-+dnl changed by passing DIRECTORY. The user can override through the
-+dnl --with-noarch-pkgconfigdir parameter.
-+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
-+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
-+m4_pushdef([pkg_description],
-+ [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
-+AC_ARG_WITH([noarch-pkgconfigdir],
-+ [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
-+ [with_noarch_pkgconfigdir=]pkg_default)
-+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
-+m4_popdef([pkg_default])
-+m4_popdef([pkg_description])
-+])dnl PKG_NOARCH_INSTALLDIR
-+
-+
-+dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
-+dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-+dnl -------------------------------------------
-+dnl Since: 0.28
-+dnl
-+dnl Retrieves the value of the pkg-config variable for the given module.
-+AC_DEFUN([PKG_CHECK_VAR],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
-+
-+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
-+AS_VAR_COPY([$1], [pkg_cv_][$1])
-+
-+AS_VAR_IF([$1], [""], [$5], [$4])dnl
-+])dnl PKG_CHECK_VAR
-
-Property changes on: m4/pkg.m4
-___________________________________________________________________
-Added: svn:eol-style
-## -0,0 +1 ##
-+native
-\ No newline at end of property
-Index: configure.ac
-===================================================================
---- a/configure.ac (revision 8440)
-+++ b/configure.ac (revision 8441)
-@@ -178,13 +178,21 @@
- fi
- fi
-
-+# Require pkg-config
-+# ------------------
-+PKG_PROG_PKG_CONFIG
-
-+# Do not abort while not having runtime dependency
-+#if test -z "$PKG_CONFIG"; then
-+# AC_MSG_ERROR([pkg-config not found. pkg-config is required to check for some dependencies.])
-+#fi
-+
-+
- # CppUnit tests
- # -------------
-
--AM_PATH_CPPUNIT([1.10.2], [has_cppunit="yes"])
-+PKG_CHECK_MODULES(CPPUNIT, [cppunit >= 1.13.0], [has_cppunit=yes],[:])
-
--
- # Doxygen
- # -------
-
-@@ -195,7 +203,6 @@
- # ----------------------------
-
- AM_CONDITIONAL(USE_RESOURCEFILE, test "$use_resourcefile" = "true")
--AM_CONDITIONAL(HAS_CPPUNIT, [test "$has_cppunit" = "yes"])
-
- AC_CONFIG_FILES(
- Makefile
diff --git a/dev-libs/libfilezilla/libfilezilla-0.11.2.ebuild b/dev-libs/libfilezilla/libfilezilla-0.11.2.ebuild
deleted file mode 100644
index b546fecc3c4..00000000000
--- a/dev-libs/libfilezilla/libfilezilla-0.11.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic
-
-DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
-HOMEPAGE="https://lib.filezilla-project.org/"
-SRC_URI="mirror://sourceforge/filezilla/${P}.tar.bz2
- http://download.filezilla-project.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- test? ( dev-util/cppunit )"
-
-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
-}
diff --git a/dev-libs/libfilezilla/libfilezilla-0.9.1.ebuild b/dev-libs/libfilezilla/libfilezilla-0.9.1.ebuild
deleted file mode 100644
index 26d14b20ef9..00000000000
--- a/dev-libs/libfilezilla/libfilezilla-0.9.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic
-
-DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
-HOMEPAGE="https://lib.filezilla-project.org/"
-SRC_URI="mirror://sourceforge/filezilla/${P}.tar.bz2
- http://download.filezilla-project.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- test? ( dev-util/cppunit )"
-
-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
-}
diff --git a/dev-libs/libfilezilla/libfilezilla-0.9.2.ebuild b/dev-libs/libfilezilla/libfilezilla-0.9.2.ebuild
deleted file mode 100644
index ab130c40e55..00000000000
--- a/dev-libs/libfilezilla/libfilezilla-0.9.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic
-
-DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
-HOMEPAGE="https://lib.filezilla-project.org/"
-SRC_URI="mirror://sourceforge/filezilla/${P}.tar.bz2
- http://download.filezilla-project.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- test? ( dev-util/cppunit )"
-
-PATCHES=("${FILESDIR}"/${PN}-0.9.2-cppunit-pkgconfig.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
-
- # cppunit patch changes .m4
- eautoreconf
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libfilezilla/files/, dev-libs/libfilezilla/
@ 2022-04-20 0:37 Yixun Lan
0 siblings, 0 replies; 5+ messages in thread
From: Yixun Lan @ 2022-04-20 0:37 UTC (permalink / raw
To: gentoo-commits
commit: 5de5b893520423567e28dee634f082134670840e
Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 20 00:20:52 2022 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Wed Apr 20 00:36:53 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5de5b893
dev-libs/libfilezilla: use -pthread to fix atomic issue
the -pthread flag will expand link option "-latomic" in RISC-V platfrom,
so will effectively fix the problem.
Closes: https://bugs.gentoo.org/837740
Upstream report: https://trac.filezilla-project.org/ticket/12699
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
.../libfilezilla/files/libfilezilla-0.37.1-pthread.patch | 13 +++++++++++++
dev-libs/libfilezilla/libfilezilla-0.37.1.ebuild | 2 ++
2 files changed, 15 insertions(+)
diff --git a/dev-libs/libfilezilla/files/libfilezilla-0.37.1-pthread.patch b/dev-libs/libfilezilla/files/libfilezilla-0.37.1-pthread.patch
new file mode 100644
index 000000000000..6a40cc69c52e
--- /dev/null
+++ b/dev-libs/libfilezilla/files/libfilezilla-0.37.1-pthread.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index 14bb5d0..da45769 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -120,7 +120,7 @@ AC_CHECK_DECLS([pthread_condattr_setclock], [], [], [[#include <pthread.h>]])
+ if test "$windows" = "1"; then
+ libdeps="-lws2_32"
+ else
+- libdeps=-lpthread
++ libdeps=-pthread
+ CHECK_ICONV([libdeps="$libdeps -liconv"])
+
+ CHECK_RANDOM
diff --git a/dev-libs/libfilezilla/libfilezilla-0.37.1.ebuild b/dev-libs/libfilezilla/libfilezilla-0.37.1.ebuild
index 106c52d6facd..9a58c23e0be8 100644
--- a/dev-libs/libfilezilla/libfilezilla-0.37.1.ebuild
+++ b/dev-libs/libfilezilla/libfilezilla-0.37.1.ebuild
@@ -23,6 +23,8 @@ RDEPEND="
DEPEND="${RDEPEND}
test? ( dev-util/cppunit )"
+PATCHES=( "${FILESDIR}"/${PN}-0.37.1-pthread.patch )
+
pkg_pretend() {
if [[ ${MERGE_TYPE} != binary ]]; then
if ! test-flag-CXX -std=c++14; then
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libfilezilla/files/, dev-libs/libfilezilla/
@ 2022-04-26 0:38 Yixun Lan
0 siblings, 0 replies; 5+ messages in thread
From: Yixun Lan @ 2022-04-26 0:38 UTC (permalink / raw
To: gentoo-commits
commit: 8feb83a6e35a7d738c2927d7e50fd63144eb4944
Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 26 00:00:33 2022 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Tue Apr 26 00:00:33 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8feb83a6
dev-libs/libfilezilla: drop versions
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
dev-libs/libfilezilla/Manifest | 7 ---
.../files/libfilezilla-0.27.1-gcc11.patch | 10 -----
dev-libs/libfilezilla/libfilezilla-0.27.1.ebuild | 50 ----------------------
dev-libs/libfilezilla/libfilezilla-0.28.0.ebuild | 48 ---------------------
dev-libs/libfilezilla/libfilezilla-0.30.0.ebuild | 48 ---------------------
dev-libs/libfilezilla/libfilezilla-0.31.1.ebuild | 48 ---------------------
dev-libs/libfilezilla/libfilezilla-0.34.0.ebuild | 49 ---------------------
dev-libs/libfilezilla/libfilezilla-0.34.2.ebuild | 49 ---------------------
dev-libs/libfilezilla/libfilezilla-0.35.0.ebuild | 49 ---------------------
9 files changed, 358 deletions(-)
diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index 261c430c14a4..91fb0b1d8692 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -1,9 +1,2 @@
-DIST libfilezilla-0.27.1.tar.bz2 568252 BLAKE2B 5ab11e60a3df1e56275b0a1eeb94a91a5e036306c8d65c95ecdf26737ad5c73782d69e50f81749864293bc827b2502988b45a2268bb8020e685a4c864168af5e SHA512 30db720a8fbc806f498aa94ca9bdbbfa6ef04b4b4853e2c38744c2ba26dc8e34d3b006a057dcb527f6d745bf594ccffbb424f9b59dca6d1cb028b0f13bdd466a
-DIST libfilezilla-0.28.0.tar.bz2 572028 BLAKE2B 579881b1bf127f709cdfda61efb71cce3df741152124b74a2f7d718e43d7d71ce678ec6ba10ff61926b275d5b9e69f8df0f9741a0ba1e9b5ff2c51d35472d10a SHA512 e14bc3d5d20c62f0910ab55aa6466590a0d55aedf534e7eb67481a65b372c62fd0015506a1acdc476811aa2c0ce7561f30e79a10f994dfd98014e4ed4b4f471e
-DIST libfilezilla-0.30.0.tar.bz2 578592 BLAKE2B abfef274989b0ba31d9237394aa1e88012e9fe9d071c11e7350e0ada8d5da54d7cdc93f46f65b38fa9a811a638210238f42de99fdd6832f97ede3808723e5d4f SHA512 f05a1ef2be7a6d32a6c5adf8e02f2b17e83deb67bf7c67b1bc1fec539a7235903d91dd3e98412aa1b90f1fcb322cb9ab54d3a1ff4ec44889b4dcdda6984300c9
-DIST libfilezilla-0.31.1.tar.bz2 585070 BLAKE2B b7cd275ee39d5ac62801889adae79515c056a5f838f4348324c0f5a975d3cc45a058b4c7d37f99179efe6808464b7972c31e300ae9e05371134d7a149b5616d5 SHA512 072ae343bc44939deff435078c29954dc60e4bb5079aa705b7445bec17717919d4957858538284e4f131d734439743bd5d39085a618ea41d586be8be887cf2b8
-DIST libfilezilla-0.34.0.tar.bz2 593998 BLAKE2B 3f3563389f4dfe3667c8c1e46d5f4ab76e02f93188bada3c15e974405c49e0d1346813e64457ec5b60bdeca98629e5a05941f76cb375bb229eee759cc6ab5246 SHA512 960908aa570704e983e51e2eaa13a7fb688587bd1f3c37ade6a3f1b3f5379d0b9e5d3c727bcf58f033a1cc0fce2fc34e2fdffdb379ad5be85de917c0a590de22
-DIST libfilezilla-0.34.2.tar.bz2 595072 BLAKE2B b7c5db16ff74ee218eb38e69f029f6c2cad7984f7f27795ec67f9250eb544b259941cd34fc30bc8222aa0fef51e275d4ca0587754386807ecd916ab7c56b6688 SHA512 a749635f7526e307b93002c4044debdcae948bebb73c272ffc98d1997cf160001a7edc6c776656ea927254614c5a3067ebab1ffc92d7b9f97cf5d4542dec8df9
-DIST libfilezilla-0.35.0.tar.bz2 597061 BLAKE2B 3b7e54a5c999ca7a52d90bdc71a237940c7909ff2ca63c28e0ed76e743a15209cfddd66d0de54c157b42524a460079f05cc3af93a54d4b76c2d44e623bab23fe SHA512 685ed22ab8e4c197f26488751bac2b28e72e5dddce0fce4795afabe59a9c1c7775ac92958ad9c15b0717a8e9f4cf4bf44eee61179d8a2194cbc11a7e2564a5c4
DIST libfilezilla-0.36.0.tar.bz2 598327 BLAKE2B d578b7c83cbd440acbb3efe2994c7140bfb0a11271e68a8bae52ac53f10e1ccf428c50d07e8cfc79f63beb0a3bffe8fbffd962413725817ac9df14e0b3b3a1cd SHA512 c6b0240c560afb87426f7ccf01e34eb92975b043697be89f26a12dcfaf4a109d308eed200429f986b14f80111573ea5a869194375c844fa7b666d173e9629a0a
DIST libfilezilla-0.37.1.tar.bz2 608419 BLAKE2B ae76a1d9d9829061ec95ae3b94e282a32835db19b85859c39db5b089a478f93b511fce4a798ebe79bf628bcb6b30f3ea40ff34aacfe2201bfa93887d4f8ce48e SHA512 1bcf9da8ec0fbac1ffada95d8dc1e4a67fbd77fca9273fa9e67418c7e89c74139683535fb917db4fa750bd263cb45a8f230e32b6ab890f3ca5ef5af39ef8ecae
diff --git a/dev-libs/libfilezilla/files/libfilezilla-0.27.1-gcc11.patch b/dev-libs/libfilezilla/files/libfilezilla-0.27.1-gcc11.patch
deleted file mode 100644
index 68f2c7ec9f7b..000000000000
--- a/dev-libs/libfilezilla/files/libfilezilla-0.27.1-gcc11.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libfilezilla/lib/buffer.cpp 2020/12/09 13:33:18 10031
-+++ libfilezilla/lib/buffer.cpp 2021/04/27 07:39:32 10225
-@@ -2,6 +2,7 @@
-
- #include <algorithm>
- #include <cstdlib>
-+#include <limits>
-
- #include <string.h>
-
diff --git a/dev-libs/libfilezilla/libfilezilla-0.27.1.ebuild b/dev-libs/libfilezilla/libfilezilla-0.27.1.ebuild
deleted file mode 100644
index bdbb4d9e2d84..000000000000
--- a/dev-libs/libfilezilla/libfilezilla-0.27.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic
-
-DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
-HOMEPAGE="https://lib.filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0/12" # libfilezilla.so version
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/nettle:0=
- >=net-libs/gnutls-3.5.7:=
-"
-DEPEND="${RDEPEND}
- test? ( dev-util/cppunit )"
-
-PATCHES=( "${FILESDIR}"/${P}-gcc11.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_configure() {
- if use ppc || use arm || use hppa; then
- # bug 727652
- append-libs -latomic
- fi
-
- default
-}
-
-src_install() {
- default
- find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/dev-libs/libfilezilla/libfilezilla-0.28.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.28.0.ebuild
deleted file mode 100644
index f0acd4e96389..000000000000
--- a/dev-libs/libfilezilla/libfilezilla-0.28.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic
-
-DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
-HOMEPAGE="https://lib.filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0/13" # libfilezilla.so version
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/nettle:0=
- >=net-libs/gnutls-3.5.7:=
-"
-DEPEND="${RDEPEND}
- test? ( dev-util/cppunit )"
-
-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_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
-}
diff --git a/dev-libs/libfilezilla/libfilezilla-0.30.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.30.0.ebuild
deleted file mode 100644
index f0d6428c3e3c..000000000000
--- a/dev-libs/libfilezilla/libfilezilla-0.30.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic
-
-DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
-HOMEPAGE="https://lib.filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0/15" # libfilezilla.so version
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/nettle:0=
- >=net-libs/gnutls-3.5.7:=
-"
-DEPEND="${RDEPEND}
- test? ( dev-util/cppunit )"
-
-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_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
-}
diff --git a/dev-libs/libfilezilla/libfilezilla-0.31.1.ebuild b/dev-libs/libfilezilla/libfilezilla-0.31.1.ebuild
deleted file mode 100644
index 0f53a3a78253..000000000000
--- a/dev-libs/libfilezilla/libfilezilla-0.31.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic
-
-DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
-HOMEPAGE="https://lib.filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0/16" # libfilezilla.so version
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/nettle:0=
- >=net-libs/gnutls-3.5.7:=
-"
-DEPEND="${RDEPEND}
- test? ( dev-util/cppunit )"
-
-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_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
-}
diff --git a/dev-libs/libfilezilla/libfilezilla-0.34.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.34.0.ebuild
deleted file mode 100644
index 91f14170584c..000000000000
--- a/dev-libs/libfilezilla/libfilezilla-0.34.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic
-
-DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
-HOMEPAGE="https://lib.filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0/21" # libfilezilla.so version
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~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 )"
-
-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_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
-}
diff --git a/dev-libs/libfilezilla/libfilezilla-0.34.2.ebuild b/dev-libs/libfilezilla/libfilezilla-0.34.2.ebuild
deleted file mode 100644
index 54125a19723a..000000000000
--- a/dev-libs/libfilezilla/libfilezilla-0.34.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic
-
-DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
-HOMEPAGE="https://lib.filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0/22" # libfilezilla.so version
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~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 )"
-
-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_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
-}
diff --git a/dev-libs/libfilezilla/libfilezilla-0.35.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.35.0.ebuild
deleted file mode 100644
index 785d5e9fa7d6..000000000000
--- a/dev-libs/libfilezilla/libfilezilla-0.35.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit flag-o-matic
-
-DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
-HOMEPAGE="https://lib.filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0/23" # libfilezilla.so version
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~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 )"
-
-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_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
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libfilezilla/files/, dev-libs/libfilezilla/
@ 2023-02-16 9:22 Yixun Lan
0 siblings, 0 replies; 5+ messages in thread
From: Yixun Lan @ 2023-02-16 9:22 UTC (permalink / raw
To: gentoo-commits
commit: 45fb8f807e5908e2bbc73d3d038bd77c825256ea
Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 16 09:17:13 2023 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Thu Feb 16 09:22:33 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45fb8f80
dev-libs/libfilezilla: fix build failure with gcc-13
patch only apply to version 0.41.0
Upstream: https://trac.filezilla-project.org/ticket/12868
Closes: https://bugs.gentoo.org/893982
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
.../files/libfilezilla-0.41.0-gcc13.patch | 79 ++++++++++++++++++++++
dev-libs/libfilezilla/libfilezilla-0.41.0.ebuild | 5 +-
2 files changed, 83 insertions(+), 1 deletion(-)
diff --git a/dev-libs/libfilezilla/files/libfilezilla-0.41.0-gcc13.patch b/dev-libs/libfilezilla/files/libfilezilla-0.41.0-gcc13.patch
new file mode 100644
index 000000000000..19423a7e732e
--- /dev/null
+++ b/dev-libs/libfilezilla/files/libfilezilla-0.41.0-gcc13.patch
@@ -0,0 +1,79 @@
+--- a/lib/libfilezilla/buffer.hpp 2022-02-03 09:53:39.000000000 +0000
++++ b/lib/libfilezilla/buffer.hpp 2023-02-12 19:18:24.678399429 +0000
+@@ -2,6 +2,7 @@
+ #define LIBFILEZILLA_BUFFER_HEADER
+
+ #include "libfilezilla.hpp"
++#include <cstdint>
+
+ #include <vector>
+ #include <type_traits>
+--- a/lib/libfilezilla/hash.hpp 2022-02-03 09:53:39.000000000 +0000
++++ b/lib/libfilezilla/hash.hpp 2023-02-12 19:22:58.938975128 +0000
+@@ -1,3 +1,4 @@
++#include <cstdint>
+ #ifndef LIBFILEZILLA_HASH_HEADER
+ #define LIBFILEZILLA_HASH_HEADER
+
+--- a/lib/libfilezilla/encryption.hpp 2020-08-21 14:35:14.000000000 +0100
++++ b/lib/libfilezilla/encryption.hpp 2023-02-12 19:26:03.514379399 +0000
+@@ -11,7 +11,7 @@
+ */
+
+ #include "libfilezilla.hpp"
+-
++#include <cstdint>
+ #include <vector>
+ #include <string>
+
+--- a/lib/libfilezilla/encode.hpp 2021-12-08 15:09:45.000000000 +0000
++++ b/lib/libfilezilla/encode.hpp 2023-02-12 19:28:38.684399363 +0000
+@@ -2,7 +2,7 @@
+ #define LIBFILEZILLA_ENCODE_HEADER
+
+ #include "libfilezilla.hpp"
+-
++#include <cstdint>
+ #include <string>
+ #include <vector>
+
+--- a/lib/libfilezilla/nonowning_buffer.hpp 2022-07-08 14:18:44.000000000 +0100
++++ b/lib/libfilezilla/nonowning_buffer.hpp 2023-02-12 19:31:09.324359290 +0000
+@@ -2,6 +2,7 @@
+ #define LIBFILEZILLA_NONOWNING_BUFFER_HEADER
+
+ #include "libfilezilla.hpp"
++#include <cstdint>
+
+ /** \file
+ * \brief Declares fz::nonowning_buffer
+--- a/lib/libfilezilla/signature.hpp 2020-07-07 13:06:31.000000000 +0100
++++ b/lib/libfilezilla/signature.hpp 2023-02-12 19:34:00.747588389 +0000
+@@ -8,6 +8,7 @@
+ */
+
+ #include "libfilezilla.hpp"
++#include <cstdint>
+
+ #include <vector>
+ #include <string>
+--- a/lib/libfilezilla/json.hpp 2022-09-05 14:52:21.000000000 +0100
++++ b/lib/libfilezilla/json.hpp 2023-02-12 19:36:07.564236643 +0000
+@@ -9,6 +9,7 @@
+ #include <map>
+ #include <type_traits>
+ #include <variant>
++#include <cstdint>
+
+ namespace fz {
+
+--- a/lib/libfilezilla/string.hpp 2023-01-12 09:41:17.000000000 +0000
++++ b/lib/libfilezilla/string.hpp 2023-02-12 20:14:26.622449014 +0000
+@@ -2,6 +2,7 @@
+ #define LIBFILEZILLA_STRING_HEADER
+
+ #include "libfilezilla.hpp"
++#include <cstdint>
+
+ #include <algorithm>
+ #include <string>
diff --git a/dev-libs/libfilezilla/libfilezilla-0.41.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.41.0.ebuild
index 58bc413a0ed5..f6ab16d883db 100644
--- a/dev-libs/libfilezilla/libfilezilla-0.41.0.ebuild
+++ b/dev-libs/libfilezilla/libfilezilla-0.41.0.ebuild
@@ -23,7 +23,10 @@ RDEPEND="
DEPEND="${RDEPEND}
test? ( dev-util/cppunit )"
-PATCHES=( "${FILESDIR}"/${PN}-0.37.1-pthread.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.37.1-pthread.patch
+ "${FILESDIR}"/${PN}-0.41.0-gcc13.patch
+)
pkg_pretend() {
if [[ ${MERGE_TYPE} != binary ]]; then
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-02-16 9:22 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-17 10:24 [gentoo-commits] repo/gentoo:master commit in: dev-libs/libfilezilla/files/, dev-libs/libfilezilla/ Sergei Trofimovich
-- strict thread matches above, loose matches on Subject: below --
2018-08-10 22:53 Bernard Cafarelli
2022-04-20 0:37 Yixun Lan
2022-04-26 0:38 Yixun Lan
2023-02-16 9:22 Yixun Lan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox