Hello community,
here is the log from the commit of package libfilezilla for openSUSE:Factory
checked in at 2016-05-14 12:23:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libfilezilla (Old)
and /work/SRC/openSUSE:Factory/.libfilezilla.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libfilezilla"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libfilezilla/libfilezilla.changes
2016-04-28 17:02:36.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libfilezilla.new/libfilezilla.changes
2016-05-14 12:23:38.000000000 +0200
@@ -1,0 +2,8 @@
+Tue May 10 22:30:56 UTC 2016 - ec...@opensuse.org
+
+- Update to version 0.5.1
+ - Add constructore to sparse_optional taking pointers
+ - Fix compilation on systems where iconv's second argument is
+ const
+
+-------------------------------------------------------------------
Old:
----
libfilezilla-0.5.0.tar.bz2
New:
----
libfilezilla-0.5.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libfilezilla.spec ++++++
--- /var/tmp/diff_new_pack.JZMvH6/_old 2016-05-14 12:23:39.000000000 +0200
+++ /var/tmp/diff_new_pack.JZMvH6/_new 2016-05-14 12:23:39.000000000 +0200
@@ -20,7 +20,7 @@
%define libname %{name}%{major}
%define develname %{name}-devel
Name: libfilezilla
-Version: 0.5.0
+Version: 0.5.1
Release: 0
Summary: C++ library for filezilla
License: GPL-2.0+
@@ -34,9 +34,9 @@
BuildRequires: doxygen
BuildRequires: fdupes
BuildRequires: graphviz
-BuildRequires: pkgconfig(cppunit)
BuildRequires: libtool
BuildRequires: pkg-config
+BuildRequires: pkgconfig(cppunit)
%if 0%{?suse_version} <= 1320
# FileZilla requires C++14 support.
BuildRequires: gcc5-c++
++++++ libfilezilla-0.5.0.tar.bz2 -> libfilezilla-0.5.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libfilezilla-0.5.0/NEWS new/libfilezilla-0.5.1/NEWS
--- old/libfilezilla-0.5.0/NEWS 2016-04-15 09:52:25.000000000 +0200
+++ new/libfilezilla-0.5.1/NEWS 2016-05-09 17:30:15.000000000 +0200
@@ -1,3 +1,8 @@
+0.5.1 (2016-05-09)
+
++ Add constructore to sparse_optional taking pointers
+- Fix compilation on systems where iconv's second argument is const
+
0.5.0 (2016-04-15)
- Handle timestamps where midnight is represented as 24:00:00.000 of the
previous day
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libfilezilla-0.5.0/configure
new/libfilezilla-0.5.1/configure
--- old/libfilezilla-0.5.0/configure 2016-04-15 09:52:38.000000000 +0200
+++ new/libfilezilla-0.5.1/configure 2016-05-09 17:31:41.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libfilezilla 0.5.0.
+# Generated by GNU Autoconf 2.69 for libfilezilla 0.5.1.
#
# Report bugs to <tim.ko...@filezilla-project.org>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='libfilezilla'
PACKAGE_TARNAME='libfilezilla'
-PACKAGE_VERSION='0.5.0'
-PACKAGE_STRING='libfilezilla 0.5.0'
+PACKAGE_VERSION='0.5.1'
+PACKAGE_STRING='libfilezilla 0.5.1'
PACKAGE_BUGREPORT='tim.ko...@filezilla-project.org'
PACKAGE_URL='https://lib.filezilla-project.org/'
@@ -1395,7 +1395,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libfilezilla 0.5.0 to adapt to many kinds of systems.
+\`configure' configures libfilezilla 0.5.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1465,7 +1465,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libfilezilla 0.5.0:";;
+ short | recursive ) echo "Configuration of libfilezilla 0.5.1:";;
esac
cat <<\_ACEOF
@@ -1589,7 +1589,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libfilezilla configure 0.5.0
+libfilezilla configure 0.5.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2034,7 +2034,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libfilezilla $as_me 0.5.0, which was
+It was created by libfilezilla $as_me 0.5.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2900,7 +2900,7 @@
# Define the identity of the package.
PACKAGE='libfilezilla'
- VERSION='0.5.0'
+ VERSION='0.5.1'
cat >>confdefs.h <<_ACEOF
@@ -19461,7 +19461,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libfilezilla $as_me 0.5.0, which was
+This file was extended by libfilezilla $as_me 0.5.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -19528,7 +19528,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-libfilezilla config.status 0.5.0
+libfilezilla config.status 0.5.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libfilezilla-0.5.0/configure.ac
new/libfilezilla-0.5.1/configure.ac
--- old/libfilezilla-0.5.0/configure.ac 2016-04-15 09:52:27.000000000 +0200
+++ new/libfilezilla-0.5.1/configure.ac 2016-05-09 17:29:21.000000000 +0200
@@ -1,4 +1,4 @@
-AC_INIT([libfilezilla],[0.5.0],[tim.ko...@filezilla-project.org],[],[https://lib.filezilla-project.org/])
+AC_INIT([libfilezilla],[0.5.1],[tim.ko...@filezilla-project.org],[],[https://lib.filezilla-project.org/])
AC_CONFIG_HEADERS([lib/libfilezilla/private/config.hpp])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR(config)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libfilezilla-0.5.0/lib/libfilezilla/optional.hpp
new/libfilezilla-0.5.1/lib/libfilezilla/optional.hpp
--- old/libfilezilla-0.5.0/lib/libfilezilla/optional.hpp 2016-02-21
11:35:46.000000000 +0100
+++ new/libfilezilla-0.5.1/lib/libfilezilla/optional.hpp 2016-05-09
17:28:54.000000000 +0200
@@ -21,6 +21,10 @@
public:
sparse_optional();
explicit sparse_optional(T const& v);
+
+ /// Takes ownership of pointer.
+ explicit sparse_optional(T * v);
+
sparse_optional(sparse_optional<T> const& v);
sparse_optional(sparse_optional<T> && v) noexcept;
~sparse_optional();
@@ -58,6 +62,12 @@
{
}
+template<typename T>
+sparse_optional<T>::sparse_optional(T * v)
+ : v_(v)
+{
+}
+
template<typename T>
sparse_optional<T>::sparse_optional(sparse_optional<T> const& v)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libfilezilla-0.5.0/lib/libfilezilla/version.hpp
new/libfilezilla-0.5.1/lib/libfilezilla/version.hpp
--- old/libfilezilla-0.5.0/lib/libfilezilla/version.hpp 2016-04-15
09:52:56.000000000 +0200
+++ new/libfilezilla-0.5.1/lib/libfilezilla/version.hpp 2016-05-09
17:31:43.000000000 +0200
@@ -9,15 +9,15 @@
#include <tuple>
/// \brief Version string of the libfilezilla headers
-#define LIBFILEZILLA_VERSION "0.5.0"
+#define LIBFILEZILLA_VERSION "0.5.1"
#define LIBFILEZILLA_VERSION_MAJOR 0
#define LIBFILEZILLA_VERSION_MINOR 5
-#define LIBFILEZILLA_VERSION_MICRO 0
+#define LIBFILEZILLA_VERSION_MICRO 1
#define LIBFILEZILLA_VERSION_NANO 0
/// \brief Suffix string, e.g. "rc1"
-#define LIBFILEZILLA_VERSION_SUFFIX "0.5.0"
+#define LIBFILEZILLA_VERSION_SUFFIX "0.5.1"
namespace fz {
/// \brief Get version string of libfilezilla
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libfilezilla-0.5.0/lib/string.cpp
new/libfilezilla-0.5.1/lib/string.cpp
--- old/libfilezilla-0.5.0/lib/string.cpp 2016-04-15 09:52:15.000000000
+0200
+++ new/libfilezilla-0.5.1/lib/string.cpp 2016-05-09 17:28:54.000000000
+0200
@@ -7,6 +7,8 @@
#else
#include <iconv.h>
#include <strings.h>
+
+#include <type_traits>
#endif
#include <cstdlib>
@@ -88,6 +90,13 @@
return ret;
}
+#ifndef FZ_WINDOWS
+// On some platforms, e.g. NetBSD, the second argument to iconv is const.
+// Depending which one is used, declare iconv_second_arg_type as either char*
or char const*
+extern "C" typedef size_t (*iconv_prototype_with_const)(iconv_t, char const**,
size_t *, char**, size_t *);
+typedef std::conditional<std::is_same<decltype(&iconv),
iconv_prototype_with_const>::value, char const*, char*>::type
iconv_second_arg_type;
+#endif
+
std::wstring to_wstring_from_utf8(std::string const& in)
{
std::wstring ret;
@@ -104,7 +113,7 @@
#else
iconv_t cd = iconv_open("WCHAR_T", "UTF-8");
if (cd != reinterpret_cast<iconv_t>(-1)) {
- char * in_p = const_cast<char*>(in.c_str());
+ auto in_p =
const_cast<iconv_second_arg_type>(in.c_str());
size_t in_len = in.size();
size_t out_len = in_len * sizeof(wchar_t) * 2;
@@ -168,7 +177,7 @@
#else
iconv_t cd = iconv_open("UTF-8", "WCHAR_T");
if (cd != reinterpret_cast<iconv_t>(-1)) {
- char * in_p =
reinterpret_cast<char*>(const_cast<wchar_t*>(in.c_str()));
+ auto in_p =
reinterpret_cast<iconv_second_arg_type>(const_cast<wchar_t*>(in.c_str()));
size_t in_len = in.size() * sizeof(wchar_t);
size_t out_len = in.size() * 4;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libfilezilla-0.5.0/tests/eventloop.cpp
new/libfilezilla-0.5.1/tests/eventloop.cpp
--- old/libfilezilla-0.5.0/tests/eventloop.cpp 2016-01-31 11:35:01.000000000
+0100
+++ new/libfilezilla-0.5.1/tests/eventloop.cpp 2016-05-09 17:28:54.000000000
+0200
@@ -239,7 +239,7 @@
fz::mutex m_;
fz::condition cond_;
- fz::timer_id id_;
+ fz::timer_id id_{};
};
}
