[SCM] blender/master.jessie: Fix FTBFS on jessie
pocock at users.alioth.debian.org
pocock at users.alioth.debian.org
Fri Jan 13 14:49:04 UTC 2017
The following commit has been merged in the master.jessie branch:
commit 16b57b09a19892345b7cbd24bb5a1f9944793cc8
Author: Daniel Pocock <daniel at pocock.pro>
Date: Mon Jun 1 13:08:43 2015 +0200
Fix FTBFS on jessie
diff --git a/debian/patches/0012-signed.patch b/debian/patches/0012-signed.patch
new file mode 100644
index 0000000..4153131
--- /dev/null
+++ b/debian/patches/0012-signed.patch
@@ -0,0 +1,15 @@
+diff --git a/source/blender/blenfont/intern/blf_glyph.c b/source/blender/blenfont/intern/blf_glyph.c
+index a2462f3..4913777 100644
+--- a/source/blender/blenfont/intern/blf_glyph.c
++++ b/source/blender/blenfont/intern/blf_glyph.c
+@@ -262,8 +262,8 @@ GlyphBLF *blf_glyph_add(FontBLF *font, unsigned int index, unsigned int c)
+ g->xoff = -1;
+ g->yoff = -1;
+ bitmap = slot->bitmap;
+- g->width = bitmap.width;
+- g->height = bitmap.rows;
++ g->width = (int)bitmap.width;
++ g->height = (int)bitmap.rows;
+
+ if (g->width && g->height) {
+ if (sharp) {
diff --git a/debian/patches/series b/debian/patches/series
index 85dec38..9944fd5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@
0009-add_flag_disabling_SSE-SSE2_intrinsics.patch
0010-fix_atomic_issue.patch
0011-set_SSL_version_to_v23.patch
+0012-signed.patch
diff --git a/debian/rules b/debian/rules
index 205da1d..017a54d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,6 +44,7 @@ override_dh_auto_install:
rm $(INSTDIR)/usr/share/doc/blender/readme.html
override_dh_install:
+ mkdir -p debian/tmp/usr/share/locale
dh_install --fail-missing --list-missing
override_dh_strip:
--
blender packaging
More information about the pkg-multimedia-commits
mailing list