Control: tags 962230 + patch
Control: tags 962230 + pending

Dear maintainer,

I've prepared an NMU for sword (versioned as 1.8.1+dfsg-8.2) and 
uploaded it to DELAYED/2. Please feel free to tell me if I should
cancel it.

cu
Adrian
diff -Nru sword-1.8.1+dfsg/debian/changelog sword-1.8.1+dfsg/debian/changelog
--- sword-1.8.1+dfsg/debian/changelog	2020-06-09 03:39:54.000000000 +0300
+++ sword-1.8.1+dfsg/debian/changelog	2020-06-18 19:00:26.000000000 +0300
@@ -1,3 +1,10 @@
+sword (1.8.1+dfsg-8.2) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Add workaround for building on mips64el. (Closes: #962230)
+
+ -- Adrian Bunk <b...@debian.org>  Thu, 18 Jun 2020 19:00:26 +0300
+
 sword (1.8.1+dfsg-8.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru sword-1.8.1+dfsg/debian/patches/0006-powerpc64.patch sword-1.8.1+dfsg/debian/patches/0006-powerpc64.patch
--- sword-1.8.1+dfsg/debian/patches/0006-powerpc64.patch	2018-11-12 18:05:48.000000000 +0200
+++ sword-1.8.1+dfsg/debian/patches/0006-powerpc64.patch	2020-06-18 19:00:19.000000000 +0300
@@ -1,6 +1,6 @@
 From: Daniel Glassey <w...@debian.org>
 Date: Sat, 3 Nov 2018 13:34:07 +0700
-Subject: powerpc64 can define __s64 differently
+Subject: powerpc64 and mips64el can define __s64 differently
 
 Index: sword/include/sysdata.h
 ===================================================================
@@ -10,7 +10,7 @@
  
  #ifdef OS_ANDROID
  #elif defined(__GNUC__)
-+  #if !defined(__SANE_USERSPACE_TYPES__) && defined(__powerpc64__)
++  #if !defined(__SANE_USERSPACE_TYPES__) && (defined(__powerpc64__) || (defined(__mips__) && (_MIPS_SIM==_ABI64)))
 +  typedef __signed__ long __s64;
 +  typedef unsigned long __u64;
 +  #else

Reply via email to