Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=dex77stuff.git;a=commitdiff;h=3c4426d98073f904a9a73728636fedc91c84ec64
commit 3c4426d98073f904a9a73728636fedc91c84ec64
Author: PacMiam <pacm...@gmx.fr>
Date: Wed Mar 4 22:37:32 2015 +0100
filezilla-3.10.2-1-i686
* Version bump: 3.9.0.5 -> 3.10.2
diff --git a/source/xapps-extra/filezilla/FrugalBuild
b/source/xapps-extra/filezilla/FrugalBuild
index 6f5ab96..af526e7 100644
--- a/source/xapps-extra/filezilla/FrugalBuild
+++ b/source/xapps-extra/filezilla/FrugalBuild
@@ -4,9 +4,10 @@
options+=('asneeded')
pkgname=filezilla
-pkgver=3.9.0.5
+pkgver=3.10.2
pkgrel=1
pkgdesc="a fast and reliable cross-platform FTP, FTPS and SFTP client"
+ulr="http://filezilla-project.org/";
groups=('xapps-extra')
archs=('i686' 'x86_64')
@@ -24,7 +25,6 @@ Fconfopts+=" --with-tinyxml=builtin \
--disable-static \
--enable-locales \
--disable-autoupdatecheck"
-#export WXRC='/usr/bin/wxrc-3.0'
_F_cd_path="$pkgname-$pkgver"
_F_sourceforge_ext="_src.tar.bz2"
_F_sourceforge_dirname="$pkgname"
@@ -34,6 +34,8 @@ _F_gnome_iconcache="y"
Finclude sourceforge gnome-scriptlet
up2date="lynx -dump
http://sourceforge.net/projects/filezilla/files/FileZilla_Client/ | grep
'http.*filezilla/.*FileZilla_Client/.*/$'|sed 's|.*/\(.*\)/|\1|;q' "
-sha1sums=('0880807f966caeeee64e2cd8e3bba0ee7ffcec3f')
+source=(${source[@]} fix_wxtimer.patch)
+sha1sums=('c2910a68e17f908b2309493b5d8bbd8e6bce6a41' \
+ 'ffcae981a377f47bd358677139aa9ccc798809e2')
# optimization OK
diff --git a/source/xapps-extra/filezilla/fix_wxtimer.patch
b/source/xapps-extra/filezilla/fix_wxtimer.patch
new file mode 100644
index 0000000..779c404
--- /dev/null
+++ b/source/xapps-extra/filezilla/fix_wxtimer.patch
@@ -0,0 +1,312 @@
+diff -Naur filezilla-3.10.2/src/interface/Mainfrm.h
filezilla-3.10.2b/src/interface/Mainfrm.h
+--- filezilla-3.10.2/src/interface/Mainfrm.h 2014-12-28 18:48:10.000000000
+0100
++++ filezilla-3.10.2b/src/interface/Mainfrm.h 2015-03-04 22:23:40.588398823
+0100
+@@ -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;
+@@ -26,172 +31,167 @@
+ class CWindowStateManager;
+
+
++class CMainFrame final : public wxNavigationEnabled<wxFrame>
+ #if FZ_MANUALUPDATECHECK
+-#include "updater.h"
+-#endif
+-class CWindowStateManager;
+-
+-class CMainFrame : public wxNavigationEnabled<wxFrame>
+-#if FZ_MANUALUPDATECHECK
+- , protected CUpdateHandler
++ , protected CUpdateHandler
+ #endif
+ {
+- friend class CMainFrameStateEventHandler;
++ friend class CMainFrameStateEventHandler;
+ public:
+- CMainFrame();
+- virtual ~CMainFrame();
++ CMainFrame();
++ virtual ~CMainFrame();
+
+- void UpdateActivityLed(int direction);
++ void UpdateActivityLed(int direction);
+
+- CStatusView* GetStatusView() { return m_pStatusView; }
+- CQueueView* GetQueue() { return m_pQueueView; }
+- CQuickconnectBar* GetQuickconnectBar() { return m_pQuickconnectBar; }
++ CStatusView* GetStatusView() { return m_pStatusView; }
++ CQueueView* GetQueue() { return m_pQueueView; }
++ CQuickconnectBar* GetQuickconnectBar() { return m_pQuickconnectBar; }
+
+- void UpdateLayout(int layout = -1, int swap = -1, int
messagelog_position = -1);
++ void UpdateLayout(int layout = -1, int swap = -1, int messagelog_position
= -1);
+
+- // Window size and position as well as pane sizes
+- void RememberSplitterPositions();
+- bool RestoreSplitterPositions();
+- void SetDefaultSplitterPositions();
++ // Window size and position as well as pane sizes
++ void RememberSplitterPositions();
++ bool RestoreSplitterPositions();
++ void SetDefaultSplitterPositions();
+
+- void CheckChangedSettings();
++ void CheckChangedSettings();
+
+- void ConnectNavigationHandler(wxEvtHandler* handler);
++ void ConnectNavigationHandler(wxEvtHandler* handler);
+
+- wxStatusBar* GetStatusBar() const { return m_pStatusBar; }
++ wxStatusBar* GetStatusBar() const { return m_pStatusBar; }
+
+- void ProcessCommandLine();
++ void ProcessCommandLine();
+
+- void PostInitialize();
++ void PostInitialize();
+
+- bool ConnectToServer(const CServer& server, const CServerPath& path =
CServerPath(), bool isReconnect = false);
++ bool ConnectToServer(const CServer& server, const CServerPath& path =
CServerPath(), bool isReconnect = false);
+
+- CContextControl* GetContextControl() { return m_pContextControl; }
++ CContextControl* GetContextControl() { return m_pContextControl; }
+
+- bool ConnectToSite(CSiteManagerItemData_Site & data, bool newTab =
false);
++ bool ConnectToSite(CSiteManagerItemData_Site & data, bool newTab = false);
+
+- CFileZillaEngineContext& GetEngineContext() { return m_engineContext; }
++ CFileZillaEngineContext& GetEngineContext() { return m_engineContext; }
+ protected:
+- void FixTabOrder();
++ void FixTabOrder();
+
+- bool CloseDialogsAndQuit(wxCloseEvent &event);
+- bool CreateMenus();
+- bool CreateQuickconnectBar();
+- bool CreateMainToolBar();
+- void OpenSiteManager(const CServer* pServer = 0);
+-
+- void FocusNextEnabled(std::list<wxWindow*>& windowOrder,
std::list<wxWindow*>::iterator iter, bool skipFirst, bool forward);
+-
+- void SetBookmarksFromPath(const wxString& path);
+-
+- CStatusBar* m_pStatusBar{};
+- CMenuBar* m_pMenuBar{};
+- CToolBar* m_pToolBar{};
+- CQuickconnectBar* m_pQuickconnectBar{};
+-
+- CSplitterWindowEx* m_pTopSplitter{}; // If log position is 0, splits
message log from rest of panes
+- CSplitterWindowEx* m_pBottomSplitter{}; // Top contains view splitter,
bottom queue (or queuelog splitter if in position 1)
+- CSplitterWindowEx* m_pQueueLogSplitter{};
+-
+- CFileZillaEngineContext m_engineContext;
+- CContextControl* m_pContextControl{};
+-
+- CStatusView* m_pStatusView{};
+- CQueueView* m_pQueueView{};
+- CLed* m_pActivityLed[2];
+- CThemeProvider* m_pThemeProvider{};
++ bool CloseDialogsAndQuit(wxCloseEvent &event);
++ bool CreateMenus();
++ bool CreateQuickconnectBar();
++ bool CreateMainToolBar();
++ void OpenSiteManager(const CServer* pServer = 0);
++
++ void FocusNextEnabled(std::list<wxWindow*>& windowOrder,
std::list<wxWindow*>::iterator iter, bool skipFirst, bool forward);
++
++ void SetBookmarksFromPath(const wxString& path);
++
++ CStatusBar* m_pStatusBar{};
++ CMenuBar* m_pMenuBar{};
++ CToolBar* m_pToolBar{};
++ CQuickconnectBar* m_pQuickconnectBar{};
++
++ CSplitterWindowEx* m_pTopSplitter{}; // If log position is 0, splits
message log from rest of panes
++ CSplitterWindowEx* m_pBottomSplitter{}; // Top contains view splitter,
bottom queue (or queuelog splitter if in position 1)
++ CSplitterWindowEx* m_pQueueLogSplitter{};
++
++ CFileZillaEngineContext m_engineContext;
++ CContextControl* m_pContextControl{};
++
++ CStatusView* m_pStatusView{};
++ CQueueView* m_pQueueView{};
++ CLed* m_pActivityLed[2];
++ CThemeProvider* m_pThemeProvider{};
+ #if FZ_MANUALUPDATECHECK
+- CUpdater* m_pUpdater{};
+- virtual void UpdaterStateChanged( UpdaterState s, build const& v );
+- void TriggerUpdateDialog();
+- wxTimer update_dialog_timer_;
++ CUpdater* m_pUpdater{};
++ virtual void UpdaterStateChanged( UpdaterState s, build const& v );
++ void TriggerUpdateDialog();
++ wxTimer update_dialog_timer_;
+ #endif
+
+- void ShowDirectoryTree(bool local, bool show);
++ void ShowDirectoryTree(bool local, bool show);
+
+- void ShowDropdownMenu(wxMenu* pMenu, wxToolBar* pToolBar,
wxCommandEvent& event);
++ void ShowDropdownMenu(wxMenu* pMenu, wxToolBar* pToolBar, wxCommandEvent&
event);
+
+ #ifdef __WXMSW__
+- virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM
lParam);
++ virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM
lParam);
+ #endif
+
+- void HandleResize();
++ void HandleResize();
+
+- // Event handlers
+- DECLARE_EVENT_TABLE()
+- void OnSize(wxSizeEvent& event);
+- void OnMenuHandler(wxCommandEvent& event);
+- void OnEngineEvent(wxFzEvent& event);
+- void OnUpdateLedTooltip(wxCommandEvent&);
+- void OnDisconnect(wxCommandEvent&);
+- void OnCancel(wxCommandEvent&);
+- void OnClose(wxCloseEvent& event);
+- void OnReconnect(wxCommandEvent&);
+- void OnRefresh(wxCommandEvent&);
+- void OnTimer(wxTimerEvent& event);
+- void OnSiteManager(wxCommandEvent&);
+- void OnProcessQueue(wxCommandEvent& event);
+- void OnMenuEditSettings(wxCommandEvent&);
+- void OnToggleToolBar(wxCommandEvent& event);
+- void OnToggleLogView(wxCommandEvent&);
+- void OnToggleDirectoryTreeView(wxCommandEvent& event);
+- void OnToggleQueueView(wxCommandEvent& event);
+- void OnMenuHelpAbout(wxCommandEvent&);
+- void OnFilter(wxCommandEvent& event);
+- void OnFilterRightclicked(wxCommandEvent& event);
++ // Event handlers
++ DECLARE_EVENT_TABLE()
++ void OnSize(wxSizeEvent& event);
++ void OnMenuHandler(wxCommandEvent& event);
++ void OnEngineEvent(wxFzEvent& event);
++ void OnUpdateLedTooltip(wxCommandEvent&);
++ void OnDisconnect(wxCommandEvent&);
++ void OnCancel(wxCommandEvent&);
++ void OnClose(wxCloseEvent& event);
++ void OnReconnect(wxCommandEvent&);
++ void OnRefresh(wxCommandEvent&);
++ void OnTimer(wxTimerEvent& event);
++ void OnSiteManager(wxCommandEvent&);
++ void OnProcessQueue(wxCommandEvent& event);
++ void OnMenuEditSettings(wxCommandEvent&);
++ void OnToggleToolBar(wxCommandEvent& event);
++ void OnToggleLogView(wxCommandEvent&);
++ void OnToggleDirectoryTreeView(wxCommandEvent& event);
++ void OnToggleQueueView(wxCommandEvent& event);
++ void OnMenuHelpAbout(wxCommandEvent&);
++ void OnFilter(wxCommandEvent& event);
++ void OnFilterRightclicked(wxCommandEvent& event);
+ #if FZ_MANUALUPDATECHECK
+- void OnCheckForUpdates(wxCommandEvent& event);
++ void OnCheckForUpdates(wxCommandEvent& event);
+ #endif //FZ_MANUALUPDATECHECK
+- void OnSitemanagerDropdown(wxCommandEvent& event);
+- void OnNavigationKeyEvent(wxNavigationKeyEvent& event);
+- void OnChar(wxKeyEvent& event);
+- void OnActivate(wxActivateEvent& event);
+- void OnToolbarComparison(wxCommandEvent& event);
+- void OnToolbarComparisonDropdown(wxCommandEvent& event);
+- void OnDropdownComparisonMode(wxCommandEvent& event);
+- void OnDropdownComparisonHide(wxCommandEvent& event);
+- void OnSyncBrowse(wxCommandEvent& event);
++ void OnSitemanagerDropdown(wxCommandEvent& event);
++ void OnNavigationKeyEvent(wxNavigationKeyEvent& event);
++ void OnChar(wxKeyEvent& event);
++ void OnActivate(wxActivateEvent& event);
++ void OnToolbarComparison(wxCommandEvent& event);
++ void OnToolbarComparisonDropdown(wxCommandEvent& event);
++ void OnDropdownComparisonMode(wxCommandEvent& event);
++ void OnDropdownComparisonHide(wxCommandEvent& event);
++ void OnSyncBrowse(wxCommandEvent& event);
+ #ifdef __WXMAC__
+- void OnChildFocused(wxChildFocusEvent& event);
++ void OnChildFocused(wxChildFocusEvent& event);
+ #else
+- void OnIconize(wxIconizeEvent& event);
+- void OnTaskBarClick(wxTaskBarIconEvent&);
++ void OnIconize(wxIconizeEvent& event);
++ void OnTaskBarClick(wxTaskBarIconEvent&);
+ #endif
+ #ifdef __WXGTK__
+- void OnTaskBarClick_Delayed(wxCommandEvent& event);
++ void OnTaskBarClick_Delayed(wxCommandEvent& event);
+ #endif
+- void OnSearch(wxCommandEvent& event);
+- void OnMenuNewTab(wxCommandEvent& event);
+- void OnMenuCloseTab(wxCommandEvent& event);
++ void OnSearch(wxCommandEvent& event);
++ void OnMenuNewTab(wxCommandEvent& event);
++ void OnMenuCloseTab(wxCommandEvent& event);
+
+- bool m_bInitDone{};
+- bool m_bQuit{};
+- wxEventType m_closeEvent{};
+- wxTimer m_closeEventTimer;
++ bool m_bInitDone{};
++ bool m_bQuit{};
++ wxEventType m_closeEvent{};
++ wxTimer m_closeEventTimer;
+
+- CAsyncRequestQueue* m_pAsyncRequestQueue{};
+- CMainFrameStateEventHandler* m_pStateEventHandler{};
++ CAsyncRequestQueue* m_pAsyncRequestQueue{};
++ CMainFrameStateEventHandler* m_pStateEventHandler{};
+
+- CWindowStateManager* m_pWindowStateManager{};
++ CWindowStateManager* m_pWindowStateManager{};
+
+- CQueue* m_pQueuePane{};
++ CQueue* m_pQueuePane{};
+
+ #ifndef __WXMAC__
+- wxTaskBarIcon* m_taskBarIcon{};
++ wxTaskBarIcon* m_taskBarIcon{};
+ #endif
+ #ifdef __WXGTK__
+- // There is a bug in KDE, causing the window to toggle iconized state
+- // several times a second after uniconizing it from taskbar icon.
+- // Set m_taskbar_is_uniconizing in OnTaskBarClick and unset the
+- // next time the pending event processing runs and calls
OnTaskBarClick_Delayed.
+- // While set, ignore iconize events.
+- bool m_taskbar_is_uniconizing{};
++ // There is a bug in KDE, causing the window to toggle iconized state
++ // several times a second after uniconizing it from taskbar icon.
++ // Set m_taskbar_is_uniconizing in OnTaskBarClick and unset the
++ // next time the pending event processing runs and calls
OnTaskBarClick_Delayed.
++ // While set, ignore iconize events.
++ bool m_taskbar_is_uniconizing{};
+ #endif
+
+- int m_comparisonToggleAcceleratorId{};
++ int m_comparisonToggleAcceleratorId{};
+
+ #ifdef __WXMAC__
+- int m_lastFocusedChild{-1};
++ int m_lastFocusedChild{-1};
+ #endif
+ };
+
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
