Hello community,
here is the log from the commit of package praat for openSUSE:Factory checked
in at 2018-05-16 11:39:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/praat (Old)
and /work/SRC/openSUSE:Factory/.praat.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "praat"
Wed May 16 11:39:17 2018 rev:13 rq:606619 version:6.0.40
Changes:
--------
--- /work/SRC/openSUSE:Factory/praat/praat.changes 2018-03-30
12:09:34.789054577 +0200
+++ /work/SRC/openSUSE:Factory/.praat.new/praat.changes 2018-05-16
11:40:43.726187136 +0200
@@ -1,0 +2,10 @@
+Sat May 12 06:34:41 UTC 2018 - aloi...@gmx.com
+
+- Update to version 6.0.40
+ * Scripting: selected# ().
+ * Table window: cell selection.
+ * Unicode-savvy regular expressions.
+
+- Add praat-no-return-in-nonvoid.patch
+
+-------------------------------------------------------------------
Old:
----
praat-6.0.38.tar.gz
New:
----
praat-6.0.40.tar.gz
praat-no-return-in-nonvoid.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ praat.spec ++++++
--- /var/tmp/diff_new_pack.VvPH8H/_old 2018-05-16 11:40:45.278130661 +0200
+++ /var/tmp/diff_new_pack.VvPH8H/_new 2018-05-16 11:40:45.282130515 +0200
@@ -17,7 +17,7 @@
Name: praat
-Version: 6.0.38
+Version: 6.0.40
Release: 0
Summary: Phonetics by computer
License: GPL-3.0-or-later
@@ -27,8 +27,15 @@
Source3: %{name}.changes
# PATCH-FIX-OPENSUSE praat-use_system_libs.patch -- replace some embedded libs
with system ones
Patch1: praat-use_system_libs.patch
+# PATCH-FIX-OPENSUSE praat-no-return-in-nonvoid.patch -- address rpmlint
complaint
+Patch2: praat-no-return-in-nonvoid.patch
BuildRequires: ImageMagick
-BuildRequires: gcc-c++ >= 4.8
+%if 0%{?suse_version} >= 1500
+BuildRequires: gcc-c++
+%else
+BuildRequires: gcc7
+BuildRequires: gcc7-c++
+%endif
BuildRequires: glpk-devel
BuildRequires: pkg-config
BuildRequires: pkgconfig(alsa)
@@ -50,6 +57,7 @@
%prep
%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')
@@ -58,8 +66,12 @@
sed -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -i external/portaudio/pa_front.c
%build
+test -x "$(type -p gcc-7)" && export CC=gcc-7
+test -x "$(type -p g++-7)" && export CXX=g++-7 LINK=g++-7
cp makefiles/makefile.defs.linux.pulse ./makefile.defs
-sed -e '/^CFLAGS/s/$/\ %{optflags}/' -i makefile.defs
+sed -e '/^CFLAGS/s/$/\ %{optflags}/' \
+ -e '/^CC/s/=/?=/' -e '/^CXX/s/=/?=/' \
+ -e '/^LINK/s/=/?=/' -i makefile.defs
make %{?_smp_mflags}
%install
++++++ praat-6.0.38.tar.gz -> praat-6.0.40.tar.gz ++++++
/work/SRC/openSUSE:Factory/praat/praat-6.0.38.tar.gz
/work/SRC/openSUSE:Factory/.praat.new/praat-6.0.40.tar.gz differ: char 13, line
1
++++++ praat-no-return-in-nonvoid.patch ++++++
Index: praat-6.0.40/sys/melder.cpp
===================================================================
--- praat-6.0.40.orig/sys/melder.cpp
+++ praat-6.0.40/sys/melder.cpp
@@ -379,7 +379,7 @@ bool Melder_stringMatchesCriterion (cons
return !! place;
}
}
- //return false; // should not occur
+ return false; // should not occur
}
void Melder_help (const char32 *query) {
