[SCM] blender/master: debian/patches/: patchset updated against v2.74
mfv at users.alioth.debian.org
mfv at users.alioth.debian.org
Tue Apr 7 06:43:19 UTC 2015
The following commit has been merged in the master branch:
commit c6b4adc1d8963bc01f4326fcf3b06a2bfa5ea84f
Author: Matteo F. Vescovi <mfv at debian.org>
Date: Fri Apr 3 09:51:33 2015 +0200
debian/patches/: patchset updated against v2.74
- #0001 => #0007 refreshed
diff --git a/debian/patches/0001-blender_thumbnailer.patch b/debian/patches/0001-blender_thumbnailer.patch
index dfbc974..fd8939c 100644
--- a/debian/patches/0001-blender_thumbnailer.patch
+++ b/debian/patches/0001-blender_thumbnailer.patch
@@ -33,7 +33,7 @@ index 779c615..dbcd865 100755
# ##### BEGIN GPL LICENSE BLOCK #####
#
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index 21cb41d..a66eabb 100644
+index f51b7be..f849f6a 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -484,7 +484,7 @@ if(UNIX AND NOT APPLE)
diff --git a/debian/patches/0002-install_in_usr_share.patch b/debian/patches/0002-install_in_usr_share.patch
index 1fd9c8a..e640b0e 100644
--- a/debian/patches/0002-install_in_usr_share.patch
+++ b/debian/patches/0002-install_in_usr_share.patch
@@ -9,7 +9,7 @@ Subject: install_in_usr_share
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index a66eabb..2771eb9 100644
+index f849f6a..fad5a6e 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -312,8 +312,8 @@ if(WITH_PYTHON)
diff --git a/debian/patches/0003-filter_docs_to_install.patch b/debian/patches/0003-filter_docs_to_install.patch
index 0a402b8..2991e8c 100644
--- a/debian/patches/0003-filter_docs_to_install.patch
+++ b/debian/patches/0003-filter_docs_to_install.patch
@@ -8,7 +8,7 @@ Install only relevant documentation.
1 file changed, 2 deletions(-)
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index 2771eb9..d7ea8ad 100644
+index fad5a6e..c914eac 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -242,8 +242,6 @@ endif()
diff --git a/debian/patches/0004-locales_directory_install.patch b/debian/patches/0004-locales_directory_install.patch
index cb1fcbd..3915e2a 100644
--- a/debian/patches/0004-locales_directory_install.patch
+++ b/debian/patches/0004-locales_directory_install.patch
@@ -1,5 +1,5 @@
From: "Matteo F. Vescovi" <mfv at debian.org>
-Date: Thu, 8 Jan 2015 15:12:42 +0100
+Date: Fri, 3 Apr 2015 09:42:30 +0200
Subject: locales_directory_install
Change where locales are installed.
@@ -13,10 +13,10 @@ Contributions by:
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/source/blender/blenfont/intern/blf_lang.c b/source/blender/blenfont/intern/blf_lang.c
-index 10614e8..776afc5 100644
+index 99e1aa5..4a8b0d6 100644
--- a/source/blender/blenfont/intern/blf_lang.c
+++ b/source/blender/blenfont/intern/blf_lang.c
-@@ -78,9 +78,9 @@ static void free_locales(void)
+@@ -82,9 +82,9 @@ static void free_locales(void)
num_locales = num_locales_menu = 0;
}
@@ -28,7 +28,7 @@ index 10614e8..776afc5 100644
char languages[FILE_MAX];
LinkNode *lines = NULL, *line;
char *str;
-@@ -88,7 +88,7 @@ static void fill_locales(void)
+@@ -92,7 +92,7 @@ static void fill_locales(void)
free_locales();
@@ -37,13 +37,17 @@ index 10614e8..776afc5 100644
line = lines = BLI_file_read_as_lines(languages);
/* This whole "parsing" code is a bit weak, in that it expects strictly formated input file...
-@@ -188,11 +188,11 @@ EnumPropertyItem *BLF_RNA_lang_enum_properties(void)
+@@ -192,7 +192,7 @@ EnumPropertyItem *BLF_RNA_lang_enum_properties(void)
void BLF_lang_init(void)
{
#ifdef WITH_INTERNATIONAL
- const char * const messagepath = BKE_appdir_folder_id(BLENDER_DATAFILES, "locale");
+ const char * const messagepath = BKE_appdir_folder_id(BLENDER_SYSTEM_LOCALE, NULL);
+ #endif
+ /* Make sure LANG is correct and wouldn't cause std::rumtime_error. */
+@@ -225,7 +225,7 @@ void BLF_lang_init(void)
+ #ifdef WITH_INTERNATIONAL
if (messagepath) {
bl_locale_init(messagepath, TEXT_DOMAIN_NAME);
- fill_locales();
@@ -64,7 +68,7 @@ index 5e42f17..d6838bc 100644
/* for BKE_appdir_folder_id_version only */
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index d7ea8ad..a12f3d9 100644
+index c914eac..2b11015 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -327,11 +327,11 @@ if(WITH_INTERNATIONAL)
diff --git a/debian/patches/0005-update_manpages.patch b/debian/patches/0005-update_manpages.patch
index 8b06c57..136d036 100644
--- a/debian/patches/0005-update_manpages.patch
+++ b/debian/patches/0005-update_manpages.patch
@@ -148,7 +148,7 @@ index 0000000..d15b0c9
+.SH AUTHORS
+This manpage was written for a Debian GNU/Linux by Kevin Roy <kiniou at gmail.com>.
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index a12f3d9..89695c7 100644
+index 2b11015..25cf67d 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -425,6 +425,7 @@ if(UNIX AND NOT APPLE)
diff --git a/debian/patches/0006-do_not_use_version_number_in_system_path.patch b/debian/patches/0006-do_not_use_version_number_in_system_path.patch
index ee65f2a..802e71a 100644
--- a/debian/patches/0006-do_not_use_version_number_in_system_path.patch
+++ b/debian/patches/0006-do_not_use_version_number_in_system_path.patch
@@ -28,7 +28,7 @@ index e2d9733..ec0e691 100644
if (static_path) {
static string system_path = string(static_path) + "/blender/" + versionstr;
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index 89695c7..86970e8 100644
+index 25cf67d..9e8777a 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -265,7 +265,7 @@ if(UNIX AND NOT APPLE)
diff --git a/debian/patches/0007-look_for_droid_ttf_with_fontconfig.patch b/debian/patches/0007-look_for_droid_ttf_with_fontconfig.patch
index e3ce47c..3e16710 100644
--- a/debian/patches/0007-look_for_droid_ttf_with_fontconfig.patch
+++ b/debian/patches/0007-look_for_droid_ttf_with_fontconfig.patch
@@ -1,5 +1,5 @@
From: "Matteo F. Vescovi" <mfv at debian.org>
-Date: Thu, 8 Jan 2015 16:04:37 +0100
+Date: Fri, 3 Apr 2015 09:50:43 +0200
Subject: look_for_droid_ttf_with_fontconfig
* Remove bad installation of fonts directory into locales.
@@ -16,10 +16,10 @@ Subject: look_for_droid_ttf_with_fontconfig
7 files changed, 85 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4ee277b..ffe4c53 100644
+index b52dd05..08529c5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -864,6 +864,13 @@ if(UNIX AND NOT APPLE)
+@@ -872,6 +872,13 @@ if(UNIX AND NOT APPLE)
endif()
endif()
@@ -34,10 +34,10 @@ index 4ee277b..ffe4c53 100644
if(WITH_CODEC_SNDFILE)
find_package_wrapper(SndFile)
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
-index 40bea5e..b295857 100644
+index 33c7644..73e3a86 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
-@@ -306,6 +306,9 @@ macro(setup_liblinks
+@@ -324,6 +324,9 @@ macro(setup_liblinks
if(WITH_SYSTEM_GLEW)
target_link_libraries(${target} ${BLENDER_GLEW_LIBRARIES})
endif()
@@ -48,10 +48,10 @@ index 40bea5e..b295857 100644
target_link_libraries(${target} ${BULLET_LIBRARIES})
endif()
diff --git a/source/blender/blenfont/CMakeLists.txt b/source/blender/blenfont/CMakeLists.txt
-index 346d5bc..f5132e9 100644
+index 392a9ed..deb1f3c 100644
--- a/source/blender/blenfont/CMakeLists.txt
+++ b/source/blender/blenfont/CMakeLists.txt
-@@ -60,6 +60,13 @@ if(WITH_INTERNATIONAL)
+@@ -66,6 +66,13 @@ if(WITH_INTERNATIONAL)
add_definitions(-DWITH_INTERNATIONAL)
endif()
@@ -66,7 +66,7 @@ index 346d5bc..f5132e9 100644
blender_add_lib(bf_blenfont "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/blenfont/intern/blf_translation.c b/source/blender/blenfont/intern/blf_translation.c
-index e7d2c14..21f2d00 100644
+index 2a4a152..7fd4b5c 100644
--- a/source/blender/blenfont/intern/blf_translation.c
+++ b/source/blender/blenfont/intern/blf_translation.c
@@ -52,7 +52,11 @@
@@ -115,19 +115,19 @@ index e7d2c14..21f2d00 100644
}
diff --git a/source/blender/blenlib/BLI_fileops.h b/source/blender/blenlib/BLI_fileops.h
-index 4f451a6..fa2f35e 100644
+index 7898a54..7db1d2e 100644
--- a/source/blender/blenlib/BLI_fileops.h
+++ b/source/blender/blenlib/BLI_fileops.h
-@@ -87,6 +87,7 @@ bool BLI_is_file(const char *path);
- void BLI_dir_create_recursive(const char *dir);
- double BLI_dir_free_space(const char *dir);
- char *BLI_current_working_dir(char *dir, const size_t maxlen);
+@@ -89,6 +89,7 @@ bool BLI_is_file(const char *path) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
+ void BLI_dir_create_recursive(const char *dir) ATTR_NONNULL();
+ double BLI_dir_free_space(const char *dir) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
+ char *BLI_current_working_dir(char *dir, const size_t maxlen) ATTR_NONNULL();
+char *BLI_file_to_mem(const char *from_file, int *size_r);
- unsigned int BLI_dir_contents(const char *dir, struct direntry **filelist);
- void BLI_free_filelist(struct direntry *filelist, unsigned int nrentries);
+ /* Filelist */
+
diff --git a/source/blender/blenlib/intern/fileops.c b/source/blender/blenlib/intern/fileops.c
-index f6bbd32..91b4070 100644
+index d6fe5e5..52e2c33 100644
--- a/source/blender/blenlib/intern/fileops.c
+++ b/source/blender/blenlib/intern/fileops.c
@@ -159,6 +159,50 @@ char *BLI_file_ungzip_to_mem(const char *from_file, int *r_size)
@@ -182,7 +182,7 @@ index f6bbd32..91b4070 100644
* 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/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index 86970e8..7aaaa92 100644
+index 9e8777a..2279826 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -324,12 +324,6 @@ endif()
--
blender packaging
More information about the pkg-multimedia-commits
mailing list