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

[Jan Beyer]

Author: beathovn-guest
Date: 2011-08-09 20:08:14 +0000 (Tue, 09 Aug 2011)
New Revision: 7398

Added:
   trunk/packages/gwyddion/trunk/debian/patches/gwyddion-2.25-get-rid-of-gwy_byteswaped_copy.patch
Modified:
   trunk/packages/gwyddion/trunk/debian/changelog
   trunk/packages/gwyddion/trunk/debian/patches/series
Log:
New Debian release with added patch against build problem on big endian architectures.

Modified: trunk/packages/gwyddion/trunk/debian/changelog
===================================================================
--- trunk/packages/gwyddion/trunk/debian/changelog	2011-08-09 07:46:19 UTC (rev 7397)
+++ trunk/packages/gwyddion/trunk/debian/changelog	2011-08-09 20:08:14 UTC (rev 7398)
@@ -1,3 +1,10 @@
+gwyddion (2.25-2) unstable; urgency=low
+
+  * Adding patch gwyddion-2.25-get-rid-of-gwy_byteswaped_copy.patch
+    to fix a fatal compiler warning on big endian architectures
+
+ -- Jan Beyer <jan at beathovn.de>  Tue, 09 Aug 2011 21:34:00 +0200
+
 gwyddion (2.25-1) unstable; urgency=low
 
   * New upstream release

Added: trunk/packages/gwyddion/trunk/debian/patches/gwyddion-2.25-get-rid-of-gwy_byteswaped_copy.patch
===================================================================
--- trunk/packages/gwyddion/trunk/debian/patches/gwyddion-2.25-get-rid-of-gwy_byteswaped_copy.patch	                        (rev 0)
+++ trunk/packages/gwyddion/trunk/debian/patches/gwyddion-2.25-get-rid-of-gwy_byteswaped_copy.patch	2011-08-09 20:08:14 UTC (rev 7398)
@@ -0,0 +1,88 @@
+Description: fix build problem on big endian architectures
+Author: David Necas <yeti at gwyddion.net>
+
+--- gwyddion-2.25/modules/file/dumbfile.c	(revision 12726)
++++ gwyddion-2.25/modules/file/dumbfile.c	(revision 12727)
+@@ -69,7 +69,7 @@
+     &module_register,
+     N_("Reads and exports Gwyddion dumb dump files."),
+     "Yeti <yeti at gwyddion.net>",
+-    "1.0",
++    "1.1",
+     "David Nečas (Yeti)",
+     "2011",
+ };
+@@ -283,7 +283,7 @@
+ #if (G_BYTE_ORDER == G_LITTLE_ENDIAN)
+         memcpy(d, pos, n);
+ #else
+-        gwy_byteswapped_copy(pos, (guint8*)d,
++        gwy_memcpy_byte_swap(pos, (guint8*)d,
+                              sizeof(gdouble), xres*yres, sizeof(gdouble)-1);
+ #endif
+         pos += n;
+--- gwyddion-2.25/modules/plugin-proxy.c	(revision 12726)
++++ gwyddion-2.25/modules/plugin-proxy.c	(revision 12727)
+@@ -51,6 +51,7 @@
+ #include <sys/types.h>
+ #include <glib/gstdio.h>
+ #include <libgwyddion/gwymacros.h>
++#include <libgwyddion/gwyutils.h>
+ #include <libgwymodule/gwymodule.h>
+ #include <libprocess/datafield.h>
+ #include <app/gwyapp.h>
+@@ -144,7 +145,7 @@
+        "running external programs (plug-ins) on data pretending they are "
+        "data processing or file loading/saving modules."),
+     "Yeti <yeti at gwyddion.net>",
+-    "3.8",
++    "3.9",
+     "David Nečas (Yeti) & Petr Klapetek",
+     "2004",
+ };
+@@ -1116,27 +1117,6 @@
+     return fh;
+ }
+ 
+-static inline void
+-gwy_byteswapped_copy(const guint8 *source,
+-                     guint8 *dest,
+-                     gsize size,
+-                     gsize len,
+-                     gsize byteswap)
+-{
+-    gsize i, k;
+-
+-    if (!byteswap) {
+-        memcpy(dest, source, size*len);
+-        return;
+-    }
+-
+-    for (i = 0; i < len; i++) {
+-        guint8 *b = dest + i*size;
+-
+-        for (k = 0; k < size; k++)
+-            b[k ^ byteswap] = *(source++);
+-    }
+-}
+ /**
+  * dump_export_data_field:
+  * @dfield: A #GwyDataField.
+@@ -1180,7 +1160,7 @@
+         guint8 *d;
+ 
+         d = g_new(guint8, sizeof(gdouble)*xres*yres);
+-        gwy_byteswapped_copy((const guint8*)data, d,
++        gwy_memcpy_byte_swap((const guint8*)data, d,
+                              sizeof(gdouble), xres*yres, sizeof(gdouble) - 1);
+         fwrite(data, sizeof(gdouble), xres*yres, fh);
+         g_free(d);
+@@ -1397,7 +1377,7 @@
+ #if (G_BYTE_ORDER == G_LITTLE_ENDIAN)
+         memcpy(d, pos, n);
+ #else
+-        gwy_byteswapped_copy(pos, (guint8*)d,
++        gwy_memcpy_byte_swap(pos, (guint8*)d,
+                              sizeof(gdouble), xres*yres, sizeof(gdouble)-1);
+ #endif
+         pos += n;

Modified: trunk/packages/gwyddion/trunk/debian/patches/series
===================================================================
--- trunk/packages/gwyddion/trunk/debian/patches/series	2011-08-09 07:46:19 UTC (rev 7397)
+++ trunk/packages/gwyddion/trunk/debian/patches/series	2011-08-09 20:08:14 UTC (rev 7398)
@@ -1,2 +1,3 @@
 fix-manpage-section-for-debian.diff
 fix-rpath-issue.patch
+gwyddion-2.25-get-rid-of-gwy_byteswaped_copy.patch