6 files changed, 0 insertions, 123 deletions
diff --git a/sysutils/freefilesync/files/patch-Makefile b/sysutils/freefilesync/files/patch-Makefile
deleted file mode 100644
index 0972eb974928..000000000000
--- a/sysutils/freefilesync/files/patch-Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
---- Makefile.orig	2018-02-06 16:36:07 UTC
-+++ Makefile
-@@ -1,13 +1,13 @@
- APPNAME     = FreeFileSync
--prefix      = /usr
-+prefix      = $(PREFIX)
- BINDIR      = $(DESTDIR)$(prefix)/bin
- SHAREDIR    = $(DESTDIR)$(prefix)/share
- APPSHAREDIR = $(SHAREDIR)/$(APPNAME)
- DOCSHAREDIR = $(SHAREDIR)/doc/$(APPNAME)
- 
--CXXFLAGS  = -std=c++14 -pipe -DWXINTL_NO_GETTEXT_MACRO -I../.. -I../../zenXml -include "zen/i18n.h" -Wall -O3 -DNDEBUG `wx-config --cxxflags --debug=no` -pthread
-+CXXFLAGS  = -std=c++14 -pipe -DWXINTL_NO_GETTEXT_MACRO -I../.. -I../../zenXml -include "zen/i18n.h" -Wall -O3 -DNDEBUG `${WX_CONFIG} --cxxflags --debug=no` -pthread
- 
--LINKFLAGS = -s `wx-config --libs std, aui --debug=no` -lboost_thread -lboost_chrono -lboost_system -lz -pthread
-+LINKFLAGS = -s `${WX_CONFIG} --libs std, aui --debug=no` -lboost_thread -lboost_chrono -lboost_system -lz -pthread
- 
- #Gtk - support recycler/icon loading/no button border/grid scrolling
- CXXFLAGS  += `pkg-config --cflags gtk+-2.0`
-@@ -99,10 +99,10 @@ launchpad: FreeFileSync
- 
- ../Obj/FFS_GCC_Make_Release/ffs/src/%.o : %.cpp
- 	mkdir -p $(dir $@)
--	g++ $(CXXFLAGS) -c $< -o $@
-+	${CXX} $(CXXFLAGS) -c $< -o $@
- 
- FreeFileSync: $(OBJECT_LIST)
--	g++ -o ../Build/$(APPNAME) $(OBJECT_LIST) $(LINKFLAGS)
-+	${CXX} -o ../Build/$(APPNAME) $(OBJECT_LIST) $(LINKFLAGS)
- 
- clean:
- 	rm -rf ../Obj/FFS_GCC_Make_Release
-@@ -111,7 +111,7 @@ clean:
- 
- install:
- 	mkdir -p $(BINDIR)
--	cp ../Build/$(APPNAME) $(BINDIR)
-+	cp ../Build/$(APPNAME) $(BINDIR)/freefilesync
- 
- 	mkdir -p $(APPSHAREDIR)
- 	cp -R ../Build/Languages/ \
-@@ -122,6 +122,3 @@ install:
- 	../Build/Resources.zip \
- 	$(APPSHAREDIR)
- 
--	mkdir -p $(DOCSHAREDIR)
--	cp ../Build/Changelog.txt $(DOCSHAREDIR)/changelog
--	gzip $(DOCSHAREDIR)/changelog
diff --git a/sysutils/freefilesync/files/patch-lib_dir__lock.h b/sysutils/freefilesync/files/patch-lib_dir__lock.h
deleted file mode 100644
index 87649f1fb218..000000000000
--- a/sysutils/freefilesync/files/patch-lib_dir__lock.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/dir_lock.h.orig	2018-03-02 05:46:44 UTC
-+++ lib/dir_lock.h
-@@ -11,6 +11,7 @@
- #include <chrono>
- #include <functional>
- #include <zen/file_error.h>
-+#include <zen/warn_static.h>
- 
- 
- namespace fff
diff --git a/sysutils/freefilesync/files/patch-ui_main__dlg.cpp b/sysutils/freefilesync/files/patch-ui_main__dlg.cpp
deleted file mode 100644
index 4303a0cf92c2..000000000000
--- a/sysutils/freefilesync/files/patch-ui_main__dlg.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- ui/main_dlg.cpp.orig	2018-03-02 05:46:44 UTC
-+++ ui/main_dlg.cpp
-@@ -28,6 +28,7 @@
- #include <wx+/image_resources.h>
- #include "cfg_grid.h"
- #include "version_check.h"
-+#include "version_check_impl.h"
- #include "gui_status_handler.h"
- #include "small_dlgs.h"
- #include "progress_indicator.h"
diff --git a/sysutils/freefilesync/files/patch-ui_version__check.cpp b/sysutils/freefilesync/files/patch-ui_version__check.cpp
deleted file mode 100644
index cc888fd4f909..000000000000
--- a/sysutils/freefilesync/files/patch-ui_version__check.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
---- ui/version_check.cpp.orig	2018-03-02 05:46:44 UTC
-+++ ui/version_check.cpp
-@@ -70,16 +70,10 @@ std::vector<std::pair<std::string, std::
-     params.emplace_back("installation_type", isPortableVersion() ? "Portable" : "Local");
- 
- 
--    params.emplace_back("os_name", "Linux");
--
--    const wxLinuxDistributionInfo distribInfo = wxGetLinuxDistributionInfo();
--    assert(contains(distribInfo.Release, L'.'));
--    std::vector<wxString> digits = split<wxString>(distribInfo.Release, L'.', SplitType::ALLOW_EMPTY); //e.g. "15.04"
--    digits.resize(2);
--    //distribInfo.Id //e.g. "Ubuntu"
-+    params.emplace_back("os_name", "FreeBSD");
- 
--    const int osvMajor = stringTo<int>(digits[0]);
--    const int osvMinor = stringTo<int>(digits[1]);
-+    const int osvMajor = 0;
-+    const int osvMinor = 0;
- 
-     params.emplace_back("os_version", numberTo<std::string>(osvMajor) + "." + numberTo<std::string>(osvMinor));
- 
diff --git a/sysutils/freefilesync/files/patch-zen_file__io.cpp b/sysutils/freefilesync/files/patch-zen_file__io.cpp
deleted file mode 100644
index 9ddcad46e44e..000000000000
--- a/sysutils/freefilesync/files/patch-zen_file__io.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../../zen/file_io.cpp.orig	2018-03-01 11:10:56.764684000 +0200
-+++ ../../zen/file_io.cpp	2018-03-01 11:12:35.599889000 +0200
-@@ -305,8 +305,7 @@
- {
-     const FileHandle fh = getHandle();
-     //don't use potentially inefficient ::posix_fallocate!
--    const int rv = ::fallocate(fh,            //int fd,
--                               0,             //int mode,
-+    const int rv = ::posix_fallocate(fh,            //int fd,
-                                0,             //off_t offset
-                                expectedSize); //off_t len
-     if (rv != 0)
diff --git a/sysutils/freefilesync/files/patch-zen_thread.h b/sysutils/freefilesync/files/patch-zen_thread.h
deleted file mode 100644
index 533b307238b9..000000000000
--- a/sysutils/freefilesync/files/patch-zen_thread.h
+++ /dev/null
@@ -1,21 +0,0 @@
---- ../../zen/thread.h.orig	2018-03-01 11:48:04.473377000 +0200
-+++ ../../zen/thread.h	2018-03-01 11:48:51.214192000 +0200
-@@ -12,8 +12,7 @@
- #include "scope_guard.h"
- #include "type_traits.h"
- #include "optional.h"
--    #include <sys/prctl.h>
--
-+#include <pthread_np.h>
- 
- namespace zen
- {
-@@ -407,7 +406,7 @@
- inline
- void setCurrentThreadName(const char* threadName)
- {
--    ::prctl(PR_SET_NAME, threadName, 0, 0, 0);
-+    pthread_set_name_np(pthread_self(), threadName);
- 
- }
-