SHA256
1
0
forked from pool/FreeFileSync
FreeFileSync/freefilesync-build.patch

71 lines
3.0 KiB
Diff
Raw Normal View History

Index: FreeFileSync-9.1/FreeFileSync/Source/fs/abstract.h
===================================================================
--- FreeFileSync-9.1.orig/FreeFileSync/Source/fs/abstract.h
+++ FreeFileSync-9.1/FreeFileSync/Source/fs/abstract.h
@@ -12,6 +12,7 @@
#include <zen/zstring.h>
#include <zen/optional.h>
#include <zen/serialize.h> //InputStream/OutputStream support buffered stream concept
+#include <zen/warn_static.h>
#include "../lib/icon_holder.h"
Index: FreeFileSync-9.1/FreeFileSync/Source/Makefile
===================================================================
--- FreeFileSync-9.1.orig/FreeFileSync/Source/Makefile
+++ FreeFileSync-9.1/FreeFileSync/Source/Makefile
@@ -121,5 +121,5 @@ install:
$(APPSHAREDIR)
mkdir -p $(DOCSHAREDIR)
- cp ../Build/Changelog.txt $(DOCSHAREDIR)/changelog
+ cp ../../Changelog.txt $(DOCSHAREDIR)/changelog
gzip $(DOCSHAREDIR)/changelog
Index: FreeFileSync-9.1/FreeFileSync/Source/ui/main_dlg.cpp
===================================================================
--- FreeFileSync-9.1.orig/FreeFileSync/Source/ui/main_dlg.cpp
+++ FreeFileSync-9.1/FreeFileSync/Source/ui/main_dlg.cpp
@@ -956,7 +956,7 @@ xmlAccess::XmlGlobalSettings MainDialog:
history.resize(globalSettings.gui.cfgFileHistMax);
globalSettings.gui.cfgFileHistory = history;
- globalSettings.gui.cfgFileHistFirstItemPos = m_listBoxHistory->GetTopItem();
+ // globalSettings.gui.cfgFileHistFirstItemPos = m_listBoxHistory->GetTopItem();
//--------------------------------------------------------------------------------
globalSettings.gui.lastUsedConfigFiles.clear();
for (const Zstring& cfgFilePath : activeConfigFiles)
@@ -4767,13 +4767,13 @@ void MainDialog::OnMenuCheckVersionAutom
m_menuItemCheckVersionAuto->Check(updateCheckActive(globalCfg.gui.lastUpdateCheck));
- if (shouldRunPeriodicUpdateCheck(globalCfg.gui.lastUpdateCheck))
+ /*if (shouldRunPeriodicUpdateCheck(globalCfg.gui.lastUpdateCheck))
{
flashStatusInformation(_("Searching for program updates..."));
//synchronous update check is sufficient here:
periodicUpdateCheckEval(this, globalCfg.gui.lastUpdateCheck, globalCfg.gui.lastOnlineVersion,
periodicUpdateCheckRunAsync(periodicUpdateCheckPrepare().get()).get());
- }
+ }*/
}
@@ -4782,7 +4782,7 @@ void MainDialog::OnRegularUpdateCheck(wx
//execute just once per startup!
Disconnect(wxEVT_IDLE, wxIdleEventHandler(MainDialog::OnRegularUpdateCheck), nullptr, this);
- if (shouldRunPeriodicUpdateCheck(globalCfg.gui.lastUpdateCheck))
+ /*if (shouldRunPeriodicUpdateCheck(globalCfg.gui.lastUpdateCheck))
{
flashStatusInformation(_("Searching for program updates..."));
@@ -4794,7 +4794,7 @@ void MainDialog::OnRegularUpdateCheck(wx
periodicUpdateCheckEval(this, globalCfg.gui.lastUpdateCheck, globalCfg.gui.lastOnlineVersion,
resultAsync.get()); //run on main thread:
});
- }
+ }*/
}