[med-svn] [Git][med-team/praat][master] 4 commits: Fix FTCBFS
Rafael Laboissiere
gitlab at salsa.debian.org
Thu Jan 17 17:21:06 GMT 2019
Rafael Laboissiere pushed to branch master at Debian Med / praat
Commits:
c72dfcf6 by Rafael Laboissiere at 2019-01-17T15:02:33Z
Fix FTCBFS
+ d/rules: seed build tools from dpkg's buildtools.mk
+ d/mk-vars-hardening: Do not include CFLAGS into CXXFLAGS
+ d/p/cross-build.patch: Allow substituting pkg-config.
+ d/p/cross-build.patch: Don't stuff flags into $(CC) or $(CXX).
+ d/p/cross-build.patch: Default LINK to $(CXX).
Gbp-Dch: Full
Closes: #919490
Thanks: Helmut Grohne <helmut at subdivi.de> for the patch
- - - - -
f60df121 by Rafael Laboissiere at 2019-01-17T15:02:33Z
d/What_s_new_.html: Update upstream changelog
Gbp-Dch: Ignore
- - - - -
a111aae4 by Rafael Laboissiere at 2019-01-17T15:02:33Z
d/t/run-tests: Drop unit test test_MixingMatrix
- - - - -
ca920e30 by Rafael Laboissiere at 2019-01-17T17:20:29Z
Changelog entry for version 6.0.46-4
Gbp-Dch: Ignore
- - - - -
7 changed files:
- debian/What_s_new_.html
- debian/changelog
- debian/mk-vars-hardening
- + debian/patches/cross-build.patch
- debian/patches/series
- debian/rules
- debian/tests/run-tests
Changes:
=====================================
debian/What_s_new_.html
=====================================
@@ -7,10 +7,46 @@ What's new?
<p>
Latest changes in Praat.</p>
<p>
+<b>6.0.46</b> (3 January 2019)</p>
+<ul>
+<li>
+ Removed a crashing bug in the LongSound window introduced in 6.0.44.
+<li>
+ Removed a bug causing incorrect conversion from Formant to LPC introduced in 6.0.44.
+<li>
+ More space for actions in buttons window.
+</ul>
+<p>
+<b>6.0.45</b> (1 January 2019)</p>
+<ul>
+<li>
+ Removed a crashing bug in EditDistanceTable introduced in 6.0.44.
+<li>
+ Removed a crashing bug in KlattGrid drawing introduced in 6.0.44.
+<li>
+ Removed a bug introduced in 6.0.44 whereby old HMM files were read incorrectly.
+</ul>
+<p>
+<b>6.0.44</b> (31 December 2018)</p>
+<ul>
+<li>
+ Bug fixes and speed.
+</ul>
+<p>
+<b>6.0.43</b> (8 September 2018)</p>
+<ul>
+<li>
+ Removed a very old bug that could create invalid TextGrids during forced alignment.
+<li>
+ Windows: repaired a bug introduced in 6.0.41 that caused a crash in several places (such as when changing the sample rate in the SoundRecorder) when Praat had been started with a double click.
+<li>
+ Windows: repaired a bug introduced in 6.0.41 that caused Praat to crash when exiting.
+</ul>
+<p>
<b>6.0.42</b> (15 August 2018)</p>
<ul>
<li>
- Reapired a bug introduced in 6.0.41 that caused a crash in pause windows.
+ Repaired a bug introduced in 6.0.41 that caused a crash in pause windows.
</ul>
<p>
<b>6.0.41</b> (6 August 2018)</p>
@@ -422,179 +458,4 @@ Latest changes in Praat.</p>
<b>5.4.17</b> (20 August 2015)</p>
<ul>
<li>
- Scripting: removed a bug that could cause Praat to crash when calling <code>writeFile()</code> with an empty text.
-</ul>
-<p>
-<b>5.4.16</b> (16 August 2015)</p>
-<ul>
-<li>
- Mac 64-bit: removed a bug by which graphical text passed over the right edge in TextGrid intervals.
-<li>
- Mac 64-bit: removed a bug that allowed the general "Zoom" and "Close" commands to be accessible from a script.
-</ul>
-<p>
-<b>5.4.15</b> (1 August 2015)</p>
-<ul>
-<li>
- Introduced several command line options that make it easier to call Praat from a web server.
-<li>
- 64-bit Mac: removed a bug introduced in 5.4.11 that caused incorrect spacing of vertical text in picture files.
-</ul>
-<p>
-<b>5.4.14</b> (24 July 2015)</p>
-<ul>
-<li>
- Windows and 32-bit Mac: removed a bug introduced in 5.4.12 that could cause weird behavior (even crashing) when pressing the Tab key in the script window or in the manual.
-</ul>
-<p>
-<b>5.4.13</b> (22 July 2015)</p>
-<ul>
-<li>
- The Demo window can now save itself to a PNG or PDF file.
-<li>
- Windows: removed a bug introduced in 5.4.10 whereby Praatcon would write garbled text to the console.
-</ul>
-<p>
-<b>5.4.12</b> (10 July 2015)</p>
-<ul>
-<li>
- Windows: removed a bug introduced in 5.4.10 whereby SpeechSynthesizer would only pronounce the first letter of the text.
-</ul>
-<p>
-<b>5.4.11</b> (8 July 2015)</p>
-<ul>
-<li>
- Windows: removed a bug introduced in 5.4.10 whereby the file selection window could try to open a file with a garbled name.
-<li>
- Removed a bug whereby the PointProcess window would crash when showing a perfectly silent sound.
-</ul>
-<p>
-<b>5.4.10</b> (27 June 2015)</p>
-<ul>
-<li>
- Removed a bug introduced in version 4.5.09 (January 2007) that caused incorrect upsampling of stereo sounds when the upsampling factor was exactly 2. This bug has caused incorrect playing of stereo sounds with a sampling frequency of 22050 Hz on the Mac since January 2015.
-<li>
- Removed a bug introduced in 2011 that could cause Praat to crash when you scrolled the LongSound window.
-<li>
- TextGrid: <b>Count intervals where...</b> and <b>Count points where...</b>.
-</ul>
-<p>
-<b>5.4.09</b> (1 June 2015)</p>
-<ul>
-<li>
- Linux: the tab key can be used to play sounds on more computers.
-<li>
- Windows: TextGrid files with non-BMP characters are now read correctly.
-<li>
- Windows: files with names that contain non-BMP characters are now saved correctly.
-<li>
- Updated manual.
-</ul>
-<p>
-<b>5.4.08</b> (24 March 2015)</p>
-<ul>
-<li>
- Sound window: removed a bug that caused a crash in "Editor info".
-</ul>
-<p>
-<b>5.4.07</b> (22 March 2015)</p>
-<ul>
-<li>
- TextGrid window: <b>Add interval</b> now does the same thing as <b>Add boundary</b> if a time stretch is selected.
-<li>
- Linux: better redrawing in TextGrid window.
-</ul>
-<p>
-<b>5.4.06</b> (21 February 2015)</p>
-<ul>
-<li>
- Windows: repaired a bug that could cause Praat to crash if a metafile resolution was 200 dpi.
-</ul>
-<p>
-<b>5.4.05</b> (13 February 2015)</p>
-<ul>
-<li>
- Better support for big integer numbers on Windows XP.
-<li>
- Sound window: guarded against empty view ranges for the intensity curve.
-</ul>
-<p>
-<b>5.4.04</b> (28 December 2014)</p>
-<ul>
-<li>
- Windows audio playback: if the sound has more channels than the audio hardware, distribute them evenly.
-</ul>
-<p>
-<b>5.4.03</b> (18 December 2014)</p>
-<ul>
-<li>
- TextGrid reading: Praat now corrects some incomplete TextGrid files created by others.
-<li>
- Better support for text files larger than 2 GB.
-</ul>
-<p>
-<b>5.4.02</b> (26 November 2014)</p>
-<ul>
-<li>
- Mac: repaired a bug by which quote characters typed into the script window could become curly instead of straight.
-</ul>
-<p>
-<b>5.4.01</b> (9 November 2014)</p>
-<ul>
-<li>
- <a href="MelSpectrogram.html">MelSpectrogram</a>, <a href="BarkSpectrogram.html">BarkSpectrogram</a>.
-<li>
- Linux: removed a bug that could cause too many flashes when scrolling a Sound window.
-<li>
- Mac: repaired a bug that could cause a crash in the VowelEditor window.
-</ul>
-<h3>
-What used to be new?</h3>
-<ul>
-<li>
- <a href="What_was_new_in_5_4_.html">What was new in 5.4?</a>
-<li>
- <a href="What_was_new_in_5_3_.html">What was new in 5.3?</a>
-<li>
- <a href="What_was_new_in_5_2_.html">What was new in 5.2?</a>
-<li>
- <a href="What_was_new_in_5_1_.html">What was new in 5.1?</a>
-<li>
- <a href="What_was_new_in_5_0_.html">What was new in 5.0?</a>
-<li>
- <a href="What_was_new_in_4_6_.html">What was new in 4.6?</a>
-<li>
- <a href="What_was_new_in_4_5_.html">What was new in 4.5?</a>
-<li>
- <a href="What_was_new_in_4_4_.html">What was new in 4.4?</a>
-<li>
- <a href="What_was_new_in_4_3_.html">What was new in 4.3?</a>
-<li>
- <a href="What_was_new_in_4_2_.html">What was new in 4.2?</a>
-<li>
- <a href="What_was_new_in_4_1_.html">What was new in 4.1?</a>
-<li>
- <a href="What_was_new_in_4_0_.html">What was new in 4.0?</a>
-<li>
- <a href="What_was_new_in_3_9_.html">What was new in 3.9?</a>
-<li>
- <a href="What_was_new_in_3_8_.html">What was new in 3.8?</a>
-<li>
- <a href="What_was_new_in_3_7_.html">What was new in 3.7?</a>
-<li>
- <a href="What_was_new_in_3_6_.html">What was new in 3.6?</a>
-<li>
- <a href="What_was_new_in_3_5_.html">What was new in 3.5?</a>
-<li>
- <a href="What_was_new_in_3_3_.html">What was new in 3.3?</a>
-<li>
- <a href="What_was_new_in_3_2_.html">What was new in 3.2?</a>
-<li>
- <a href="What_was_new_in_3_1_.html">What was new in 3.1?</a>
-</ul>
-<hr>
-<address>
- <p>© ppgb, August 15, 2018</p>
-</address>
-</body>
-</html>
+ Scripting: removed a bug that could cause Praat to crash
\ No newline at end of file
=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+praat (6.0.46-4) unstable; urgency=medium
+
+ * Fix FTCBFS
+ + d/rules: seed build tools from dpkg's buildtools.mk
+ + d/mk-vars-hardening: Do not include CFLAGS into CXXFLAGS
+ + d/p/cross-build.patch: Allow substituting pkg-config.
+ + d/p/cross-build.patch: Don't stuff flags into $(CC) or $(CXX).
+ + d/p/cross-build.patch: Default LINK to $(CXX).
+ Thanks to Helmut Grohne <helmut at subdivi.de> for the patch (Closes: #919490)
+ * d/t/run-tests: Drop unit test test_MixingMatrix
+
+ -- Rafael Laboissiere <rafael at debian.org> Wed, 16 Jan 2019 20:54:25 -0200
+
praat (6.0.46-3) unstable; urgency=medium
* d/p/show-fc-discrimant-test.patch: Drop patch
=====================================
debian/mk-vars-hardening
=====================================
@@ -1,2 +1,2 @@
CFLAGS += $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
-CXXFLAGS = $(CFLAGS) -Wshadow $(shell dpkg-buildflags --get CXXFLAGS)
+CXXFLAGS += $(shell dpkg-buildflags --get CXXFLAGS)
=====================================
debian/patches/cross-build.patch
=====================================
@@ -0,0 +1,192 @@
+Description: Allow cross build
+Author: Helmut Grohne <helmut at subdivi.de>
+Bug-Debian: https://bugs.debian.org/919490
+Forwarded: no
+Reviewed-by: Rafael Laboissiere <rafael at debian.org>
+Last-Update: 2019-01-16
+
+--- praat-6.0.46.orig/makefiles/makefile.defs.linux.alsa
++++ praat-6.0.46/makefiles/makefile.defs.linux.alsa
+@@ -3,19 +3,23 @@
+ # System: Linux
+ # Paul Boersma, 3 August 2018
+
+-CC = gcc -std=gnu99
++CC = gcc
+
+-CXX = g++ -std=c++17
++CXX = g++
+
+-CFLAGS = -DUNIX -Dlinux -DALSA -D_FILE_OFFSET_BITS=64 `pkg-config --cflags gtk+-2.0` -Werror=missing-prototypes -Werror=implicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O1 -g1 -pthread
++PKG_CONFIG ?= pkg-config
+
+-CXXFLAGS = $(CFLAGS) -Wshadow
++COMMON_CFLAGS = -DUNIX -Dlinux -DALSA -D_FILE_OFFSET_BITS=64 `$(PKG_CONFIG) --cflags gtk+-2.0` -Werror=missing-prototypes -Werror=implicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O1 -g1 -pthread
+
+-LINK = g++
++CFLAGS = -std=gnu99 $(COMMON_CFLAGS)
++
++CXXFLAGS = -std=c++17 $(COMMON_CFLAGS) -Wshadow
++
++LINK = $(CXX)
+
+ EXECUTABLE = praat
+
+-LIBS = `pkg-config --libs gtk+-2.0` -lm -lasound -lpthread
++LIBS = `$(PKG_CONFIG) --libs gtk+-2.0` -lm -lasound -lpthread
+
+ AR = ar
+ RANLIB = ls
+--- praat-6.0.46.orig/makefiles/makefile.defs.linux.jack
++++ praat-6.0.46/makefiles/makefile.defs.linux.jack
+@@ -3,19 +3,23 @@
+ # System: Linux
+ # Paul Boersma, 21 October 2018
+
+-CC = gcc -std=gnu99
++CC = gcc
+
+-CXX = g++ -std=c++17
++CXX = g++
+
+-CFLAGS = -DUNIX -Dlinux -DJACK -D_FILE_OFFSET_BITS=64 `pkg-config --cflags gtk+-2.0` -Werror=missing-prototypes -Werror=implicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O1 -g1 -pthread
++PKG_CONFIG ?= pkg-config
+
+-CXXFLAGS = $(CFLAGS) -Wshadow
++COMMON_CFLAGS = -DUNIX -Dlinux -DJACK -D_FILE_OFFSET_BITS=64 `$(PKG_CONFIG) --cflags gtk+-2.0` -Werror=missing-prototypes -Werror=implicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O1 -g1 -pthread
+
+-LINK = g++
++CFLAGS = -std=gnu99 $(COMMON_CFLAGS)
++
++CXXFLAGS = -std=c++17 $(COMMON_CFLAGS) -Wshadow
++
++LINK = $(CXX)
+
+ EXECUTABLE = praat
+
+-LIBS = `pkg-config --libs gtk+-2.0` -lm -ljack -lpthread
++LIBS = `$(PKG_CONFIG) --libs gtk+-2.0` -lm -ljack -lpthread
+
+ AR = ar
+ RANLIB = ls
+--- praat-6.0.46.orig/makefiles/makefile.defs.linux.nogui
++++ praat-6.0.46/makefiles/makefile.defs.linux.nogui
+@@ -3,19 +3,23 @@
+ # System: Linux without GUI, network, and sound
+ # Paul Boersma, 3 August 2018
+
+-CC = gcc -std=gnu99
++CC = gcc
+
+-CXX = g++ -std=c++17
++CXX = g++
+
+-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
++PKG_CONFIG ?= pkg-config
+
+-CXXFLAGS = $(CFLAGS) -Wshadow
++COMMON_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
+
+-LINK = g++
++CFLAGS = -std=gnu99 $(COMMON_CFLAGS)
++
++CXXFLAGS = -std=c++17 $(COMMON_CFLAGS) -Wshadow
++
++LINK = $(CXX)
+
+ EXECUTABLE = praat_nogui
+
+-LIBS = `pkg-config --libs pangocairo` -lm -lpthread
++LIBS = `$(PKG_CONFIG) --libs pangocairo` -lm -lpthread
+
+ AR = ar
+ RANLIB = ls
+--- praat-6.0.46.orig/makefiles/makefile.defs.linux.pulse
++++ praat-6.0.46/makefiles/makefile.defs.linux.pulse
+@@ -3,19 +3,23 @@
+ # System: Linux
+ # David Weenink and Paul Boersma, 23 September 2018
+
+-CC = gcc -std=gnu99
++CC = gcc
+
+-CXX = g++ -std=c++17
++CXX = g++
+
+-CFLAGS = -DUNIX -Dlinux -DALSA -DHAVE_PULSEAUDIO -D_FILE_OFFSET_BITS=64 `pkg-config --cflags gtk+-2.0` -Werror=missing-prototypes -Werror=implicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O3 -g1 -pthread
++PKG_CONFIG ?= pkg-config
+
+-CXXFLAGS = $(CFLAGS) -Wshadow
++COMMON_CFLAGS = -DUNIX -Dlinux -DALSA -DHAVE_PULSEAUDIO -D_FILE_OFFSET_BITS=64 `$(PKG_CONFIG) --cflags gtk+-2.0` -Werror=missing-prototypes -Werror=implicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O3 -g1 -pthread
+
+-LINK = g++
++CFLAGS = -std=gnu99 $(COMMON_CFLAGS)
++
++CXXFLAGS = -std=c++17 $(COMMON_CFLAGS) -Wshadow
++
++LINK = $(CXX)
+
+ EXECUTABLE = praat
+
+-LIBS = `pkg-config --libs gtk+-2.0` -lm -lpulse -lasound -lpthread
++LIBS = `$(PKG_CONFIG) --libs gtk+-2.0` -lm -lpulse -lasound -lpthread
+
+ AR = ar
+ RANLIB = ls
+--- praat-6.0.46.orig/makefiles/makefile.defs.linux.silent
++++ praat-6.0.46/makefiles/makefile.defs.linux.silent
+@@ -3,19 +3,23 @@
+ # System: Linux without sound
+ # Paul Boersma, 3 August 2018
+
+-CC = gcc -std=gnu99
++CC = gcc
+
+-CXX = g++ -std=c++17
++CXX = g++
+
+-CFLAGS = -D_FILE_OFFSET_BITS=64 -DUNIX -Dlinux `pkg-config --cflags gtk+-2.0` -Werror=missing-prototypes -Werror=implicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O1 -g1 -pthread
++PKG_CONFIG ?= pkg-config
+
+-CXXFLAGS = $(CFLAGS) -Wshadow
++COMMON_CFLAGS = -D_FILE_OFFSET_BITS=64 -DUNIX -Dlinux `$(PKG_CONFIG) --cflags gtk+-2.0` -Werror=missing-prototypes -Werror=implicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O1 -g1 -pthread
+
+-LINK = g++
++CFLAGS = -std=gnu99 $(COMMON_CFLAGS)
++
++CXXFLAGS = -std=c++17 $(COMMON_CFLAGS) -Wshadow
++
++LINK = $(CXX)
+
+ EXECUTABLE = praat
+
+-LIBS = `pkg-config --libs gtk+-2.0` -lm -lpthread -static-libgcc -static-libstdc++
++LIBS = `$(PKG_CONFIG) --libs gtk+-2.0` -lm -lpthread -static-libgcc -static-libstdc++
+
+ AR = ar
+ RANLIB = ls
+--- praat-6.0.46.orig/makefiles/makefile.defs.linux.barren
++++ praat-6.0.46/makefiles/makefile.defs.linux.barren
+@@ -3,15 +3,17 @@
+ # System: Linux without GUI, network, graphics, and sound
+ # Paul Boersma, 3 August 2018
+
+-CC = gcc -std=gnu99
++CC = gcc
+
+-CXX = g++ -std=c++17
++CXX = g++
+
+-CFLAGS = -DNO_GRAPHICS -DNO_NETWORK -D_FILE_OFFSET_BITS=64 -DUNIX -Dlinux -Werror=missing-prototypes -Werror=implicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O3 -g1 -pthread
++COMMON_CFLAGS = -DNO_GRAPHICS -DNO_NETWORK -D_FILE_OFFSET_BITS=64 -DUNIX -Dlinux -Werror=missing-prototypes -Werror=implicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O3 -g1 -pthread
+
+-CXXFLAGS = $(CFLAGS) -Wshadow
++CFLAGS = -std=gnu99 $(COMMON_CFLAGS)
+
+-LINK = g++
++CXXFLAGS = -std=c++17 $(COMMON_CFLAGS) -Wshadow
++
++LINK = $(CXX)
+
+ EXECUTABLE = praat_barren
+
=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
use-ldflags.patch
remove-time-date-macros.patch
fix-procrustes-unit-test.patch
+cross-build.patch
=====================================
debian/rules
=====================================
@@ -15,7 +15,9 @@ SUBSTCMD = sed 's:@BINDIR@:$(BINDIR):g;s:@PIXDIR@:$(PIXDIR):g; \
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+include /usr/share/dpkg/architecture.mk
+-include /usr/share/dpkg/buildtools.mk
+PKG_CONFIG ?= pkg-config
ifneq (,$(filter $(DEB_HOST_ARCH), i386))
export DEB_CXXFLAGS_MAINT_APPEND=-ffloat-store
@@ -64,7 +66,7 @@ sendpraat: sys/sendpraat.c
$(shell dpkg-buildflags --get LDFLAGS) \
-Wl,--as-needed -std=gnu99 -DSTAND_ALONE -DUNIX \
-o sendpraat sys/sendpraat.c \
- $(shell pkg-config --cflags --libs gtk+-2.0)
+ $(shell $(PKG_CONFIG) --cflags --libs gtk+-2.0)
override_dh_auto_build: sendpraat praat.1 praat_nogui.1 sendpraat.1 praat-open-files.1
dh_auto_build
=====================================
debian/tests/run-tests
=====================================
@@ -77,6 +77,7 @@ for f in $(ls *.praat) ; do
-a $f != speechsynthesizer_test.praat \
-a $f != test_Discriminant.praat \
-a $f != test_bss_twoSoundsMixed.praat \
+ -a $f != test_MixingMatrix.praat \
-a $f != test_sigma_ellipse.praat \
-a $f != test_Sound_draw_where.praat \
-a $f != test_SpeechSynthesizer.praat \
View it on GitLab: https://salsa.debian.org/med-team/praat/compare/f37b6db2fca70e5c6363ed50b276876b9e59fc56...ca920e30b60104da9fc0974e01398b7cc2b6d1ae
--
View it on GitLab: https://salsa.debian.org/med-team/praat/compare/f37b6db2fca70e5c6363ed50b276876b9e59fc56...ca920e30b60104da9fc0974e01398b7cc2b6d1ae
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20190117/e3364e4c/attachment-0001.html>
More information about the debian-med-commit
mailing list