[vlc-commits] contrib: libarchive: fix winrt patches

2020-06-19 Thread Steve Lhomme
vlc/vlc-3.0 | branch: master | Steve Lhomme  | Thu Apr  2 
14:58:53 2020 +0200| [1ca4632aa516669042c74e330f6a3a03513ab56b] | committer: 
Steve Lhomme

contrib: libarchive: fix winrt patches

(cherry picked from commit d3b67e26cc40e787693f7353d6504a9a2b199f4f)
Signed-off-by: Steve Lhomme 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=1ca4632aa516669042c74e330f6a3a03513ab56b
---

 contrib/src/libarchive/no-windows-files.patch | 11 ---
 1 file changed, 11 deletions(-)

diff --git a/contrib/src/libarchive/no-windows-files.patch 
b/contrib/src/libarchive/no-windows-files.patch
index e5300aaef0..aa6ec78536 100644
--- a/contrib/src/libarchive/no-windows-files.patch
+++ b/contrib/src/libarchive/no-windows-files.patch
@@ -8,14 +8,3 @@
  AM_CONDITIONAL([INC_WINDOWS_FILES], [test $inc_windows_files = yes])
  AM_CONDITIONAL([INC_CYGWIN_FILES], [test $inc_cygwin_files = yes])
  
 libarchive/libarchive/archive_entry.h.old  2017-06-06 16:19:37.998058703 
+0200
-+++ libarchive/libarchive/archive_entry.h  2017-06-06 16:19:41.830066940 
+0200
-@@ -294,7 +294,7 @@
-
- __LA_DECL voidarchive_entry_set_atime(struct archive_entry *, time_t, 
long);
- __LA_DECL void  archive_entry_unset_atime(struct archive_entry *);
--#if defined(_WIN32) && !defined(__CYGWIN__)
-+#if defined(_WIN32) && !defined(__CYGWIN__) && 
WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
- __LA_DECL void archive_entry_copy_bhfi(struct archive_entry *, 
BY_HANDLE_FILE_INFORMATION *);
- #endif
- __LA_DECL voidarchive_entry_set_birthtime(struct archive_entry *, 
time_t, long);

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] contrib: libarchive: fix winrt patches

2020-05-18 Thread Steve Lhomme
vlc | branch: master | Steve Lhomme  | Thu Apr  2 14:58:53 
2020 +0200| [d3b67e26cc40e787693f7353d6504a9a2b199f4f] | committer: Steve Lhomme

contrib: libarchive: fix winrt patches

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d3b67e26cc40e787693f7353d6504a9a2b199f4f
---

 contrib/src/libarchive/no-windows-files.patch | 11 ---
 1 file changed, 11 deletions(-)

diff --git a/contrib/src/libarchive/no-windows-files.patch 
b/contrib/src/libarchive/no-windows-files.patch
index e5300aaef0..aa6ec78536 100644
--- a/contrib/src/libarchive/no-windows-files.patch
+++ b/contrib/src/libarchive/no-windows-files.patch
@@ -8,14 +8,3 @@
  AM_CONDITIONAL([INC_WINDOWS_FILES], [test $inc_windows_files = yes])
  AM_CONDITIONAL([INC_CYGWIN_FILES], [test $inc_cygwin_files = yes])
  
 libarchive/libarchive/archive_entry.h.old  2017-06-06 16:19:37.998058703 
+0200
-+++ libarchive/libarchive/archive_entry.h  2017-06-06 16:19:41.830066940 
+0200
-@@ -294,7 +294,7 @@
-
- __LA_DECL voidarchive_entry_set_atime(struct archive_entry *, time_t, 
long);
- __LA_DECL void  archive_entry_unset_atime(struct archive_entry *);
--#if defined(_WIN32) && !defined(__CYGWIN__)
-+#if defined(_WIN32) && !defined(__CYGWIN__) && 
WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
- __LA_DECL void archive_entry_copy_bhfi(struct archive_entry *, 
BY_HANDLE_FILE_INFORMATION *);
- #endif
- __LA_DECL voidarchive_entry_set_birthtime(struct archive_entry *, 
time_t, long);

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits