diff options
author | marino <marino@pkgsrc.org> | 2012-08-11 17:34:04 +0000 |
---|---|---|
committer | marino <marino@pkgsrc.org> | 2012-08-11 17:34:04 +0000 |
commit | e8b49b4a0641c9bb0b4271090727c99c9d349c81 (patch) | |
tree | ecb0349302c510e3b01431b87a0d387a8433bf1b /editors/Sigil/patches | |
parent | 6ad03a72aef7307ae906d7f13bf4d2b2fa664e5c (diff) | |
download | pkgsrc-e8b49b4a0641c9bb0b4271090727c99c9d349c81.tar.gz |
editors/Sigil: Fix patch phase, Repack all patches
Sigil is delivered in a zip file, and the files have DOS line endings.
The patches had unix line endings, and at least on some platforms
including NetBSD 5, this resulted in rejected hunks.
All three patches repacked, now contain DOS line endings and work fine.
Diffstat (limited to 'editors/Sigil/patches')
3 files changed, 39 insertions, 39 deletions
diff --git a/editors/Sigil/patches/patch-src_ZipArchive_DirEnumerator.cpp b/editors/Sigil/patches/patch-src_ZipArchive_DirEnumerator.cpp index 5a5eb43bc23..ce3df30f68d 100644 --- a/editors/Sigil/patches/patch-src_ZipArchive_DirEnumerator.cpp +++ b/editors/Sigil/patches/patch-src_ZipArchive_DirEnumerator.cpp @@ -1,15 +1,15 @@ -$NetBSD: patch-src_ZipArchive_DirEnumerator.cpp,v 1.2 2011/10/14 09:49:06 ryoon Exp $ +$NetBSD: patch-src_ZipArchive_DirEnumerator.cpp,v 1.3 2012/08/11 17:34:05 marino Exp $ Add DragonFly support. ---- src/ZipArchive/DirEnumerator.cpp.orig 2011-10-14 18:30:31 +0000 +--- src/ZipArchive/DirEnumerator.cpp.orig 2012-02-25 10:54:10.000000000 +0000 +++ src/ZipArchive/DirEnumerator.cpp -@@ -73,7 +73,7 @@ bool CDirEnumerator::Start(CFileFilter& - if (!entry) - break; - CZipString path(m_szCurrentDirectory + entry->d_name); -- #if !defined __APPLE__ && !defined __CYGWIN__ && !defined __NetBSD__ -+ #if !defined __APPLE__ && !defined __CYGWIN__ && !defined __NetBSD__ && !defined __DragonFly__ - struct stat64 sStats; - if (stat64(path, &sStats) == -1) - #else +@@ -73,7 +73,7 @@ bool CDirEnumerator::Start(CFileFilter& + if (!entry)
+ break;
+ CZipString path(m_szCurrentDirectory + entry->d_name);
+- #if !defined __APPLE__ && !defined __CYGWIN__ && !defined __NetBSD__
++ #if !defined __APPLE__ && !defined __CYGWIN__ && !defined __NetBSD__ && !defined __DragonFly__
+ struct stat64 sStats;
+ if (stat64(path, &sStats) == -1)
+ #else
diff --git a/editors/Sigil/patches/patch-src_ZipArchive_ZipFile__stl.cpp b/editors/Sigil/patches/patch-src_ZipArchive_ZipFile__stl.cpp index 66cba8f5367..baa8e2a8e8b 100644 --- a/editors/Sigil/patches/patch-src_ZipArchive_ZipFile__stl.cpp +++ b/editors/Sigil/patches/patch-src_ZipArchive_ZipFile__stl.cpp @@ -1,15 +1,15 @@ -$NetBSD: patch-src_ZipArchive_ZipFile__stl.cpp,v 1.1 2011/10/14 09:49:07 ryoon Exp $ +$NetBSD: patch-src_ZipArchive_ZipFile__stl.cpp,v 1.2 2012/08/11 17:34:05 marino Exp $ Add DragonFly support. ---- src/ZipArchive/ZipFile_stl.cpp.orig 2011-10-14 18:30:33 +0000 +--- src/ZipArchive/ZipFile_stl.cpp.orig 2012-02-25 10:54:10.000000000 +0000 +++ src/ZipArchive/ZipFile_stl.cpp @@ -16,7 +16,7 @@ - - #if (defined _ZIP_IMPL_STL && (!defined _ZIP_FILE_IMPLEMENTATION || _ZIP_FILE_IMPLEMENTATION == ZIP_ZFI_DEFAULT)) || _ZIP_FILE_IMPLEMENTATION == ZIP_ZFI_STL - --#if defined __APPLE__ || defined __CYGWIN__ || defined __NetBSD__ -+#if defined __APPLE__ || defined __CYGWIN__ || defined __NetBSD__ || defined __DragonFly__ - #define FILE_FUNCTIONS_64B_BY_DEFAULT - #else - #undef FILE_FUNCTIONS_64B_BY_DEFAULT +
+ #if (defined _ZIP_IMPL_STL && (!defined _ZIP_FILE_IMPLEMENTATION || _ZIP_FILE_IMPLEMENTATION == ZIP_ZFI_DEFAULT)) || _ZIP_FILE_IMPLEMENTATION == ZIP_ZFI_STL
+
+-#if defined __APPLE__ || defined __CYGWIN__ || defined __NetBSD__
++#if defined __APPLE__ || defined __CYGWIN__ || defined __NetBSD__ || defined __DragonFly__
+ #define FILE_FUNCTIONS_64B_BY_DEFAULT
+ #else
+ #undef FILE_FUNCTIONS_64B_BY_DEFAULT
diff --git a/editors/Sigil/patches/patch-src_ZipArchive_ZipPlatform__lnx.cpp b/editors/Sigil/patches/patch-src_ZipArchive_ZipPlatform__lnx.cpp index a1de26b647f..7d2c2e0ae94 100644 --- a/editors/Sigil/patches/patch-src_ZipArchive_ZipPlatform__lnx.cpp +++ b/editors/Sigil/patches/patch-src_ZipArchive_ZipPlatform__lnx.cpp @@ -1,24 +1,24 @@ -$NetBSD: patch-src_ZipArchive_ZipPlatform__lnx.cpp,v 1.1 2011/10/14 09:49:07 ryoon Exp $ +$NetBSD: patch-src_ZipArchive_ZipPlatform__lnx.cpp,v 1.2 2012/08/11 17:34:05 marino Exp $ Add DragonFly support. ---- src/ZipArchive/ZipPlatform_lnx.cpp.orig 2011-10-14 18:30:33 +0000 +--- src/ZipArchive/ZipPlatform_lnx.cpp.orig 2012-02-25 10:54:10.000000000 +0000 +++ src/ZipArchive/ZipPlatform_lnx.cpp @@ -16,7 +16,7 @@ - - #ifdef _ZIP_SYSTEM_LINUX - --#if defined __APPLE__ || defined __CYGWIN__ || defined __NetBSD__ -+#if defined __APPLE__ || defined __CYGWIN__ || defined __NetBSD__ || defined __DragonFly__ - #define FILE_FUNCTIONS_64B_BY_DEFAULT - #else - #undef FILE_FUNCTIONS_64B_BY_DEFAULT +
+ #ifdef _ZIP_SYSTEM_LINUX
+
+-#if defined __APPLE__ || defined __CYGWIN__ || defined __NetBSD__
++#if defined __APPLE__ || defined __CYGWIN__ || defined __NetBSD__ || defined __DragonFly__
+ #define FILE_FUNCTIONS_64B_BY_DEFAULT
+ #else
+ #undef FILE_FUNCTIONS_64B_BY_DEFAULT
@@ -34,7 +34,7 @@ - - #include <sys/types.h> - --#if defined (__FreeBSD__) || defined (__APPLE__) || defined (__NetBSD__) -+#if defined (__FreeBSD__) || defined (__APPLE__) || defined (__NetBSD__) || defined (__DragonFly__) - #include <sys/param.h> - #include <sys/mount.h> - #else +
+ #include <sys/types.h>
+
+-#if defined (__FreeBSD__) || defined (__APPLE__) || defined (__NetBSD__)
++#if defined (__FreeBSD__) || defined (__APPLE__) || defined (__NetBSD__) || defined (__DragonFly__)
+ #include <sys/param.h>
+ #include <sys/mount.h>
+ #else
|