Hello community, here is the log from the commit of package filezilla for openSUSE:Factory checked in at 2015-03-16 07:00:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/filezilla (Old) and /work/SRC/openSUSE:Factory/.filezilla.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "filezilla" Changes: -------- --- /work/SRC/openSUSE:Factory/filezilla/filezilla.changes 2014-10-05 20:32:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.filezilla.new/filezilla.changes 2015-03-16 07:00:12.000000000 +0100 @@ -1,0 +2,20 @@ +Thu Mar 12 14:08:13 UTC 2015 - tchva...@suse.com + +- Add patch to build with our wxwidgets wxstring-conversions-fix.patch + +------------------------------------------------------------------- +Thu Mar 12 08:31:02 UTC 2015 - tchva...@suse.com + +- Add patch fix-missing-include-fz-bug-10280.patch to fix build + +------------------------------------------------------------------- +Tue Mar 3 11:44:32 UTC 2015 - tchva...@suse.com + +- Version bump to 3.10.2: + * In the XML files, passwords are now base64 encoded + * The subject area in the certificate verification can now be scrolled if the + certificate contains many alternative names + * Many performance improvements + * Various bugfixes + +------------------------------------------------------------------- Old: ---- FileZilla_3.9.0.5_src.tar.bz2 New: ---- FileZilla_3.10.2_src.tar.bz2 fix-missing-include-fz-bug-10280.patch wxstring-conversions-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ filezilla.spec ++++++ --- /var/tmp/diff_new_pack.imsYmB/_old 2015-03-16 07:00:13.000000000 +0100 +++ /var/tmp/diff_new_pack.imsYmB/_new 2015-03-16 07:00:13.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package filezilla # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: filezilla -Version: 3.9.0.5 +Version: 3.10.2 Release: 0 Summary: A GUI FTP and SFTP Client License: GPL-2.0+ @@ -26,6 +26,10 @@ Source0: http://prdownloads.sourceforge.net/filezilla/FileZilla_%{version}_src.tar.bz2 Patch0: putty-no_DATE_and_TIME_.patch Patch1: filezilla-3.5.3-buildinfo-no-date.patch +# PATCH-FIX-UPSTREAM: fix missing include, will be in next version +Patch2: fix-missing-include-fz-bug-10280.patch +# PATCH-FIX-UPSTREAM: fix conversions from wxString to const char* +Patch3: wxstring-conversions-fix.patch BuildRequires: cppunit-devel BuildRequires: fdupes BuildRequires: gcc-c++ @@ -67,6 +71,8 @@ %setup -q %patch0 %patch1 +%patch2 -p2 +%patch3 -p1 # Fix invalid translation locales: cd locales @@ -75,7 +81,6 @@ ca_ES@valencia\ cs_CZ\ da_DK\ - et_EE\ eu_ES\ fa_IR\ fi_FI\ @@ -107,6 +112,7 @@ export CFLAGS="%{optflags}" export CXXFLAGS="%{optflags}" %configure \ + --disable-static \ --disable-manualupdatecheck \ --disable-autoupdatecheck \ --with-tinyxml=system \ @@ -130,6 +136,7 @@ %{_bindir}/fzputtygen %{_datadir}/%{name} %{_datadir}/pixmaps/%{name}.png +%{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/icons/hicolor/16x16/apps/%{name}.png %{_datadir}/icons/hicolor/32x32/apps/%{name}.png %{_datadir}/icons/hicolor/48x48/apps/%{name}.png ++++++ FileZilla_3.9.0.5_src.tar.bz2 -> FileZilla_3.10.2_src.tar.bz2 ++++++ ++++ 322576 lines of diff (skipped) ++++++ fix-missing-include-fz-bug-10280.patch ++++++ --- FileZilla3/trunk/src/interface/Mainfrm.h 2015/03/02 20:28:30 6542 +++ FileZilla3/trunk/src/interface/Mainfrm.h 2015/03/03 15:54:36 6543 @@ -1,13 +1,18 @@ #ifndef __MAINFRM_H__ #define __MAINFRM_H__ +#include "statusbar.h" +#include "engine_context.h" + +#include "wx/timer.h" + #ifndef __WXMAC__ #include <wx/taskbar.h> #endif -#include "statusbar.h" - -#include "engine_context.h" +#if FZ_MANUALUPDATECHECK +#include "updater.h" +#endif class CAsyncRequestQueue; class CContextControl; @@ -25,13 +30,7 @@ class CToolBar; class CWindowStateManager; - -#if FZ_MANUALUPDATECHECK -#include "updater.h" -#endif -class CWindowStateManager; - -class CMainFrame : public wxNavigationEnabled<wxFrame> +class CMainFrame final : public wxNavigationEnabled<wxFrame> #if FZ_MANUALUPDATECHECK , protected CUpdateHandler #endif ++++++ wxstring-conversions-fix.patch ++++++ Index: filezilla-3.10.2/src/engine/process.cpp =================================================================== --- filezilla-3.10.2.orig/src/engine/process.cpp +++ filezilla-3.10.2/src/engine/process.cpp @@ -290,7 +290,7 @@ public: } // Execute process - execl(cmd, args, (char*)0); // noreturn on success + execl(cmd.mb_str(), args.mb_str(), (char*)0); // noreturn on success _exit(-1); } Index: filezilla-3.10.2/src/engine/sftpcontrolsocket.cpp =================================================================== --- filezilla-3.10.2.orig/src/engine/sftpcontrolsocket.cpp +++ filezilla-3.10.2/src/engine/sftpcontrolsocket.cpp @@ -1099,7 +1099,7 @@ int CSftpControlSocket::ListParseEntry(c return FZ_REPLY_INTERNALERROR; } - pData->pParser->AddLine(entry); + pData->pParser->AddLine(entry.wchar_str()); return FZ_REPLY_WOULDBLOCK; } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
