[blender/f18: 15/15] Fix SEGFAULT in blf_lang.c (#887413)

[Jochen Schmitt]

commit c7087d4fd0c4a10c11ff77d6ba25d9a1a5de3251
Merge: df8e127 87e0685
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Sat Dec 15 09:51:30 2012 +0100

    Fix SEGFAULT in blf_lang.c (#887413)

 blender-2.65-syspath.patch |   12 ++++++++++++
 blender.spec               |   19 +++++++++++--------
 2 files changed, 23 insertions(+), 8 deletions(-)
---
diff --cc blender-2.65-syspath.patch
index 4351983,e867baa..4ff9650
--- a/blender-2.65-syspath.patch
+++ b/blender-2.65-syspath.patch
@@@ -1,12 -1,12 +1,20 @@@
  diff -up blender-2.65/source/blender/blenfont/intern/blf_lang.c.syspath blender-2.65/source/blender/blenfont/intern/blf_lang.c
  --- blender-2.65/source/blender/blenfont/intern/blf_lang.c.syspath	2012-12-10 20:25:45.000000000 +0100
++<<<<<<< HEAD
 ++++ blender-2.65/source/blender/blenfont/intern/blf_lang.c	2012-12-13 10:38:50.273961152 +0100
++=======
+ +++ blender-2.65/source/blender/blenfont/intern/blf_lang.c	2012-12-15 08:39:00.897062402 +0100
++>>>>>>> master
  @@ -83,7 +83,7 @@ static void free_locales(void)
   
   static void fill_locales(void)
   {
  -	char *languages_path = BLI_get_folder(BLENDER_DATAFILES, "locale");
++<<<<<<< HEAD
 ++	char *languages_path = "/usr/share/blender";
++=======
+ +        char languages_path[FILE_MAX] = "/usr/share/blender";
++>>>>>>> master
   	LinkNode *lines = NULL, *line;
   	char *str;
   	int idx = 0;
@@@ -21,7 -21,7 +29,11 @@@
   		bl_locale_init(messagepath, TEXT_DOMAIN_NAME);
  diff -up blender-2.65/source/blender/blenlib/intern/path_util.c.syspath blender-2.65/source/blender/blenlib/intern/path_util.c
  --- blender-2.65/source/blender/blenlib/intern/path_util.c.syspath	2012-12-10 20:25:44.000000000 +0100
++<<<<<<< HEAD
 ++++ blender-2.65/source/blender/blenlib/intern/path_util.c	2012-12-11 23:06:50.847028569 +0100
++=======
+ +++ blender-2.65/source/blender/blenlib/intern/path_util.c	2012-12-15 08:34:18.594027763 +0100
++>>>>>>> master
  @@ -983,38 +983,6 @@ static int get_path_system(char *targetp
   	char system_path[FILE_MAX];
   	const char *system_base_path;
diff --cc blender.spec
index 853b1b2,08d2d69..121a24d
--- a/blender.spec
+++ b/blender.spec
@@@ -97,16 -97,8 +97,10 @@@ Requires(post): shared-mime-inf
  Requires(postun): desktop-file-utils
  Requires(postun): shared-mime-info
  
- %if 0%{?fedora} > 10
- Requires:	  dejavu-sans-fonts
- %endif
- 
- %if 0%{?fedora} <= 10
- Requires:	  dejavu-fonts
- %endif
+ Requires:	  google-droid-sans-fonts
  
 +Requires:	  google-droid-sans-fonts
 +
  Provides:	  blender(ABI) = %{blender_api}
  
  Provides:	  blender-fonts = %{?epoch:%{epoch}:}%{version}-%{release}