Bug#733405: lasi: diff for NMU version 1.1.0-1.1

[Angel Abad]

tags 733405 + pending
thanks

Dear maintainer,

I've prepared an NMU for lasi (versioned as 1.1.0-1.1) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.

Regards.
diff -Nru lasi-1.1.0/debian/changelog lasi-1.1.0/debian/changelog
--- lasi-1.1.0/debian/changelog 2014-06-19 14:01:01.0 +0200
+++ lasi-1.1.0/debian/changelog 2014-06-19 13:49:25.0 +0200
@@ -1,3 +1,12 @@
+lasi (1.1.0-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Use 3.0 (quilt) format
+  * debian/patches/fix-freetype-ftbfs (Closes: #733405):
+- Include Freetype headers in recommended way, fix FTBFS
+
+ -- Angel Abad   Thu, 19 Jun 2014 13:36:38 +0200
+
 lasi (1.1.0-1) unstable; urgency=low
 
   [ Andrew Ross ]
diff -Nru lasi-1.1.0/debian/patches/fix-freetype-ftbfs 
lasi-1.1.0/debian/patches/fix-freetype-ftbfs
--- lasi-1.1.0/debian/patches/fix-freetype-ftbfs1970-01-01 
01:00:00.0 +0100
+++ lasi-1.1.0/debian/patches/fix-freetype-ftbfs2014-06-19 
13:45:54.0 +0200
@@ -0,0 +1,99 @@
+Description: Include Freetype headers in recommended way.
+ This change should fix . The
+ change goes a bit beyond the macports patch for the problem linked in
+ that bug report which was incomplete. (I searched for all occurrences
+ of #include and freetype in the code base and changed to the standard
+ form.)
+ .
+ Tested on Linux with Freetype version 2.4.9 which implies this change
+ does not disrupt anything for that Freetype version. A further test
+ for Freetype version 2.5.1 (which previously could not be used with
+ libLASi because of the non-standard #includes in the old version
+ of that code) has been requested.
+Author: Alan W. Irwin
+Origin: http://sourceforge.net/p/lasi/code/182/
+Bug: http://sourceforge.net/p/lasi/bugs/2/
+Bug-Debian: http://bugs.debian.org/733405
+Reviewed-By: Juhani Numminen  
+
+--- lasi-1.1.0.orig/include/LASi.h
 lasi-1.1.0/include/LASi.h
+@@ -11,7 +11,8 @@
+ #include 
+ #include 
+ #include 
+-#include 
++#include 
++#include FT_GLYPH_H
+ 
+ class FreetypeGlyphMgr;
+ class ContextMgr;
+--- lasi-1.1.0.orig/src/drawGlyph.cpp
 lasi-1.1.0/src/drawGlyph.cpp
+@@ -6,7 +6,8 @@
+  */
+ 
+ #include 
+-#include 
++#include 
++#include FT_OUTLINE_H
+ #include 
+ #include 
+ #include 
+--- lasi-1.1.0.orig/src/drawGlyph.h
 lasi-1.1.0/src/drawGlyph.h
+@@ -10,7 +10,8 @@
+ 
+ #include 
+ #include 
+-#include 
++#include 
++#include FT_FREETYPE_H
+ 
+ /** Generate the Postscript commands to draw the glyph
+   * using the font in pPangoCtx.
+--- lasi-1.1.0.orig/src/glyphMgr.cpp
 lasi-1.1.0/src/glyphMgr.cpp
+@@ -10,8 +10,7 @@
+ 
+ #include 
+ #include FT_FREETYPE_H
+-
+-#include 
++#include FT_GLYPH_H
+ 
+ #include 
+ #include "util.h"
+--- lasi-1.1.0.orig/src/glyphMgr.h
 lasi-1.1.0/src/glyphMgr.h
+@@ -15,8 +15,7 @@
+ 
+ #include 
+ #include FT_FREETYPE_H
+-
+-#include 
++#include FT_GLYPH_H
+ 
+ /** Manage FT_Glyph by insuring that FT_Glyph is handled correctly.
+  */
+--- lasi-1.1.0.orig/src/util.cpp
 lasi-1.1.0/src/util.cpp
+@@ -11,7 +11,6 @@
+ 
+ #include 
+ #include FT_FREETYPE_H
+-//#include 
+ 
+ using namespace std;
+ 
+--- lasi-1.1.0.orig/src/util.h
 lasi-1.1.0/src/util.h
+@@ -18,7 +18,7 @@
+ 
+ #include 
+ #include FT_FREETYPE_H
+-#include 
++#include FT_GLYPH_H
+ 
+ std::ostream& operator<<(std::ostream&, const FT_Library);
+ std::ostream& operator<<(std::ostream&, const FT_Face);
diff -Nru lasi-1.1.0/debian/patches/series lasi-1.1.0/debian/patches/series
--- lasi-1.1.0/debian/patches/series1970-01-01 01:00:00.0 +0100
+++ lasi-1.1.0/debian/patches/series2014-06-19 13:47:21.0 +0200
@@ -0,0 +1 @@
+fix-freetype-ftbfs
diff -Nru lasi-1.1.0/debian/source/format lasi-1.1.0/debian/source/format
--- lasi-1.1.0/debian/source/format 1970-01-01 01:00:00.0 +0100
+++ lasi-1.1.0/debian/source/format 2014-06-19 13:37:41.0 +0200
@@ -0,0 +1 @@
+3.0 (quilt)


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#733405:

[Angel Abad]

Hello, I'm preparing a NMU for solving this bug.

Cheers

-- 
Angel Abad
an...@debian.org | angela...@ubuntu.com | angela...@gmail.com
http://www.pastelero.net
FPR: EBF6 080D 59D4 008A DF47  00D4 098D AE47 EE3B C279

Bug#733405: (no subject)

[Juhani Numminen]

Control: tags -1 + fixed-upstream

This is the patch upstream has applied in SVN revision 128, with DEP-3
patch tagging metadata.

-- Juhani NumminenDescription: Include Freetype headers in recommended way.
 This change should fix . The
 change goes a bit beyond the macports patch for the problem linked in
 that bug report which was incomplete. (I searched for all occurrences
 of #include and freetype in the code base and changed to the standard
 form.)
 .
 Tested on Linux with Freetype version 2.4.9 which implies this change
 does not disrupt anything for that Freetype version. A further test
 for Freetype version 2.5.1 (which previously could not be used with
 libLASi because of the non-standard #includes in the old version
 of that code) has been requested.
Origin: http://sourceforge.net/p/lasi/code/182/
Bug: http://sourceforge.net/p/lasi/bugs/2/
Bug-Debian: http://bugs.debian.org/733405

Index: include/LASi.h
===
--- include/LASi.h  (revision 181)
+++ include/LASi.h  (revision 182)
@@ -11,7 +11,8 @@
 #include 
 #include 
 #include 
-#include 
+#include 
+#include FT_GLYPH_H
 
 class FreetypeGlyphMgr;
 class ContextMgr;
Index: src/glyphMgr.h
===
--- src/glyphMgr.h  (revision 181)
+++ src/glyphMgr.h  (revision 182)
@@ -15,9 +15,8 @@
 
 #include 
 #include FT_FREETYPE_H
+#include FT_GLYPH_H
 
-#include 
-
 /** Manage FT_Glyph by insuring that FT_Glyph is handled correctly.
  */
 class FreetypeGlyphMgr { //: public Manager {
Index: src/drawGlyph.cpp
===
--- src/drawGlyph.cpp   (revision 181)
+++ src/drawGlyph.cpp   (revision 182)
@@ -6,7 +6,8 @@
  */
 
 #include 
-#include 
+#include 
+#include FT_OUTLINE_H
 #include 
 #include 
 #include 
Index: src/util.h
===
--- src/util.h  (revision 181)
+++ src/util.h  (revision 182)
@@ -18,7 +18,7 @@
 
 #include 
 #include FT_FREETYPE_H
-#include 
+#include FT_GLYPH_H
 
 std::ostream& operator<<(std::ostream&, const FT_Library);
 std::ostream& operator<<(std::ostream&, const FT_Face);
Index: src/drawGlyph.h
===
--- src/drawGlyph.h (revision 181)
+++ src/drawGlyph.h (revision 182)
@@ -10,7 +10,8 @@
 
 #include 
 #include 
-#include 
+#include 
+#include FT_FREETYPE_H
 
 /** Generate the Postscript commands to draw the glyph
   * using the font in pPangoCtx.
Index: src/glyphMgr.cpp
===
--- src/glyphMgr.cpp(revision 181)
+++ src/glyphMgr.cpp(revision 182)
@@ -10,9 +10,8 @@
 
 #include 
 #include FT_FREETYPE_H
+#include FT_GLYPH_H
 
-#include 
-
 #include 
 #include "util.h"
 #include "glyphMgr.h"
Index: src/util.cpp
===
--- src/util.cpp(revision 181)
+++ src/util.cpp(revision 182)
@@ -11,7 +11,6 @@
 
 #include 
 #include FT_FREETYPE_H
-//#include 
 
 using namespace std;
 

Bug#733405: Patch for #733405

[Juhani Numminen]

Control: tags -1 + patch

Dear maintainer,
here’s a patch I created and tested.

I didn’t prepare a NMU patch as I don’t have enough knowledge about
patching with source-format 1.0 and CDBS.

Best Regards,
-- Juhani Numminen
Description: Fix build failure with freetype 2.5.1
Author: Juhani Numminen 
Bug-Debian: http://bugs.debian.org/733405

--- a/include/LASi.h
+++ b/include/LASi.h
@@ -11,7 +11,8 @@
 #include 
 #include 
 #include 
-#include 
+#include 
+#include FT_GLYPH_H
 
 class FreetypeGlyphMgr;
 class ContextMgr;

--- a/src/drawGlyph.cpp
+++ b/src/drawGlyph.cpp
@@ -6,7 +6,8 @@
  */
 
 #include 
-#include 
+#include 
+#include FT_OUTLINE_H
 #include 
 #include 
 #include 

--- a/src/drawGlyph.h
+++ b/src/drawGlyph.h
@@ -10,7 +10,8 @@
 
 #include 
 #include 
-#include 
+#include 
+#include FT_FREETYPE_H
 
 /** Generate the Postscript commands to draw the glyph
   * using the font in pPangoCtx.

--- a/src/glyphMgr.cpp
+++ b/src/glyphMgr.cpp
@@ -11,7 +11,7 @@
 #include 
 #include FT_FREETYPE_H
 
-#include 
+#include FT_GLYPH_H
 
 #include 
 #include "util.h"

--- a/src/glyphMgr.h
+++ b/src/glyphMgr.h
@@ -16,7 +16,7 @@
 #include 
 #include FT_FREETYPE_H
 
-#include 
+#include FT_GLYPH_H
 
 /** Manage FT_Glyph by insuring that FT_Glyph is handled correctly.
  */

--- a/src/util.h
+++ b/src/util.h
@@ -18,7 +18,7 @@
 
 #include 
 #include FT_FREETYPE_H
-#include 
+#include FT_GLYPH_H
 
 std::ostream& operator<<(std::ostream&, const FT_Library);
 std::ostream& operator<<(std::ostream&, const FT_Face);

Bug#733405: lasi: FTBFS: drawGlyph.cpp:9:30: fatal error: freetype/ftoutln.h: No such file or directory

[David Suárez]

Source: lasi
Version: 1.1.0-1
Severity: serious
Tags: jessie sid
User: debian...@lists.debian.org
Usertags: qa-ftbfs-20131226 qa-ftbfs
Justification: FTBFS on amd64

Hi,

During a rebuild of all packages in sid, your package failed to build on
amd64.

On the new 2.5 version the headers are located at
'/usr/include/freetype2/ftglyph.h' instead of
'/usr/include/freetype2/freetype/ftglyph.h' like in previous versions.

Relevant part (hopefully):
> make[3]: Entering directory `/«PKGBUILDDIR»/obj-x86_64-linux-gnu'
> /usr/bin/cmake -E cmake_progress_report 
> /«PKGBUILDDIR»/obj-x86_64-linux-gnu/CMakeFiles 1
> [ 33%] Building CXX object src/CMakeFiles/LASi.dir/drawGlyph.o
> cd /«PKGBUILDDIR»/obj-x86_64-linux-gnu/src && /usr/bin/g++   -DLASi_EXPORTS 
> -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat 
> -Werror=format-security -Wall -D_FORTIFY_SOURCE=2 -fPIC 
> -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 
> -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/harfbuzz 
> -I/usr/include/freetype2 -I/«PKGBUILDDIR»/include 
> -I/«PKGBUILDDIR»/obj-x86_64-linux-gnu-pthread -I/usr/include/pango-1.0 
> -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -pthread 
> -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/freetype2 
> -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include 
> -I/usr/include/freetype2 -o CMakeFiles/LASi.dir/drawGlyph.o -c 
> /«PKGBUILDDIR»/src/drawGlyph.cpp
> /«PKGBUILDDIR»/src/drawGlyph.cpp:9:30: fatal error: freetype/ftoutln.h: No 
> such file or directory
>  #include 
>   ^
> compilation terminated.
> make[3]: *** [src/CMakeFiles/LASi.dir/drawGlyph.o] Error 1

The full build log is available from:
   http://aws-logs.debian.net/ftbfs-logs/2013/12/26/lasi_1.1.0-1_unstable.log

A list of current common problems and possible solutions is available at
http://wiki.debian.org/qa.debian.org/FTBFS . You're welcome to contribute!

About the archive rebuild: The rebuild was done on EC2 VM instances from
Amazon Web Services, using a clean, minimal and up-to-date chroot. Every
failed build was retried once to eliminate random failures.


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org