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

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

The following commit has been merged in the master branch:
commit 06bf087d6f9a74d0c64dcca7bc78ace11daa9643
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date:   Mon Aug 19 17:25:58 2013 +0200

    debian/patches/: patchset updated
    
    - 0010-fix_FTBFS_on_non-linux_architectures.patch modified
      to fix FTBFS on Hurd.

diff --git a/debian/patches/0001-blender_thumbnailer.patch b/debian/patches/0001-blender_thumbnailer.patch
index a11a1c5..d81ff50 100644
--- a/debian/patches/0001-blender_thumbnailer.patch
+++ b/debian/patches/0001-blender_thumbnailer.patch
@@ -25,7 +25,7 @@ index 0000000..05d4fae
 +Exec=/usr/share/blender/scripts/blender-thumbnailer.py %i %o
 +MimeType=application/x-blender;
 diff --git a/release/bin/blender-thumbnailer.py b/release/bin/blender-thumbnailer.py
-index 8b93eeb..6c2cf23 100755
+index 8b93eeb..ca4a38c 100755
 --- a/release/bin/blender-thumbnailer.py
 +++ b/release/bin/blender-thumbnailer.py
 @@ -1,4 +1,4 @@
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 4790662..60c371b 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,13 @@
 From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
-Date: Thu, 1 Aug 2013 17:05:39 +0200
+Date: Mon, 19 Aug 2013 17:24:27 +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/ghost/intern/GHOST_SystemPathsX11.cpp | 4 ++++
+ source/blender/blenlib/BLI_sys_types.h       | 2 +-
+ source/blender/blenlib/intern/storage.c      | 4 ++++
+ 4 files changed, 12 insertions(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 0a58232..e4e6518 100644
@@ -21,8 +23,23 @@ index 0a58232..e4e6518 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/ghost/intern/GHOST_SystemPathsX11.cpp b/intern/ghost/intern/GHOST_SystemPathsX11.cpp
+index e6fd170..22e3502 100644
+--- a/intern/ghost/intern/GHOST_SystemPathsX11.cpp
++++ b/intern/ghost/intern/GHOST_SystemPathsX11.cpp
+@@ -50,6 +50,10 @@ static const char *static_path = PREFIX "/share";
+ static const char *static_path = NULL;
+ #endif
+ 
++#ifndef PATH_MAX
++# define PATH_MAX 4096
++#endif
++
+ GHOST_SystemPathsX11::GHOST_SystemPathsX11()
+ {
+ }
 diff --git a/source/blender/blenlib/BLI_sys_types.h b/source/blender/blenlib/BLI_sys_types.h
-index e544006..c9cf4fc 100644
+index e544006..4de1ddc 100644
 --- a/source/blender/blenlib/BLI_sys_types.h
 +++ b/source/blender/blenlib/BLI_sys_types.h
 @@ -82,7 +82,7 @@ typedef unsigned long uintptr_t;
@@ -34,3 +51,18 @@ index e544006..c9cf4fc 100644
  
  /* Linux-i386, Linux-Alpha, Linux-ppc */
  #include <stdint.h>
+diff --git a/source/blender/blenlib/intern/storage.c b/source/blender/blenlib/intern/storage.c
+index 6b45c6f..901081a 100644
+--- a/source/blender/blenlib/intern/storage.c
++++ b/source/blender/blenlib/intern/storage.c
+@@ -93,6 +93,10 @@
+ 
+ #include "../imbuf/IMB_imbuf.h"
+ 
++#ifndef PATH_MAX
++# define PATH_MAX 4096
++#endif
++
+ /**
+  * Copies the current working directory into *dir (max size maxncpy), and
+  * returns a pointer to same.

-- 
blender packaging