diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2016-09-24 14:18:22 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2016-09-24 14:18:22 -0700 |
| commit | e6751b6fb2336c1e26a52d40938190c3650c7bec (patch) | |
| tree | ce4aed24756afdf6c047b44415648455704442fc | |
| parent | 79321d14533e7d509453cfddb975dbfd9634cb21 (diff) | |
| download | zxcvbn-c-e6751b6fb2336c1e26a52d40938190c3650c7bec.tar.gz | |
add missing cast patch & re-order patches
| -rw-r--r-- | debian/patches/angled-include-zxcvbn.h.patch | 2 | ||||
| -rw-r--r-- | debian/patches/missing-cast-for-C-11.patch | 22 | ||||
| -rw-r--r-- | debian/patches/series | 3 |
3 files changed, 25 insertions, 2 deletions
diff --git a/debian/patches/angled-include-zxcvbn.h.patch b/debian/patches/angled-include-zxcvbn.h.patch index 838f4f4..100823f 100644 --- a/debian/patches/angled-include-zxcvbn.h.patch +++ b/debian/patches/angled-include-zxcvbn.h.patch @@ -22,7 +22,7 @@ index 9d74ce5..bb0f8bd 100644 /* For pre-compiled headers under windows */ #ifdef _WIN32 diff --git a/zxcvbn.c b/zxcvbn.c -index c29c20c..aa0a881 100644 +index c801ae0..bfb40b3 100644 --- a/zxcvbn.c +++ b/zxcvbn.c @@ -30,7 +30,7 @@ diff --git a/debian/patches/missing-cast-for-C-11.patch b/debian/patches/missing-cast-for-C-11.patch new file mode 100644 index 0000000..f1fafe6 --- /dev/null +++ b/debian/patches/missing-cast-for-C-11.patch @@ -0,0 +1,22 @@ +From: Sean Whitton <spwhitton@spwhitton.name> +Date: Sat, 24 Sep 2016 14:17:05 -0700 +Subject: missing cast for C++11 + +Fixes build with gcc 5+ +--- + zxcvbn.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/zxcvbn.c b/zxcvbn.c +index c29c20c..c801ae0 100644 +--- a/zxcvbn.c ++++ b/zxcvbn.c +@@ -212,7 +212,7 @@ static inline void MyOpenFile(FileHandle & f, const char *Name) + } + static inline bool MyReadFile(FileHandle & f, void *Buf, unsigned int Num) + { +- return f.read((char *)Buf, Num); ++ return (bool)f.read((char *)Buf, Num); + } + static inline void MyCloseFile(FileHandle & f) + { diff --git a/debian/patches/series b/debian/patches/series index eab4d2c..077e114 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,5 @@ +missing-cast-for-C-11.patch +patch-README-for-Debian.patch conditionally-define-CFLAGS.patch angled-include-zxcvbn.h.patch -patch-README-for-Debian.patch targets-to-build-shlib.patch |