[blender] Fis SEGFAULT in blf_lang.c (#887413)
Jochen Schmitt
s4504kr at fedoraproject.org
Sat Dec 15 08:20:26 UTC 2012
commit 13bb0487ea250fda18da96607b82244c8fa73834
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date: Sat Dec 15 09:20:19 2012 +0100
Fis SEGFAULT in blf_lang.c (#887413)
blender-2.65-syspath.patch | 6 +++---
blender.spec | 5 ++++-
2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/blender-2.65-syspath.patch b/blender-2.65-syspath.patch
index 4351983..e867baa 100644
--- a/blender-2.65-syspath.patch
+++ b/blender-2.65-syspath.patch
@@ -1,12 +1,12 @@
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
-+++ 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
@@ -83,7 +83,7 @@ static void free_locales(void)
static void fill_locales(void)
{
- char *languages_path = BLI_get_folder(BLENDER_DATAFILES, "locale");
-+ char *languages_path = "/usr/share/blender";
++ char languages_path[FILE_MAX] = "/usr/share/blender";
LinkNode *lines = NULL, *line;
char *str;
int idx = 0;
@@ -21,7 +21,7 @@ diff -up blender-2.65/source/blender/blenfont/intern/blf_lang.c.syspath blender-
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
-+++ 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
@@ -983,38 +983,6 @@ static int get_path_system(char *targetp
char system_path[FILE_MAX];
const char *system_base_path;
diff --git a/blender.spec b/blender.spec
index 668c19f..733bdfb 100644
--- a/blender.spec
+++ b/blender.spec
@@ -13,7 +13,7 @@
Name: blender
Epoch: 1
Version: %{blender_api}
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: 3D modeling, animation, rendering and post-production
@@ -273,6 +273,9 @@ fi || :
%{_sysconfdir}/rpm/macros.blender
%changelog
+* Sat Dec 15 2012 Jochen Schmitt <JOchen herr-schmitt de> - 1:2.65-4
+- Fis SEGFAULT in blf_lang.c (#887413)
+
* Fri Dec 14 2012 Jochen Schmitt <Jochen herr-schmitt de> - 1:2.65-3
- Remove Req. to the DejaVu Sans font
More information about the scm-commits
mailing list