[med-svn] r14768 - in trunk/packages/gwyddion/trunk/debian: . patches

[Jan Beyer]

Author: beathovn-guest
Date: 2013-09-29 19:59:29 +0000 (Sun, 29 Sep 2013)
New Revision: 14768

Added:
   trunk/packages/gwyddion/trunk/debian/patches/gwyddion-2.32_fix-build-error-on-big-endian.patch
Modified:
   trunk/packages/gwyddion/trunk/debian/changelog
   trunk/packages/gwyddion/trunk/debian/patches/series
Log:
Add a patch by Thorsten Glaser to fix build error on big endian machines. Patch accepted by upstream and already included in their SVN for next release

Modified: trunk/packages/gwyddion/trunk/debian/changelog
===================================================================
--- trunk/packages/gwyddion/trunk/debian/changelog	2013-09-28 21:40:05 UTC (rev 14767)
+++ trunk/packages/gwyddion/trunk/debian/changelog	2013-09-29 19:59:29 UTC (rev 14768)
@@ -1,3 +1,9 @@
+gwyddion (2.32-2) unstable; urgency=low
+
+  * Include a patch to fix build error on big endian architectures
+
+ -- Jan Beyer <jan at beathovn.de>  Sun, 29 Sep 2013 21:57:23 +0200
+
 gwyddion (2.32-1) unstable; urgency=low
 
   * New upstream release

Added: trunk/packages/gwyddion/trunk/debian/patches/gwyddion-2.32_fix-build-error-on-big-endian.patch
===================================================================
--- trunk/packages/gwyddion/trunk/debian/patches/gwyddion-2.32_fix-build-error-on-big-endian.patch	                        (rev 0)
+++ trunk/packages/gwyddion/trunk/debian/patches/gwyddion-2.32_fix-build-error-on-big-endian.patch	2013-09-29 19:59:29 UTC (rev 14768)
@@ -0,0 +1,21 @@
+Description: Fix build error on big endian architectures.
+Forwarded: yes, already included in upstream's SVN
+Author: Thorsten Glaser <tg at mirbsd.de>
+
+--- gwyddion-2.32/modules/file/gxyzffile.c~	2013-09-27 20:33:10.007873206 +0200
++++ gwyddion-2.32/modules/file/gxyzffile.c	2013-09-27 20:33:20.828014170 +0200
+@@ -338,10 +338,10 @@ append_double(gdouble *target, const gdo
+     union { guchar pp[8]; double d; } u;
+     u.d = v;
+ #if (G_BYTE_ORDER == G_BIG_ENDIAN)
+-    GWY_SWAP(guchar, z.pp[0], z.pp[7]);
+-    GWY_SWAP(guchar, z.pp[1], z.pp[6]);
+-    GWY_SWAP(guchar, z.pp[2], z.pp[5]);
+-    GWY_SWAP(guchar, z.pp[3], z.pp[4]);
++    GWY_SWAP(guchar, u.pp[0], u.pp[7]);
++    GWY_SWAP(guchar, u.pp[1], u.pp[6]);
++    GWY_SWAP(guchar, u.pp[2], u.pp[5]);
++    GWY_SWAP(guchar, u.pp[3], u.pp[4]);
+ #endif
+     *target = u.d;
+ }

Modified: trunk/packages/gwyddion/trunk/debian/patches/series
===================================================================
--- trunk/packages/gwyddion/trunk/debian/patches/series	2013-09-28 21:40:05 UTC (rev 14767)
+++ trunk/packages/gwyddion/trunk/debian/patches/series	2013-09-29 19:59:29 UTC (rev 14768)
@@ -1,2 +1,3 @@
 fix-manpage-section-for-debian.diff
 fix-rpath-issue.patch
+gwyddion-2.32_fix-build-error-on-big-endian.patch