Hello community, here is the log from the commit of package lmms for openSUSE:Factory checked in at 2015-06-30 10:18:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lmms (Old) and /work/SRC/openSUSE:Factory/.lmms.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lmms" Changes: -------- --- /work/SRC/openSUSE:Factory/lmms/lmms.changes 2015-03-28 18:38:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.lmms.new/lmms.changes 2015-06-30 10:18:52.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Jun 24 09:38:18 UTC 2015 - [email protected] + +- Fix compilation with GCC 5: + * Add lmms-1.1.3-fix-wrong-comparison-logic.patch from upstream. + * Add fgnu89-inline to CFLAGS. + +------------------------------------------------------------------- New: ---- lmms-1.1.3-fix-wrong-comparison-logic.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lmms.spec ++++++ --- /var/tmp/diff_new_pack.lFiMGH/_old 2015-06-30 10:18:53.000000000 +0200 +++ /var/tmp/diff_new_pack.lFiMGH/_new 2015-06-30 10:18:53.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package lmms # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,7 +27,8 @@ Url: https://lmms.io/ Source0: https://github.com/LMMS/lmms/archive/v%{version}.tar.gz - +# PATCH-FIX-UPSTREAM Fix wrong comparison logic (from upstream) +Patch1: lmms-1.1.3-fix-wrong-comparison-logic.patch # PATCH-FIX-OPENSUSE Patch for providing proper return code in a function Patch2: lmms-1.1.0-return.patch # PATCH-FIX-OPENSUSE Some parts cannot be build because stk misses some files due to legal issues (bnc#761147) @@ -89,6 +90,7 @@ %prep %setup -q +%patch1 -p1 %patch2 -p1 %if %{with crippled_stk} %patch4 -p1 @@ -97,7 +99,7 @@ %build mkdir build cd build -export CFLAGS="%{optflags}" +export CFLAGS="%{optflags} -fgnu89-inline" export CXXFLAGS="%{optflags}" cmake -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ ++++++ lmms-1.1.3-fix-wrong-comparison-logic.patch ++++++ >From 317b2f02a829f694a66c760fc6de7df1db99b006 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel <[email protected]> Date: Mon, 16 Feb 2015 18:22:49 +0100 Subject: [PATCH] AutomatableModel: fix wrong comparison logic We must not negate the float but instead test for inequality in order to determine whether the linked model has to be updated. Closes #1761. --- src/core/AutomatableModel.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/core/AutomatableModel.cpp b/src/core/AutomatableModel.cpp index 6c7501c..bf56285 100644 --- a/src/core/AutomatableModel.cpp +++ b/src/core/AutomatableModel.cpp @@ -318,8 +318,7 @@ void AutomatableModel::setAutomatedValue( const float value ) it != m_linkedModels.end(); ++it ) { if( (*it)->m_setValueDepth < 1 && - !(*it)->fittedValue( m_value ) != - (*it)->m_value ) + (*it)->fittedValue( m_value ) != (*it)->m_value ) { (*it)->setAutomatedValue( value ); }
