File blender-2.64a-fix-locale-files-path.patch of Package blender

Overview Repositories Revisions Requests Users Attributes Meta

File blender-2.64a-fix-locale-files-path.patch of Package blender (Revision 32e949192f7b51e3f03564529e77fa3c)

Currently displaying revision 32e949192f7b51e3f03564529e77fa3c , Show latest

Index: source/creator/CMakeLists.txt
===================================================================
--- source/creator/CMakeLists.txt.orig	2013-05-01 22:32:06.000000000 +0200
+++ source/creator/CMakeLists.txt	2013-05-01 22:33:27.049051615 +0200
@@ -308,11 +308,16 @@ endif()
 if(WITH_INTERNATIONAL)
 	install(
 		DIRECTORY
-			${CMAKE_SOURCE_DIR}/release/datafiles/locale
 			${CMAKE_SOURCE_DIR}/release/datafiles/fonts
 		DESTINATION ${TARGETDIR_VER}/datafiles
 		PATTERN ".svn" EXCLUDE
 	)
+	install(
+		DIRECTORY
+			${CMAKE_SOURCE_DIR}/release/datafiles/locale
+			DESTINATION ${CMAKE_INSTALL_PREFIX}/share
+		PATTERN ".svn" EXCLUDE
+	)
 endif()
 
 # color management
Index: release/environment-unix
===================================================================
--- release/environment-unix.orig	2013-05-01 22:32:06.000000000 +0200
+++ release/environment-unix	2013-05-01 22:33:27.060051615 +0200
@@ -11,7 +11,7 @@
 BLENDER_USER_BASE=${HOME}/.blender/${BLENDER_VERSION}
 BLENDER_SYSTEM_BASE=${BLENDER_SHARE}/${BLENDER_VERSION}
 BLENDER_USER_DATAFILES=${HOME}/.blender/${BLENDER_VERSION}/datafiles
-BLENDER_SYSTEM_DATAFILES=${BLENDER_SHARE}/${BLENDER_VERSION}/datafiles
+BLENDER_SYSTEM_DATAFILES=/usr/share
 BLENDER_USER_PY=${HOME}/.blender/${BLENDER_VERSION}/py
 BLENDER_SYSTEM_PY=${BLENDER_SHARE}/${BLENDER_VERSION}/py
 BLENDER_USER_PLUGINS=${HOME}/.blender/${BLENDER_VERSION}/plugins
Index: source/blender/blenlib/intern/path_util.c
===================================================================
--- source/blender/blenlib/intern/path_util.c.orig	2013-05-01 22:32:06.000000000 +0200
+++ source/blender/blenlib/intern/path_util.c	2013-05-01 22:33:27.065051615 +0200
@@ -1113,38 +1113,6 @@ static int get_path_system(char *targetp
 	char system_path[FILE_MAX];
 	const char *system_base_path;
-	char cwd[FILE_MAX];
-	char relfolder[FILE_MAX];
-
-	if (folder_name) {
-		if (subfolder_name) {
-			BLI_join_dirfile(relfolder, sizeof(relfolder), folder_name, subfolder_name);
-		}
-		else {
-			BLI_strncpy(relfolder, folder_name, sizeof(relfolder));
-		}
-	}
-	else {
-		relfolder[0] = '\0';
-	}
-
-	/* first allow developer only overrides to the system path
-	 * these are only used when running blender from source */
-
-	/* try CWD/release/folder_name */
-	if (BLI_current_working_dir(cwd, sizeof(cwd))) {
-		if (test_path(targetpath, cwd, "release", relfolder)) {
-			return true;
-		}
-	}
-
-	/* try EXECUTABLE_DIR/release/folder_name */
-	if (test_path(targetpath, bprogdir, "release", relfolder))
-		return true;
-
-	/* end developer overrides */
-
-

system_path[0] = '\0';
 
 	if (test_env_path(system_path, envvar)) {

Places

File blender-2.64a-fix-locale-files-path.patch of Package blender (Revision 32e949192f7b51e3f03564529e77fa3c)

Places