[SCM] blender/master: debian/patches/: patchset re-worked against v2.76
mfv at users.alioth.debian.org
mfv at users.alioth.debian.org
Thu Feb 4 22:47:12 UTC 2016
The following commit has been merged in the master branch:
commit d238963a0809fe4d739a959722253a418ea9c18d
Author: Matteo F. Vescovi <mfv at debian.org>
Date: Fri Oct 23 21:43:59 2015 +0200
debian/patches/: patchset re-worked against v2.76
- #0001 to #0005 refreshed
- 0006-blender_desktop.patch dropped (applied upstream)
- 0007-look_for_droid_ttf_with_fontconfig.patch -> #0006
- 0008-fix_FTBFS_on_non-x86_platforms.patch -> #0007
diff --git a/debian/patches/0001-blender_thumbnailer.patch b/debian/patches/0001-blender_thumbnailer.patch
index 9908aff..0f54928 100644
--- a/debian/patches/0001-blender_thumbnailer.patch
+++ b/debian/patches/0001-blender_thumbnailer.patch
@@ -23,7 +23,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 d3b31d6..9685d46 100755
+index fe5d462..5d2dd95 100755
--- a/release/bin/blender-thumbnailer.py
+++ b/release/bin/blender-thumbnailer.py
@@ -1,4 +1,4 @@
@@ -33,10 +33,10 @@ index d3b31d6..9685d46 100755
# ##### BEGIN GPL LICENSE BLOCK #####
#
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index 1b2dd21..ef7b0b0 100644
+index 8feb882..d10de41 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
-@@ -487,7 +487,7 @@ if(UNIX AND NOT APPLE)
+@@ -494,7 +494,7 @@ if(UNIX AND NOT APPLE)
)
install(
PROGRAMS ${CMAKE_SOURCE_DIR}/release/bin/blender-thumbnailer.py
diff --git a/debian/patches/0002-install_in_usr_share.patch b/debian/patches/0002-install_in_usr_share.patch
index b0e9e6b..d1dcf81 100644
--- a/debian/patches/0002-install_in_usr_share.patch
+++ b/debian/patches/0002-install_in_usr_share.patch
@@ -9,10 +9,10 @@ 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 ef7b0b0..19113e3 100644
+index d10de41..888475a 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
-@@ -317,8 +317,8 @@ if(WITH_PYTHON)
+@@ -324,8 +324,8 @@ if(WITH_PYTHON)
endif()
install(
diff --git a/debian/patches/0003-locales_directory_install.patch b/debian/patches/0003-locales_directory_install.patch
index d80f18b..310105f 100644
--- a/debian/patches/0003-locales_directory_install.patch
+++ b/debian/patches/0003-locales_directory_install.patch
@@ -1,5 +1,5 @@
From: "Matteo F. Vescovi" <mfv at debian.org>
-Date: Fri, 17 Jul 2015 22:10:32 +0200
+Date: Fri, 23 Oct 2015 21:10:16 +0200
Subject: locales_directory_install
Change where locales are installed.
@@ -7,17 +7,43 @@ Change where locales are installed.
Contributions by:
Antonio Ospite <ospite at studenti.unina.it>
---
- source/blender/blenfont/intern/blf_lang.c | 10 +++++-----
- source/blender/blenkernel/BKE_appdir.h | 1 +
- source/blender/blenkernel/intern/appdir.c | 3 +++
- source/creator/CMakeLists.txt | 4 ++--
+ source/blender/blenkernel/BKE_appdir.h | 1 +
+ source/blender/blenkernel/intern/appdir.c | 3 +++
+ source/blender/blentranslation/intern/blt_lang.c | 10 +++++-----
+ 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 4683081..121e15d 100644
---- a/source/blender/blenfont/intern/blf_lang.c
-+++ b/source/blender/blenfont/intern/blf_lang.c
-@@ -82,9 +82,9 @@ static void free_locales(void)
+diff --git a/source/blender/blenkernel/BKE_appdir.h b/source/blender/blenkernel/BKE_appdir.h
+index 077fe2a..905106d 100644
+--- a/source/blender/blenkernel/BKE_appdir.h
++++ b/source/blender/blenkernel/BKE_appdir.h
+@@ -67,6 +67,7 @@ enum {
+ BLENDER_SYSTEM_DATAFILES = 52,
+ BLENDER_SYSTEM_SCRIPTS = 53,
+ BLENDER_SYSTEM_PYTHON = 54,
++ BLENDER_SYSTEM_LOCALE = 55,
+ };
+
+ /* for BKE_appdir_folder_id_version only */
+diff --git a/source/blender/blenkernel/intern/appdir.c b/source/blender/blenkernel/intern/appdir.c
+index ee6710e..c95eb7a 100644
+--- a/source/blender/blenkernel/intern/appdir.c
++++ b/source/blender/blenkernel/intern/appdir.c
+@@ -398,6 +398,9 @@ const char *BKE_appdir_folder_id(const int folder_id, const char *subfolder)
+ if (get_path_system(path, "python", subfolder, "BLENDER_SYSTEM_PYTHON", ver)) break;
+ return NULL;
+
++ case BLENDER_SYSTEM_LOCALE:
++ BLI_strncpy(path, "/usr/share/locale", FILE_MAX); break;
++
+ default:
+ BLI_assert(0);
+ break;
+diff --git a/source/blender/blentranslation/intern/blt_lang.c b/source/blender/blentranslation/intern/blt_lang.c
+index 1ad62fa..3c70e0c 100644
+--- a/source/blender/blentranslation/intern/blt_lang.c
++++ b/source/blender/blentranslation/intern/blt_lang.c
+@@ -84,9 +84,9 @@ static void free_locales(void)
num_locales = num_locales_menu = 0;
}
@@ -29,7 +55,7 @@ index 4683081..121e15d 100644
char languages[FILE_MAX];
LinkNode *lines = NULL, *line;
char *str;
-@@ -92,7 +92,7 @@ static void fill_locales(void)
+@@ -94,7 +94,7 @@ static void fill_locales(void)
free_locales();
@@ -37,9 +63,9 @@ index 4683081..121e15d 100644
+ BLI_join_dirfile(languages, FILE_MAX, locale_path, "languages");
line = lines = BLI_file_read_as_lines(languages);
- /* This whole "parsing" code is a bit weak, in that it expects strictly formated input file...
-@@ -192,7 +192,7 @@ EnumPropertyItem *BLF_RNA_lang_enum_properties(void)
- void BLF_lang_init(void)
+ /* This whole "parsing" code is a bit weak, in that it expects strictly formatted input file...
+@@ -194,7 +194,7 @@ EnumPropertyItem *BLT_lang_RNA_enum_properties(void)
+ void BLT_lang_init(void)
{
#ifdef WITH_INTERNATIONAL
- const char * const messagepath = BKE_appdir_folder_id(BLENDER_DATAFILES, "locale");
@@ -47,7 +73,7 @@ index 4683081..121e15d 100644
#endif
/* Make sure LANG is correct and wouldn't cause std::rumtime_error. */
-@@ -225,7 +225,7 @@ void BLF_lang_init(void)
+@@ -227,7 +227,7 @@ void BLT_lang_init(void)
#ifdef WITH_INTERNATIONAL
if (messagepath) {
bl_locale_init(messagepath, TEXT_DOMAIN_NAME);
@@ -56,37 +82,11 @@ index 4683081..121e15d 100644
}
else {
printf("%s: 'locale' data path for translations not found, continuing\n", __func__);
-diff --git a/source/blender/blenkernel/BKE_appdir.h b/source/blender/blenkernel/BKE_appdir.h
-index 077fe2a..905106d 100644
---- a/source/blender/blenkernel/BKE_appdir.h
-+++ b/source/blender/blenkernel/BKE_appdir.h
-@@ -67,6 +67,7 @@ enum {
- BLENDER_SYSTEM_DATAFILES = 52,
- BLENDER_SYSTEM_SCRIPTS = 53,
- BLENDER_SYSTEM_PYTHON = 54,
-+ BLENDER_SYSTEM_LOCALE = 55,
- };
-
- /* for BKE_appdir_folder_id_version only */
-diff --git a/source/blender/blenkernel/intern/appdir.c b/source/blender/blenkernel/intern/appdir.c
-index b1b32e7..8d89ce8 100644
---- a/source/blender/blenkernel/intern/appdir.c
-+++ b/source/blender/blenkernel/intern/appdir.c
-@@ -399,6 +399,9 @@ const char *BKE_appdir_folder_id(const int folder_id, const char *subfolder)
- if (get_path_system(path, "python", subfolder, "BLENDER_SYSTEM_PYTHON", ver)) break;
- return NULL;
-
-+ case BLENDER_SYSTEM_LOCALE:
-+ BLI_strncpy(path, "/usr/share/locale", FILE_MAX); break;
-+
- default:
- BLI_assert(0);
- break;
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index 19113e3..4848d65 100644
+index 888475a..8b99a9c 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
-@@ -334,11 +334,11 @@ if(WITH_INTERNATIONAL)
+@@ -341,11 +341,11 @@ if(WITH_INTERNATIONAL)
install(
DIRECTORY
${CMAKE_SOURCE_DIR}/release/datafiles/fonts
diff --git a/debian/patches/0004-update_manpages.patch b/debian/patches/0004-update_manpages.patch
index c4e4b4d..b96108b 100644
--- a/debian/patches/0004-update_manpages.patch
+++ b/debian/patches/0004-update_manpages.patch
@@ -148,10 +148,10 @@ index 0000000..5435c63
+.SH AUTHORS
+This manpage was written for a Debian by Kevin Roy <kiniou at gmail.com>.
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index 4848d65..fab2491 100644
+index 8b99a9c..1c75ff4 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
-@@ -441,6 +441,7 @@ if(UNIX AND NOT APPLE)
+@@ -448,6 +448,7 @@ if(UNIX AND NOT APPLE)
FILES
${CMAKE_SOURCE_DIR}/release/freedesktop/blender.desktop
${CMAKE_SOURCE_DIR}/release/freedesktop/icons/scalable/apps/blender.svg
@@ -159,7 +159,7 @@ index 4848d65..fab2491 100644
DESTINATION "."
)
-@@ -463,6 +464,10 @@ if(UNIX AND NOT APPLE)
+@@ -470,6 +471,10 @@ if(UNIX AND NOT APPLE)
FILES ${CMAKE_CURRENT_BINARY_DIR}/blender.1
DESTINATION share/man/man1
)
diff --git a/debian/patches/0005-do_not_use_version_number_in_system_path.patch b/debian/patches/0005-do_not_use_version_number_in_system_path.patch
index 3099439..a83a225 100644
--- a/debian/patches/0005-do_not_use_version_number_in_system_path.patch
+++ b/debian/patches/0005-do_not_use_version_number_in_system_path.patch
@@ -28,10 +28,10 @@ index 5473e40..348b9c3 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 fab2491..15c906e 100644
+index 1c75ff4..d129c1e 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
-@@ -272,7 +272,7 @@ if(UNIX AND NOT APPLE)
+@@ -279,7 +279,7 @@ if(UNIX AND NOT APPLE)
if(WITH_INSTALL_PORTABLE)
set(TARGETDIR_VER ${BLENDER_VERSION})
else()
diff --git a/debian/patches/0006-blender_desktop.patch b/debian/patches/0006-blender_desktop.patch
deleted file mode 100644
index f9ca03d..0000000
--- a/debian/patches/0006-blender_desktop.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Bastien Montagne <montagne29 at wanadoo.fr>
-Date: Thu, 2 Jul 2015 22:32:11 +0200
-Subject: blender_desktop
-
-- Linux XDesktop spec: add '%f' file specifier to 'Exec' field.
-- Also reorder alphabetically generic names & comments, and add
- french comment.
-- Add a 'Keyword' field.
-
-Signed-off-by: Matteo F. Vescovi <mfv at debian.org>
----
- release/freedesktop/blender.desktop | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/release/freedesktop/blender.desktop b/release/freedesktop/blender.desktop
-index 1620815..a28a815 100644
---- a/release/freedesktop/blender.desktop
-+++ b/release/freedesktop/blender.desktop
-@@ -1,14 +1,16 @@
- [Desktop Entry]
- Name=Blender
--GenericName=3D modeller
--GenericName[es]=modelador 3D
-+GenericName=3D modeler
- GenericName[de]=3D-Modellierer
--GenericName[fr]=modeleur 3D
-+GenericName[es]=Modelador 3D
-+GenericName[fr]=Modeleur 3D
- GenericName[ru]=Редактор 3D-моделей
- Comment=3D modeling, animation, rendering and post-production
--Comment[es]=modelado 3D, animación, renderizado y post-producción
- Comment[de]=3D-Modellierung, Animation, Rendering und Nachbearbeitung
--Exec=blender
-+Comment[es]=Modelado 3D, animación, renderizado y post-producción
-+Comment[fr]=Modelage 3D, animation, rendu et post-production
-+Keywords=3d;cg;modeling;animation;painting;sculpting;texturing;video editing;video tracking;rendering;render engine;cycles;game engine;python;
-+Exec=blender %f
- Icon=blender
- Terminal=false
- Type=Application
diff --git a/debian/patches/0007-look_for_droid_ttf_with_fontconfig.patch b/debian/patches/0006-look_for_droid_ttf_with_fontconfig.patch
similarity index 84%
rename from debian/patches/0007-look_for_droid_ttf_with_fontconfig.patch
rename to debian/patches/0006-look_for_droid_ttf_with_fontconfig.patch
index 921e924..75cda7b 100644
--- a/debian/patches/0007-look_for_droid_ttf_with_fontconfig.patch
+++ b/debian/patches/0006-look_for_droid_ttf_with_fontconfig.patch
@@ -1,27 +1,27 @@
From: "Matteo F. Vescovi" <mfv at debian.org>
-Date: Sat, 18 Jul 2015 21:30:33 +0200
+Date: Fri, 23 Oct 2015 21:42:19 +0200
Subject: look_for_droid_ttf_with_fontconfig
* Remove bad installation of fonts directory into locales.
* Avoid using the droid font shipped with upstream source
and use fontconfig to get it.
---
- CMakeLists.txt | 11 ++++++
- build_files/cmake/Modules/FindFontconfig.cmake | 48 ++++++++++++++++++++++++
- build_files/cmake/macros.cmake | 6 +++
- source/blender/blenfont/CMakeLists.txt | 7 ++++
- source/blender/blenfont/intern/blf_translation.c | 44 +++++++++++++++++++++-
- source/blender/blenlib/BLI_fileops.h | 1 +
- source/blender/blenlib/intern/fileops.c | 43 +++++++++++++++++++++
- source/creator/CMakeLists.txt | 6 ---
+ CMakeLists.txt | 11 ++++++
+ build_files/cmake/Modules/FindFontconfig.cmake | 48 ++++++++++++++++++++++++++
+ build_files/cmake/macros.cmake | 6 ++++
+ source/blender/blenfont/CMakeLists.txt | 7 ++++
+ source/blender/blenfont/intern/blf_font_i18n.c | 44 ++++++++++++++++++++++-
+ source/blender/blenlib/BLI_fileops.h | 1 +
+ source/blender/blenlib/intern/fileops.c | 43 +++++++++++++++++++++++
+ source/creator/CMakeLists.txt | 6 ----
8 files changed, 159 insertions(+), 7 deletions(-)
create mode 100644 build_files/cmake/Modules/FindFontconfig.cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1f0be6c..0e726c0 100644
+index 029198f..0823f0a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -192,6 +192,9 @@ option(WITH_BLENDER "Build blender (disable to build only the blender player)" O
+@@ -198,6 +198,9 @@ option(WITH_BLENDER "Build blender (disable to build only the blender player)" O
mark_as_advanced(WITH_BLENDER)
option(WITH_INTERNATIONAL "Enable I18N (International fonts and text)" ON)
@@ -31,7 +31,7 @@ index 1f0be6c..0e726c0 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" ON)
-@@ -903,6 +906,13 @@ if(UNIX AND NOT APPLE)
+@@ -972,6 +975,13 @@ if(UNIX AND NOT APPLE)
endif()
endif()
@@ -45,7 +45,7 @@ index 1f0be6c..0e726c0 100644
# Codecs
if(WITH_CODEC_SNDFILE)
find_package_wrapper(SndFile)
-@@ -2864,6 +2874,7 @@ if(FIRST_RUN)
+@@ -2977,6 +2987,7 @@ if(FIRST_RUN)
info_cfg_text("Other:")
info_cfg_option(WITH_OPENNL)
@@ -108,10 +108,10 @@ index 0000000..7dc09f3
+
+endif (FONTCONFIG_LIBRARIES AND FONTCONFIG_INCLUDE_DIR)
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
-index 7de2b25..364c120 100644
+index 90c4fbd..f740d4d 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
-@@ -284,6 +284,9 @@ macro(SETUP_LIBDIRS)
+@@ -294,6 +294,9 @@ function(SETUP_LIBDIRS)
if(WITH_MEM_JEMALLOC)
link_directories(${JEMALLOC_LIBPATH})
endif()
@@ -121,7 +121,7 @@ index 7de2b25..364c120 100644
if(WIN32 AND NOT UNIX)
link_directories(${PTHREADS_LIBPATH})
-@@ -327,6 +330,9 @@ macro(setup_liblinks
+@@ -340,6 +343,9 @@ function(setup_liblinks
if(WITH_SYSTEM_GLEW)
target_link_libraries(${target} ${BLENDER_GLEW_LIBRARIES})
endif()
@@ -132,10 +132,10 @@ index 7de2b25..364c120 100644
target_link_libraries(${target} ${BULLET_LIBRARIES})
endif()
diff --git a/source/blender/blenfont/CMakeLists.txt b/source/blender/blenfont/CMakeLists.txt
-index 059e2ca..b744a8a 100644
+index 36ad6fe..19d2bab 100644
--- a/source/blender/blenfont/CMakeLists.txt
+++ b/source/blender/blenfont/CMakeLists.txt
-@@ -66,6 +66,13 @@ if(WITH_INTERNATIONAL)
+@@ -64,6 +64,13 @@ if(WITH_INTERNATIONAL)
add_definitions(-DWITH_INTERNATIONAL)
endif()
@@ -149,14 +149,14 @@ index 059e2ca..b744a8a 100644
if(WITH_PYTHON)
add_definitions(-DWITH_PYTHON)
list(APPEND INC
-diff --git a/source/blender/blenfont/intern/blf_translation.c b/source/blender/blenfont/intern/blf_translation.c
-index 5d828d9..602af66 100644
---- a/source/blender/blenfont/intern/blf_translation.c
-+++ b/source/blender/blenfont/intern/blf_translation.c
-@@ -54,10 +54,14 @@
-
- #include "boost_locale_wrapper.h"
+diff --git a/source/blender/blenfont/intern/blf_font_i18n.c b/source/blender/blenfont/intern/blf_font_i18n.c
+index b6ff7ed..2165995 100644
+--- a/source/blender/blenfont/intern/blf_font_i18n.c
++++ b/source/blender/blenfont/intern/blf_font_i18n.c
+@@ -45,10 +45,14 @@
+ #include "BKE_appdir.h"
+ #ifdef WITH_INTERNATIONAL
+#ifdef WITH_FONTCONFIG
+#include <fontconfig/fontconfig.h>
+#else
@@ -169,7 +169,7 @@ index 5d828d9..602af66 100644
static unsigned char *unifont_mono_ttf = NULL;
static int unifont_mono_size = 0;
#endif /* WITH_INTERNATIONAL */
-@@ -66,6 +70,24 @@ unsigned char *BLF_get_unifont(int *r_unifont_size)
+@@ -57,6 +61,24 @@ unsigned char *BLF_get_unifont(int *r_unifont_size)
{
#ifdef WITH_INTERNATIONAL
if (unifont_ttf == NULL) {
@@ -194,7 +194,7 @@ index 5d828d9..602af66 100644
const char * const fontpath = BKE_appdir_folder_id(BLENDER_DATAFILES, "fonts");
if (fontpath) {
char unifont_path[1024];
-@@ -77,6 +99,7 @@ unsigned char *BLF_get_unifont(int *r_unifont_size)
+@@ -68,6 +90,7 @@ unsigned char *BLF_get_unifont(int *r_unifont_size)
else {
printf("%s: 'fonts' data path not found for international font, continuing\n", __func__);
}
@@ -202,7 +202,7 @@ index 5d828d9..602af66 100644
}
*r_unifont_size = unifont_size;
-@@ -101,6 +124,24 @@ unsigned char *BLF_get_unifont_mono(int *r_unifont_size)
+@@ -92,6 +115,24 @@ unsigned char *BLF_get_unifont_mono(int *r_unifont_size)
{
#ifdef WITH_INTERNATIONAL
if (unifont_mono_ttf == NULL) {
@@ -227,7 +227,7 @@ index 5d828d9..602af66 100644
const char *fontpath = BKE_appdir_folder_id(BLENDER_DATAFILES, "fonts");
if (fontpath) {
char unifont_path[1024];
-@@ -112,6 +153,7 @@ unsigned char *BLF_get_unifont_mono(int *r_unifont_size)
+@@ -103,6 +144,7 @@ unsigned char *BLF_get_unifont_mono(int *r_unifont_size)
else {
printf("%s: 'fonts' data path not found for international monospace font, continuing\n", __func__);
}
@@ -236,11 +236,11 @@ index 5d828d9..602af66 100644
*r_unifont_size = unifont_mono_size;
diff --git a/source/blender/blenlib/BLI_fileops.h b/source/blender/blenlib/BLI_fileops.h
-index 01aa5d3..644991b 100644
+index 33dae45..76e80f9 100644
--- a/source/blender/blenlib/BLI_fileops.h
+++ b/source/blender/blenlib/BLI_fileops.h
-@@ -88,6 +88,7 @@ bool BLI_is_file(const char *path) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
- void BLI_dir_create_recursive(const char *dir) ATTR_NONNULL();
+@@ -90,6 +90,7 @@ bool BLI_is_file(const char *path) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
+ bool 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) ATTR_NONNULL();
@@ -248,7 +248,7 @@ index 01aa5d3..644991b 100644
/* Filelist */
diff --git a/source/blender/blenlib/intern/fileops.c b/source/blender/blenlib/intern/fileops.c
-index d6fe5e5..beb01da 100644
+index ef9a7c0..42b7515 100644
--- a/source/blender/blenlib/intern/fileops.c
+++ b/source/blender/blenlib/intern/fileops.c
@@ -159,6 +159,49 @@ char *BLI_file_ungzip_to_mem(const char *from_file, int *r_size)
@@ -302,10 +302,10 @@ index d6fe5e5..beb01da 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 15c906e..444d39c 100644
+index d129c1e..991e62b 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
-@@ -331,12 +331,6 @@ endif()
+@@ -338,12 +338,6 @@ endif()
# localization
if(WITH_INTERNATIONAL)
diff --git a/debian/patches/0008-fix_FTBFS_on_non-x86_platforms.patch b/debian/patches/0007-fix_FTBFS_on_non-x86_platforms.patch
similarity index 100%
rename from debian/patches/0008-fix_FTBFS_on_non-x86_platforms.patch
rename to debian/patches/0007-fix_FTBFS_on_non-x86_platforms.patch
diff --git a/debian/patches/series b/debian/patches/series
index ea2fbab..0ecce03 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,5 @@
0003-locales_directory_install.patch
0004-update_manpages.patch
0005-do_not_use_version_number_in_system_path.patch
-0006-blender_desktop.patch
-0007-look_for_droid_ttf_with_fontconfig.patch
-0008-fix_FTBFS_on_non-x86_platforms.patch
+0006-look_for_droid_ttf_with_fontconfig.patch
+0007-fix_FTBFS_on_non-x86_platforms.patch
--
blender packaging
More information about the pkg-multimedia-commits
mailing list