[SCM] blender/master: debian/patches: patchset re-worked against v2.66
mfv-guest at users.alioth.debian.org
mfv-guest at users.alioth.debian.org
Mon Mar 4 11:41:49 UTC 2013
The following commit has been merged in the master branch:
commit cf61f5efaafbcc1700204cd3a6228a551515a319
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date: Mon Mar 4 11:30:23 2013 +0100
debian/patches: patchset re-worked against v2.66
diff --git a/debian/patches/0001-blender_thumbnailer.patch b/debian/patches/0001-blender_thumbnailer.patch
index 6181b71..2c1ec79 100644
--- a/debian/patches/0001-blender_thumbnailer.patch
+++ b/debian/patches/0001-blender_thumbnailer.patch
@@ -42,7 +42,7 @@ index 8b93eeb..44ffd48 100755
import struct
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index 72f1132..1979cbf 100644
+index bb10bdd..8d02216 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -392,7 +392,7 @@ if(UNIX AND NOT APPLE)
diff --git a/debian/patches/0003-install_in_usr_share.patch b/debian/patches/0003-install_in_usr_share.patch
index 5f396d5..e1def57 100644
--- a/debian/patches/0003-install_in_usr_share.patch
+++ b/debian/patches/0003-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 1979cbf..c93fc9f 100644
+index 8d02216..4e4cce2 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -280,8 +280,8 @@ if(WITH_PYTHON)
diff --git a/debian/patches/0004-filter_docs_to_install.patch b/debian/patches/0004-filter_docs_to_install.patch
index ec7dc68..14730be 100644
--- a/debian/patches/0004-filter_docs_to_install.patch
+++ b/debian/patches/0004-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 c93fc9f..a6c911e 100644
+index 4e4cce2..dbfa71a 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -225,8 +225,6 @@ else()
diff --git a/debian/patches/0005-locales_directory_install.patch b/debian/patches/0005-locales_directory_install.patch
index 5f4251f..fc07d59 100644
--- a/debian/patches/0005-locales_directory_install.patch
+++ b/debian/patches/0005-locales_directory_install.patch
@@ -1,5 +1,5 @@
From: Kevin Roy <kiniou at gmail.com>
-Date: Fri, 11 Jan 2013 15:29:45 +0100
+Date: Thu, 21 Feb 2013 16:17:01 +0100
Subject: locales_directory_install
Change where locales are installed.
@@ -11,13 +11,13 @@ Change where locales are installed.
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/source/blender/blenfont/intern/blf_lang.c b/source/blender/blenfont/intern/blf_lang.c
-index 9086799..f7c6303 100644
+index 73294f1..dc0ba58 100644
--- a/source/blender/blenfont/intern/blf_lang.c
+++ b/source/blender/blenfont/intern/blf_lang.c
@@ -185,7 +185,7 @@ EnumPropertyItem *BLF_RNA_lang_enum_properties(void)
-
void BLF_lang_init(void)
{
+ #ifdef WITH_INTERNATIONAL
- char *messagepath = BLI_get_folder(BLENDER_DATAFILES, "locale");
+ char *messagepath = BLI_get_folder(BLENDER_SYSTEM_LOCALE, NULL);
@@ -36,10 +36,10 @@ index 8c51c92..ee70094 100644
/* for BLI_get_folder_version only */
#define BLENDER_RESOURCE_PATH_USER 0
diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c
-index 06b1f1f..104dad3 100644
+index 5265d86..6e31575 100644
--- a/source/blender/blenlib/intern/path_util.c
+++ b/source/blender/blenlib/intern/path_util.c
-@@ -1092,6 +1092,9 @@ char *BLI_get_folder(int folder_id, const char *subfolder)
+@@ -1098,6 +1098,9 @@ char *BLI_get_folder(int folder_id, const char *subfolder)
if (get_path_local(path, "python", subfolder, ver)) break;
if (get_path_system(path, "python", subfolder, "BLENDER_SYSTEM_PYTHON", ver)) break;
return NULL;
@@ -50,7 +50,7 @@ index 06b1f1f..104dad3 100644
return path;
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index a6c911e..462b7e1 100644
+index dbfa71a..cc9045b 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -292,9 +292,9 @@ endif()
diff --git a/debian/patches/0006-update_manpages.patch b/debian/patches/0006-update_manpages.patch
index 8bbbdee..db5bb84 100644
--- a/debian/patches/0006-update_manpages.patch
+++ b/debian/patches/0006-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 462b7e1..1dfba9c 100644
+index cc9045b..7ea1dd3 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -330,6 +330,7 @@ if(UNIX AND NOT APPLE)
diff --git a/debian/patches/0007-do_not_use_version_number_in_system_path.patch b/debian/patches/0007-do_not_use_version_number_in_system_path.patch
index 8750bd5..d08a0cd 100644
--- a/debian/patches/0007-do_not_use_version_number_in_system_path.patch
+++ b/debian/patches/0007-do_not_use_version_number_in_system_path.patch
@@ -10,7 +10,7 @@ without version numbers.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index 1dfba9c..c2dec5a 100644
+index 7ea1dd3..6553ce3 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -240,7 +240,7 @@ if(UNIX AND NOT APPLE)
diff --git a/debian/patches/0008-look_for_droid_ttf_with_fontconfig.patch b/debian/patches/0008-look_for_droid_ttf_with_fontconfig.patch
index 4367989..85543a3 100644
--- a/debian/patches/0008-look_for_droid_ttf_with_fontconfig.patch
+++ b/debian/patches/0008-look_for_droid_ttf_with_fontconfig.patch
@@ -1,5 +1,5 @@
From: Kevin Roy <kiniou at gmail.com>
-Date: Sun, 13 Jan 2013 09:59:18 +0100
+Date: Thu, 21 Feb 2013 16:29:22 +0100
Subject: look_for_droid_ttf_with_fontconfig
* Remove bad installation of fonts directory into locales.
@@ -18,7 +18,7 @@ Subject: look_for_droid_ttf_with_fontconfig
create mode 100644 build_files/cmake/Modules/FindFontconfig.cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ecc3f3e..54a4f1e 100644
+index d208d73..b9709f4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -116,6 +116,9 @@ option(WITH_BLENDER "Build blender (disable to build only the blender player)" O
@@ -31,7 +31,7 @@ index ecc3f3e..54a4f1e 100644
option(WITH_PYTHON "Enable Embedded Python API (only disable for development)" ON)
option(WITH_PYTHON_SECURITY "Disables execution of scripts within blend files by default (recommend to leave off)" OFF)
-@@ -589,6 +592,13 @@ if(UNIX AND NOT APPLE)
+@@ -604,6 +607,13 @@ if(UNIX AND NOT APPLE)
endif()
endif()
@@ -115,10 +115,10 @@ index bdd82a4..7fdd862 100644
target_link_libraries(${target} ${BULLET_LIBRARIES})
endif()
diff --git a/source/blender/blenfont/CMakeLists.txt b/source/blender/blenfont/CMakeLists.txt
-index 90baef1..fa03af7 100644
+index 7bb80c3..6d5e22b 100644
--- a/source/blender/blenfont/CMakeLists.txt
+++ b/source/blender/blenfont/CMakeLists.txt
-@@ -58,6 +58,13 @@ if(WITH_INTERNATIONAL)
+@@ -59,6 +59,13 @@ if(WITH_INTERNATIONAL)
add_definitions(-DWITH_INTERNATIONAL)
endif()
@@ -133,12 +133,12 @@ index 90baef1..fa03af7 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 5d4b631..1e2a3bd 100644
+index b5b72b6..baa4efd 100644
--- a/source/blender/blenfont/intern/blf_translation.c
+++ b/source/blender/blenfont/intern/blf_translation.c
-@@ -47,13 +47,35 @@
+@@ -47,7 +47,11 @@
- #include "DNA_userdef_types.h" /* For user settings. */
+ #include "boost_locale_wrapper.h"
+#ifdef WITH_FONTCONFIG
+#include <fontconfig/fontconfig.h>
@@ -147,9 +147,10 @@ index 5d4b631..1e2a3bd 100644
+#endif
static unsigned char *unifont_ttf = NULL;
static int unifont_size = 0;
-
- unsigned char *BLF_get_unifont(int *unifont_size_r)
+ #endif /* WITH_INTERNATIONAL */
+@@ -56,6 +60,24 @@ unsigned char *BLF_get_unifont(int *unifont_size_r)
{
+ #ifdef WITH_INTERNATIONAL
if (unifont_ttf == NULL) {
+#ifdef WITH_FONTCONFIG
+ FcFontSet *fontset = NULL;
@@ -172,7 +173,7 @@ index 5d4b631..1e2a3bd 100644
char *fontpath = BLI_get_folder(BLENDER_DATAFILES, "fonts");
if (fontpath) {
char unifont_path[1024];
-@@ -65,6 +87,7 @@ unsigned char *BLF_get_unifont(int *unifont_size_r)
+@@ -67,6 +89,7 @@ unsigned char *BLF_get_unifont(int *unifont_size_r)
else {
printf("%s: 'fonts' data path not found for international font, continuing\n", __func__);
}
@@ -193,7 +194,7 @@ index c278370..c9789f1 100644
size_t BLI_file_descriptor_size(int file);
size_t BLI_file_size(const char *file);
diff --git a/source/blender/blenlib/intern/fileops.c b/source/blender/blenlib/intern/fileops.c
-index 0f42fca..96e85c4 100644
+index 24b3c36..e80337e 100644
--- a/source/blender/blenlib/intern/fileops.c
+++ b/source/blender/blenlib/intern/fileops.c
@@ -155,6 +155,49 @@ char *BLI_file_ungzip_to_mem(const char *from_file, int *size_r)
@@ -247,7 +248,7 @@ index 0f42fca..96e85c4 100644
/* return 1 when file can be written */
int BLI_file_is_writable(const char *filename)
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index c2dec5a..60096a8 100644
+index 6553ce3..8d859bb 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -293,7 +293,6 @@ if(WITH_INTERNATIONAL)
diff --git a/debian/patches/0009-fix_format-security_issue.patch b/debian/patches/0009-fix_format-security_issue.patch
deleted file mode 100644
index bf46fcb..0000000
--- a/debian/patches/0009-fix_format-security_issue.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
-Date: Sun, 13 Jan 2013 10:47:51 +0100
-Subject: fix_format-security_issue
-
-File source/gameengine/Ketsji/KX_KetsjiEngine.cpp
-needs a little adjustment to let blender build fine
-on Debian.
----
- source/gameengine/Ketsji/KX_KetsjiEngine.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
-index 87683f8..fe20756 100644
---- a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
-+++ b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
-@@ -1499,7 +1499,7 @@ void KX_KetsjiEngine::RenderDebugProperties()
- {
- for (int j = tc_first; j < tc_numCategories; j++)
- {
-- debugtxt.Format(m_profileLabels[j]);
-+ debugtxt.Format("%s", m_profileLabels[j]);
- m_rendertools->RenderText2D(RAS_IRenderTools::RAS_TEXT_PADDED,
- debugtxt.Ptr(),
- xcoord + const_xindent,
diff --git a/debian/patches/0010-Fix_illegal_hardware_instruction_due_to_SSE2.patch b/debian/patches/0009-fix_illegal_hardware_instruction_due_to_SSE2.patch
similarity index 97%
rename from debian/patches/0010-Fix_illegal_hardware_instruction_due_to_SSE2.patch
rename to debian/patches/0009-fix_illegal_hardware_instruction_due_to_SSE2.patch
index ea767a9..bbf7892 100644
--- a/debian/patches/0010-Fix_illegal_hardware_instruction_due_to_SSE2.patch
+++ b/debian/patches/0009-fix_illegal_hardware_instruction_due_to_SSE2.patch
@@ -1,6 +1,6 @@
From: Johann Klammer <klammerj at a1.net>
Date: Wed, 13 Feb 2013 09:04:08 +0100
-Subject: Fix_illegal_hardware_instruction_due_to_SSE2
+Subject: fix_illegal_hardware_instruction_due_to_SSE2
This makes sure it builds compatible binaries also on
machines which have sse/sse2. Fixes the SIGILL bug.
diff --git a/debian/patches/0010-fix_format-security_issue.patch b/debian/patches/0010-fix_format-security_issue.patch
new file mode 100644
index 0000000..948524e
--- /dev/null
+++ b/debian/patches/0010-fix_format-security_issue.patch
@@ -0,0 +1,77 @@
+From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
+Date: Mon, 4 Mar 2013 10:27:18 +0100
+Subject: fix_format-security_issue
+
+---
+ source/blender/blenkernel/intern/pointcache.c | 2 +-
+ source/blender/editors/transform/transform.c | 4 ++--
+ source/blender/editors/transform/transform_constraints.c | 4 ++--
+ source/blender/modifiers/intern/MOD_meshcache.c | 2 +-
+ 4 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c
+index 27c5e03..4ea4d03 100644
+--- a/source/blender/blenkernel/intern/pointcache.c
++++ b/source/blender/blenkernel/intern/pointcache.c
+@@ -3511,7 +3511,7 @@ void BKE_ptcache_update_info(PTCacheID *pid)
+ else if (totframes && cache->totpoint)
+ BLI_snprintf(cache->info, sizeof(cache->info), IFACE_("%i points found!"), cache->totpoint);
+ else
+- BLI_snprintf(cache->info, sizeof(cache->info), IFACE_("No valid data to read!"));
++ BLI_snprintf("%s", cache->info, sizeof(cache->info), IFACE_("No valid data to read!"));
+ return;
+ }
+
+diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
+index ea82ebb..4c6b494 100644
+--- a/source/blender/editors/transform/transform.c
++++ b/source/blender/editors/transform/transform.c
+@@ -4086,7 +4086,7 @@ int ShrinkFatten(TransInfo *t, const int UNUSED(mval[2]))
+
+ /* header print for NumInput */
+ str_p = str;
+- str_p += BLI_snprintf(str_p, sizeof(str), IFACE_("Shrink/Fatten:"));
++ str_p += BLI_snprintf("%s", str_p, sizeof(str), IFACE_("Shrink/Fatten:"));
+ if (hasNumInput(&t->num)) {
+ char c[NUM_STR_REP_LEN];
+ outputNumInput(&(t->num), c);
+@@ -6437,7 +6437,7 @@ int VertSlide(TransInfo *t, const int UNUSED(mval[2]))
+
+ /* header string */
+ str_p = str;
+- str_p += BLI_snprintf(str_p, sizeof(str), IFACE_("Vert Slide: "));
++ str_p += BLI_snprintf("%s", str_p, sizeof(str), IFACE_("Vert Slide: "));
+ if (hasNumInput(&t->num)) {
+ char c[NUM_STR_REP_LEN];
+ applyNumInput(&t->num, &final);
+diff --git a/source/blender/editors/transform/transform_constraints.c b/source/blender/editors/transform/transform_constraints.c
+index c4d6147..27aa86d 100644
+--- a/source/blender/editors/transform/transform_constraints.c
++++ b/source/blender/editors/transform/transform_constraints.c
+@@ -867,11 +867,11 @@ static void setNearestAxis2d(TransInfo *t)
+ /* no correction needed... just use whichever one is lower */
+ if (abs(t->mval[0] - t->con.imval[0]) < abs(t->mval[1] - t->con.imval[1]) ) {
+ t->con.mode |= CON_AXIS1;
+- BLI_snprintf(t->con.text, sizeof(t->con.text), IFACE_(" along Y axis"));
++ BLI_snprintf("%s", t->con.text, sizeof(t->con.text), IFACE_(" along Y axis"));
+ }
+ else {
+ t->con.mode |= CON_AXIS0;
+- BLI_snprintf(t->con.text, sizeof(t->con.text), IFACE_(" along X axis"));
++ BLI_snprintf("%s", t->con.text, sizeof(t->con.text), IFACE_(" along X axis"));
+ }
+ }
+
+diff --git a/source/blender/modifiers/intern/MOD_meshcache.c b/source/blender/modifiers/intern/MOD_meshcache.c
+index 5e702a4..e8f8305 100644
+--- a/source/blender/modifiers/intern/MOD_meshcache.c
++++ b/source/blender/modifiers/intern/MOD_meshcache.c
+@@ -251,7 +251,7 @@ static void meshcache_do(
+ /* -------------------------------------------------------------------- */
+ /* Apply the transformation matrix (if needed) */
+ if (UNLIKELY(err_str)) {
+- modifier_setError(&mcmd->modifier, err_str);
++ modifier_setError("%s", &mcmd->modifier, err_str);
+ }
+ else if (ok) {
+ bool use_matrix = false;
diff --git a/debian/patches/series b/debian/patches/series
index 8101cc4..91696ce 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,5 +6,5 @@
0006-update_manpages.patch
0007-do_not_use_version_number_in_system_path.patch
0008-look_for_droid_ttf_with_fontconfig.patch
-0009-fix_format-security_issue.patch
-0010-Fix_illegal_hardware_instruction_due_to_SSE2.patch
+0009-fix_illegal_hardware_instruction_due_to_SSE2.patch
+0010-fix_format-security_issue.patch
--
blender packaging
More information about the pkg-multimedia-commits
mailing list