Bug#871907: praat FTBFS on non-amd64

2017-08-13 Thread Rafael Laboissière 

Control: tags -1 confirmed pending

* Adrian Bunk  [2017-08-12 15:07]:


Source: praat
Version: 6.0.30-1
Severity: serious
Tags: patch

https://buildd.debian.org/status/package.php?p=praat=sid

... 
 g++ -std=c++11 -DNO_GUI -DNO_NETWORK -D_FILE_OFFSET_BITS=64 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/cairo -I/usr/include/pango-1.0 -DUNIX -Dlinux -Werror=missing-prototypes -Werror=implicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O3 -g1 -pthread -Wshadow -g -O2 -fdebug-prefix-map=/<>/sys=. -fstack-protector-strong -Wformat -Werror=format-security -I ../sys -I ../num -I ../dwsys -I ../kar -I ../external/portaudio -I ../external/flac -I ../external/mp3  -c -o melder_audio.o melder_audio.cpp 
 In file included from /usr/include/glib-2.0/glib/galloca.h:32:0, 
 from /usr/include/glib-2.0/glib.h:30, 
 from /usr/include/pango-1.0/pango/pango-coverage.h:25, 
 from /usr/include/pango-1.0/pango/pango-font.h:25, 
 from /usr/include/pango-1.0/pango/pango-attributes.h:25, 
 from /usr/include/pango-1.0/pango/pango.h:25, 
 from Gui.h:62, 
 from melder_audio.cpp:46: 
 /usr/include/glib-2.0/glib/gtypes.h:32:10: fatal error: glibconfig.h: No such file or directory 
 #include  
 ^~ 
 compilation terminated. 
 : recipe for target 'melder_audio.o' failed 
 make[3]: *** [melder_audio.o] Error 1



Fix is attached.


Thanks for the heads up and for the patch.  I have already noticed the 
problem earlier today and uploaded a fixed version 6.0.30-2 to unstable. 
Unfortunately, I patched the package in a slightly worse way than what 
you propose, by giving "gtk+-2.0" instead of "pangocairo" as argument to 
pkg-config.  My patch seems to work, though.  Anyway, I will release a 
new version of the package that integrates your more elegant patch.


Rafael

Bug#871907: praat FTBFS on non-amd64

2017-08-12 Thread Adrian Bunk 
Source: praat
Version: 6.0.30-1
Severity: serious
Tags: patch

https://buildd.debian.org/status/package.php?p=praat=sid

...
g++ -std=c++11 -DNO_GUI -DNO_NETWORK -D_FILE_OFFSET_BITS=64 
-I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include 
-I/usr/include/cairo -I/usr/include/pango-1.0 -DUNIX -Dlinux 
-Werror=missing-prototypes -Werror=implicit -Wreturn-type -Wunused 
-Wunused-parameter -Wuninitialized -O3 -g1 -pthread -Wshadow -g -O2 
-fdebug-prefix-map=/<>/sys=. -fstack-protector-strong -Wformat 
-Werror=format-security -I ../sys -I ../num -I ../dwsys -I ../kar -I 
../external/portaudio -I ../external/flac -I ../external/mp3  -c -o 
melder_audio.o melder_audio.cpp
In file included from /usr/include/glib-2.0/glib/galloca.h:32:0,
 from /usr/include/glib-2.0/glib.h:30,
 from /usr/include/pango-1.0/pango/pango-coverage.h:25,
 from /usr/include/pango-1.0/pango/pango-font.h:25,
 from /usr/include/pango-1.0/pango/pango-attributes.h:25,
 from /usr/include/pango-1.0/pango/pango.h:25,
 from Gui.h:62,
 from melder_audio.cpp:46:
/usr/include/glib-2.0/glib/gtypes.h:32:10: fatal error: glibconfig.h: No such 
file or directory
 #include 
  ^~
compilation terminated.
: recipe for target 'melder_audio.o' failed
make[3]: *** [melder_audio.o] Error 1


Fix is attached.
Description: Use pkg-config for pangocairo cflags and libs
 Use pkg-config instead of hardcoding pangocairo cflags and libs
 (gives the proper location instead of x86_64-linux-gnu in the
  include search path even on non-amd64).
Author: Adrian Bunk 

--- praat-6.0.30.orig/makefiles/makefile.defs.linux.nogui
+++ praat-6.0.30/makefiles/makefile.defs.linux.nogui
@@ -7,7 +7,7 @@ CC = gcc -std=gnu99
 
 CXX = g++ -std=c++11
 
-CFLAGS = -DNO_GUI -DNO_NETWORK -D_FILE_OFFSET_BITS=64 -I/usr/include/glib-2.0 
-I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/cairo 
-I/usr/include/pango-1.0 -DUNIX -Dlinux -Werror=missing-prototypes 
-Werror=implicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O3 
-g1 -pthread
+CFLAGS = -DNO_GUI -DNO_NETWORK -D_FILE_OFFSET_BITS=64 `pkg-config --cflags 
pangocairo` -DUNIX -Dlinux -Werror=missing-prototypes -Werror=implicit 
-Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O3 -g1 -pthread
 
 CXXFLAGS = $(CFLAGS) -Wshadow
 
@@ -15,10 +15,10 @@ LINK = g++
 
 EXECUTABLE = praat_nogui
 
-LIBS = -lpangocairo-1.0 -lcairo -lpango-1.0 -lgobject-2.0 -lm -lpthread
+LIBS = `pkg-config --libs pangocairo` -lm -lpthread
 
 AR = ar
 RANLIB = ls
 ICON =
 MAIN_ICON =