Hello community, here is the log from the commit of package praat for openSUSE:Factory checked in at 2018-08-18 00:04:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/praat (Old) and /work/SRC/openSUSE:Factory/.praat.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "praat" Sat Aug 18 00:04:58 2018 rev:15 rq:629568 version:6.0.42 Changes: -------- --- /work/SRC/openSUSE:Factory/praat/praat.changes 2018-08-08 14:53:43.245571899 +0200 +++ /work/SRC/openSUSE:Factory/.praat.new/praat.changes 2018-08-18 00:05:01.967242284 +0200 @@ -1,0 +2,10 @@ +Thu Aug 16 09:14:18 UTC 2018 - [email protected] + +- Update to version 6.0.42 + * Repaired a bug introduced in 6.0.41 that caused a crash in + pause windows. + +- Refreshed praat-use_system_libs.patch and + praat-no-return-in-nonvoid.patch + +------------------------------------------------------------------- Old: ---- praat-6.0.41.tar.gz New: ---- praat-6.0.42.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ praat.spec ++++++ --- /var/tmp/diff_new_pack.ZAvFfb/_old 2018-08-18 00:05:03.151245827 +0200 +++ /var/tmp/diff_new_pack.ZAvFfb/_new 2018-08-18 00:05:03.151245827 +0200 @@ -17,7 +17,7 @@ Name: praat -Version: 6.0.41 +Version: 6.0.42 Release: 0 Summary: Phonetics by computer License: GPL-3.0-or-later @@ -58,12 +58,6 @@ %setup -q %patch1 -p1 %patch2 -p1 -# fix builddate info -# Remove build time references so build-compare can do its work -FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{SOURCE3} '+%%H:%%M') -FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{SOURCE3} '+%%b %%e %%Y') -sed -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" -i external/portaudio/pa_front.c -sed -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -i external/portaudio/pa_front.c %build test -x "$(type -p gcc-7)" && export CC=gcc-7 ++++++ praat-6.0.41.tar.gz -> praat-6.0.42.tar.gz ++++++ /work/SRC/openSUSE:Factory/praat/praat-6.0.41.tar.gz /work/SRC/openSUSE:Factory/.praat.new/praat-6.0.42.tar.gz differ: char 12, line 1 ++++++ praat-no-return-in-nonvoid.patch ++++++ --- /var/tmp/diff_new_pack.ZAvFfb/_old 2018-08-18 00:05:03.187245935 +0200 +++ /var/tmp/diff_new_pack.ZAvFfb/_new 2018-08-18 00:05:03.187245935 +0200 @@ -1,8 +1,8 @@ -Index: praat-6.0.41/sys/melder.cpp +Index: praat-6.0.42/melder/melder_search.cpp =================================================================== ---- praat-6.0.41.orig/sys/melder.cpp -+++ praat-6.0.41/sys/melder.cpp -@@ -260,7 +260,7 @@ bool Melder_stringMatchesCriterion (cons +--- praat-6.0.42.orig/melder/melder_search.cpp ++++ praat-6.0.42/melder/melder_search.cpp +@@ -146,7 +146,7 @@ bool Melder_stringMatchesCriterion (cons return !! place; } } @@ -10,4 +10,4 @@ + return false; // should not occur } - void Melder_help (conststring32 query) { + /* End of file melder_search.cpp */ ++++++ praat-use_system_libs.patch ++++++ --- /var/tmp/diff_new_pack.ZAvFfb/_old 2018-08-18 00:05:03.191245947 +0200 +++ /var/tmp/diff_new_pack.ZAvFfb/_new 2018-08-18 00:05:03.191245947 +0200 @@ -8,10 +8,10 @@ other like espeak and FLAC are too heavily patched for the program to be compatible with upstream ones. -Index: praat-6.0.36/fon/SoundRecorder.h +Index: praat-6.0.42/fon/SoundRecorder.h =================================================================== ---- praat-6.0.36.orig/fon/SoundRecorder.h -+++ praat-6.0.36/fon/SoundRecorder.h +--- praat-6.0.42.orig/fon/SoundRecorder.h ++++ praat-6.0.42/fon/SoundRecorder.h @@ -25,7 +25,7 @@ #include "SoundRecorder_enums.h" @@ -21,10 +21,10 @@ #if defined (_WIN32) #elif defined (macintosh) #elif defined (linux) -Index: praat-6.0.36/fon/Sound_audio.cpp +Index: praat-6.0.42/fon/Sound_audio.cpp =================================================================== ---- praat-6.0.36.orig/fon/Sound_audio.cpp -+++ praat-6.0.36/fon/Sound_audio.cpp +--- praat-6.0.42.orig/fon/Sound_audio.cpp ++++ praat-6.0.42/fon/Sound_audio.cpp @@ -28,7 +28,7 @@ #include "Preferences.h" @@ -34,10 +34,10 @@ #if defined (macintosh) #include "macport_on.h" -Index: praat-6.0.36/num/NUMlinprog.cpp +Index: praat-6.0.42/melder/NUMlinprog.cpp =================================================================== ---- praat-6.0.36.orig/num/NUMlinprog.cpp -+++ praat-6.0.36/num/NUMlinprog.cpp +--- praat-6.0.42.orig/melder/NUMlinprog.cpp ++++ praat-6.0.42/melder/NUMlinprog.cpp @@ -17,7 +17,7 @@ */ @@ -47,62 +47,10 @@ struct structNUMlinprog { glp_prob *linearProgram; -Index: praat-6.0.36/sys/melder_audio.cpp +Index: praat-6.0.42/dwtools/VowelEditor.cpp =================================================================== ---- praat-6.0.36.orig/sys/melder_audio.cpp -+++ praat-6.0.36/sys/melder_audio.cpp -@@ -46,7 +46,7 @@ - #include "melder.h" - #include <time.h> - --#include "../external/portaudio/portaudio.h" -+#include <portaudio.h> - - #ifdef HAVE_PULSEAUDIO - void pulseAudio_initialize (); -Index: praat-6.0.36/dwsys/Makefile -=================================================================== ---- praat-6.0.36.orig/dwsys/Makefile -+++ praat-6.0.36/dwsys/Makefile -@@ -4,7 +4,7 @@ - - include ../makefile.defs - --CPPFLAGS = -I ../stat -I ../sys -I ../external/gsl -I ../kar -+CPPFLAGS = -I ../stat -I ../sys -I /usr/include/gsl -I ../kar - - all: libdwsys.a - -@@ -33,5 +33,5 @@ libdwsys.a: $(OBJECTS) NUMmachar.o - $(AR) cq libdwsys.a $(OBJECTS) - $(RANLIB) libdwsys.a - --$(OBJECTS): *.h ../stat/*.h ../sys/*.h ../external/gsl/*.h ../dwsys/*.h ../kar/*.h -+$(OBJECTS): *.h ../stat/*.h ../sys/*.h /usr/include/gsl/*.h ../dwsys/*.h ../kar/*.h - -Index: praat-6.0.36/contrib/ola/Makefile -=================================================================== ---- praat-6.0.36.orig/contrib/ola/Makefile -+++ praat-6.0.36/contrib/ola/Makefile -@@ -4,7 +4,7 @@ - - include ../../makefile.defs - --CPPFLAGS = -I ../../kar -I ../../sys -I ../../FFNet -I ../../dwtools -I ../../fon -I ../../dwsys -I ../../stat -I ../../external/gsl -D_DEBUG -D_REENTRANT -+CPPFLAGS = -I ../../kar -I ../../sys -I ../../FFNet -I ../../dwtools -I ../../fon -I ../../dwsys -I ../../stat -I /usr/include/gsl -D_DEBUG -D_REENTRANT - - OBJECTS = KNN.o \ - KNN_threads.o Pattern_to_Categories_cluster.o KNN_prune.o FeatureWeights.o praat_contrib_Ola_KNN.o manual_KNN.o -@@ -23,4 +23,4 @@ libOla.a: $(OBJECTS) - $(AR) cq libOla.a $(OBJECTS) - $(RANLIB) libOla.a - --$(OBJECTS): *.h ../../kar/*.h ../../sys/*.h ../../FFNet/*.h ../../dwtools/*.h ../../fon/*.h ../../dwsys/*.h ../../stat/*.h ../../external/gsl/*.h -+$(OBJECTS): *.h ../../kar/*.h ../../sys/*.h ../../FFNet/*.h ../../dwtools/*.h ../../fon/*.h ../../dwsys/*.h ../../stat/*.h /usr/include/gsl/*.h -Index: praat-6.0.36/dwtools/VowelEditor.cpp -=================================================================== ---- praat-6.0.36.orig/dwtools/VowelEditor.cpp -+++ praat-6.0.36/dwtools/VowelEditor.cpp +--- praat-6.0.42.orig/dwtools/VowelEditor.cpp ++++ praat-6.0.42/dwtools/VowelEditor.cpp @@ -55,7 +55,7 @@ trajectory --> path ???? #include "FormantGrid.h" @@ -112,10 +60,10 @@ #include "PitchTier_to_PointProcess.h" #include "PitchTier_to_Sound.h" #include "PointProcess_and_Sound.h" -Index: praat-6.0.36/Makefile +Index: praat-6.0.42/Makefile =================================================================== ---- praat-6.0.36.orig/Makefile -+++ praat-6.0.36/Makefile +--- praat-6.0.42.orig/Makefile ++++ praat-6.0.42/Makefile @@ -13,11 +13,8 @@ include makefile.defs # Makes the Praat executable in the source directory. @@ -127,10 +75,10 @@ - $(MAKE) -C external/portaudio $(MAKE) -C external/espeak $(MAKE) -C kar - $(MAKE) -C num + $(MAKE) -C melder @@ -40,9 +37,9 @@ all: fon/libfon.a stat/libstat.a dwsys/libdwsys.a \ - sys/libsys.a num/libnum.a kar/libkar.a \ + sys/libsys.a melder/libmelder.a kar/libkar.a \ external/espeak/libespeak.a \ - external/portaudio/libportaudio.a \ + `pkg-config --libs portaudio-2.0` `pkg-config --libs gtk+-2.0` \ @@ -140,3 +88,106 @@ $(LIBS) clean: +Index: praat-6.0.42/dwsys/Makefile +=================================================================== +--- praat-6.0.42.orig/dwsys/Makefile ++++ praat-6.0.42/dwsys/Makefile +@@ -4,7 +4,7 @@ + + include ../makefile.defs + +-CPPFLAGS = -I ../melder -I ../stat -I ../sys -I ../external/gsl -I ../kar ++CPPFLAGS = -I ../melder -I ../stat -I ../sys -I /usr/include/gsl -I ../kar + + all: libdwsys.a + +@@ -33,5 +33,5 @@ libdwsys.a: $(OBJECTS) NUMmachar.o + $(AR) cq libdwsys.a $(OBJECTS) + $(RANLIB) libdwsys.a + +-$(OBJECTS): *.h ../melder/*.h ../stat/*.h ../sys/*.h ../external/gsl/*.h ../dwsys/*.h ../kar/*.h ++$(OBJECTS): *.h ../melder/*.h ../stat/*.h ../sys/*.h /usr/include/gsl/*.h ../dwsys/*.h ../kar/*.h + +Index: praat-6.0.42/melder/melder_audio.cpp +=================================================================== +--- praat-6.0.42.orig/melder/melder_audio.cpp ++++ praat-6.0.42/melder/melder_audio.cpp +@@ -45,7 +45,7 @@ + #include <time.h> + #include "../sys/Gui.h" + #include "../sys/Preferences.h" +-#include "../external/portaudio/portaudio.h" ++#include <portaudio.h> + + #ifdef HAVE_PULSEAUDIO + void pulseAudio_initialize (); +Index: praat-6.0.42/contrib/ola/Makefile +=================================================================== +--- praat-6.0.42.orig/contrib/ola/Makefile ++++ praat-6.0.42/contrib/ola/Makefile +@@ -4,7 +4,7 @@ + + include ../../makefile.defs + +-CPPFLAGS = -I ../../kar -I ../../melder -I ../../sys -I ../../FFNet -I ../../dwtools -I ../../fon -I ../../dwsys -I ../../stat -I ../../external/gsl -D_DEBUG -D_REENTRANT ++CPPFLAGS = -I ../../kar -I ../../melder -I ../../sys -I ../../FFNet -I ../../dwtools -I ../../fon -I ../../dwsys -I ../../stat -I /usr/include/gsl -D_DEBUG -D_REENTRANT + + OBJECTS = KNN.o \ + KNN_threads.o Pattern_to_Categories_cluster.o KNN_prune.o FeatureWeights.o praat_contrib_Ola_KNN.o manual_KNN.o +@@ -23,4 +23,4 @@ libOla.a: $(OBJECTS) + $(AR) cq libOla.a $(OBJECTS) + $(RANLIB) libOla.a + +-$(OBJECTS): *.h ../../kar/*.h ../../melder/*.h ../../sys/*.h ../../FFNet/*.h ../../dwtools/*.h ../../fon/*.h ../../dwsys/*.h ../../stat/*.h ../../external/gsl/*.h ++$(OBJECTS): *.h ../../kar/*.h ../../melder/*.h ../../sys/*.h ../../FFNet/*.h ../../dwtools/*.h ../../fon/*.h ../../dwsys/*.h ../../stat/*.h /usr/include/gsl/*.h +Index: praat-6.0.42/melder/NUMspecfunc.cpp +=================================================================== +--- praat-6.0.42.orig/melder/NUMspecfunc.cpp ++++ praat-6.0.42/melder/NUMspecfunc.cpp +@@ -31,10 +31,10 @@ + #include "melder.h" + #include "../dwsys/NUM2.h" // NUMridders + +-#include "../external/gsl/gsl_errno.h" +-#include "../external/gsl/gsl_sf_bessel.h" +-#include "../external/gsl/gsl_sf_gamma.h" +-#include "../external/gsl/gsl_sf_erf.h" ++#include <gsl/gsl_errno.h> ++#include <gsl/gsl_sf_bessel.h> ++#include <gsl/gsl_sf_gamma.h> ++#include <gsl/gsl_sf_erf.h> + + double NUMlnGamma (double x) { + gsl_sf_result result; +Index: praat-6.0.42/melder/melder.cpp +=================================================================== +--- praat-6.0.42.orig/melder/melder.cpp ++++ praat-6.0.42/melder/melder.cpp +@@ -24,7 +24,7 @@ + #include "melder_enums.h" + + #include "../dwsys/NUMmachar.h" +-#include "../external/gsl/gsl_errno.h" ++#include <gsl/gsl_errno.h> + #ifdef macintosh + #include <Carbon/Carbon.h> // Gestalt + #endif +Index: praat-6.0.42/fon/Makefile +=================================================================== +--- praat-6.0.42.orig/fon/Makefile ++++ praat-6.0.42/fon/Makefile +@@ -3,7 +3,7 @@ + + include ../makefile.defs + +-CPPFLAGS = -I ../kar -I ../melder -I ../sys -I ../dwsys -I ../stat -I ../dwtools -I ../LPC -I ../fon -I ../external/portaudio -I ../external/flac -I ../external/mp3 -I ../external/espeak ++CPPFLAGS = -I ../kar -I ../melder -I ../sys -I ../dwsys -I ../stat -I ../dwtools -I ../LPC -I ../fon -I /usr/include/portaudio -I ../external/flac -I ../external/mp3 -I ../external/espeak + + OBJECTS = Transition.o Distributions_and_Transition.o \ + Function.o Sampled.o SampledXY.o Matrix.o Vector.o Polygon.o PointProcess.o \ +@@ -54,4 +54,4 @@ libfon.a: $(OBJECTS) + $(AR) cq libfon.a $(OBJECTS) + $(RANLIB) libfon.a + +-$(OBJECTS): *.h ../external/portaudio/*.h ../kar/*.h ../melder/*.h ../sys/*.h ../dwsys/*.h ../stat/*.h ../dwtools/*.h ../LPC/*.h ../external/flac/*.h ../external/mp3/mp3.h ++$(OBJECTS): *.h ../kar/*.h ../melder/*.h ../sys/*.h ../dwsys/*.h ../stat/*.h ../dwtools/*.h ../LPC/*.h ../external/flac/*.h ../external/mp3/mp3.h
