FreeBSD Bugzilla – Attachment 191097 Details for
Bug 226276
sysutils/freefilesync new version 9.8
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
diff patch
sysutils_freefilesync-9.8.patch (text/plain), 11.31 KB, created by
Olexandr Davydenko
on 2018-03-01 12:06:55 UTC
(
hide
)
Description:
diff patch
Filename:
MIME Type:
Creator:
Olexandr Davydenko
Created:
2018-03-01 12:06:55 UTC
Size:
11.31 KB
patch
obsolete
>diff -urN freefilesync.orig/distinfo freefilesync/distinfo >--- freefilesync.orig/distinfo 2016-07-30 19:00:57.000000000 +0300 >+++ freefilesync/distinfo 2018-03-01 10:42:15.773872000 +0200 >@@ -1,3 +1,3 @@ >-TIMESTAMP = 1469892304 >-SHA256 (FreeFileSync_8.3_Source.zip) = bbde3eaa345d20a088746b14dc6e0721984d316a6f3dbbe54be646b84d60e7a6 >-SIZE (FreeFileSync_8.3_Source.zip) = 3020292 >+TIMESTAMP = 1519893735 >+SHA256 (FreeFileSync_9.8_Source.zip) = 77a59586284a518d6df6c0cc934c3efa434f247acce70452ab9fe37e7747b96d >+SIZE (FreeFileSync_9.8_Source.zip) = 2866149 >diff -urN freefilesync.orig/files/patch-fs_native.cpp freefilesync/files/patch-fs_native.cpp >--- freefilesync.orig/files/patch-fs_native.cpp 2016-03-09 04:21:21.000000000 +0200 >+++ freefilesync/files/patch-fs_native.cpp 1970-01-01 03:00:00.000000000 +0300 >@@ -1,12 +0,0 @@ >---- fs/native.cpp.orig 2016-03-09 02:07:44 UTC >-+++ fs/native.cpp >-@@ -84,8 +84,7 @@ void preAllocateSpaceBestEffort(FileHand >- >- #elif defined ZEN_LINUX >- //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 >- streamSize); //off_t len >- if (rv != 0) >diff -urN freefilesync.orig/files/patch-lib_dir__lock.h freefilesync/files/patch-lib_dir__lock.h >--- freefilesync.orig/files/patch-lib_dir__lock.h 1970-01-01 03:00:00.000000000 +0300 >+++ freefilesync/files/patch-lib_dir__lock.h 2018-03-01 12:00:58.143021000 +0200 >@@ -0,0 +1,10 @@ >+--- lib/dir_lock.h.orig 2018-03-01 11:58:36.149588000 +0200 >++++ lib/dir_lock.h 2018-03-01 11:59:55.216303000 +0200 >+@@ -11,6 +11,7 @@ >+ #include <chrono> >+ #include <functional> >+ #include <zen/file_error.h> >++#include <zen/warn_static.h> >+ >+ >+ namespace fff >diff -urN freefilesync.orig/files/patch-Makefile freefilesync/files/patch-Makefile >--- freefilesync.orig/files/patch-Makefile 2016-07-07 09:51:25.000000000 +0300 >+++ freefilesync/files/patch-Makefile 2018-03-01 11:04:12.963503000 +0200 >@@ -1,6 +1,6 @@ >---- Makefile.orig 2016-04-21 22:53:00.000000000 +0800 >-+++ Makefile 2016-06-30 13:33:16.633078000 +0800 >-@@ -1,14 +1,14 @@ >+--- Makefile.orig 2018-03-01 10:59:10.564548000 +0200 >++++ Makefile 2018-03-01 11:03:31.206781000 +0200 >+@@ -1,13 +1,13 @@ > APPNAME = FreeFileSync > -prefix = /usr > +prefix = $(PREFIX) >@@ -9,16 +9,15 @@ > APPSHAREDIR = $(SHAREDIR)/$(APPNAME) > DOCSHAREDIR = $(SHAREDIR)/doc/$(APPNAME) > >- CXXFLAGS = -std=c++14 -pipe -DWXINTL_NO_GETTEXT_MACRO -I../.. -I../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" -Wall \ >---O3 -DNDEBUG `wx-config --cxxflags --debug=no` -DZEN_LINUX -pthread >-+-O3 -DNDEBUG `${WX_CONFIG} --cxxflags --debug=no` -DZEN_LINUX -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 >++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` >-@@ -97,10 +97,10 @@ >+@@ -99,10 +99,10 @@ > > ../Obj/FFS_GCC_Make_Release/ffs/src/%.o : %.cpp > mkdir -p $(dir $@) >@@ -31,7 +30,7 @@ > > clean: > rm -rf ../Obj/FFS_GCC_Make_Release >-@@ -109,7 +109,7 @@ >+@@ -111,7 +111,7 @@ > > install: > mkdir -p $(BINDIR) >@@ -40,7 +39,7 @@ > > mkdir -p $(APPSHAREDIR) > cp -R ../Build/Languages/ \ >-@@ -120,6 +120,3 @@ >+@@ -122,6 +122,3 @@ > ../Build/Resources.zip \ > $(APPSHAREDIR) > >diff -urN freefilesync.orig/files/patch-ui_main__dlg.cpp freefilesync/files/patch-ui_main__dlg.cpp >--- freefilesync.orig/files/patch-ui_main__dlg.cpp 1970-01-01 03:00:00.000000000 +0300 >+++ freefilesync/files/patch-ui_main__dlg.cpp 2018-03-01 12:40:50.997814000 +0200 >@@ -0,0 +1,10 @@ >+--- ui/main_dlg.cpp.orig 2018-03-01 12:39:08.892347000 +0200 >++++ ui/main_dlg.cpp 2018-03-01 12:39:32.048027000 +0200 >+@@ -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 -urN freefilesync.orig/files/patch-ui_version__check.cpp freefilesync/files/patch-ui_version__check.cpp >--- freefilesync.orig/files/patch-ui_version__check.cpp 2016-07-07 09:51:25.000000000 +0300 >+++ freefilesync/files/patch-ui_version__check.cpp 2018-03-01 11:27:59.801608000 +0200 >@@ -1,15 +1,15 @@ >---- ui/version_check.cpp.orig 2016-06-30 13:33:44.614966000 +0800 >-+++ ui/version_check.cpp 2016-06-30 13:36:17.540454000 +0800 >-@@ -104,16 +104,10 @@ >- const auto osvMinor = getOsVersion().minor; >+--- ui/version_check.cpp.orig 2018-03-01 11:17:27.107179000 +0200 >++++ ui/version_check.cpp 2018-03-01 11:19:43.918031000 +0200 >+@@ -70,16 +70,10 @@ >+ params.emplace_back("installation_type", isPortableVersion() ? "Portable" : "Local"); >+ > >- #elif defined ZEN_LINUX > - params.emplace_back("os_name", "Linux"); > + params.emplace_back("os_name", "FreeBSD"); > > - const wxLinuxDistributionInfo distribInfo = wxGetLinuxDistributionInfo(); > - assert(contains(distribInfo.Release, L'.')); >-- std::vector<wxString> digits = split<wxString>(distribInfo.Release, L'.'); //e.g. "15.04" >+- std::vector<wxString> digits = split<wxString>(distribInfo.Release, L'.', SplitType::ALLOW_EMPTY); //e.g. "15.04" > - digits.resize(2); > - //distribInfo.Id //e.g. "Ubuntu" > - >@@ -18,5 +18,5 @@ > + const int osvMajor = 0; > + const int osvMinor = 0; > >- #elif defined ZEN_MAC >- params.emplace_back("os_name", "Mac"); >+ params.emplace_back("os_version", numberTo<std::string>(osvMajor) + "." + numberTo<std::string>(osvMinor)); >+ >diff -urN freefilesync.orig/files/patch-zen_file__io.cpp freefilesync/files/patch-zen_file__io.cpp >--- freefilesync.orig/files/patch-zen_file__io.cpp 1970-01-01 03:00:00.000000000 +0300 >+++ freefilesync/files/patch-zen_file__io.cpp 2018-03-01 11:28:37.215684000 +0200 >@@ -0,0 +1,12 @@ >+--- ../../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 -urN freefilesync.orig/files/patch-zen_scope__guard.h freefilesync/files/patch-zen_scope__guard.h >--- freefilesync.orig/files/patch-zen_scope__guard.h 2016-11-21 05:52:38.000000000 +0200 >+++ freefilesync/files/patch-zen_scope__guard.h 1970-01-01 03:00:00.000000000 +0300 >@@ -1,11 +0,0 @@ >---- ../../zen/scope_guard.h.orig 2016-03-31 20:08:04 UTC >-+++ ../../zen/scope_guard.h >-@@ -14,7 +14,7 @@ >- //best of Zen, Loki and C++17 >- >- >--#ifdef ZEN_WIN >-+#if defined(ZEN_WIN) || (defined(_LIBCPP_VERSION) && _LIBCPP_VERSION >= 3700) >- inline int getUncaughtExceptionCount() { return std::uncaught_exceptions(); } >- >- #elif defined ZEN_LINUX || defined ZEN_MAC >diff -urN freefilesync.orig/files/patch-zen_thread.h freefilesync/files/patch-zen_thread.h >--- freefilesync.orig/files/patch-zen_thread.h 1970-01-01 03:00:00.000000000 +0300 >+++ freefilesync/files/patch-zen_thread.h 2018-03-01 11:49:41.321981000 +0200 >@@ -0,0 +1,21 @@ >+--- ../../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); >+ >+ } >+ >diff -urN freefilesync.orig/Makefile freefilesync/Makefile >--- freefilesync.orig/Makefile 2018-01-18 06:11:02.000000000 +0200 >+++ freefilesync/Makefile 2018-03-01 11:29:42.239418000 +0200 >@@ -2,8 +2,7 @@ > # $FreeBSD: head/sysutils/freefilesync/Makefile 459315 2018-01-18 04:11:02Z jbeich $ > > PORTNAME= freefilesync >-PORTVERSION= 8.3 >-PORTREVISION= 9 >+PORTVERSION= 9.8 > CATEGORIES= sysutils > MASTER_SITES= https://www.freefilesync.org/download/ \ > https://www.freefilesync.org/archive/ >@@ -13,7 +12,7 @@ > COMMENT= Backup software to synchronize files and folders > > LICENSE= GPLv3 >-LICENSE_FILE= ${WRKSRC}/LICENSE >+LICENSE_FILE= ${WRKDIR}/License.txt > > BUILD_DEPENDS= ${LOCALBASE}/include/zenxml/xml.h:textproc/zenxml > LIB_DEPENDS= libboost_system.so:devel/boost-libs \ >@@ -36,7 +35,5 @@ > ${WRKDIR}/zen/file_access.cpp > @${REINPLACE_CMD} -e 's|WEXITSTATUS||' ${WRKDIR}/zen/shell_execute.h > @${REINPLACE_CMD} -e 's| noexcept;|;|' ${WRKDIR}/zen/scope_guard.h >- @${REINPLACE_CMD} -e 's|CLOCK_MONOTONIC_RAW|CLOCK_MONOTONIC|' \ >- ${WRKDIR}/zen/tick_count.h > > .include <bsd.port.mk> >diff -urN freefilesync.orig/pkg-plist freefilesync/pkg-plist >--- freefilesync.orig/pkg-plist 2016-07-07 09:51:25.000000000 +0300 >+++ freefilesync/pkg-plist 2018-03-01 12:59:43.287123000 +0200 >@@ -47,6 +47,7 @@ > share/FreeFileSync/images/basic-step-sync-config.png > share/FreeFileSync/images/calendar-job-added.png > share/FreeFileSync/images/com-settings-context.png >+share/FreeFileSync/images/command-line-syntax.png > share/FreeFileSync/images/comparison-settings.png > share/FreeFileSync/images/comparison-variant-double-click.png > share/FreeFileSync/images/config-double-click.png >@@ -54,9 +55,9 @@ > share/FreeFileSync/images/copy-alternative-path.png > share/FreeFileSync/images/dialog-drag-move.png > share/FreeFileSync/images/direct-synchronize.png >-share/FreeFileSync/images/donate.png > share/FreeFileSync/images/explorer-context.png > share/FreeFileSync/images/filter-context.png >+share/FreeFileSync/images/filter-zero-file-size.png > share/FreeFileSync/images/filter.png > share/FreeFileSync/images/freefilesync-logo.png > share/FreeFileSync/images/gnome-scheduler.png >@@ -77,7 +78,9 @@ > share/FreeFileSync/images/save-automator.png > share/FreeFileSync/images/select-time-span.png > share/FreeFileSync/images/setup-batch-job.png >+share/FreeFileSync/images/sftp-cloud-picker.png > share/FreeFileSync/images/sftp-login.png >+share/FreeFileSync/images/sftp-performance.png > share/FreeFileSync/images/show-thumbnails.png > share/FreeFileSync/images/sync-settings-context.png > share/FreeFileSync/images/synchronization-settings.png >@@ -91,13 +94,12 @@ > share/FreeFileSync/japanese.lng > share/FreeFileSync/korean.lng > share/FreeFileSync/lithuanian.lng >-share/FreeFileSync/outdated/norwegian.lng >+share/FreeFileSync/norwegian.lng > share/FreeFileSync/polish.lng > share/FreeFileSync/portuguese.lng > share/FreeFileSync/portuguese_br.lng > share/FreeFileSync/romanian.lng > share/FreeFileSync/russian.lng >-share/FreeFileSync/serbian.lng > share/FreeFileSync/slovak.lng > share/FreeFileSync/slovenian.lng > share/FreeFileSync/spanish.lng
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=191097">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 226276
: 191097