[SCM] blender/master: debian/patches/: re-worked to fix pending bugs
mfv-guest at users.alioth.debian.org
mfv-guest at users.alioth.debian.org
Fri Mar 8 10:28:02 UTC 2013
The following commit has been merged in the master branch:
commit b260fa45fa0c58c15ad779a3cb63ff136faeff30
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date: Fri Mar 8 10:33:49 2013 +0100
debian/patches/: re-worked to fix pending bugs
- #0005: updated to fix locale issue
- #0007: updated to fix system path issue
Closes: #702503
Closes: #702515
Thanks: Antonio Ospite for the hints.
diff --git a/debian/patches/0001-blender_thumbnailer.patch b/debian/patches/0001-blender_thumbnailer.patch
index 88c3d61..c869acd 100644
--- a/debian/patches/0001-blender_thumbnailer.patch
+++ b/debian/patches/0001-blender_thumbnailer.patch
@@ -4,7 +4,9 @@ Subject: blender_thumbnailer
* Move thumbnailer script to an appropriate destination
* Add blender.thumbnailer file
-* Change to python 3.2 since lintian is messing around with that
+* Change to python 3.3 since lintian is messing around with that
+
+Signed-off-by: Matteo F. Vescovi <mfv.debian at gmail.com>
---
blender.thumbnailer | 4 ++++
release/bin/blender-thumbnailer.py | 4 ++--
@@ -23,7 +25,7 @@ index 0000000..05d4fae
+Exec=/usr/share/blender/scripts/blender-thumbnailer.py %i %o
+MimeType=application/x-blender;
diff --git a/release/bin/blender-thumbnailer.py b/release/bin/blender-thumbnailer.py
-index 8b93eeb..44ffd48 100755
+index 8b93eeb..6c2cf23 100755
--- a/release/bin/blender-thumbnailer.py
+++ b/release/bin/blender-thumbnailer.py
@@ -1,4 +1,4 @@
diff --git a/debian/patches/0005-locales_directory_install.patch b/debian/patches/0005-locales_directory_install.patch
index fc07d59..4550604 100644
--- a/debian/patches/0005-locales_directory_install.patch
+++ b/debian/patches/0005-locales_directory_install.patch
@@ -1,20 +1,45 @@
From: Kevin Roy <kiniou at gmail.com>
-Date: Thu, 21 Feb 2013 16:17:01 +0100
+Date: Fri, 8 Mar 2013 10:13:24 +0100
Subject: locales_directory_install
Change where locales are installed.
+
+Contributions by:
+ Antonio Ospite <ospite at studenti.unina.it>
+
+Signed-off-by: Matteo F. Vescovi <mfv.debian at gmail.com>
---
- source/blender/blenfont/intern/blf_lang.c | 2 +-
- source/blender/blenlib/BLI_path_util.h | 1 +
- source/blender/blenlib/intern/path_util.c | 3 +++
- source/creator/CMakeLists.txt | 4 ++--
- 4 files changed, 7 insertions(+), 3 deletions(-)
+ source/blender/blenfont/intern/blf_lang.c | 10 +++++-----
+ source/blender/blenlib/BLI_path_util.h | 1 +
+ source/blender/blenlib/intern/path_util.c | 3 +++
+ source/creator/CMakeLists.txt | 4 ++--
+ 4 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/source/blender/blenfont/intern/blf_lang.c b/source/blender/blenfont/intern/blf_lang.c
-index 73294f1..dc0ba58 100644
+index 73294f1..64fe414 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)
+@@ -76,16 +76,16 @@ static void free_locales(void)
+ num_locales = num_locales_menu = 0;
+ }
+
+-static void fill_locales(void)
++static void fill_locales(char *locale_path)
+ {
+- char *languages_path = BLI_get_folder(BLENDER_DATAFILES, "locale");
++ char *languages_path = locale_path;
+ LinkNode *lines = NULL, *line;
+ char *str;
+ int idx = 0;
+
+ free_locales();
+
+- BLI_join_dirfile(languages_path, FILE_MAX, languages_path, "languages");
++ BLI_join_dirfile(languages_path, FILE_MAX, locale_path, "languages");
+ line = lines = BLI_file_read_as_lines(languages_path);
+
+ /* This whole "parsing" code is a bit weak, in that it expects strictly formated input file...
+@@ -185,11 +185,11 @@ EnumPropertyItem *BLF_RNA_lang_enum_properties(void)
void BLF_lang_init(void)
{
#ifdef WITH_INTERNATIONAL
@@ -23,6 +48,11 @@ index 73294f1..dc0ba58 100644
if (messagepath) {
bl_locale_init(messagepath, TEXT_DOMAIN_NAME);
+- fill_locales();
++ fill_locales(messagepath);
+ }
+ else {
+ printf("%s: 'locale' data path for translations not found, continuing\n", __func__);
diff --git a/source/blender/blenlib/BLI_path_util.h b/source/blender/blenlib/BLI_path_util.h
index 8c51c92..ee70094 100644
--- a/source/blender/blenlib/BLI_path_util.h
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 d08a0cd..83caeef 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
@@ -1,14 +1,34 @@
-From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
-Date: Fri, 11 Jan 2013 15:37:53 +0100
+From: Kevin Roy <kiniou at gmail.com>
+Date: Fri, 8 Mar 2013 10:21:26 +0100
Subject: do_not_use_version_number_in_system_path
-Global installation expects system patch to be
+Global installation expects system path to be
something like /usr/share/blender/scripts/
without version numbers.
+
+Contributions by:
+ Antonio Ospite <ospite at studenti.unina.it>
+
+Signed-off-by: Matteo F. Vescovi <mfv.debian at gmail.com>
---
- source/creator/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ intern/ghost/intern/GHOST_SystemPathsX11.cpp | 3 +++
+ source/creator/CMakeLists.txt | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+diff --git a/intern/ghost/intern/GHOST_SystemPathsX11.cpp b/intern/ghost/intern/GHOST_SystemPathsX11.cpp
+index 35bebd5..e6fd170 100644
+--- a/intern/ghost/intern/GHOST_SystemPathsX11.cpp
++++ b/intern/ghost/intern/GHOST_SystemPathsX11.cpp
+@@ -60,6 +60,9 @@ GHOST_SystemPathsX11::~GHOST_SystemPathsX11()
+
+ const GHOST_TUns8 *GHOST_SystemPathsX11::getSystemDir(int, const char *versionstr) const
+ {
++ /* XXX On Debian ignore versionstr when building the system path */
++ versionstr = "";
++
+ /* no prefix assumes a portable build which only uses bundled scripts */
+ if (static_path) {
+ static char system_path[PATH_MAX];
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 7ea1dd3..6553ce3 100644
--- a/source/creator/CMakeLists.txt
diff --git a/debian/patches/0010-fix_format-security_issue.patch b/debian/patches/0010-fix_format-security_issue.patch
index 948524e..e8618ed 100644
--- a/debian/patches/0010-fix_format-security_issue.patch
+++ b/debian/patches/0010-fix_format-security_issue.patch
@@ -23,10 +23,10 @@ index 27c5e03..4ea4d03 100644
}
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
-index ea82ebb..4c6b494 100644
+index c8874d1..2cde1cb 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]))
+@@ -4094,7 +4094,7 @@ int ShrinkFatten(TransInfo *t, const int UNUSED(mval[2]))
/* header print for NumInput */
str_p = str;
@@ -35,7 +35,7 @@ index ea82ebb..4c6b494 100644
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]))
+@@ -6454,7 +6454,7 @@ int VertSlide(TransInfo *t, const int UNUSED(mval[2]))
/* header string */
str_p = str;
--
blender packaging
More information about the pkg-multimedia-commits
mailing list