[med-svn] r19585 - in trunk/packages/murasaki/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2015-07-10 04:05:25 +0000 (Fri, 10 Jul 2015)
New Revision: 19585

Added:
   trunk/packages/murasaki/trunk/debian/patches/freebsd.patch
Modified:
   trunk/packages/murasaki/trunk/debian/changelog
   trunk/packages/murasaki/trunk/debian/patches/series
Log:
Enable build on kfreebsd (Thanks for the patch to Aaron M. Ucko)


Modified: trunk/packages/murasaki/trunk/debian/changelog
===================================================================
--- trunk/packages/murasaki/trunk/debian/changelog	2015-07-10 04:02:23 UTC (rev 19584)
+++ trunk/packages/murasaki/trunk/debian/changelog	2015-07-10 04:05:25 UTC (rev 19585)
@@ -1,3 +1,11 @@
+murasaki (1.68.6-3) unstable; urgency=medium
+
+  * Enable build on kfreebsd (Thanks for the patch to Aaron M. Ucko
+    <ucko at debian.org>)
+    Closes: #789971
+
+ -- Andreas Tille <tille at debian.org>  Fri, 03 Jul 2015 18:50:47 +0200
+
 murasaki (1.68.6-2) unstable; urgency=medium
 
   * Do not try to access dirs from arch all package when doing arch any

Added: trunk/packages/murasaki/trunk/debian/patches/freebsd.patch
===================================================================
--- trunk/packages/murasaki/trunk/debian/patches/freebsd.patch	                        (rev 0)
+++ trunk/packages/murasaki/trunk/debian/patches/freebsd.patch	2015-07-10 04:05:25 UTC (rev 19585)
@@ -0,0 +1,26 @@
+Author: Aaron M. Ucko <ucko at debian.org>
+Last-Update: Thu, 09 Jul 2015 23:27:22 -0400
+Bug-Debian: http://bugs.debian.org/789971
+Description: Use __WORDSIZE wherever it is available which is not
+ only the case for Linux.  This should enable build on kfreebsd arch.
+
+--- a/src/globaltypes.h
++++ b/src/globaltypes.h
+@@ -27,6 +27,8 @@ along with Murasaki.  If not, see <http:
+ #ifndef _GLOBALTYPES_H_
+ #define _GLOBALTYPES_H_
+ 
++#include <sys/types.h>
++
+ #ifdef LARGESEQ_SUPPORT
+ typedef long SeqPos;
+ #else
+@@ -38,7 +40,7 @@ typedef unsigned long word;
+ 
+ //originally defined in sequence.h
+ 
+-#ifdef __linux__
++#ifdef __WORDSIZE
+ #define WORDSIZE __WORDSIZE
+ #else
+ #if (defined(__FreeBSD__) && defined(__i386__)) || (defined (__APPLE__) && (defined (__ppc__) || defined (__i386__))) || defined(__MINGW32__)

Modified: trunk/packages/murasaki/trunk/debian/patches/series
===================================================================
--- trunk/packages/murasaki/trunk/debian/patches/series	2015-07-10 04:02:23 UTC (rev 19584)
+++ trunk/packages/murasaki/trunk/debian/patches/series	2015-07-10 04:05:25 UTC (rev 19585)
@@ -3,3 +3,4 @@
 hardening.patch
 spelling.patch
 man_syntax.patch
+freebsd.patch