[blender/f20] Include derived DoridSans font for CJK support (#867205)

[Jochen Schmitt]

commit 0b5d39490312e4ee985755e23c6e8911a9260466
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Wed Sep 4 18:07:32 2013 +0200

    Include derived DoridSans font for CJK support (#867205)

 blender-2.68a-droid.patch |   75 +++------------------------------------------
 blender.spec              |    7 +++-
 2 files changed, 10 insertions(+), 72 deletions(-)
---
diff --git a/blender-2.68a-droid.patch b/blender-2.68a-droid.patch
index fa4c6f7..46d45dc 100644
--- a/blender-2.68a-droid.patch
+++ b/blender-2.68a-droid.patch
@@ -1,31 +1,15 @@
-diff -up blender-2.67/source/blender/blenfont/intern/blf_translation.c.droid blender-2.67/source/blender/blenfont/intern/blf_translation.c
---- blender-2.67/source/blender/blenfont/intern/blf_translation.c.droid	2013-03-20 19:42:09.000000000 +0100
-+++ blender-2.67/source/blender/blenfont/intern/blf_translation.c	2013-05-08 17:32:21.494426968 +0200
-@@ -47,7 +47,7 @@
- 
- #include "boost_locale_wrapper.h"
- 
--static const char unifont_filename[] = "droidsans.ttf.gz";
-+static const char unifont_filename[] = "DroidSans.ttf";
- static unsigned char *unifont_ttf = NULL;
- static int unifont_size = 0;
- static const char unifont_mono_filename[] = "bmonofont-i18n.ttf.gz";
-@@ -59,13 +59,13 @@ unsigned char *BLF_get_unifont(int *unif
+diff -up blender-2.68a/source/blender/blenfont/intern/blf_translation.c.droid blender-2.68a/source/blender/blenfont/intern/blf_translation.c
+--- blender-2.68a/source/blender/blenfont/intern/blf_translation.c.droid	2013-03-20 19:42:09.000000000 +0100
++++ blender-2.68a/source/blender/blenfont/intern/blf_translation.c	2013-09-04 17:05:04.775210317 +0200
+@@ -59,7 +59,7 @@ unsigned char *BLF_get_unifont(int *unif
  {
  #ifdef WITH_INTERNATIONAL
  	if (unifont_ttf == NULL) {
 -		const char * const fontpath = BLI_get_folder(BLENDER_DATAFILES, "fonts");
-+		const char * const fontpath = "/usr/share/fonts/google-droid";
++		const char * const fontpath = "/usr/share/fonts/blender";
  		if (fontpath) {
  			char unifont_path[1024];
  
- 			BLI_snprintf(unifont_path, sizeof(unifont_path), "%s/%s", fontpath, unifont_filename);
- 
--			unifont_ttf = (unsigned char *)BLI_file_ungzip_to_mem(unifont_path, &unifont_size);
-+			unifont_ttf = (unsigned char *)BLI_file_to_mem(unifont_path, &unifont_size);
- 		}
- 		else {
- 			printf("%s: 'fonts' data path not found for international font, continuing\n", __func__);
 @@ -94,7 +94,7 @@ unsigned char *BLF_get_unifont_mono(int
  {
  #ifdef WITH_INTERNATIONAL
@@ -35,52 +19,3 @@ diff -up blender-2.67/source/blender/blenfont/intern/blf_translation.c.droid ble
  		if (fontpath) {
  			char unifont_path[1024];
  
-diff -up blender-2.67/source/blender/blenlib/BLI_fileops.h.droid blender-2.67/source/blender/blenlib/BLI_fileops.h
---- blender-2.67/source/blender/blenlib/BLI_fileops.h.droid	2013-03-26 08:29:01.000000000 +0100
-+++ blender-2.67/source/blender/blenlib/BLI_fileops.h	2013-05-08 17:43:04.378413699 +0200
-@@ -81,6 +81,8 @@ bool   BLI_file_touch(const char *file);
- int    BLI_file_gzip(const char *from, const char *to);
- char  *BLI_file_ungzip_to_mem(const char *from_file, int *size_r);
- 
-+char *BLI_file_to_mem(const char *from_file, int *size_r);
-+
- size_t BLI_file_descriptor_size(int file);
- size_t BLI_file_size(const char *file);
- 
-diff -up blender-2.67/source/blender/blenlib/intern/fileops.c.droid blender-2.67/source/blender/blenlib/intern/fileops.c
---- blender-2.67/source/blender/blenlib/intern/fileops.c.droid	2013-05-01 19:43:33.000000000 +0200
-+++ blender-2.67/source/blender/blenlib/intern/fileops.c	2013-05-08 17:39:00.896339249 +0200
-@@ -160,6 +160,33 @@ char *BLI_file_ungzip_to_mem(const char
- 	return mem;
- }
- 
-+char *BLI_file_to_mem(const char *from_file, int *size_r)
-+{
-+        int file;
-+	int size = 0;
-+	char *mem = NULL;
-+
-+	file = BLI_open(from_file, O_RDONLY, 0);
-+
-+	size = BLI_file_descriptor_size(file);
-+       
-+	if (size == 0) {
-+	  close (file);
-+	  return 0;
-+	}
-+      
-+	mem = MEM_callocN(size, "BLI_ungzip_to_mem");
-+		
-+	read(file, mem, size);
-+	
-+	close (file);
-+
-+	*size_r = size;
-+
-+	return mem;
-+}
-+
-+
- /**
-  * Returns true if the file with the specified name can be written.
-  * This implementation uses access(2), which makes the check according
diff --git a/blender.spec b/blender.spec
index 4c5cf27..50881ec 100644
--- a/blender.spec
+++ b/blender.spec
@@ -14,7 +14,7 @@
 Name:           blender
 Epoch:          1
 Version:        %{blender_api}a
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -248,7 +248,7 @@ sed -e 's/@VERSION@/%{blender_api}/g' %{SOURCE10} \
 rm ${RPM_BUILD_ROOT}/%{_datadir}/locale/languages
 
 mkdir -p ${RPM_BUILD_ROOT}/%{blender_fontdir}/
-cp -p release/datafiles/fonts/bmonofont-i18n.ttf.gz \
+cp -p release/datafiles/fonts/*.ttf.gz \
     ${RPM_BUILD_ROOT}%{blender_fontdir}/
 
 %find_lang %{name}
@@ -296,6 +296,9 @@ fi || :
 %doc release/datafiles/LICENSE-bmonofont-i18n.ttf.txt
 
 %changelog
+* Wed Sep  4 2013 Jochen Schmitt <Jochen herr-schmitt de> - 1:2.68a-5
+- Include derived DoridSans font for CJK support (#867205)
+
 * Sun Sep  1 2013 Jochen Schmitt <Jochen herr-schmitt de> - 1:2.68a-4
 - Aboid twice occurance of locale files
 - Fix typo in DroideSans font name