diff options
| author | Teus Benschop <teusjannette@gmail.com> | 2018-10-28 11:58:04 +0100 |
|---|---|---|
| committer | Teus Benschop <teusjannette@gmail.com> | 2018-10-28 11:58:04 +0100 |
| commit | 283b41969146a10af1c78c42c1942259b788a7eb (patch) | |
| tree | 5e68484909e19f69986575488177132b5c66da0e /debian | |
| parent | 3830630cea5e901ba0928f8b1d32fd5f3022f21e (diff) | |
remove already applied patches
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | debian/patches/sword-ppc64.patch | 24 |
2 files changed, 0 insertions, 25 deletions
diff --git a/debian/patches/series b/debian/patches/series index 9643f59..380f743 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ 13_curl.diff abicompare.patch -sword-ppc64.patch template-depth.patch diff --git a/debian/patches/sword-ppc64.patch b/debian/patches/sword-ppc64.patch deleted file mode 100644 index 4fc1cf5..0000000 --- a/debian/patches/sword-ppc64.patch +++ /dev/null @@ -1,24 +0,0 @@ -Description: fix Type definition conflict with asm/types.h for ppc64 -Author: Fernando Seiti Furusato <ferseiti@br.ibm.com> - -Index: sword-1.7.3+dfsg/include/sysdata.h -=================================================================== ---- sword-1.7.3+dfsg.orig/include/sysdata.h -+++ sword-1.7.3+dfsg/include/sysdata.h -@@ -40,12 +40,15 @@ typedef unsigned short __u16; - typedef signed int __s32; - typedef unsigned int __u32; - --#ifdef __GNUC__ -+#if defined(__GNUC__) && !defined(__powerpc64__) - __extension__ typedef __signed__ long long __s64; - __extension__ typedef unsigned long long __u64; - #elif defined(__BORLANDC__) - typedef signed __int64 __s64; - typedef unsigned __int64 __u64; -+#elif defined(__powerpc64__) -+typedef __signed__ long __s64; -+typedef unsigned long __u64; - #else - typedef signed long long __s64; - typedef unsigned long long __u64; |