Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package praat for openSUSE:Factory checked in at 2022-12-03 10:03:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/praat (Old) and /work/SRC/openSUSE:Factory/.praat.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "praat" Sat Dec 3 10:03:37 2022 rev:30 rq:1039635 version:6.3.02 Changes: -------- --- /work/SRC/openSUSE:Factory/praat/praat.changes 2021-06-04 22:44:08.843167948 +0200 +++ /work/SRC/openSUSE:Factory/.praat.new.1835/praat.changes 2022-12-03 10:03:51.203312600 +0100 @@ -1,0 +2,17 @@ +Wed Nov 30 10:44:05 UTC 2022 - Atri Bhattacharya <badshah...@gmail.com> + +- Update to version 6.3.01: + * Linux: corrected a bug introduced in 6.2.20 by which typing + Tab would not start a Sound. + * Sound window: corrected a bug introduced in 6.2.19 by which + drawing selection hairs could not be switched off (or on) when + painting a spectrogram to the Picture window. +- Add praat-allow-system-flags.patch: allow system specified + compiler and linker flags to be incorporated into appropriate + flags in the makefile; in particular this allows us to + incorporate rpm optflags without using sed snippets. +- Rebase praat-use_system_libs.patch to apply cleanly. +- Clean up some trailing white-spaces in changelog entries. +- Drop praat-gcc11.patch: incorporated upstream. + +------------------------------------------------------------------- Old: ---- praat-6.1.48.tar.gz praat-gcc11.patch New: ---- praat-6.3.02.tar.gz praat-allow-system-flags.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ praat.spec ++++++ --- /var/tmp/diff_new_pack.kIMoSD/_old 2022-12-03 10:03:52.135317779 +0100 +++ /var/tmp/diff_new_pack.kIMoSD/_new 2022-12-03 10:03:52.143317824 +0100 @@ -1,7 +1,7 @@ # # spec file for package praat # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: praat -Version: 6.1.48 +Version: 6.3.02 Release: 0 Summary: Phonetics by computer License: GPL-3.0-or-later @@ -29,8 +29,8 @@ Patch1: praat-use_system_libs.patch # PATCH-FIX-OPENSUSE praat-no-return-in-nonvoid.patch -- make the compiler happy Patch2: praat-no-return-in-nonvoid.patch -# PATCH-FIX-UPSTREAM praat-gcc11.patch -Patch3: praat-gcc11.patch +# PATCH-FEATURE-OPENSUSE praat-allow-system-flags.patch badshah...@gmail.com -- Allow compilation and linker flags to incorporate appropriate env flags +Patch3: praat-allow-system-flags.patch BuildRequires: gcc-c++ BuildRequires: glpk-devel BuildRequires: hicolor-icon-theme @@ -61,10 +61,8 @@ %build cp makefiles/makefile.defs.linux.pulse ./makefile.defs -sed -e '/^CFLAGS/s/$/\ %{optflags}/' \ - -e '/^CXXFLAGS/s/$/\ %{optflags}/' \ - -e '/^CC/s/=/?=/' -e '/^CXX/s/=/?=/' \ - -e '/^LINK/s/=/?=/' -i makefile.defs +export CFLAGS="%{optflags}" +export CXXFLAGS="%{optflags}" %make_build %install ++++++ praat-6.1.48.tar.gz -> praat-6.3.02.tar.gz ++++++ /work/SRC/openSUSE:Factory/praat/praat-6.1.48.tar.gz /work/SRC/openSUSE:Factory/.praat.new.1835/praat-6.3.02.tar.gz differ: char 13, line 1 ++++++ praat-allow-system-flags.patch ++++++ Index: praat-6.3.02/makefiles/makefile.defs.linux.pulse =================================================================== --- praat-6.3.02.orig/makefiles/makefile.defs.linux.pulse +++ praat-6.3.02/makefiles/makefile.defs.linux.pulse @@ -12,13 +12,13 @@ PKG_CONFIG ?= "pkg-config" COMMONFLAGS = -DUNIX -Dlinux -DALSA -DHAVE_PULSEAUDIO -D_FILE_OFFSET_BITS=64 `$(PKG_CONFIG) --cflags gtk+-3.0` \ -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O3 -g1 -pthread -CFLAGS = -std=gnu99 $(COMMONFLAGS) -Werror=missing-prototypes -Werror=implicit +CFLAGS += -std=gnu99 $(COMMONFLAGS) -Werror=missing-prototypes -Werror=implicit -CXXFLAGS = -std=c++17 $(COMMONFLAGS) -Wshadow +CXXFLAGS += -std=c++17 $(COMMONFLAGS) -Wshadow EXECUTABLE = praat -LIBS = `$(PKG_CONFIG) --libs gtk+-3.0` -no-pie -lm -lpulse -lasound -lpthread -L /usr/lib/x86_64-linux-gnu +LIBS = ${LDFLAGS} `$(PKG_CONFIG) --libs gtk+-3.0` -no-pie -lm -lpulse -lasound -lpthread -L /usr/lib/x86_64-linux-gnu AR = ar RANLIB = ls ++++++ praat-no-return-in-nonvoid.patch ++++++ --- /var/tmp/diff_new_pack.kIMoSD/_old 2022-12-03 10:03:52.207318179 +0100 +++ /var/tmp/diff_new_pack.kIMoSD/_new 2022-12-03 10:03:52.211318202 +0100 @@ -1,8 +1,8 @@ -Index: praat-6.1.41/melder/melder_search.cpp +Index: praat-6.3.02/melder/melder_search.cpp =================================================================== ---- praat-6.1.41.orig/melder/melder_search.cpp -+++ praat-6.1.41/melder/melder_search.cpp -@@ -145,7 +145,7 @@ bool Melder_stringMatchesCriterion (cons +--- praat-6.3.02.orig/melder/melder_search.cpp ++++ praat-6.3.02/melder/melder_search.cpp +@@ -146,7 +146,7 @@ bool Melder_stringMatchesCriterion (cons return !! place; } } ++++++ praat-use_system_libs.patch ++++++ --- /var/tmp/diff_new_pack.kIMoSD/_old 2022-12-03 10:03:52.227318291 +0100 +++ /var/tmp/diff_new_pack.kIMoSD/_new 2022-12-03 10:03:52.227318291 +0100 @@ -10,10 +10,10 @@ Praat also supplies an unstable upstream portaudio version that's not recommendable for distro inclusion. -Index: praat-6.1.48/melder/NUMlinprog.cpp +Index: praat-6.3.02/melder/NUMlinprog.cpp =================================================================== ---- praat-6.1.48.orig/melder/NUMlinprog.cpp -+++ praat-6.1.48/melder/NUMlinprog.cpp +--- praat-6.3.02.orig/melder/NUMlinprog.cpp ++++ praat-6.3.02/melder/NUMlinprog.cpp @@ -17,7 +17,7 @@ */ @@ -23,10 +23,10 @@ struct structNUMlinprog { glp_prob *linearProgram; -Index: praat-6.1.48/melder/NUMspecfunc.cpp +Index: praat-6.3.02/melder/NUMspecfunc.cpp =================================================================== ---- praat-6.1.48.orig/melder/NUMspecfunc.cpp -+++ praat-6.1.48/melder/NUMspecfunc.cpp +--- praat-6.3.02.orig/melder/NUMspecfunc.cpp ++++ praat-6.3.02/melder/NUMspecfunc.cpp @@ -31,10 +31,10 @@ #include "melder.h" #include "../dwsys/NUM2.h" // NUMridders @@ -42,10 +42,10 @@ double NUMlnGamma (double x) { gsl_sf_result result; -Index: praat-6.1.48/melder/melder.cpp +Index: praat-6.3.02/melder/melder.cpp =================================================================== ---- praat-6.1.48.orig/melder/melder.cpp -+++ praat-6.1.48/melder/melder.cpp +--- praat-6.3.02.orig/melder/melder.cpp ++++ praat-6.3.02/melder/melder.cpp @@ -24,7 +24,7 @@ #include "melder_enums.h" @@ -55,16 +55,16 @@ #ifdef macintosh #include <Carbon/Carbon.h> // Gestalt #endif -Index: praat-6.1.48/dwsys/Makefile +Index: praat-6.3.02/dwsys/Makefile =================================================================== ---- praat-6.1.48.orig/dwsys/Makefile -+++ praat-6.1.48/dwsys/Makefile +--- praat-6.3.02.orig/dwsys/Makefile ++++ praat-6.3.02/dwsys/Makefile @@ -4,7 +4,7 @@ include ../makefile.defs --CPPFLAGS = -I ../melder -I ../stat -I ../sys -I ../fon -I ../external/gsl -I ../external/clapack -I ../kar -+CPPFLAGS = -I ../melder -I ../stat -I ../sys -I ../fon -I /usr/include/gsl -I ../external/clapack -I ../kar +-CPPFLAGS = -I ../melder -I ../stat -I ../sys -I ../fon -I ../external/gsl -I ../external/clapack -I ../kar -I ../dwtools ++CPPFLAGS = -I ../melder -I ../stat -I ../sys -I ../fon -I /usr/include/gsl -I ../external/clapack -I ../kar -I ../dwtools all: libdwsys.a @@ -75,11 +75,11 @@ -$(OBJECTS): *.h ../melder/*.h ../stat/*.h ../sys/*.h ../fon/*.h ../external/gsl/*.h ../dwsys/*.h ../kar/*.h +$(OBJECTS): *.h ../melder/*.h ../stat/*.h ../sys/*.h ../fon/*.h /usr/include/gsl/*.h ../dwsys/*.h ../kar/*.h -Index: praat-6.1.48/Makefile +Index: praat-6.3.02/Makefile =================================================================== ---- praat-6.1.48.orig/Makefile -+++ praat-6.1.48/Makefile -@@ -23,23 +23,17 @@ all: all-external all-self +--- praat-6.3.02.orig/Makefile ++++ praat-6.3.02/Makefile +@@ -22,23 +22,17 @@ all: all-external all-self external/espeak/libespeak.a \ external/portaudio/libportaudio.a \ external/flac/libflac.a external/mp3/libmp3.a \ @@ -105,24 +105,11 @@ all-self: $(MAKE) -C kar -Index: praat-6.1.48/dwtools/Makefile +Index: praat-6.3.02/dwtools/Sound_extensions.cpp =================================================================== ---- praat-6.1.48.orig/dwtools/Makefile -+++ praat-6.1.48/dwtools/Makefile -@@ -4,7 +4,7 @@ - - include ../makefile.defs - --CPPFLAGS = -I . -I ../kar -I ../melder -I ../LPC -I ../fon -I ../sys -I ../stat -I ../dwsys -I ../external/portaudio -I ../external/espeak -I ../external/clapack -I ../EEG -I ../external/vorbis -I ../external/opusfile -+CPPFLAGS = -I . -I ../kar -I ../melder -I ../LPC -I ../fon -I ../sys -I ../stat -I ../dwsys -I ../external/portaudio -I ../external/espeak -I ../external/clapack -I ../EEG -I /usr/include/opus - - OBJECTS = ActivationList.o AffineTransform.o AnalyticSound.o \ - Categories.o CategoriesEditor.o \ -Index: praat-6.1.48/dwtools/Sound_extensions.cpp -=================================================================== ---- praat-6.1.48.orig/dwtools/Sound_extensions.cpp -+++ praat-6.1.48/dwtools/Sound_extensions.cpp -@@ -35,9 +35,9 @@ +--- praat-6.3.02.orig/dwtools/Sound_extensions.cpp ++++ praat-6.3.02/dwtools/Sound_extensions.cpp +@@ -36,9 +36,9 @@ #include "Ltas.h" #include "Manipulation.h" #include "NUMcomplex.h" @@ -135,4 +122,17 @@ #include "enums_getText.h" #include "Sound_extensions_enums.h" +Index: praat-6.3.02/dwtools/Makefile +=================================================================== +--- praat-6.3.02.orig/dwtools/Makefile ++++ praat-6.3.02/dwtools/Makefile +@@ -4,7 +4,7 @@ + + include ../makefile.defs + +-CPPFLAGS = -I . -I ../kar -I ../melder -I ../LPC -I ../fon -I ../foned -I ../sys -I ../stat -I ../dwsys -I ../external/portaudio -I ../external/espeak -I ../external/clapack -I ../EEG -I ../external/vorbis -I ../external/opusfile ++CPPFLAGS = -I . -I ../kar -I ../melder -I ../LPC -I ../fon -I ../foned -I ../sys -I ../stat -I ../dwsys -I ../external/portaudio -I ../external/espeak -I ../external/clapack -I ../EEG -I /usr/include/opus + + OBJECTS = ActivationList.o AffineTransform.o AnalyticSound.o \ + Categories.o CategoriesEditor.o \