diff --git a/patches/ntdll-DOS_Attributes/0002-ntdll-Implement-retrieving-DOS-attributes-in-NtQuery.patch b/patches/ntdll-DOS_Attributes/0002-ntdll-Implement-retrieving-DOS-attributes-in-NtQuery.patch index 42be1264..a6f4d477 100644 --- a/patches/ntdll-DOS_Attributes/0002-ntdll-Implement-retrieving-DOS-attributes-in-NtQuery.patch +++ b/patches/ntdll-DOS_Attributes/0002-ntdll-Implement-retrieving-DOS-attributes-in-NtQuery.patch @@ -1,20 +1,19 @@ -From 6a744d7489e7bc7047c2c7235e5dc91d938bf927 Mon Sep 17 00:00:00 2001 +From 047f470355885dff798b77061696de522bf03744 Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Tue, 19 Aug 2014 22:10:49 -0600 -Subject: ntdll: Implement retrieving DOS attributes in - NtQueryInformationFile. +Subject: ntdll: Implement retrieving DOS attributes in NtQueryInformationFile. --- - configure.ac | 12 ++++++++++++ - dlls/ntdll/file.c | 23 ++++++++++++++++++++++- - include/wine/port.h | 8 ++++++++ - libs/port/Makefile.in | 3 ++- - libs/port/xattr.c | 39 +++++++++++++++++++++++++++++++++++++++ + configure.ac | 12 ++++++++++++ + dlls/ntdll/file.c | 23 ++++++++++++++++++++++- + include/wine/port.h | 8 ++++++++ + libs/port/Makefile.in | 3 ++- + libs/port/xattr.c | 39 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 83 insertions(+), 2 deletions(-) create mode 100644 libs/port/xattr.c diff --git a/configure.ac b/configure.ac -index 240ce29..fd760e3 100644 +index de6d2cc..9de4fa0 100644 --- a/configure.ac +++ b/configure.ac @@ -77,2 +77,3 @@ AC_ARG_WITH(tiff, AS_HELP_STRING([--without-tiff],[do not use TIFF])) @@ -29,7 +28,7 @@ index 240ce29..fd760e3 100644 +then + AC_CHECK_HEADERS(attr/xattr.h, [HAVE_XATTR=1]) +fi -+if test "x$with_xattr" == "xyes" ++if test "x$with_xattr" = "xyes" +then + WINE_ERROR_WITH(xattr,[test "x$HAVE_XATTR" = "x"],[xattr ${notice_platform}development files \ +not found. Wine will be built without extended attribute support, which probably isn't what you \ @@ -40,7 +39,7 @@ index 240ce29..fd760e3 100644 AC_SUBST(dlldir,"\${libdir}/wine") diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c -index 53cce85..e258ca1 100644 +index 1a69648..b0c3df8 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -103,6 +103,22 @@ mode_t FILE_umask = 0; @@ -162,5 +161,5 @@ index 0000000..2d37be9 +#endif +} -- -1.7.9.5 +2.1.3 diff --git a/patches/ntdll-DOS_Attributes/0006-libport-Add-support-for-Mac-OS-X-style-extended-attr.patch b/patches/ntdll-DOS_Attributes/0006-libport-Add-support-for-Mac-OS-X-style-extended-attr.patch index de0fd31e..e2a8b26b 100644 --- a/patches/ntdll-DOS_Attributes/0006-libport-Add-support-for-Mac-OS-X-style-extended-attr.patch +++ b/patches/ntdll-DOS_Attributes/0006-libport-Add-support-for-Mac-OS-X-style-extended-attr.patch @@ -1,4 +1,4 @@ -From 29e445c891dab24f5f753cf7823dc2572db3b903 Mon Sep 17 00:00:00 2001 +From 4abb908b47ae85da0eb37b9c08becda2694862ec Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Mon, 6 Oct 2014 14:21:11 -0600 Subject: libport: Add support for Mac OS X style extended attributes. @@ -9,7 +9,7 @@ Subject: libport: Add support for Mac OS X style extended attributes. 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac -index 6234d15..3e88371 100644 +index 9de4fa0..efe4e01 100644 --- a/configure.ac +++ b/configure.ac @@ -671,6 +671,9 @@ AC_CHECK_HEADERS([libprocstat.h],,, @@ -20,7 +20,7 @@ index 6234d15..3e88371 100644 + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[getxattr("", "", "", 0, 0, 0);]])], + [AC_DEFINE(XATTR_ADDITIONAL_OPTIONS, 1, [Define if xattr functions take additional arguments (Mac OS X)])])]) fi - if test "x$with_xattr" == "xyes" + if test "x$with_xattr" = "xyes" then diff --git a/libs/port/xattr.c b/libs/port/xattr.c index dc89a45..2f20687 100644 @@ -104,5 +104,5 @@ index dc89a45..2f20687 100644 #else errno = ENOTSUP; -- -2.1.2 +2.1.3