r47463 - in /packages/inventor/trunk/debian: changelog patches/dont-use-FT_Done_GlyphSlot.patch patches/series

[smr at users.alioth.debian.org]

Author: smr
Date: Sun Jul 16 23:51:08 2017
New Revision: 47463

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47463
Log:
Patch to fix FTBFS with newer freetype.

Added:
    packages/inventor/trunk/debian/patches/dont-use-FT_Done_GlyphSlot.patch
Modified:
    packages/inventor/trunk/debian/changelog
    packages/inventor/trunk/debian/patches/series

Modified: packages/inventor/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/inventor/trunk/debian/changelog?rev=47463&op=diff
==============================================================================
--- packages/inventor/trunk/debian/changelog	(original)
+++ packages/inventor/trunk/debian/changelog	Sun Jul 16 23:51:08 2017
@@ -1,3 +1,11 @@
+inventor (2.1.5-10-20) UNRELEASED; urgency=medium
+
+  * d/patches/dont-use-FT_Done_GlyphSlot.patch: New.  Remove use
+  of FT_Done_GlyphSlot so that Inventor builds with freetype 2.8.
+  Closes: #867111
+
+ -- Steve M. Robbins <smr at debian.org>  Sun, 16 Jul 2017 18:50:42 -0500
+
 inventor (2.1.5-10-19) unstable; urgency=medium
 
   * patches/inventor-gcc6.patch: New.  Fixes required for building with

Added: packages/inventor/trunk/debian/patches/dont-use-FT_Done_GlyphSlot.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/inventor/trunk/debian/patches/dont-use-FT_Done_GlyphSlot.patch?rev=47463&op=file
==============================================================================
--- packages/inventor/trunk/debian/patches/dont-use-FT_Done_GlyphSlot.patch	(added)
+++ packages/inventor/trunk/debian/patches/dont-use-FT_Done_GlyphSlot.patch	Sun Jul 16 23:51:08 2017
@@ -0,0 +1,33 @@
+Author: Steve M. Robbins <smr at debian.org>
+Description: Don't use FT_Done_GlyphSlot()
+  Removed use of FT_Done_GlyphSlot() to solve FTBFS bug #867111.
+
+  The symbol FT_Done_GlyphSlot is presumably an internal detail.
+  Fedora found that of 800 freetype-using packages, only Inventor
+  used this symbol; see https://bugzilla.redhat.com/show_bug.cgi?id=1372368
+
+  The documentation for this function reads:
+
+    Destroys a given glyph slot. Remember however that all slots are
+    automatically destroyed with its parent. Using this function is
+    not always mandatory.
+
+    See http://www.stillhq.com/freetype/doco/0.1/FT_Done_GlyphSlot.html
+
+  Which suggests it likely that this function call was never required
+  in the first place.
+
+
+--- inventor-2.1.5-10.orig/libFL/ang/flfreetype.c
++++ inventor-2.1.5-10/libFL/ang/flfreetype.c
+@@ -402,10 +402,6 @@
+ _flFTDeleteGlyphChar(FLFreeTypeOutline *outline)
+ {
+   TRACE(("_flFTDeleteGlyphChar: outline=%p\n", outline));
+-
+-  if (outline) {
+-    FT_Done_GlyphSlot(outline->glyph);
+-  }
+ }
+ 
+ short

Modified: packages/inventor/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/inventor/trunk/debian/patches/series?rev=47463&op=diff
==============================================================================
--- packages/inventor/trunk/debian/patches/series	(original)
+++ packages/inventor/trunk/debian/patches/series	Sun Jul 16 23:51:08 2017
@@ -12,3 +12,4 @@
 forward-declare.patch
 freetype.patch
 inventor-gcc6.patch
+dont-use-FT_Done_GlyphSlot.patch