Package: espeakedit Version: 1.46.02-4 Severity: normal Tags: patch User: freewx-ma...@lists.alioth.debian.org Usertags: wx3.0
Dear maintainer, We're aiming to migrate the archive to using wxwidgets3.0 instead of wxwidgets2.8. I've rebuilt your package using the attached patch. The amount of testing I was able to do was rather limited by #746537, but it seems to work as well as the package currently in unstable. Notably, passing -DNDEBUG when compiling avoids the assertion dialog Reese Dunn reports here: https://lists.debian.org/debian-devel/2013/11/msg00266.html I'm happy to NMU this change if you wish me to - just let me know. Cheers, Olly
diff -Nru espeakedit-1.46.02/debian/changelog espeakedit-1.46.02/debian/changelog --- espeakedit-1.46.02/debian/changelog 2014-04-20 08:00:53.000000000 +1200 +++ espeakedit-1.46.02/debian/changelog 2014-05-01 16:59:36.000000000 +1200 @@ -1,3 +1,10 @@ +espeakedit (1.46.02-4.1) unstable; urgency=low + + * Non-maintainer upload. + * Update to use wxWidgets 3.0 (new patch wx3.0-3.diff). + + -- Olly Betts <o...@survex.com> Thu, 01 May 2014 16:09:24 +1200 + espeakedit (1.46.02-4) unstable; urgency=low * Bump Standards-Version to 3.9.5 (no changes). diff -Nru espeakedit-1.46.02/debian/control espeakedit-1.46.02/debian/control --- espeakedit-1.46.02/debian/control 2013-10-28 21:21:45.000000000 +1300 +++ espeakedit-1.46.02/debian/control 2014-05-01 16:46:29.000000000 +1200 @@ -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 (>= 2.8.12.1-4), portaudio19-dev, dpkg-dev (>= 1.16.0), hardening-wrapper, libsonic-dev +Build-Depends: debhelper (>= 7), libwxgtk3.0-dev, portaudio19-dev, dpkg-dev (>= 1.16.0), hardening-wrapper, libsonic-dev Standards-Version: 3.9.5 Package: espeakedit diff -Nru espeakedit-1.46.02/debian/patches/series espeakedit-1.46.02/debian/patches/series --- espeakedit-1.46.02/debian/patches/series 2013-11-18 10:58:09.000000000 +1300 +++ espeakedit-1.46.02/debian/patches/series 2014-05-01 16:58:20.000000000 +1200 @@ -4,3 +4,4 @@ libsonic wx3.0.diff wx3.0-2.diff +wx3.0-3.diff diff -Nru espeakedit-1.46.02/debian/patches/wx3.0-3.diff espeakedit-1.46.02/debian/patches/wx3.0-3.diff --- espeakedit-1.46.02/debian/patches/wx3.0-3.diff 1970-01-01 12:00:00.000000000 +1200 +++ espeakedit-1.46.02/debian/patches/wx3.0-3.diff 2014-05-01 17:16:47.000000000 +1200 @@ -0,0 +1,34 @@ +Description: Update Makefile for wx3.0 +Author: Olly Betts <o...@survex.com> +Last-Update: 2014-05-01 + +--- a/src/Makefile ++++ b/src/Makefile +@@ -10,19 +10,18 @@ + + OBJS=$(patsubst %.cpp,%.o,$(SRCS)) + +-WX_LIBS = -pthread -lwx_gtk2u_xrc-2.8 -lwx_gtk2u_qa-2.8 -lwx_gtk2u_html-2.8 \ +- -lwx_gtk2u_adv-2.8 -lwx_gtk2u_core-2.8 -lwx_baseu_xml-2.8 -lwx_baseu_net-2.8 -lwx_baseu-2.8 ++WX_LIBS = `wx-config --libs` + + LIBS=-lstdc++ -lportaudio -lsonic + + 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 -Wall -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 ++CPPFLAGS = `wx-config --cppflags` \ ++ -DGTK_NO_CHECK_CASTS -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES \ ++ -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA -D_ESPEAKEDIT -DNDEBUG ++ ++CXXFLAGS = `wx-config --cxxflags` -O2 -Wall \ ++ -DGTK_NO_CHECK_CASTS -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES \ ++ -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA -D_ESPEAKEDIT -DNDEBUG + + all: espeakedit +