Attachment 167963 Details for Bug 207879 – v0

[patch] v0

freefilesync_10.x.diff (text/plain), 2.50 KB, created by Jan Beich on 2016-03-10 13:31:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2016-03-10 13:31:07 UTC

Size: 2.50 KB

patch

obsolete

>commit 629ea73
>Author: Jan Beich <jbeich@FreeBSD.org>
>Date:   Thu Mar 10 11:06:15 2016 +0000
>
>    sysutils/freefilesync: unbreak build on 10.x
>    
>    error: invalid value 'c++14' in '-std=c++14'
>    
>    ../../zen/file_access.cpp:893:15: error: no member named 'futimens' in the global namespace
>            if (::futimens(fdFile, newTimes) != 0)
>                ~~^
>    ../../zen/file_access.cpp:898:15: error: no member named 'utimensat' in the global namespace
>            if (::utimensat(AT_FDCWD, filePath.c_str(), newTimes, AT_SYMLINK_NOFOLLOW) != 0)
>                ~~^
>    2 errors generated.
>    
>    Reported by:	pkg-fallout
>---
> sysutils/freefilesync/Makefile                     |  2 +-
> .../freefilesync/files/patch-zen_file__access.cpp  | 23 ++++++++++++++++++++++
> 2 files changed, 24 insertions(+), 1 deletion(-)
>
>diff --git sysutils/freefilesync/Makefile sysutils/freefilesync/Makefile
>index ca18a09..d0a62bc 100644
>--- sysutils/freefilesync/Makefile
>+++ sysutils/freefilesync/Makefile
>@@ -18,7 +18,7 @@ LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs \
> 
> WRKSRC=		${WRKDIR}/FreeFileSync/Source
> 
>-USES=		compiler:c++11-lang dos2unix gmake pkgconfig zip
>+USES=		compiler:c++14-lang dos2unix gmake pkgconfig zip
> USE_LDCONFIG=	yes
> USE_WX=		3.0+
> 
>diff --git sysutils/freefilesync/files/patch-zen_file__access.cpp sysutils/freefilesync/files/patch-zen_file__access.cpp
>new file mode 100644
>index 0000000..d455ccb
>--- /dev/null
>+++ sysutils/freefilesync/files/patch-zen_file__access.cpp
>@@ -0,0 +1,23 @@
>+--- ../../zen/file_access.cpp.orig	2016-01-11 12:13:10 UTC
>++++ ../../zen/file_access.cpp
>+@@ -877,6 +877,11 @@ void setFileTimeRaw(const Zstring& fileP
>+     //https://sourceforge.net/p/freefilesync/discussion/open-discussion/thread/218564cf/
>+     newTimes[1] = modTime; //modification time
>+ 
>++#if defined(__FreeBSD__)
>++#include <osreldate.h>
>++#if __FreeBSD_version < 1002506 || (__FreeBSD_version >= 1100000 && __FreeBSD_version < 1100056)
>++    throw ErrorLinuxFallbackToUtimes(L"");
>++#else
>+     //=> using open()/futimens() for regular files and utimensat(AT_SYMLINK_NOFOLLOW) for symlinks is consistent with "cp" and "touch"!
>+     if (procSl == ProcSymlink::FOLLOW)
>+     {
>+@@ -898,6 +903,8 @@ void setFileTimeRaw(const Zstring& fileP
>+         if (::utimensat(AT_FDCWD, filePath.c_str(), newTimes, AT_SYMLINK_NOFOLLOW) != 0)
>+             THROW_LAST_FILE_ERROR(replaceCpy(_("Cannot write modification time of %x."), L"%x", fmtPath(filePath)), L"utimensat");
>+     }
>++#endif
>++#endif
>+ }
>+ 
>+

Flags:

jbeich: maintainer-approval? (kevlo)

Actions: View | Diff

Attachments on bug 207879: 167963 | 167992 | 167993