Attachment 173784 Details for Bug 211943 – Patch

[patch] Patch

freefilesync.patch (text/plain), 2.17 KB, created by Dmitry Marakasov on 2016-08-17 13:04:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2016-08-17 13:04:35 UTC

Size: 2.17 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 420253)
>+++ Makefile	(working copy)
>@@ -13,8 +13,6 @@
> LICENSE=	GPLv3
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-BROKEN_FreeBSD_9=	does not build on FreeBSD < 10.x
>-
> BUILD_DEPENDS=	${LOCALBASE}/include/zenxml/xml.h:textproc/zenxml
> LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
> 		libnotify.so:devel/libnotify
>@@ -29,6 +27,12 @@
> USE_LDCONFIG=	yes
> USE_WX=		3.0+
> 
>+.include <bsd.port.pre.mk>
>+
>+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1003000
>+BROKEN=		does not build on FreeBSD < 10.3 (lack of futimens(2))
>+.endif
>+
> post-patch:
> 	@${REINPLACE_CMD} -e 's/wx-config/$${WX_CONFIG:T}/' \
> 		-e 's,g++,$${CXX},' ${WRKSRC}/Makefile
>@@ -38,4 +42,4 @@
> 	@${REINPLACE_CMD} -e 's|CLOCK_MONOTONIC_RAW|CLOCK_MONOTONIC|' \
> 		${WRKDIR}/zen/tick_count.h
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>Index: files/patch-zen_file__access.cpp
>===================================================================
>--- files/patch-zen_file__access.cpp	(revision 420253)
>+++ files/patch-zen_file__access.cpp	(nonexistent)
>@@ -1,26 +0,0 @@
>---- ../../zen/file_access.cpp.orig	2016-01-11 12:13:10 UTC
>-+++ ../../zen/file_access.cpp
>-@@ -877,6 +877,15 @@ void setFileTimeRaw(const Zstring& fileP
>-     //https://sourceforge.net/p/freefilesync/discussion/open-discussion/thread/218564cf/
>-     newTimes[1] = modTime; //modification time
>- 
>-+#if defined(__FreeBSD__)
>-+// only defines __FreeBSD_version
>-+#include <osreldate.h>
>-+#endif
>-+
>-+#if (defined(__FreeBSD__) && (__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 +907,7 @@ 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
>- }
>- 
>-

Actions: View | Diff

Attachments on bug 211943: 173784