[SCM] blender/master: debian/patches: #0002 dropped (applied upstream)

mfv-guest at users.alioth.debian.org mfv-guest at users.alioth.debian.org
Mon Mar 12 17:49:08 UTC 2012


The following commit has been merged in the master branch:
commit 43b55b6e941216cab7479ff53cc0ac0c9cdff5e2
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date:   Tue Feb 21 22:13:58 2012 +0100

    debian/patches: #0002 dropped (applied upstream)

diff --git a/debian/patches/0002-fix_FTBFS_on_KFreeBSD.patch b/debian/patches/0002-fix_FTBFS_on_KFreeBSD.patch
deleted file mode 100644
index d66ba2c..0000000
--- a/debian/patches/0002-fix_FTBFS_on_KFreeBSD.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Kevin 'kiniou' Roy <kiniou at gmail.com>
-Date: Tue, 28 Sep 2010 15:50:17 +0200
-Subject: fix_FTBFS_on_KFreeBSD
-
-added __GNU__ and __GLIBC__ to conditional defined in order to compile on KFreeBSD
----
- source/blender/blenlib/intern/storage.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/source/blender/blenlib/intern/storage.c b/source/blender/blenlib/intern/storage.c
-index 001b191..c5b6f46 100644
---- a/source/blender/blenlib/intern/storage.c
-+++ b/source/blender/blenlib/intern/storage.c
-@@ -54,7 +54,7 @@
- #include <sys/mount.h>
- #endif
- 
--#if defined(linux) || defined(__CYGWIN32__) || defined(__hpux)
-+#if defined(linux) || defined(__CYGWIN32__) || defined(__hpux) || defined(__GNU__) || defined(__GLIBC__)
- #include <sys/vfs.h>
- #endif
- 
-@@ -180,7 +180,7 @@ double BLI_dir_free_space(const char *dir)
- 		if (slash) slash[1] = 0;
- 	} else strcpy(name,"/");
- 
--#if defined (__FreeBSD__) || defined (linux) || defined (__OpenBSD__) || defined (__APPLE__) 
-+#if defined (__FreeBSD__) || defined (linux) || defined (__OpenBSD__) || defined (__APPLE__) || defined(__GNU__) || defined(__GLIBC__)
- 	if (statfs(name, &disk)) return(-1);
- #endif
- 
--- 

-- 
blender packaging



More information about the pkg-multimedia-commits mailing list