[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#652601: espeakedit FTBFS with multiarch libwxgtk2.8-dev



package: espeakedit
severity: serious
tags: patch

espeakedit FTBFS with libwxgtk2.8-dev 2.8.12.1-4 or later. This was first
noticed on the armhf buildd but I have also reproduced it on i386.

The cause is that
/usr/lib/wx/include/gtk2-unicode-release-2.8/wx/setup.h has moved to
/usr/lib/<multiarch triplet>/wx/include/gtk2-unicode-release-2.8/wx/setup.h

The attatched patch fixes the paths and adds appropriate build-depends
(the dpkg-dev dep is for dpkg-architecture -qDEB_HOST_MULTIARCH ).

diff -ur espeakedit-1.43.03/debian/control espeakedit-1.43.03.new/debian/control
--- espeakedit-1.43.03/debian/control	2011-10-12 08:51:22.000000000 +0100
+++ espeakedit-1.43.03.new/debian/control	2011-12-19 02:00:32.000000000 +0000
@@ -6,7 +6,7 @@
 Vcs-Browser: http://git.debian.org/?p=pkg-a11y/espeakedit.git;a=summary
 Vcs-Git: git://git.debian.org/git/pkg-a11y/espeakedit.git
 Homepage: http://espeak.sourceforge.net/
-Build-Depends: debhelper (>= 7), libwxgtk2.8-dev, portaudio19-dev
+Build-Depends: debhelper (>= 7), libwxgtk2.8-dev (>= 2.8.12.1-4), portaudio19-dev, dpkg-dev (>= 1.16.0)
 Standards-Version: 3.9.2
 
 Package: espeakedit
diff -ur espeakedit-1.43.03/debian/patches/wx2.8.diff espeakedit-1.43.03.new/debian/patches/wx2.8.diff
--- espeakedit-1.43.03/debian/patches/wx2.8.diff	2011-10-12 08:54:21.000000000 +0100
+++ espeakedit-1.43.03.new/debian/patches/wx2.8.diff	2011-12-19 02:02:56.000000000 +0000
@@ -1,8 +1,8 @@
-diff --git a/src/Makefile b/src/Makefile
-index d26273d..464fb0b 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -1,13 +1,13 @@
+Index: espeakedit-1.43.03/src/Makefile
+===================================================================
+--- espeakedit-1.43.03.orig/src/Makefile	2007-05-05 11:25:42.000000000 +0100
++++ espeakedit-1.43.03/src/Makefile	2011-12-19 02:02:29.000000000 +0000
+@@ -1,13 +1,14 @@
  SRCS=$(wildcard *.cpp)
  OBJS=$(patsubst %.cpp,%.o,$(SRCS))
  
@@ -12,10 +12,11 @@
  LIBS=-lstdc++ -lportaudio
  
 -CPPFLAGS =  -Wall -g -fexceptions -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA -D_ESPEAKEDIT
-+CPPFLAGS =  -Wall -g -fexceptions -I/usr/lib/wx/include/gtk2-unicode-release-2.8 -I/usr/include/wx-2.8 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA -D_ESPEAKEDIT
++DEB_HOST_MULTIARCH ?=$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
++CPPFLAGS =  -Wall -g -fexceptions -I/usr/lib/$(DEB_HOST_MULTIARCH)/wx/include/gtk2-unicode-release-2.8 -I/usr/include/wx-2.8 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA -D_ESPEAKEDIT
  
 -CXXFLAGS = -O2 -g0 -Wall -g -fexceptions -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA -D_ESPEAKEDIT
-+CXXFLAGS = -O2 -g0 -Wall -g -fexceptions -I/usr/lib/wx/include/gtk2-unicode-release-2.8 -I/usr/include/wx-2.8 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA -D_ESPEAKEDIT
++CXXFLAGS = -O2 -g0 -Wall -g -fexceptions -I/usr/lib/$(DEB_HOST_MULTIARCH)/wx/include/gtk2-unicode-release-2.8 -I/usr/include/wx-2.8 -DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA -D_ESPEAKEDIT
  
  all: espeakedit
  

Reply to: