--- Begin Message ---
Package: espeakedit
Version: 1.46.02-4
Severity: normal
Tags: patch
User: freewx-maint@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 <olly@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 <olly@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
+
--- End Message ---
--- Begin Message ---
Source: espeakedit
Source-Version: 1.48.03-2
We believe that the bug you reported is fixed in the latest version of
espeakedit, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 746538@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Samuel Thibault <sthibault@debian.org> (supplier of updated espeakedit package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Thu, 01 May 2014 23:59:44 +0200
Source: espeakedit
Binary: espeakedit
Architecture: source amd64
Version: 1.48.03-2
Distribution: unstable
Urgency: medium
Maintainer: Debian Accessibility Team <debian-accessibility@lists.debian.org>
Changed-By: Samuel Thibault <sthibault@debian.org>
Description:
espeakedit - Multi-lingual software speech synthesizer - editor
Closes: 746538
Changes:
espeakedit (1.48.03-2) unstable; urgency=medium
.
[ Olly Betts ]
* Update to use wxWidgets 3.0 (new patch wx3.0-3.diff) (Closes: Bug#746538).
Checksums-Sha1:
a9ab515cab84f8429fc7f8555e7dfa25429268eb 2057 espeakedit_1.48.03-2.dsc
c60e6139a279c243c87ff6c0504883cfd918e136 5016 espeakedit_1.48.03-2.debian.tar.xz
e168159577823cf8e9285ac9fb6fca28b033d7b4 324824 espeakedit_1.48.03-2_amd64.deb
Checksums-Sha256:
02e2b07e55fd3f0555da389fb0301202d9ec584ba395f191d1a08691051dbafc 2057 espeakedit_1.48.03-2.dsc
06b9be29463af208b4c264b9614be07f76779b625a52fec5b30c375d8c1b87ea 5016 espeakedit_1.48.03-2.debian.tar.xz
f379dd540d504465b160a4b7dc0052107f4957f50af790d36637aabb0ddb6e36 324824 espeakedit_1.48.03-2_amd64.deb
Files:
113b7a656b1d3e1b683b22d31e1a7af6 324824 sound extra espeakedit_1.48.03-2_amd64.deb
780681a4cc4dd543fc075281f3260b39 2057 sound extra espeakedit_1.48.03-2.dsc
23374bde942c3f18f1e11a317403b3e7 5016 sound extra espeakedit_1.48.03-2.debian.tar.xz
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAEBCgAGBQJTYsXUAAoJEJTQtYw0gxjVwN0P/2H45NpeIi9tl22mE4PAkJMk
4YqGwc6wMzULjy1sztegxJhge7qD8A6RSJgTkPHUziqMfgH9Suf1Bd3KR6XUWzA9
xrCGFccar9vduI1n0ILSJLUk7huxBGgBusVAma6An4aW6X9ELYCmqmqUU75BQ5jM
qEtqPakQCjnmB2htWis18Amp0F1XWJV21nPxKWg9UzAUsZ/ajsObtDN1zW4a11yO
+YufCjZoWi7FkipKNyAmeRvQFoWIFGkbeZKLg87hhfQE8igUN1prOeu61lE5J+xU
yP6Cx+CKLSG0RRiDovVL3Bqii381GuLWFWdHoBZ0iT+7UBou5WrZsT89bQiRR+QD
ZXF1bS3uOzuwu2cmvbhp3Wg3Px1IX+HQv/OMcyms8hGV27ofEEOcGq83iPQsr8UW
VPm0BkhcyXQR9FMwgPUO95/qbAz6hPVQ7/pB1FJdxL8DfQWrsyULtaQD6t5KS9AV
necez5B9xjkmOdQMTSMrTkqpw+52SNdifhe+24874zQOGQU3+Vg4rvg0eG3RY1QB
o14wLfweHsLBIZyPWC45H2e6sY2n9XQs0M8XV6+CtjRPAqzoHXOHCFft8NgthPi6
dK2IWGjo/xAFd9Yc6WlQP8VjCpR+1pTDb3WbPmkucZFsomjMT9p6Hlwneb4mHCPn
iqXqnVeF9o+/xbmfhgI5
=waVz
-----END PGP SIGNATURE-----
--- End Message ---