[SCM] blender/master: debian/patches/: patchset refreshed

[mfv-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5ac560dd57e691f78c3e0aa5cdca58c84b6b774d
Author: Matteo F. Vescovi <mfvescovi at gmail.com>
Date:   Mon May 26 09:41:29 2014 +0200

    debian/patches/: patchset refreshed
    
    - 0010-fix_FTBFS_on_non-linux_architectures.patch updated
    - 0013-fix_FTBFS_on_kFreeBSD.patch dropped (made by #0010)
    
    Closes: #749223
    Thanks: Pino Toscano (pino) for the updated patch.

diff --git a/debian/patches/0010-fix_FTBFS_on_non-linux_architectures.patch b/debian/patches/0010-fix_FTBFS_on_non-linux_architectures.patch
index 790e1d4..f251168 100644
--- a/debian/patches/0010-fix_FTBFS_on_non-linux_architectures.patch
+++ b/debian/patches/0010-fix_FTBFS_on_non-linux_architectures.patch
@@ -1,11 +1,12 @@
 From: "Matteo F. Vescovi" <mfvescovi at gmail.com>
-Date: Tue, 20 Aug 2013 12:14:30 +0200
+Date: Mon, 26 May 2014 09:37:54 +0200
 Subject: fix_FTBFS_on_non-linux_architectures
 
 ---
- CMakeLists.txt                         | 3 +++
- source/blender/blenlib/BLI_sys_types.h | 2 +-
- 2 files changed, 4 insertions(+), 1 deletion(-)
+ CMakeLists.txt                              | 3 +++
+ intern/guardedalloc/intern/mallocn_intern.h | 2 +-
+ source/blender/blenlib/BLI_sys_types.h      | 2 +-
+ 3 files changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 1feaa4b..3db7971 100644
@@ -21,6 +22,19 @@ index 1feaa4b..3db7971 100644
  
  	# lfs on glibc, all compilers should use
  	add_definitions(-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE)
+diff --git a/intern/guardedalloc/intern/mallocn_intern.h b/intern/guardedalloc/intern/mallocn_intern.h
+index db45b59..828e70e 100644
+--- a/intern/guardedalloc/intern/mallocn_intern.h
++++ b/intern/guardedalloc/intern/mallocn_intern.h
+@@ -51,7 +51,7 @@
+ 
+ #undef HAVE_MALLOC_STATS
+ 
+-#if defined(__linux__)
++#if defined(__linux__) || defined(__GLIBC__)
+ #  include <malloc.h>
+ #  define HAVE_MALLOC_STATS
+ #elif defined(__FreeBSD__)
 diff --git a/source/blender/blenlib/BLI_sys_types.h b/source/blender/blenlib/BLI_sys_types.h
 index b7a70a8..e35086d 100644
 --- a/source/blender/blenlib/BLI_sys_types.h
diff --git a/debian/patches/0013-fix_FTBFS_on_kFreeBSD.patch b/debian/patches/0013-fix_FTBFS_on_kFreeBSD.patch
deleted file mode 100644
index ffe402a..0000000
--- a/debian/patches/0013-fix_FTBFS_on_kFreeBSD.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Sebastian Ramacher <sramacher at debian.org>
-Date: Sun, 18 May 2014 17:06:20 +0200
-Subject: fix_FTBFS_on_kFreeBSD
-
----
- intern/guardedalloc/intern/mallocn_intern.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/intern/guardedalloc/intern/mallocn_intern.h b/intern/guardedalloc/intern/mallocn_intern.h
-index db45b59..1290f5a 100644
---- a/intern/guardedalloc/intern/mallocn_intern.h
-+++ b/intern/guardedalloc/intern/mallocn_intern.h
-@@ -51,7 +51,7 @@
- 
- #undef HAVE_MALLOC_STATS
- 
--#if defined(__linux__)
-+#if defined(__linux__) || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__))
- #  include <malloc.h>
- #  define HAVE_MALLOC_STATS
- #elif defined(__FreeBSD__)
diff --git a/debian/patches/series b/debian/patches/series
index 4a6baa0..a6caf84 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,4 +10,3 @@
 0010-fix_FTBFS_on_non-linux_architectures.patch
 0011-fix_FTBFS_on_unofficial_64bit_archs.patch
 0012-fix_FTBFS_due_to_SSE.patch
-0013-fix_FTBFS_on_kFreeBSD.patch

-- 
blender packaging