Attachment 167993 Details for Bug 207879 – ugly version

[patch] ugly version

freefilesync_10.x_NO_WRKSUBDIR.diff (text/plain), 5.05 KB, created by Jan Beich on 2016-03-11 08:46:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2016-03-11 08:46:09 UTC

Size: 5.05 KB

patch

obsolete

>commit 82d30f6 (HEAD -> freefilesync2)
>Author: Jan Beich <jbeich@FreeBSD.org>
>Date:   Thu Mar 10 11:06:15 2016 +0000
>
>    sysutils/freefilesync: unbreak build on 10.x (partially r410810)
>    
>    ../../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.
>    
>    PR:		207879
>    Reported by:	pkg-fallout
>    Approved by:	kevlo (maintainer, previous version)
>---
> sysutils/freefilesync/Makefile                     | 11 ++++++-----
> sysutils/freefilesync/files/patch-Makefile         |  4 ++--
> sysutils/freefilesync/files/patch-fs_native.cpp    |  4 ++--
> .../freefilesync/files/patch-ui_version__check.cpp |  4 ++--
> .../freefilesync/files/patch-zen_file__access.cpp  | 23 ++++++++++++++++++++++
> 5 files changed, 35 insertions(+), 11 deletions(-)
>
>diff --git sysutils/freefilesync/Makefile sysutils/freefilesync/Makefile
>index d0a62bc..9cec97d 100644
>--- sysutils/freefilesync/Makefile
>+++ sysutils/freefilesync/Makefile
>@@ -16,7 +16,8 @@ BUILD_DEPENDS=	${LOCALBASE}/include/zenxml/xml.h:${PORTSDIR}/textproc/zenxml
> LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs \
> 		libnotify.so:${PORTSDIR}/devel/libnotify
> 
>-WRKSRC=		${WRKDIR}/FreeFileSync/Source
>+NO_WRKSUBDIR=	yes # for USES=dos2unix
>+BUILD_WRKSRC=	${WRKSRC}/FreeFileSync/Source
> 
> USES=		compiler:c++14-lang dos2unix gmake pkgconfig zip
> USE_LDCONFIG=	yes
>@@ -24,11 +25,11 @@ USE_WX=		3.0+
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's/wx-config/$${WX_CONFIG:T}/' \
>-		-e 's,g++,$${CXX},' ${WRKSRC}/Makefile
>+		-e 's,g++,$${CXX},' ${BUILD_WRKSRC}/Makefile
> 	@${REINPLACE_CMD} -e 's|<sys/vfs.h>|<sys/mount.h>|' \
>-		${WRKDIR}/zen/file_access.cpp
>-	@${REINPLACE_CMD} -e 's|WEXITSTATUS||' ${WRKDIR}/zen/shell_execute.h
>+		${WRKSRC}/zen/file_access.cpp
>+	@${REINPLACE_CMD} -e 's|WEXITSTATUS||' ${WRKSRC}/zen/shell_execute.h
> 	@${REINPLACE_CMD} -e 's|CLOCK_MONOTONIC_RAW|CLOCK_MONOTONIC|' \
>-		${WRKDIR}/zen/tick_count.h
>+		${WRKSRC}/zen/tick_count.h
> 
> .include <bsd.port.mk>
>diff --git sysutils/freefilesync/files/patch-Makefile sysutils/freefilesync/files/patch-Makefile
>index 9aa34e1..70a0363 100644
>--- sysutils/freefilesync/files/patch-Makefile
>+++ sysutils/freefilesync/files/patch-Makefile
>@@ -1,5 +1,5 @@
>---- Makefile.orig	2016-03-09 22:42:49.363968000 +0800
>-+++ Makefile	2016-03-09 22:51:51.270475000 +0800
>+--- FreeFileSync/Source/Makefile.orig	2015-11-02 10:29:48 UTC
>++++ FreeFileSync/Source/Makefile
> @@ -1,14 +1,14 @@
>  APPNAME     = FreeFileSync
> -prefix      = /usr
>diff --git sysutils/freefilesync/files/patch-fs_native.cpp sysutils/freefilesync/files/patch-fs_native.cpp
>index 49b4b60..209509c 100644
>--- sysutils/freefilesync/files/patch-fs_native.cpp
>+++ sysutils/freefilesync/files/patch-fs_native.cpp
>@@ -1,5 +1,5 @@
>---- fs/native.cpp.orig	2016-03-09 02:07:44 UTC
>-+++ fs/native.cpp
>+--- FreeFileSync/Source/fs/native.cpp.orig	2015-11-05 09:15:34 UTC
>++++ FreeFileSync/Source/fs/native.cpp
> @@ -84,8 +84,7 @@ void preAllocateSpaceBestEffort(FileHand
>  
>  #elif defined ZEN_LINUX
>diff --git sysutils/freefilesync/files/patch-ui_version__check.cpp sysutils/freefilesync/files/patch-ui_version__check.cpp
>index 44951ba..835bb32 100644
>--- sysutils/freefilesync/files/patch-ui_version__check.cpp
>+++ sysutils/freefilesync/files/patch-ui_version__check.cpp
>@@ -1,5 +1,5 @@
>---- ui/version_check.cpp.orig	2016-03-09 02:07:44 UTC
>-+++ ui/version_check.cpp
>+--- FreeFileSync/Source/ui/version_check.cpp.orig	2016-02-01 22:59:14 UTC
>++++ FreeFileSync/Source/ui/version_check.cpp
> @@ -112,17 +112,10 @@ std::string geHttpPostParameters() //mus
>      const auto osvMinor = getOsVersion().minor;
>  
>diff --git sysutils/freefilesync/files/patch-zen_file__access.cpp sysutils/freefilesync/files/patch-zen_file__access.cpp
>new file mode 100644
>index 0000000..9f89eca
>--- /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
>+ }
>+ 
>+

Actions: View | Diff

Attachments on bug 207879: 167963 | 167992 | 167993