[SCM] Control pipeline recipes from the European Southern Observatory branch, debian, updated. upstream/0.3.5.1-45-g6556562

Ole Streicher debian at liska.ath.cx
Mon Nov 26 14:47:05 UTC 2012


The following commit has been merged in the debian branch:
commit 65565621b400cf54f3270f997a21d3409f96216d
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Nov 26 15:46:57 2012 +0100

    Fix FTBS on 32 bit machines

diff --git a/debian/patches/fix_cplsize.patch b/debian/patches/fix_cplsize.patch
new file mode 100644
index 0000000..c38a8f5
--- /dev/null
+++ b/debian/patches/fix_cplsize.patch
@@ -0,0 +1,13 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Set CPL size to "long long" to fix FTBS on 32 bit systems
+--- a/cpl/cpl_api.h
++++ b/cpl/cpl_api.h
+@@ -40,7 +40,7 @@
+ 
+ typedef int cpl_error_code, cpl_errorstate, cpl_boolean, cpl_frame_group,
+     cpl_parameter_mode, cpl_parameter_class, cpl_type, cpl_msg_severity;
+-typedef size_t cpl_size;
++typedef long long cpl_size;
+ typedef void cpl_pluginlist, cpl_frameset, cpl_frame, 
+     cpl_parameter, cpl_parameterlist, cpl_recipeconfig;
+ 
diff --git a/debian/patches/series b/debian/patches/series
index a410047..e87b5d2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 set-default-plugin-path.patch
 disable_crash_tests.patch
+fix_cplsize.patch

-- 
Control pipeline recipes from the European Southern Observatory



More information about the debian-science-commits mailing list