r36884 - in /packages/scilab/trunk/debian: changelog patches/basename.diff

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Sun Sep 12 09:08:54 2010
New Revision: 36884

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36884
Log:
+  * Fix a FTBFS under powerpc (conflicting declaration of basename)
+    basename.diff

Added:
    packages/scilab/trunk/debian/patches/basename.diff
Modified:
    packages/scilab/trunk/debian/changelog

Modified: packages/scilab/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/changelog?rev=36884&op=diff
==============================================================================
--- packages/scilab/trunk/debian/changelog (original)
+++ packages/scilab/trunk/debian/changelog Sun Sep 12 09:08:54 2010
@@ -1,3 +1,10 @@
+scilab (5.2.2-4) unstable; urgency=low
+
+  * Fix a FTBFS under powerpc (conflicting declaration of basename)
+    basename.diff
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Mon, 16 Aug 2010 22:20:42 +0200
+
 scilab (5.2.2-3) unstable; urgency=low
 
   * Remove option -fwritable-string. writable-string.diff (Closes: #593114)

Added: packages/scilab/trunk/debian/patches/basename.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/trunk/debian/patches/basename.diff?rev=36884&op=file
==============================================================================
--- packages/scilab/trunk/debian/patches/basename.diff (added)
+++ packages/scilab/trunk/debian/patches/basename.diff Sun Sep 12 09:08:54 2010
@@ -1,0 +1,61 @@
+commit 5e2c68ef0c11d9831b75181aa7bca9de60a6d667
+Author: Sylvestre Ledru <sylvestre.ledru at scilab.org>
+Date:   Mon Aug 16 22:05:14 2010 +0200
+
+    Dead code removed (and was conflicting in some case with the string.h declaration of basename)
+    
+    Change-Id: I2b80bfb63d033c317061dfa5a77d0235b86f260f
+
+diff --git a/scilab/modules/fileio/src/c/basename.c b/scilab/modules/fileio/src/c/basename.c
+index 861d3c9..5969821 100644
+--- a/scilab/modules/fileio/src/c/basename.c
++++ b/scilab/modules/fileio/src/c/basename.c
+@@ -46,20 +46,3 @@ wchar_t *basenameW(wchar_t *wcfullfilename, BOOL bExpand)
+ 	}
+ 	return basename_str;
+ }
+-/*--------------------------------------------------------------------------*/
+-char *basename(char *fullfilename, BOOL bExpand)
+-{
+-	char *result = NULL;
+-	if (fullfilename)
+-	{
+-		wchar_t *wcresult = NULL;
+-		wchar_t *wcfullfilename = to_wide_string(fullfilename);
+-
+-		wcresult = basenameW(wcfullfilename, bExpand);
+-		result = wide_string_to_UTF8(wcresult);
+-		if (wcfullfilename) {FREE(wcfullfilename); wcfullfilename = NULL;}
+-		if (wcresult) {FREE(wcresult); wcresult = NULL;}
+-	}
+-	return result;
+-}
+-/*--------------------------------------------------------------------------*/
+diff --git a/scilab/modules/fileio/src/c/basename.h b/scilab/modules/fileio/src/c/basename.h
+index 879df41..c01bb29 100644
+--- a/scilab/modules/fileio/src/c/basename.h
++++ b/scilab/modules/fileio/src/c/basename.h
+@@ -16,16 +16,6 @@
+ #include <wchar.h>
+ #include "BOOL.h"
+ 
+-
+-/**
+-* strip directory and suffix from filenames
+-* @param[in] filename
+-* @param[in] BOOL flagexpand
+-* @return basename
+-*/
+-char *basename(char *fullfilename, BOOL bExpand);
+-
+-
+ /**
+ * strip directory and suffix from filenames (wide string)
+ * @param[in] filename
+@@ -34,4 +24,4 @@ char *basename(char *fullfilename, BOOL bExpand);
+ */
+ wchar_t *basenameW(wchar_t *wcfullfilename, BOOL bExpand);
+ 
+-#endif
+\ No newline at end of file
++#endif